]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'refs/remotes/origin/divVerent/mapinfo-cleanup'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 4 Aug 2010 11:33:16 +0000 (13:33 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 4 Aug 2010 11:33:16 +0000 (13:33 +0200)
531 files changed:
_hud_descriptions.cfg [new file with mode: 0644]
balance.cfg [deleted file]
balance25.cfg
balanceFruit.cfg [deleted file]
balanceNexSVN.cfg [new file with mode: 0644]
balanceSamual.cfg
balanceXPM.cfg [deleted file]
balanceXonotic.cfg [new file with mode: 0644]
defaultXPM.cfg
defaultXonotic.cfg
effectinfo.txt
gfx/conback.tga
gfx/conback2.tga [new file with mode: 0644]
gfx/conback3.tga [new file with mode: 0644]
gfx/hud/default/ammo_bullets.tga [new file with mode: 0644]
gfx/hud/default/ammo_cells.tga [new file with mode: 0644]
gfx/hud/default/ammo_current_bg.tga [new file with mode: 0644]
gfx/hud/default/ammo_fuel.tga [new file with mode: 0644]
gfx/hud/default/ammo_rockets.tga [new file with mode: 0644]
gfx/hud/default/ammo_shells.tga [new file with mode: 0644]
gfx/hud/default/armor.tga [new file with mode: 0644]
gfx/hud/default/border.tga
gfx/hud/default/border_highlighted.tga [new file with mode: 0644]
gfx/hud/default/border_highlighted2.tga [new file with mode: 0644]
gfx/hud/default/borderx.tga [deleted file]
gfx/hud/default/dock.tga [new file with mode: 0644]
gfx/hud/default/flag_blue_carrying.tga [new file with mode: 0644]
gfx/hud/default/flag_blue_lost.tga [new file with mode: 0644]
gfx/hud/default/flag_blue_shielded.tga [new file with mode: 0644]
gfx/hud/default/flag_blue_taken.tga [new file with mode: 0644]
gfx/hud/default/flag_red_carrying.tga [new file with mode: 0644]
gfx/hud/default/flag_red_lost.tga [new file with mode: 0644]
gfx/hud/default/flag_red_shielded.tga [new file with mode: 0644]
gfx/hud/default/flag_red_taken.tga [new file with mode: 0644]
gfx/hud/default/health.tga [new file with mode: 0644]
gfx/hud/default/key_backward.tga [new file with mode: 0644]
gfx/hud/default/key_backward_inv.tga [new file with mode: 0644]
gfx/hud/default/key_crouch.tga [new file with mode: 0644]
gfx/hud/default/key_crouch_inv.tga [new file with mode: 0644]
gfx/hud/default/key_forward.tga [new file with mode: 0644]
gfx/hud/default/key_forward_inv.tga [new file with mode: 0644]
gfx/hud/default/key_jump.tga [new file with mode: 0644]
gfx/hud/default/key_jump_inv.tga [new file with mode: 0644]
gfx/hud/default/key_left.tga [new file with mode: 0644]
gfx/hud/default/key_left_inv.tga [new file with mode: 0644]
gfx/hud/default/key_right.tga [new file with mode: 0644]
gfx/hud/default/key_right_inv.tga [new file with mode: 0644]
gfx/hud/default/kh_blue.tga [new file with mode: 0644]
gfx/hud/default/kh_bluearrow.tga [new file with mode: 0644]
gfx/hud/default/kh_pink.tga [new file with mode: 0644]
gfx/hud/default/kh_pinkarrow.tga [new file with mode: 0644]
gfx/hud/default/kh_red.tga [new file with mode: 0644]
gfx/hud/default/kh_redarrow.tga [new file with mode: 0644]
gfx/hud/default/kh_yellow.tga [new file with mode: 0644]
gfx/hud/default/kh_yellowarrow.tga [new file with mode: 0644]
gfx/hud/default/nexball_carrying.tga [new file with mode: 0644]
gfx/hud/default/notify_blue_captured.tga [new file with mode: 0644]
gfx/hud/default/notify_blue_lost.tga [new file with mode: 0644]
gfx/hud/default/notify_blue_returned.tga [new file with mode: 0644]
gfx/hud/default/notify_blue_shielded.tga [new file with mode: 0644]
gfx/hud/default/notify_blue_taken.tga [new file with mode: 0644]
gfx/hud/default/notify_camping.tga [new file with mode: 0644]
gfx/hud/default/notify_death.tga [new file with mode: 0644]
gfx/hud/default/notify_fall.tga [new file with mode: 0644]
gfx/hud/default/notify_headshot.tga [new file with mode: 0644]
gfx/hud/default/notify_lava.tga [new file with mode: 0644]
gfx/hud/default/notify_melee_laser.tga [new file with mode: 0644]
gfx/hud/default/notify_melee_shotgun.tga [new file with mode: 0644]
gfx/hud/default/notify_outofammo.tga [new file with mode: 0644]
gfx/hud/default/notify_red_captured.tga [new file with mode: 0644]
gfx/hud/default/notify_red_lost.tga [new file with mode: 0644]
gfx/hud/default/notify_red_returned.tga [new file with mode: 0644]
gfx/hud/default/notify_red_shielded.tga [new file with mode: 0644]
gfx/hud/default/notify_red_taken.tga [new file with mode: 0644]
gfx/hud/default/notify_selfkill.tga [new file with mode: 0644]
gfx/hud/default/notify_shootingstar.tga [new file with mode: 0644]
gfx/hud/default/notify_slime.tga [new file with mode: 0644]
gfx/hud/default/notify_teamkill_blue.tga [new file with mode: 0644]
gfx/hud/default/notify_teamkill_red.tga [new file with mode: 0644]
gfx/hud/default/notify_void.tga [new file with mode: 0644]
gfx/hud/default/notify_water.tga [new file with mode: 0644]
gfx/hud/default/num_leading.tga [new file with mode: 0644]
gfx/hud/default/race_newfail.tga [new file with mode: 0644]
gfx/hud/default/race_newrankgreen.tga [new file with mode: 0644]
gfx/hud/default/race_newrankyellow.tga [new file with mode: 0644]
gfx/hud/default/race_newrecordserver.tga [new file with mode: 0644]
gfx/hud/default/race_newtime.tga [new file with mode: 0644]
gfx/hud/default/shield.tga [new file with mode: 0644]
gfx/hud/default/statusbar.tga [new file with mode: 0644]
gfx/hud/default/statusbar_vertical.tga [new file with mode: 0644]
gfx/hud/default/strength.tga [new file with mode: 0644]
gfx/hud/default/voteprogress_back.tga [new file with mode: 0644]
gfx/hud/default/voteprogress_prog.tga [new file with mode: 0644]
gfx/hud/default/voteprogress_voted.tga [new file with mode: 0644]
gfx/hud/default/weapon_accuracy.tga [new file with mode: 0644]
gfx/hud/default/weapon_ammo.tga [new file with mode: 0644]
gfx/hud/default/weapon_complainbubble.tga [new file with mode: 0644]
gfx/hud/default/weapon_current_bg.tga [new file with mode: 0644]
gfx/hud/default/weapon_hlacmod_renameit.tga [new file with mode: 0644]
gfx/hud/default/weaponcampingrifle.tga [new file with mode: 0644]
gfx/hud/default/weaponcrylink.tga [new file with mode: 0644]
gfx/hud/default/weaponelectro.tga [new file with mode: 0644]
gfx/hud/default/weaponfireball.tga [new file with mode: 0644]
gfx/hud/default/weapongrenadelauncher.tga [new file with mode: 0644]
gfx/hud/default/weaponhagar.tga [new file with mode: 0644]
gfx/hud/default/weaponhlac.tga [new file with mode: 0644]
gfx/hud/default/weaponhook.tga [new file with mode: 0644]
gfx/hud/default/weaponlaser.tga [new file with mode: 0644]
gfx/hud/default/weaponminstanex.tga [new file with mode: 0644]
gfx/hud/default/weaponnex.tga [new file with mode: 0644]
gfx/hud/default/weaponporto.tga [new file with mode: 0644]
gfx/hud/default/weaponrocketlauncher.tga [new file with mode: 0644]
gfx/hud/default/weaponseeker.tga [new file with mode: 0644]
gfx/hud/default/weaponshotgun.tga [new file with mode: 0644]
gfx/hud/default/weapontuba.tga [new file with mode: 0644]
gfx/hud/default/weaponuzi.tga [new file with mode: 0644]
gfx/hud/luminos/ammo_bullets.tga [new file with mode: 0644]
gfx/hud/luminos/ammo_cells.tga [new file with mode: 0644]
gfx/hud/luminos/ammo_current_bg.tga [new file with mode: 0644]
gfx/hud/luminos/ammo_fuel.tga [new file with mode: 0644]
gfx/hud/luminos/ammo_rockets.tga [new file with mode: 0644]
gfx/hud/luminos/ammo_shells.tga [new file with mode: 0644]
gfx/hud/luminos/armor.tga [new file with mode: 0644]
gfx/hud/luminos/border.tga [new file with mode: 0644]
gfx/hud/luminos/border_highlighted.tga [new file with mode: 0644]
gfx/hud/luminos/border_highlighted2.tga [new file with mode: 0644]
gfx/hud/luminos/dock.tga [new file with mode: 0644]
gfx/hud/luminos/flag_blue_carrying.tga [new file with mode: 0644]
gfx/hud/luminos/flag_blue_lost.tga [new file with mode: 0644]
gfx/hud/luminos/flag_blue_shielded.tga [new file with mode: 0644]
gfx/hud/luminos/flag_blue_taken.tga [new file with mode: 0644]
gfx/hud/luminos/flag_red_carrying.tga [new file with mode: 0644]
gfx/hud/luminos/flag_red_lost.tga [new file with mode: 0644]
gfx/hud/luminos/flag_red_shielded.tga [new file with mode: 0644]
gfx/hud/luminos/flag_red_taken.tga [new file with mode: 0644]
gfx/hud/luminos/health.tga [new file with mode: 0644]
gfx/hud/luminos/key_backward.tga [new file with mode: 0644]
gfx/hud/luminos/key_backward_inv.tga [new file with mode: 0644]
gfx/hud/luminos/key_crouch.tga [new file with mode: 0644]
gfx/hud/luminos/key_crouch_inv.tga [new file with mode: 0644]
gfx/hud/luminos/key_forward.tga [new file with mode: 0644]
gfx/hud/luminos/key_forward_inv.tga [new file with mode: 0644]
gfx/hud/luminos/key_jump.tga [new file with mode: 0644]
gfx/hud/luminos/key_jump_inv.tga [new file with mode: 0644]
gfx/hud/luminos/key_left.tga [new file with mode: 0644]
gfx/hud/luminos/key_left_inv.tga [new file with mode: 0644]
gfx/hud/luminos/key_right.tga [new file with mode: 0644]
gfx/hud/luminos/key_right_inv.tga [new file with mode: 0644]
gfx/hud/luminos/nexball_carrying.tga [new file with mode: 0644]
gfx/hud/luminos/notify_blue_captured.tga [new file with mode: 0644]
gfx/hud/luminos/notify_blue_carrying.tga [new file with mode: 0644]
gfx/hud/luminos/notify_blue_lost.tga [new file with mode: 0644]
gfx/hud/luminos/notify_blue_returned.tga [new file with mode: 0644]
gfx/hud/luminos/notify_blue_shielded.tga [new file with mode: 0644]
gfx/hud/luminos/notify_blue_taken.tga [new file with mode: 0644]
gfx/hud/luminos/notify_camping.tga [new file with mode: 0644]
gfx/hud/luminos/notify_death.tga [new file with mode: 0644]
gfx/hud/luminos/notify_fall.tga [new file with mode: 0644]
gfx/hud/luminos/notify_headshot.tga [new file with mode: 0644]
gfx/hud/luminos/notify_lava.tga [new file with mode: 0644]
gfx/hud/luminos/notify_melee_laser.tga [new file with mode: 0644]
gfx/hud/luminos/notify_melee_shotgun.tga [new file with mode: 0644]
gfx/hud/luminos/notify_outofammo.tga [new file with mode: 0644]
gfx/hud/luminos/notify_red_captured.tga [new file with mode: 0644]
gfx/hud/luminos/notify_red_carrying.tga [new file with mode: 0644]
gfx/hud/luminos/notify_red_lost.tga [new file with mode: 0644]
gfx/hud/luminos/notify_red_returned.tga [new file with mode: 0644]
gfx/hud/luminos/notify_red_shielded.tga [new file with mode: 0644]
gfx/hud/luminos/notify_red_taken.tga [new file with mode: 0644]
gfx/hud/luminos/notify_selfkill.tga [new file with mode: 0644]
gfx/hud/luminos/notify_shootingstar.tga [new file with mode: 0644]
gfx/hud/luminos/notify_slime.tga [new file with mode: 0644]
gfx/hud/luminos/notify_teamkill_blue.tga [new file with mode: 0644]
gfx/hud/luminos/notify_teamkill_red.tga [new file with mode: 0644]
gfx/hud/luminos/notify_telefrag.tga [new file with mode: 0644]
gfx/hud/luminos/notify_void.tga [new file with mode: 0644]
gfx/hud/luminos/notify_water.tga [new file with mode: 0644]
gfx/hud/luminos/num_leading.tga [new file with mode: 0644]
gfx/hud/luminos/race_newfail.tga [new file with mode: 0644]
gfx/hud/luminos/race_newrankgreen.tga [new file with mode: 0644]
gfx/hud/luminos/race_newrankyellow.tga [new file with mode: 0644]
gfx/hud/luminos/race_newrecordserver.tga [new file with mode: 0644]
gfx/hud/luminos/race_newtime.tga [new file with mode: 0644]
gfx/hud/luminos/statusbar.tga [new file with mode: 0644]
gfx/hud/luminos/statusbar_vertical.tga [new file with mode: 0644]
gfx/hud/luminos/voteprogress_back.tga [new file with mode: 0644]
gfx/hud/luminos/voteprogress_prog.tga [new file with mode: 0644]
gfx/hud/luminos/voteprogress_voted.tga [new file with mode: 0644]
gfx/hud/luminos/weapon_accuracy.tga [new file with mode: 0644]
gfx/hud/luminos/weapon_ammo.tga [new file with mode: 0644]
gfx/hud/luminos/weapon_complainbubble.tga [new file with mode: 0644]
gfx/hud/luminos/weapon_current_bg.tga [new file with mode: 0644]
gfx/hud/luminos/weapon_hlacmod_renameit.tga [new file with mode: 0644]
gfx/hud/luminos/weaponcampingrifle.tga [new file with mode: 0644]
gfx/hud/luminos/weaponcrylink.tga [new file with mode: 0644]
gfx/hud/luminos/weaponelectro.tga [new file with mode: 0644]
gfx/hud/luminos/weaponfireball.tga [new file with mode: 0644]
gfx/hud/luminos/weapongrenadelauncher.tga [new file with mode: 0644]
gfx/hud/luminos/weaponhagar.tga [new file with mode: 0644]
gfx/hud/luminos/weaponhlac.tga [new file with mode: 0644]
gfx/hud/luminos/weaponhook.tga [new file with mode: 0644]
gfx/hud/luminos/weaponlaser.tga [new file with mode: 0644]
gfx/hud/luminos/weaponminstanex.tga [new file with mode: 0644]
gfx/hud/luminos/weaponnex.tga [new file with mode: 0644]
gfx/hud/luminos/weaponporto.tga [new file with mode: 0644]
gfx/hud/luminos/weaponrocketlauncher.tga [new file with mode: 0644]
gfx/hud/luminos/weaponseeker.tga [new file with mode: 0644]
gfx/hud/luminos/weaponshotgun.tga [new file with mode: 0644]
gfx/hud/luminos/weapontuba.tga [new file with mode: 0644]
gfx/hud/luminos/weaponuzi.tga [new file with mode: 0644]
gfx/hud/old/num_0.tga [deleted file]
gfx/hud/old/num_0_stroke.tga [deleted file]
gfx/hud/old/num_1.tga [deleted file]
gfx/hud/old/num_1_stroke.tga [deleted file]
gfx/hud/old/num_2.tga [deleted file]
gfx/hud/old/num_2_stroke.tga [deleted file]
gfx/hud/old/num_3.tga [deleted file]
gfx/hud/old/num_3_stroke.tga [deleted file]
gfx/hud/old/num_4.tga [deleted file]
gfx/hud/old/num_4_stroke.tga [deleted file]
gfx/hud/old/num_5.tga [deleted file]
gfx/hud/old/num_5_stroke.tga [deleted file]
gfx/hud/old/num_6.tga [deleted file]
gfx/hud/old/num_6_stroke.tga [deleted file]
gfx/hud/old/num_7.tga [deleted file]
gfx/hud/old/num_7_stroke.tga [deleted file]
gfx/hud/old/num_8.tga [deleted file]
gfx/hud/old/num_8_stroke.tga [deleted file]
gfx/hud/old/num_9.tga [deleted file]
gfx/hud/old/num_9_stroke.tga [deleted file]
gfx/hud/old/num_colon.tga [deleted file]
gfx/hud/old/num_colon_stroke.tga [deleted file]
gfx/hud/old/num_dot.tga [deleted file]
gfx/hud/old/num_dot_stroke.tga [deleted file]
gfx/hud/old/num_leading_1.tga [deleted file]
gfx/hud/old/num_leading_2.tga [deleted file]
gfx/hud/old/num_leading_3.tga [deleted file]
gfx/hud/old/num_minus.tga [deleted file]
gfx/hud/old/num_minus_stroke.tga [deleted file]
gfx/hud/old/num_plus.tga [deleted file]
gfx/hud/old/num_plus_stroke.tga [deleted file]
gfx/hud/old/rifle_ring_1.tga [deleted file]
gfx/hud/old/rifle_ring_2.tga [deleted file]
gfx/hud/old/rifle_ring_3.tga [deleted file]
gfx/hud/old/rifle_ring_4.tga [deleted file]
gfx/hud/old/rifle_ring_5.tga [deleted file]
gfx/hud/old/rifle_ring_6.tga [deleted file]
gfx/hud/old/rifle_ring_7.tga [deleted file]
gfx/hud/old/rifle_ring_8.tga [deleted file]
gfx/hud/wickedhud/ammo_bullets.tga [deleted file]
gfx/hud/wickedhud/ammo_cells.tga [deleted file]
gfx/hud/wickedhud/ammo_current_bg.tga [deleted file]
gfx/hud/wickedhud/ammo_fuel.tga [deleted file]
gfx/hud/wickedhud/ammo_rockets.tga [deleted file]
gfx/hud/wickedhud/ammo_shells.tga [deleted file]
gfx/hud/wickedhud/armor.tga [deleted file]
gfx/hud/wickedhud/border.tga [deleted file]
gfx/hud/wickedhud/border_chat.tga [deleted file]
gfx/hud/wickedhud/border_healtharmor.tga [deleted file]
gfx/hud/wickedhud/border_inventory.tga [deleted file]
gfx/hud/wickedhud/border_modicons.tga [deleted file]
gfx/hud/wickedhud/border_powerups.tga [deleted file]
gfx/hud/wickedhud/border_radar.tga [deleted file]
gfx/hud/wickedhud/border_score.tga [deleted file]
gfx/hud/wickedhud/border_timer.tga [deleted file]
gfx/hud/wickedhud/border_vote.tga [deleted file]
gfx/hud/wickedhud/border_weaponicons.tga [deleted file]
gfx/hud/wickedhud/dock.tga [deleted file]
gfx/hud/wickedhud/dock_small.tga [deleted file]
gfx/hud/wickedhud/flag_blue_carrying.tga [deleted file]
gfx/hud/wickedhud/flag_blue_lost.tga [deleted file]
gfx/hud/wickedhud/flag_blue_shielded.tga [deleted file]
gfx/hud/wickedhud/flag_blue_taken.tga [deleted file]
gfx/hud/wickedhud/flag_red_carrying.tga [deleted file]
gfx/hud/wickedhud/flag_red_lost.tga [deleted file]
gfx/hud/wickedhud/flag_red_shielded.tga [deleted file]
gfx/hud/wickedhud/flag_red_taken.tga [deleted file]
gfx/hud/wickedhud/health.tga [deleted file]
gfx/hud/wickedhud/key_backward.tga [deleted file]
gfx/hud/wickedhud/key_backward_inv.tga [deleted file]
gfx/hud/wickedhud/key_crouch.tga [deleted file]
gfx/hud/wickedhud/key_crouch_inv.tga [deleted file]
gfx/hud/wickedhud/key_forward.tga [deleted file]
gfx/hud/wickedhud/key_forward_inv.tga [deleted file]
gfx/hud/wickedhud/key_jump.tga [deleted file]
gfx/hud/wickedhud/key_jump_inv.tga [deleted file]
gfx/hud/wickedhud/key_left.tga [deleted file]
gfx/hud/wickedhud/key_left_inv.tga [deleted file]
gfx/hud/wickedhud/key_right.tga [deleted file]
gfx/hud/wickedhud/key_right_inv.tga [deleted file]
gfx/hud/wickedhud/kh_blue.tga [deleted file]
gfx/hud/wickedhud/kh_bluearrow.tga [deleted file]
gfx/hud/wickedhud/kh_pink.tga [deleted file]
gfx/hud/wickedhud/kh_pinkarrow.tga [deleted file]
gfx/hud/wickedhud/kh_red.tga [deleted file]
gfx/hud/wickedhud/kh_redarrow.tga [deleted file]
gfx/hud/wickedhud/kh_yellow.tga [deleted file]
gfx/hud/wickedhud/kh_yellowarrow.tga [deleted file]
gfx/hud/wickedhud/nexball_carrying.tga [deleted file]
gfx/hud/wickedhud/notify_camping.tga [deleted file]
gfx/hud/wickedhud/notify_death.tga [deleted file]
gfx/hud/wickedhud/notify_fall.tga [deleted file]
gfx/hud/wickedhud/notify_lava.tga [deleted file]
gfx/hud/wickedhud/notify_outofammo.tga [deleted file]
gfx/hud/wickedhud/notify_selfkill.tga [deleted file]
gfx/hud/wickedhud/notify_shootingstar.tga [deleted file]
gfx/hud/wickedhud/notify_slime.tga [deleted file]
gfx/hud/wickedhud/notify_teamkill.tga [deleted file]
gfx/hud/wickedhud/notify_void.tga [deleted file]
gfx/hud/wickedhud/notify_water.tga [deleted file]
gfx/hud/wickedhud/num_0.tga [deleted file]
gfx/hud/wickedhud/num_0_stroke.tga [deleted file]
gfx/hud/wickedhud/num_1.tga [deleted file]
gfx/hud/wickedhud/num_1_stroke.tga [deleted file]
gfx/hud/wickedhud/num_2.tga [deleted file]
gfx/hud/wickedhud/num_2_stroke.tga [deleted file]
gfx/hud/wickedhud/num_3.tga [deleted file]
gfx/hud/wickedhud/num_3_stroke.tga [deleted file]
gfx/hud/wickedhud/num_4.tga [deleted file]
gfx/hud/wickedhud/num_4_stroke.tga [deleted file]
gfx/hud/wickedhud/num_5.tga [deleted file]
gfx/hud/wickedhud/num_5_stroke.tga [deleted file]
gfx/hud/wickedhud/num_6.tga [deleted file]
gfx/hud/wickedhud/num_6_stroke.tga [deleted file]
gfx/hud/wickedhud/num_7.tga [deleted file]
gfx/hud/wickedhud/num_7_stroke.tga [deleted file]
gfx/hud/wickedhud/num_8.tga [deleted file]
gfx/hud/wickedhud/num_8_stroke.tga [deleted file]
gfx/hud/wickedhud/num_9.tga [deleted file]
gfx/hud/wickedhud/num_9_stroke.tga [deleted file]
gfx/hud/wickedhud/num_colon.tga [deleted file]
gfx/hud/wickedhud/num_colon_stroke.tga [deleted file]
gfx/hud/wickedhud/num_dot.tga [deleted file]
gfx/hud/wickedhud/num_dot_stroke.tga [deleted file]
gfx/hud/wickedhud/num_leading_1.tga [deleted file]
gfx/hud/wickedhud/num_leading_2.tga [deleted file]
gfx/hud/wickedhud/num_leading_3.tga [deleted file]
gfx/hud/wickedhud/num_minus.tga [deleted file]
gfx/hud/wickedhud/num_minus_stroke.tga [deleted file]
gfx/hud/wickedhud/num_plus.tga [deleted file]
gfx/hud/wickedhud/num_plus_stroke.tga [deleted file]
gfx/hud/wickedhud/race_newfail.tga [deleted file]
gfx/hud/wickedhud/race_newrankgreen.tga [deleted file]
gfx/hud/wickedhud/race_newrankyellow.tga [deleted file]
gfx/hud/wickedhud/race_newrecordserver.tga [deleted file]
gfx/hud/wickedhud/race_newtime.tga [deleted file]
gfx/hud/wickedhud/rifle_ring_1.tga [deleted file]
gfx/hud/wickedhud/rifle_ring_2.tga [deleted file]
gfx/hud/wickedhud/rifle_ring_3.tga [deleted file]
gfx/hud/wickedhud/rifle_ring_4.tga [deleted file]
gfx/hud/wickedhud/rifle_ring_5.tga [deleted file]
gfx/hud/wickedhud/rifle_ring_6.tga [deleted file]
gfx/hud/wickedhud/rifle_ring_7.tga [deleted file]
gfx/hud/wickedhud/rifle_ring_8.tga [deleted file]
gfx/hud/wickedhud/shield.tga [deleted file]
gfx/hud/wickedhud/statusbar.tga [deleted file]
gfx/hud/wickedhud/statusbar_vertical.tga [deleted file]
gfx/hud/wickedhud/strength.tga [deleted file]
gfx/hud/wickedhud/voteprogress_back.tga [deleted file]
gfx/hud/wickedhud/voteprogress_prog.tga [deleted file]
gfx/hud/wickedhud/voteprogress_voted.tga [deleted file]
gfx/hud/wickedhud/weapon_accuracy.tga [deleted file]
gfx/hud/wickedhud/weapon_current_bg.tga [deleted file]
gfx/hud/wickedhud/weapon_hlacmod_renameit.tga [deleted file]
gfx/hud/wickedhud/weaponcampingrifle.tga [deleted file]
gfx/hud/wickedhud/weaponcrylink.tga [deleted file]
gfx/hud/wickedhud/weaponelectro.tga [deleted file]
gfx/hud/wickedhud/weaponfireball.tga [deleted file]
gfx/hud/wickedhud/weapongrenadelauncher.tga [deleted file]
gfx/hud/wickedhud/weaponhagar.tga [deleted file]
gfx/hud/wickedhud/weaponhlac.tga [deleted file]
gfx/hud/wickedhud/weaponhook.tga [deleted file]
gfx/hud/wickedhud/weaponlaser.tga [deleted file]
gfx/hud/wickedhud/weaponminstanex.tga [deleted file]
gfx/hud/wickedhud/weaponnex.tga [deleted file]
gfx/hud/wickedhud/weaponporto.tga [deleted file]
gfx/hud/wickedhud/weaponrocketlauncher.tga [deleted file]
gfx/hud/wickedhud/weaponseeker.tga [deleted file]
gfx/hud/wickedhud/weaponshotgun.tga [deleted file]
gfx/hud/wickedhud/weapontuba.tga [deleted file]
gfx/hud/wickedhud/weaponuzi.tga [deleted file]
gfx/menu/default/cursor_move.tga [new file with mode: 0644]
gfx/menu/default/cursor_resize.tga [new file with mode: 0644]
gfx/menu/default/cursor_resize2.tga [new file with mode: 0644]
gfx/menu/wickedx/colorpicker_m.tga
gfx/menu/wickedx/colorpicker_selected.tga [new file with mode: 0644]
gfx/menu/wickedx/cursor_move.tga [new file with mode: 0644]
gfx/menu/wickedx/cursor_resize.tga [new file with mode: 0644]
gfx/menu/wickedx/cursor_resize2.tga [new file with mode: 0644]
gfx/rifle_ring_1.tga [new file with mode: 0644]
gfx/rifle_ring_2.tga [new file with mode: 0644]
gfx/rifle_ring_3.tga [new file with mode: 0644]
gfx/rifle_ring_4.tga [new file with mode: 0644]
hud_default.cfg [new file with mode: 0644]
hud_luminos_default.cfg [new file with mode: 0644]
hud_old_nexuiz.cfg
hud_wickedhud_big.cfg [deleted file]
hud_wickedhud_default.cfg [deleted file]
models/items/jetpack.blend [deleted file]
models/misc/chatbubble.spr_0.tga
models/vehicles/raptor_cockpit.dpm
models/vehicles/spinner.dpm [new file with mode: 0644]
models/weapons/h_shotgun.iqm
models/weapons/h_shotgun.iqm.framegroups
particles/gauntletbeam.tga [new file with mode: 0644]
particles/lgbeam.tga [new file with mode: 0644]
physics10.cfg
physics11.cfg
physics151.cfg
physics151b.cfg
physics16rc1.cfg
physics20.cfg
physics25.cfg
physics26.cfg
physicsCPMA.cfg
physicsHavoc.cfg
physicsLeeStricklin.cfg
physicsLzd.cfg
physicsNoQWBunny-nexbased.cfg [new file with mode: 0644]
physicsNoQWBunny-xpmbased.cfg [new file with mode: 0644]
physicsNoQWBunny.cfg [deleted file]
physicsQ.cfg
physicsQ2.cfg
physicsQ2a.cfg
physicsQ3.cfg
physicsQBF.cfg
physicsQBFplus.cfg
physicsSamual.cfg
physicsWarsow.cfg
physicsWarsowClassicBunny.cfg
physicsWarsowDev.cfg
physicsXPM.cfg
physicsXPMLight.cfg [new file with mode: 0644]
qcsrc/client/Defs.qc
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/gibs.qc
qcsrc/client/hook.qc
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/mapvoting.qc
qcsrc/client/miscfunctions.qc
qcsrc/client/noise.qc [new file with mode: 0644]
qcsrc/client/noise.qh [new file with mode: 0644]
qcsrc/client/progs.src
qcsrc/client/projectile.qc
qcsrc/client/scoreboard.qc
qcsrc/client/teamradar.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/constants.qh
qcsrc/common/items.qh
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/menu/classes.c
qcsrc/menu/gamecommand.qc
qcsrc/menu/item/borderimage.c
qcsrc/menu/item/dialog.c
qcsrc/menu/menu.qh
qcsrc/menu/xonotic/checkbox_string.c [new file with mode: 0644]
qcsrc/menu/xonotic/colorpicker_string.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_ammo.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_chat.c
qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c
qcsrc/menu/xonotic/dialog_hudpanel_infomessages.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_inventory.c [deleted file]
qcsrc/menu/xonotic/dialog_hudpanel_modicons.c
qcsrc/menu/xonotic/dialog_hudpanel_notification.c
qcsrc/menu/xonotic/dialog_hudpanel_powerups.c
qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c
qcsrc/menu/xonotic/dialog_hudpanel_racetimer.c
qcsrc/menu/xonotic/dialog_hudpanel_radar.c
qcsrc/menu/xonotic/dialog_hudpanel_score.c
qcsrc/menu/xonotic/dialog_hudpanel_timer.c
qcsrc/menu/xonotic/dialog_hudpanel_vote.c
qcsrc/menu/xonotic/dialog_hudpanel_weaponicons.c [deleted file]
qcsrc/menu/xonotic/dialog_hudpanel_weapons.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudsetup_exit.c
qcsrc/menu/xonotic/mainwindow.c
qcsrc/menu/xonotic/playermodel.c
qcsrc/server/autocvars.qh
qcsrc/server/cheats.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/ctf.qc
qcsrc/server/domination.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_hook.qc
qcsrc/server/g_hook.qh
qcsrc/server/g_subs.qc
qcsrc/server/g_world.qc
qcsrc/server/gamecommand.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src
qcsrc/server/sv_main.qc
qcsrc/server/t_items.qc
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/vehicles.qc
qcsrc/server/vehicles/vehicles.qh
qcsrc/server/vote.qc
qcsrc/server/w_campingrifle.qc
qcsrc/server/w_crylink.qc
qcsrc/server/w_electro.qc
qcsrc/server/w_electro.qh [new file with mode: 0644]
qcsrc/server/w_fireball.qc
qcsrc/server/w_grenadelauncher.qc
qcsrc/server/w_hagar.qc
qcsrc/server/w_hlac.qc
qcsrc/server/w_hook.qc
qcsrc/server/w_laser.qc
qcsrc/server/w_laser.qh [new file with mode: 0644]
qcsrc/server/w_minstanex.qc
qcsrc/server/w_nex.qc
qcsrc/server/w_porto.qc
qcsrc/server/w_rocketlauncher.qc
qcsrc/server/w_seeker.qc
qcsrc/server/w_shotgun.qc
qcsrc/server/w_tuba.qc
qcsrc/server/w_uzi.qc
qcsrc/warpzonelib/client.qc
qcsrc/warpzonelib/common.qc
qcsrc/warpzonelib/common.qh
sound/weapons/gauntlet_fire.ogg
sound/weapons/gauntletbeam_fly.ogg [new file with mode: 0644]
sound/weapons/lgbeam_fire.ogg [new file with mode: 0644]
sound/weapons/lgbeam_fly.ogg [new file with mode: 0644]
sound/weapons/shotgun_melee.ogg [new file with mode: 0644]
update-cvarcount.sh
vehicle_raptor.cfg [new file with mode: 0644]

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
new file mode 100644 (file)
index 0000000..09860bb
--- /dev/null
@@ -0,0 +1,203 @@
+// this is a dummy skin that contains only the cvar descriptions, so that we can leave them out from the real skin files themselves.
+// please add any new cvars into this file, with null string values
+seta hud_skin "" "skin folder where to look for images"
+seta hud_panel_bg "" "default background for the panels, file must exist in gfx/hud/[skin name]/, 0 = disable background by default"
+seta hud_panel_bg_color "" "default background color for the panels, accepts \"shirt\" and \"pants\""
+seta hud_panel_bg_color_team "" "default setting for overriding panel color with team color in team games, 0.5 = less saturated"
+seta hud_panel_bg_alpha "" "default alpha of the background"
+seta hud_panel_bg_border "" "default border size for the panels"
+seta hud_panel_bg_padding "" "default padding of contents from the border"
+seta hud_panel_fg_alpha "" "alpha of the foreground"
+
+seta hud_dock "" "enable a fullscreen background for the hud, useful for creating artificial docks, \"\" = disable"
+seta hud_dock_color "" "dock color, accepts \"shirt\" and \"pants\""
+seta hud_dock_color_team "" "override dock color with team color in team games"
+seta hud_dock_alpha "" "alpha of the dock"
+
+seta hud_progressbar_alpha "" "alpha of progressbars"
+seta hud_progressbar_strength_color "" "R G B vector of the progress bar background color"
+seta hud_progressbar_shield_color "" "R G B vector of the progress bar background color"
+seta hud_progressbar_health_color "" "R G B vector of the progress bar background color"
+seta hud_progressbar_armor_color "" "R G B vector of the progress bar background color"
+seta hud_progressbar_fuel_color "" "R G B vector of the progress bar background color"
+seta hud_progressbar_nexball_color "" "R G B vector of the progress bar background color"
+
+seta _hud_panelorder "" "contains order in which panels are to be drawn"
+
+seta hud_configure_grid "" "snap to grid when moving/resizing panels"
+seta hud_configure_grid_xsize "" "snap to X * vid_conwidth"
+seta hud_configure_grid_ysize "" "snap to Y * vid_conheight"
+
+seta hud_panel_weapons "" "enable/disable this panel"
+seta hud_panel_weapons_pos "" "position of this panel"
+seta hud_panel_weapons_size "" "size of this panel"
+seta hud_panel_weapons_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_weapons_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_weapons_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_weapons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_weapons_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_weapons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_panel_weapons_aspect "" "use this aspect on the items"
+seta hud_panel_weapons_complainbubble "" "complain bubble (out of ammo, weapon not available etc)"
+seta hud_panel_weapons_complainbubble_padding "" "padding for the complainbubble"
+seta hud_panel_weapons_complainbubble_color_outofammo "" "color of the complainbubble when showing out of ammo message"
+seta hud_panel_weapons_complainbubble_color_donthave "" "color of the complainbubble when showing don't have weapon message"
+seta hud_panel_weapons_complainbubble_color_unavailable "" "color of the complainbubble when showing weapon unavailable message"
+seta hud_panel_weapons_ammo_color "" "color of status bar"
+seta hud_panel_weapons_ammo_alpha "" "alpha of status bar"
+
+seta hud_panel_ammo "" "enable/disable this panel"
+seta hud_panel_ammo_pos "" "position of this panel"
+seta hud_panel_ammo_size "" "size of this panel"
+seta hud_panel_ammo_onlycurrent "" "1 = show only current ammo type"
+seta hud_panel_ammo_iconalign "" "0 = align icons to the left, 1 = align icons to the right"
+seta hud_panel_ammo_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_ammo_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_ammo_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_ammo_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_ammo_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_ammo_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_panel_powerups "" "enable/disable this panel"
+seta hud_panel_powerups_pos "" "position of this panel"
+seta hud_panel_powerups_size "" "size of this panel"
+seta hud_panel_powerups_flip "" "flip strength/shield positions"
+seta hud_panel_powerups_baralign "" "0 = align bars to the left, 1 = align bars to the right, 2 = align right bar to the right, 3 = align left bar to the right"
+seta hud_panel_powerups_iconalign "" "0 = align icons to the left, 1 = align icons to the right, 2 = align right icon to the right, 3 = align left icon to the right"
+seta hud_panel_powerups_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_powerups_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_powerups_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_powerups_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_powerups_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_powerups_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_panel_powerups_progressbar "" "enable progressbar in panel"
+
+seta hud_panel_healtharmor "" "enable/disable this panel, 2 = combined health/armor display"
+seta hud_panel_healtharmor_pos "" "position of this panel"
+seta hud_panel_healtharmor_size "" "size of this panel"
+seta hud_panel_healtharmor_flip "" "flip health/armor positions"
+seta hud_panel_healtharmor_baralign "" "0 = align bars to the left, 1 = align bars to the right, 2 = align right bar to the right, 3 = align left bar to the right"
+seta hud_panel_healtharmor_iconalign "" "0 = align icons to the left, 1 = align icons to the right, 2 = align right icon to the right, 3 = align left icon to the right"
+seta hud_panel_healtharmor_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_healtharmor_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_healtharmor_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_healtharmor_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_healtharmor_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_healtharmor_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_panel_healtharmor_progressbar "" "enable progressbar in panel"
+
+seta hud_panel_notify "" "enable/disable this panel"
+seta hud_panel_notify_pos "" "position of this base of the panel"
+seta hud_panel_notify_size "" "size of this panel with all notifications on"
+seta hud_panel_notify_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_notify_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_notify_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_notify_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_notify_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_notify_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_panel_notify_flip "" "order the list top to bottom instead of bottom to top"
+seta hud_panel_notify_print "" "also con_notify print the messages that are shown on the notify panel"
+
+seta hud_panel_timer "" "enable/disable this panel"
+seta hud_panel_timer_pos "" "position of this base of the panel"
+seta hud_panel_timer_size "" "size of this panel"
+seta hud_panel_timer_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_timer_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_timer_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_timer_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_timer_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_timer_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_panel_radar "" "enable/disable this panel, 2 = also enable in non-teambased gamemodes"
+seta hud_panel_radar_pos "" "position of this base of the panel"
+seta hud_panel_radar_size "" "size of this panel"
+seta hud_panel_radar_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_radar_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_radar_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_radar_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_radar_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_radar_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_panel_radar_foreground_alpha "" "alpha of the map"
+
+seta hud_panel_score "" "enable/disable this panel"
+seta hud_panel_score_pos "" "position of this base of the panel"
+seta hud_panel_score_size "" "size of this panel"
+seta hud_panel_score_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_score_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_score_bg_color_team "" "override panel color with team color in team based games"
+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_racetimer "" "enable/disable this panel"
+seta hud_panel_racetimer_pos "" "position of this base of the panel"
+seta hud_panel_racetimer_size "" "size of this panel"
+seta hud_panel_racetimer_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_racetimer_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_racetimer_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_racetimer_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_racetimer_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_racetimer_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_panel_vote "" "enable/disable this panel"
+seta hud_panel_vote_pos "" "position of this base of the panel"
+seta hud_panel_vote_size "" "size of this panel"
+seta hud_panel_vote_alreadyvoted_alpha "" "alpha of the vote dialog after you have voted"
+seta hud_panel_vote_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_vote_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_vote_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_vote_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_vote_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_vote_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_panel_modicons "" "enable/disable this panel"
+seta hud_panel_modicons_pos "" "position of this base of the panel"
+seta hud_panel_modicons_size "" "size of this panel"
+seta hud_panel_modicons_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_modicons_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_modicons_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_modicons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_modicons_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_modicons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_panel_pressedkeys "" "enable/disable this panel, 1 = show only when spectating other players, 2 = show always"
+seta hud_panel_pressedkeys_pos "" "position of this base of the panel"
+seta hud_panel_pressedkeys_size "" "size of this panel"
+seta hud_panel_pressedkeys_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_pressedkeys_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_pressedkeys_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_pressedkeys_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_pressedkeys_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_pressedkeys_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_panel_pressedkeys_aspect "" "forced aspect on panel"
+
+seta hud_panel_chat "" "enable/disable this panel"
+seta hud_panel_chat_pos "" "position of this base of the panel"
+seta hud_panel_chat_size "" "size of this panel"
+seta hud_panel_chat_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_chat_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_chat_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_chat_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_chat_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_chat_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_panel_engineinfo "" "enable/disable this panel
+seta hud_panel_engineinfo_pos "" "position of this base of the panel"
+seta hud_panel_engineinfo_size "" "size of this panel"
+seta hud_panel_engineinfo_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_engineinfo_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_engineinfo_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_engineinfo_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_engineinfo_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_engineinfo_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_panel_infomessages "" "enable/disable this panel
+seta hud_panel_infomessages_pos "" "position of this base of the panel"
+seta hud_panel_infomessages_size "" "size of this panel"
+seta hud_panel_infomessages_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_infomessages_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_infomessages_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_infomessages_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_infomessages_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_infomessages_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_panel_infomessages_flip "" "1 = align the items to the right"
diff --git a/balance.cfg b/balance.cfg
deleted file mode 100644 (file)
index 156b69a..0000000
+++ /dev/null
@@ -1,633 +0,0 @@
-// {{{ starting gear
-set g_start_weapon_laser -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_shotgun -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_uzi -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_grenadelauncher -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_electro -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_crylink -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_nex -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_hagar -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_rocketlauncher -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_minstanex -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_porto -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_hook -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_hlac -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_campingrifle -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_tuba -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_fireball -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_seeker -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_balance_health_start 150
-set g_balance_armor_start 0
-set g_start_ammo_shells 40
-set g_start_ammo_nails 0
-set g_start_ammo_rockets 0
-set g_start_ammo_cells 0
-set g_start_ammo_fuel 0
-set g_warmup_start_health 250 "starting values when being in warmup-stage"
-set g_warmup_start_armor 100 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_shells 50 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_nails 150 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_rockets 50 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_cells 50 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
-set g_lms_start_health 250
-set g_lms_start_armor 100
-set g_lms_start_ammo_shells 50
-set g_lms_start_ammo_nails 150
-set g_lms_start_ammo_rockets 50
-set g_lms_start_ammo_cells 50
-set g_lms_start_ammo_fuel 0
-set g_balance_nix_roundtime 25
-set g_balance_nix_incrtime 1.6
-set g_balance_nix_ammo_shells 15
-set g_balance_nix_ammo_nails 45
-set g_balance_nix_ammo_rockets 15
-set g_balance_nix_ammo_cells 15
-set g_balance_nix_ammo_fuel 0
-set g_balance_nix_ammoincr_shells 2
-set g_balance_nix_ammoincr_nails 6
-set g_balance_nix_ammoincr_rockets 2
-set g_balance_nix_ammoincr_cells 2
-set g_balance_nix_ammoincr_fuel 2
-// }}}
-
-// {{{ pickup items
-set g_pickup_ammo_anyway 0
-set g_pickup_weapons_anyway 0
-set g_pickup_shells 15
-set g_pickup_shells_max 999
-set g_pickup_nails 80
-set g_pickup_nails_max 999
-set g_pickup_rockets 15
-set g_pickup_rockets_max 999
-set g_pickup_cells 25
-set g_pickup_cells_max 999
-set g_pickup_fuel 25
-set g_pickup_fuel_jetpack 50
-set g_pickup_fuel_max 999
-set g_pickup_armorsmall 5
-set g_pickup_armorsmall_max 999
-set g_pickup_armorsmall_anyway 0
-set g_pickup_armormedium 25
-set g_pickup_armormedium_max 999
-set g_pickup_armormedium_anyway 0
-set g_pickup_armorbig 50
-set g_pickup_armorbig_max 999
-set g_pickup_armorbig_anyway 0
-set g_pickup_armorlarge 100
-set g_pickup_armorlarge_max 999
-set g_pickup_armorlarge_anyway 0
-set g_pickup_healthsmall 5
-set g_pickup_healthsmall_max 999
-set g_pickup_healthsmall_anyway 0
-set g_pickup_healthmedium 25
-set g_pickup_healthmedium_max 999
-set g_pickup_healthmedium_anyway 0
-set g_pickup_healthlarge 50
-set g_pickup_healthlarge_max 999
-set g_pickup_healthlarge_anyway 0
-set g_pickup_healthmega 100
-set g_pickup_healthmega_max 999
-set g_pickup_healthmega_anyway 0
-set g_pickup_respawntime_short 15
-set g_pickup_respawntime_medium 20
-set g_pickup_respawntime_long 30
-set g_pickup_respawntime_powerup 120
-set g_pickup_respawntime_weapon 15
-set g_pickup_respawntime_ammo 15
-set g_pickup_respawntimejitter_short 0
-set g_pickup_respawntimejitter_medium 0
-set g_pickup_respawntimejitter_long 0
-set g_pickup_respawntimejitter_powerup 10
-set g_pickup_respawntimejitter_weapon 0
-set g_pickup_respawntimejitter_ammo 0
-// }}}
-
-// {{{ regen/rot
-set g_balance_health_regen 0.1
-set g_balance_health_regenlinear 0
-set g_balance_pause_health_regen 5
-set g_balance_pause_health_regen_spawn 0
-set g_balance_health_rot 0.1
-set g_balance_health_rotlinear 0
-set g_balance_pause_health_rot 5
-set g_balance_pause_health_rot_spawn 10
-set g_balance_health_regenstable 100
-set g_balance_health_rotstable 100
-set g_balance_health_limit 999
-set g_balance_armor_regen 0
-set g_balance_armor_regenlinear 0
-set g_balance_armor_rot 0.1
-set g_balance_armor_rotlinear 0
-set g_balance_pause_armor_rot 5
-set g_balance_pause_armor_rot_spawn 10
-set g_balance_armor_regenstable 100
-set g_balance_armor_rotstable 100
-set g_balance_armor_limit 999
-set g_balance_armor_blockpercent 0.6
-set g_balance_fuel_regen 0.1 "fuel regeneration (only applies if the player owns IT_FUEL_REGEN)"
-set g_balance_fuel_regenlinear 0
-set g_balance_pause_fuel_regen 2 // other than this, fuel uses the health regen counter
-set g_balance_fuel_rot 0.05
-set g_balance_fuel_rotlinear 0
-set g_balance_pause_fuel_rot 5
-set g_balance_pause_fuel_rot_spawn 10
-set g_balance_fuel_regenstable 50
-set g_balance_fuel_rotstable 100
-set g_balance_fuel_limit 999
-// }}}
-
-// {{{ misc
-set g_balance_selfdamagepercent 0.6
-set g_balance_weaponswitchdelay 0.15
-set g_weaponspeedfactor 1 "weapon projectile speed multiplier"
-set g_weaponratefactor 1 "weapon fire rate multiplier"
-set g_weapondamagefactor 1 "weapon damage multiplier"
-set g_weaponforcefactor 1 "weapon force multiplier"
-set g_weaponspreadfactor 1 "weapon spread multiplier"
-set g_balance_firetransfer_time 0.9
-set g_balance_firetransfer_damage 0.8
-set g_throughfloor_damage 0.4
-set g_throughfloor_force 0.7
-set g_projectiles_newton_style 2
-// possible values:
-// 0: absolute velocity projectiles (like Quake)
-// 1: relative velocity projectiles, "Newtonian" (like Tribes 2)
-// 2: relative velocity projectiles, but aim is precorrected so projectiles hit the crosshair (note: strafe rockets then are SLOWER than ones shot while standing, happens in 1 too when aiming correctly which is hard)
-// 3: absolute velocity + player velocity component in shot direction (note: does NOT yield the right relative velocity, but may be good enough, but it is somewhat prone to sniper rockets)
-// 4: just add the player velocity length to the absolute velocity (tZork's sniper rockets)
-set g_projectiles_newton_style_2_minfactor 0.7
-set g_projectiles_newton_style_2_maxfactor 5
-set g_projectiles_spread_style 0
-// possible values:
-// 0: forward + solid sphere (like Quake) - varies velocity
-// 1: forward + flattened solid sphere
-// 2: forward + solid circle
-// 3: forward + normal distribution 3D - varies velocity
-// 4: forward + normal distribution on a plane
-// 5: forward + circle with 1-r falloff
-// 6: forward + circle with 1-r^2 falloff
-// 7: forward + circle with (1-r)(2-r) falloff
-set g_balance_falldamage_deadminspeed 150
-set g_balance_falldamage_minspeed 1400
-set g_balance_falldamage_factor 0.15
-set g_balance_falldamage_maxdamage 25
-// }}}
-
-// {{{ powerups
-set g_balance_powerup_invincible_takedamage 0.2
-set g_balance_powerup_invincible_time 30
-set g_balance_powerup_strength_damage 3
-set g_balance_powerup_strength_force 3
-set g_balance_powerup_strength_time 30
-set g_balance_powerup_strength_selfdamage 1.5
-set g_balance_powerup_strength_selfforce 1.5
-// }}}
-
-// {{{ jetpack/hook
-set g_jetpack_antigravity 0.8 "factor of gravity compensation of the jetpack"
-set g_jetpack_acceleration_side 1200 "acceleration of the jetpack in xy direction"
-set g_jetpack_acceleration_up 600 "acceleration of the jetpack in z direction (note: you have to factor in gravity here, if antigravity is not 1)"
-set g_jetpack_maxspeed_side 1500 "max speed of the jetpack in xy direction"
-set g_jetpack_maxspeed_up 600 "max speed of the jetpack in z direction"
-set g_jetpack_fuel 8 "fuel per second for jetpack"
-set g_jetpack_attenuation 2 "jetpack sound attenuation"
-
-set g_grappling_hook_tarzan 2 // 2: can also pull players
-set g_balance_grapplehook_speed_fly 1800
-set g_balance_grapplehook_speed_pull 2000
-set g_balance_grapplehook_force_rubber 2000
-set g_balance_grapplehook_force_rubber_overstretch 1000
-set g_balance_grapplehook_length_min 50
-set g_balance_grapplehook_stretch 50
-set g_balance_grapplehook_airfriction 0.2
-set g_balance_grapplehook_health 130
-// }}}
-
-// {{{ weapon properties
-// {{{ laser
-set g_balance_laser_primary_damage 35
-set g_balance_laser_primary_edgedamage 10
-set g_balance_laser_primary_force 400
-set g_balance_laser_primary_radius 70
-set g_balance_laser_primary_speed 9000
-set g_balance_laser_primary_spread 0
-set g_balance_laser_primary_refire 0.7
-set g_balance_laser_primary_animtime 0.3
-set g_balance_laser_primary_lifetime 30
-set g_balance_laser_primary_shotangle 0
-set g_balance_laser_primary_delay 0.03
-set g_balance_laser_gauntlet 0
-set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
-set g_balance_laser_secondary_damage 35
-set g_balance_laser_secondary_edgedamage 10
-set g_balance_laser_secondary_force 400
-set g_balance_laser_secondary_radius 70
-set g_balance_laser_secondary_speed 9000
-set g_balance_laser_secondary_spread 0
-set g_balance_laser_secondary_refire 0.7
-set g_balance_laser_secondary_animtime 0.3
-set g_balance_laser_secondary_lifetime 30
-set g_balance_laser_secondary_shotangle 0
-set g_balance_laser_secondary_delay 0
-// }}}
-// {{{ shotgun
-set g_balance_shotgun_primary_bullets 6
-set g_balance_shotgun_primary_damage 9
-set g_balance_shotgun_primary_force 60
-set g_balance_shotgun_primary_spread 0.07
-set g_balance_shotgun_primary_refire 0.5
-set g_balance_shotgun_primary_animtime 0.2
-set g_balance_shotgun_primary_ammo 1
-set g_balance_shotgun_primary_speed 12000
-set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
-set g_balance_shotgun_secondary 1
-set g_balance_shotgun_secondary_bullets 6
-set g_balance_shotgun_secondary_damage 9
-set g_balance_shotgun_secondary_force 60
-set g_balance_shotgun_secondary_spread 0.1
-set g_balance_shotgun_secondary_refire 1.35
-set g_balance_shotgun_secondary_animtime 0.2
-set g_balance_shotgun_secondary_ammo 1
-set g_balance_shotgun_secondary_speed 12000
-set g_balance_shotgun_secondary_bulletconstant 75 // 3.8qu
-// }}}
-// {{{ uzi
-set g_balance_uzi_first 1
-set g_balance_uzi_first_damage 30
-set g_balance_uzi_first_force 50
-set g_balance_uzi_first_spread 0.015
-set g_balance_uzi_first_refire 0.2
-set g_balance_uzi_first_ammo 1
-set g_balance_uzi_sustained_damage 15
-set g_balance_uzi_sustained_force 27
-set g_balance_uzi_sustained_spread 0.05
-set g_balance_uzi_sustained_refire 0.1
-set g_balance_uzi_sustained_ammo 1
-set g_balance_uzi_speed 18000
-set g_balance_uzi_bulletconstant 115 // 13.1qu
-// }}}
-// {{{ mortar
-set g_balance_grenadelauncher_primary2secondary 0
-set g_balance_grenadelauncher_primary_damage 70
-set g_balance_grenadelauncher_primary_edgedamage 38
-set g_balance_grenadelauncher_primary_force 400
-set g_balance_grenadelauncher_primary_radius 140
-set g_balance_grenadelauncher_primary_speed 2000
-set g_balance_grenadelauncher_primary_speed_up 200
-set g_balance_grenadelauncher_primary_speed_z 0
-set g_balance_grenadelauncher_primary_spread 0
-set g_balance_grenadelauncher_primary_lifetime 30
-set g_balance_grenadelauncher_primary_refire 0.8
-set g_balance_grenadelauncher_primary_animtime 0.3
-set g_balance_grenadelauncher_primary_ammo 2
-set g_balance_grenadelauncher_secondary_damage 70
-set g_balance_grenadelauncher_secondary_edgedamage 38
-set g_balance_grenadelauncher_secondary_force 400
-set g_balance_grenadelauncher_secondary_radius 140
-set g_balance_grenadelauncher_secondary_speed 1400
-set g_balance_grenadelauncher_secondary_speed_up 200
-set g_balance_grenadelauncher_secondary_speed_z 0
-set g_balance_grenadelauncher_secondary_spread 0
-set g_balance_grenadelauncher_secondary_lifetime 2.5
-set g_balance_grenadelauncher_secondary_refire 0.7
-set g_balance_grenadelauncher_secondary_animtime 0.3
-set g_balance_grenadelauncher_secondary_ammo 2
-set g_balance_grenadelauncher_secondary_health 10
-set g_balance_grenadelauncher_secondary_damageforcescale 4
-set g_balance_grenadelauncher_secondary_bouncefactor 0.5
-set g_balance_grenadelauncher_secondary_bouncestop 0.075
-// }}}
-// {{{ electro
-set g_balance_electro_lightning 0
-set g_balance_electro_primary_damage 65
-set g_balance_electro_primary_edgedamage 0
-set g_balance_electro_primary_force 200
-set g_balance_electro_primary_radius 150
-set g_balance_electro_primary_comboradius 0
-set g_balance_electro_primary_speed 2000
-set g_balance_electro_primary_spread 0
-set g_balance_electro_primary_lifetime 30
-set g_balance_electro_primary_refire 0.6
-set g_balance_electro_primary_animtime 0.3
-set g_balance_electro_primary_ammo 2
-set g_balance_electro_secondary_damage 50
-set g_balance_electro_secondary_spread 0.05
-set g_balance_electro_secondary_edgedamage 0
-set g_balance_electro_secondary_force 200
-set g_balance_electro_secondary_radius 150
-set g_balance_electro_secondary_speed 900
-set g_balance_electro_secondary_speed_up 200
-set g_balance_electro_secondary_speed_z 0
-set g_balance_electro_secondary_spread 0
-set g_balance_electro_secondary_lifetime 5
-set g_balance_electro_secondary_refire 0.3
-set g_balance_electro_secondary_refire2 0
-set g_balance_electro_secondary_animtime 0.3
-set g_balance_electro_secondary_ammo 2
-set g_balance_electro_secondary_health 5
-set g_balance_electro_secondary_damageforcescale 4
-set g_balance_electro_secondary_count 1
-set g_balance_electro_combo_damage 80
-set g_balance_electro_combo_edgedamage 0
-set g_balance_electro_combo_force 200
-set g_balance_electro_combo_radius 250
-set g_balance_electro_combo_comboradius 0
-set g_balance_electro_combo_speed 2000
-// }}}
-// {{{ crylink
-set g_balance_crylink_primary_damage 18
-set g_balance_crylink_primary_edgedamage 0
-set g_balance_crylink_primary_force -55
-set g_balance_crylink_primary_radius 80
-set g_balance_crylink_primary_speed 7000
-set g_balance_crylink_primary_spread 0.03
-set g_balance_crylink_primary_shots 4
-set g_balance_crylink_primary_bounces 1
-set g_balance_crylink_primary_refire 0.4
-set g_balance_crylink_primary_animtime 0.3
-set g_balance_crylink_primary_ammo 2
-set g_balance_crylink_primary_bouncedamagefactor 0.5
-
-set g_balance_crylink_primary_middle_lifetime 5 // range: 35000 full, fades to 70000
-set g_balance_crylink_primary_middle_fadetime 5
-set g_balance_crylink_primary_star_lifetime 0.1 // range: 700 full, fades to 2450
-set g_balance_crylink_primary_star_fadetime 0.25
-set g_balance_crylink_primary_other_lifetime 0.1 // range: 700 full, fades to 2450
-set g_balance_crylink_primary_other_fadetime 0.25
-
-set g_balance_crylink_secondary 1
-set g_balance_crylink_secondary_damage 18
-set g_balance_crylink_secondary_edgedamage 0
-set g_balance_crylink_secondary_force -55
-set g_balance_crylink_secondary_radius 3
-set g_balance_crylink_secondary_speed 7000
-set g_balance_crylink_secondary_spread 0.08
-set g_balance_crylink_secondary_shots 7
-set g_balance_crylink_secondary_bounces 0
-set g_balance_crylink_secondary_refire 0.5
-set g_balance_crylink_secondary_animtime 0.3
-set g_balance_crylink_secondary_ammo 2
-set g_balance_crylink_secondary_bouncedamagefactor 0.5
-
-set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000
-set g_balance_crylink_secondary_middle_fadetime 5
-set g_balance_crylink_secondary_line_lifetime 2 // range: 35000 full, fades to 70000
-set g_balance_crylink_secondary_line_fadetime 2
-// }}}
-// {{{ nex
-set g_balance_nex_damage 90
-set g_balance_nex_force 200
-set g_balance_nex_refire 1.5
-set g_balance_nex_animtime 0.3
-set g_balance_nex_ammo 5
-set g_balance_nex_damagefalloff_mindist 1000
-set g_balance_nex_damagefalloff_maxdist 3000
-set g_balance_nex_damagefalloff_halflife 1500
-set g_balance_nex_damagefalloff_forcehalflife 1500
-// }}}
-// {{{ minstanex
-set g_balance_minstanex_refire 1
-set g_balance_minstanex_animtime 0.3
-set g_balance_minstanex_ammo 10
-// }}}
-// {{{ hagar
-set g_balance_hagar_primary_damage 37
-set g_balance_hagar_primary_edgedamage 15
-set g_balance_hagar_primary_force 100
-set g_balance_hagar_primary_radius 65
-set g_balance_hagar_primary_spread 0.010
-set g_balance_hagar_primary_speed 3000
-set g_balance_hagar_primary_lifetime 30
-set g_balance_hagar_primary_refire 0.15
-set g_balance_hagar_primary_ammo 1
-set g_balance_hagar_secondary 1
-set g_balance_hagar_secondary_damage 37
-set g_balance_hagar_secondary_edgedamage 15
-set g_balance_hagar_secondary_force 100
-set g_balance_hagar_secondary_radius 65
-set g_balance_hagar_secondary_spread 0.015
-set g_balance_hagar_secondary_speed 1400
-set g_balance_hagar_secondary_lifetime_min 30
-set g_balance_hagar_secondary_lifetime_rand 0
-set g_balance_hagar_secondary_refire 0.15
-set g_balance_hagar_secondary_ammo 1
-// }}}
-// {{{ rocketlauncher
-set g_balance_rocketlauncher_damage 105
-set g_balance_rocketlauncher_edgedamage 40
-set g_balance_rocketlauncher_force 600
-set g_balance_rocketlauncher_radius 150
-set g_balance_rocketlauncher_speed 850
-set g_balance_rocketlauncher_speedaccel 0
-set g_balance_rocketlauncher_speedstart 850
-set g_balance_rocketlauncher_lifetime 30
-set g_balance_rocketlauncher_refire 1
-set g_balance_rocketlauncher_animtime 0.3
-set g_balance_rocketlauncher_ammo 3
-set g_balance_rocketlauncher_health 40
-set g_balance_rocketlauncher_damageforcescale 4
-set g_balance_rocketlauncher_detonatedelay 0.2 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
-set g_balance_rocketlauncher_guiderate 90 // max degrees per second
-set g_balance_rocketlauncher_guideratedelay 0.01 // immediate
-set g_balance_rocketlauncher_guidegoal 512 // goal distance for (non-laser) guiding (higher = less control, lower = erratic)
-set g_balance_rocketlauncher_guidedelay 0.15 // delay before guiding kicks in
-set g_balance_rocketlauncher_guidestop 0 // stop guiding when firing again
-set g_balance_rocketlauncher_laserguided_speed 1000 //650
-set g_balance_rocketlauncher_laserguided_speedaccel 0
-set g_balance_rocketlauncher_laserguided_speedstart 1000
-set g_balance_rocketlauncher_laserguided_turnrate 0.75 //0.5
-set g_balance_rocketlauncher_laserguided_allow_steal 1
-// }}}
-// {{{ porto
-set g_balance_porto_primary_refire 1.5
-set g_balance_porto_primary_animtime 0.3
-set g_balance_porto_primary_speed 5000
-set g_balance_porto_primary_lifetime 30
-set g_balance_portal_health 200 // these get recharged whenever the portal is used
-set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
-// }}}
-// {{{ hook
-set g_balance_hook_primary_fuel 5 // hook monkeys set 0
-set g_balance_hook_primary_refire 0 // hook monkeys set 0
-set g_balance_hook_primary_animtime 0.3 // good shoot anim
-set g_balance_hook_primary_hooked_time_max 0 // infinite
-set g_balance_hook_primary_hooked_time_free 2 // 2s being hooked are free
-set g_balance_hook_primary_hooked_fuel 5 // fuel per second hooked
-set g_balance_hook_secondary_damage 25 // not much
-set g_balance_hook_secondary_edgedamage 5 // not much
-set g_balance_hook_secondary_radius 500 // LOTS
-set g_balance_hook_secondary_force -2000 // LOTS
-set g_balance_hook_secondary_ammo 50 // a whole pack
-set g_balance_hook_secondary_lifetime 30 // infinite
-set g_balance_hook_secondary_speed 0 // not much throwing
-set g_balance_hook_secondary_gravity 5 // fast falling
-set g_balance_hook_secondary_refire 3 // don't drop too many bombs...
-set g_balance_hook_secondary_animtime 0.3 // good shoot anim
-set g_balance_hook_secondary_power 3 // effect behaves like a square function
-set g_balance_hook_secondary_duration 1.5 // effect runs for three seconds
-// }}}
-// {{{ hlac
-set g_balance_hlac_primary_spread_min 0.01
-set g_balance_hlac_primary_spread_max 0.25
-set g_balance_hlac_primary_spread_add 0.0045
-set g_balance_hlac_primary_spread_crouchmod 0.25
-
-set g_balance_hlac_primary_damage 23
-set g_balance_hlac_primary_edgedamage 10
-set g_balance_hlac_primary_force 100
-set g_balance_hlac_primary_radius 70
-set g_balance_hlac_primary_speed 9000
-set g_balance_hlac_primary_lifetime 5
-
-set g_balance_hlac_primary_refire 0.1
-set g_balance_hlac_primary_animtime 0.4
-set g_balance_hlac_primary_ammo 1
-
-set g_balance_hlac_secondary 1
-set g_balance_hlac_secondary_spread 0.15
-set g_balance_hlac_secondary_spread_crouchmod 0.5
-
-set g_balance_hlac_secondary_damage 23
-set g_balance_hlac_secondary_edgedamage 10
-set g_balance_hlac_secondary_force 100
-set g_balance_hlac_secondary_radius 70
-set g_balance_hlac_secondary_speed 9000
-set g_balance_hlac_secondary_lifetime 5
-
-set g_balance_hlac_secondary_refire 1
-set g_balance_hlac_secondary_animtime 0.3
-set g_balance_hlac_secondary_ammo 10
-set g_balance_hlac_secondary_shots 6
-// }}}
-// {{{ campingrifle
-set g_balance_campingrifle_magazinecapacity 0
-set g_balance_campingrifle_reloadtime 2 // matches reload anim
-set g_balance_campingrifle_auto_reload_after_changing_weapons 0
-set g_balance_campingrifle_bursttime 0.85 // 0.35 - 0.1 + 0.35 - 0.1 + 0.35 = three secondaries
-set g_balance_campingrifle_tracer 1
-set g_balance_campingrifle_primary_damage 50
-set g_balance_campingrifle_primary_headshotaddeddamage 50
-set g_balance_campingrifle_primary_spread 0
-set g_balance_campingrifle_primary_force 0
-set g_balance_campingrifle_primary_speed 35000
-set g_balance_campingrifle_primary_lifetime 5
-set g_balance_campingrifle_primary_refire 0.7
-set g_balance_campingrifle_primary_animtime 0.3
-set g_balance_campingrifle_primary_ammo 10
-set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu
-set g_balance_campingrifle_primary_burstcost 0.35 // require same cooldown as secondary, note it's smaller than primary refire time
-set g_balance_campingrifle_primary_bullethail 0
-set g_balance_campingrifle_secondary_damage 15
-set g_balance_campingrifle_secondary_headshotaddeddamage 25
-set g_balance_campingrifle_secondary_spread 0.02
-set g_balance_campingrifle_secondary_force 0
-set g_balance_campingrifle_secondary_speed 20000
-set g_balance_campingrifle_secondary_lifetime 5
-set g_balance_campingrifle_secondary_refire 0.1
-set g_balance_campingrifle_secondary_animtime 0.1
-set g_balance_campingrifle_secondary_ammo 4
-set g_balance_campingrifle_secondary_bulletconstant 130 // 18.3qu
-set g_balance_campingrifle_secondary_burstcost 0.35
-set g_balance_campingrifle_secondary_bullethail 0
-// }}}
-// {{{ tuba
-set g_balance_tuba_refire 0.05
-set g_balance_tuba_animtime 0.05
-set g_balance_tuba_attenuation 0.5
-set g_balance_tuba_volume 1
-set g_balance_tuba_fadetime 0.25
-set g_balance_tuba_damage 5
-set g_balance_tuba_edgedamage 0
-set g_balance_tuba_radius 200
-set g_balance_tuba_force 40
-// }}}
-// {{{ fireball
-set g_balance_fireball_primary_ammo 40
-set g_balance_fireball_primary_animtime 0.15
-set g_balance_fireball_primary_bfgdamage 100
-set g_balance_fireball_primary_bfgforce 0
-set g_balance_fireball_primary_bfgradius 1000
-set g_balance_fireball_primary_damage 200
-set g_balance_fireball_primary_damageforcescale 4
-set g_balance_fireball_primary_edgedamage 0
-set g_balance_fireball_primary_force 700
-set g_balance_fireball_primary_health 50
-set g_balance_fireball_primary_laserburntime 0.5
-set g_balance_fireball_primary_laserdamage 80
-set g_balance_fireball_primary_laseredgedamage 20
-set g_balance_fireball_primary_laserradius 256
-set g_balance_fireball_primary_lifetime 15
-set g_balance_fireball_primary_radius 200
-set g_balance_fireball_primary_refire 5
-set g_balance_fireball_primary_refire2 0
-set g_balance_fireball_primary_speed 650
-set g_balance_fireball_primary_spread 0
-set g_balance_fireball_secondary_ammo 5
-set g_balance_fireball_secondary_animtime 0.3
-set g_balance_fireball_secondary_damage 40
-set g_balance_fireball_secondary_damageforcescale 4
-set g_balance_fireball_secondary_damagetime 5
-set g_balance_fireball_secondary_force 100
-set g_balance_fireball_secondary_laserburntime 0.5
-set g_balance_fireball_secondary_laserdamage 50
-set g_balance_fireball_secondary_laseredgedamage 20
-set g_balance_fireball_secondary_laserradius 110
-set g_balance_fireball_secondary_lifetime 7
-set g_balance_fireball_secondary_refire 2
-set g_balance_fireball_secondary_speed 900
-set g_balance_fireball_secondary_speed_up 100
-set g_balance_fireball_secondary_speed_z 0
-set g_balance_fireball_secondary_spread 0
-// }}}
-// {{{ seeker
-set g_balance_seeker_flac_ammo 0.5
-set g_balance_seeker_flac_animtime 0.1
-set g_balance_seeker_flac_damage 15
-set g_balance_seeker_flac_edgedamage 10
-set g_balance_seeker_flac_force 50
-set g_balance_seeker_flac_lifetime 0.1
-set g_balance_seeker_flac_lifetime_rand 0.05
-set g_balance_seeker_flac_radius 100
-set g_balance_seeker_flac_refire 0.1
-set g_balance_seeker_flac_speed 3000
-set g_balance_seeker_flac_speed_up 1000
-set g_balance_seeker_flac_speed_z 0
-set g_balance_seeker_flac_spread 0.4
-set g_balance_seeker_missile_accel 1.05
-set g_balance_seeker_missile_ammo 2
-set g_balance_seeker_missile_animtime 0.3
-set g_balance_seeker_missile_count 4
-set g_balance_seeker_missile_damage 40
-set g_balance_seeker_missile_damageforcescale 4
-set g_balance_seeker_missile_decel 0.9
-set g_balance_seeker_missile_delay 0.25
-set g_balance_seeker_missile_edgedamage 10
-set g_balance_seeker_missile_force 250
-set g_balance_seeker_missile_health 5
-set g_balance_seeker_missile_lifetime 15
-set g_balance_seeker_missile_proxy 0
-set g_balance_seeker_missile_proxy_delay 0.2
-set g_balance_seeker_missile_proxy_maxrange 45
-set g_balance_seeker_missile_radius 80
-set g_balance_seeker_missile_refire 0.5
-set g_balance_seeker_missile_smart 1
-set g_balance_seeker_missile_smart_mindist 800
-set g_balance_seeker_missile_smart_trace_max 2500
-set g_balance_seeker_missile_smart_trace_min 1000
-set g_balance_seeker_missile_speed 700
-set g_balance_seeker_missile_speed_accel 0
-set g_balance_seeker_missile_speed_up 300
-set g_balance_seeker_missile_speed_z 0
-set g_balance_seeker_missile_speed_max 1250
-set g_balance_seeker_missile_spread 0
-set g_balance_seeker_missile_turnrate 0.65
-set g_balance_seeker_tag_ammo 1
-set g_balance_seeker_tag_animtime 0.3
-set g_balance_seeker_tag_damageforcescale 4
-set g_balance_seeker_tag_health 5
-set g_balance_seeker_tag_lifetime 15
-set g_balance_seeker_tag_refire 0.7
-set g_balance_seeker_tag_speed 9000
-set g_balance_seeker_tag_spread 0
-// End new seeker
index a4369249fad75c47203fb17c752354c91dcf8677..0250978c3b56b38e8e261be84dcfbfea2884e627 100644 (file)
@@ -217,7 +217,7 @@ set g_balance_laser_primary_animtime 0.3
 set g_balance_laser_primary_lifetime 30
 set g_balance_laser_primary_shotangle 0
 set g_balance_laser_primary_delay 0
-set g_balance_laser_gauntlet 0
+set g_balance_laser_primary_gauntlet 0
 set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
 set g_balance_laser_secondary_damage 35
 set g_balance_laser_secondary_edgedamage 10
@@ -230,6 +230,7 @@ set g_balance_laser_secondary_animtime 0.3
 set g_balance_laser_secondary_lifetime 30
 set g_balance_laser_secondary_shotangle 0
 set g_balance_laser_secondary_delay 0
+set g_balance_laser_secondary_gauntlet 0
 // }}}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 6
@@ -242,15 +243,14 @@ set g_balance_shotgun_primary_ammo 1
 set g_balance_shotgun_primary_speed 12000
 set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
 set g_balance_shotgun_secondary 1
-set g_balance_shotgun_secondary_bullets 6
-set g_balance_shotgun_secondary_damage 9
-set g_balance_shotgun_secondary_force 60
-set g_balance_shotgun_secondary_spread 0.1
-set g_balance_shotgun_secondary_refire 1.35
-set g_balance_shotgun_secondary_animtime 0.2
-set g_balance_shotgun_secondary_ammo 1
-set g_balance_shotgun_secondary_speed 12000
-set g_balance_shotgun_secondary_bulletconstant 75 // 3.8qu
+set g_balance_shotgun_secondary_melee_delay 0.35 // match the anim
+set g_balance_shotgun_secondary_melee_range 60
+set g_balance_shotgun_secondary_melee_swing 50
+set g_balance_shotgun_secondary_melee_time 0.1
+set g_balance_shotgun_secondary_damage 115
+set g_balance_shotgun_secondary_force 150
+set g_balance_shotgun_secondary_refire 1.1
+set g_balance_shotgun_secondary_animtime 1
 // }}}
 // {{{ uzi
 set g_balance_uzi_first 1
@@ -269,6 +269,7 @@ set g_balance_uzi_bulletconstant 115 // 13.1qu
 // }}}
 // {{{ mortar
 set g_balance_grenadelauncher_primary2secondary 0
+set g_balance_grenadelauncher_primary_sticky 0
 set g_balance_grenadelauncher_primary_damage 70
 set g_balance_grenadelauncher_primary_edgedamage 38
 set g_balance_grenadelauncher_primary_force 400
@@ -278,9 +279,12 @@ set g_balance_grenadelauncher_primary_speed_up 200
 set g_balance_grenadelauncher_primary_speed_z 0
 set g_balance_grenadelauncher_primary_spread 0
 set g_balance_grenadelauncher_primary_lifetime 30
+set g_balance_grenadelauncher_primary_lifetime2 1
 set g_balance_grenadelauncher_primary_refire 0.8
 set g_balance_grenadelauncher_primary_animtime 0.3
 set g_balance_grenadelauncher_primary_ammo 2
+set g_balance_grenadelauncher_primary_health 25
+set g_balance_grenadelauncher_secondary_sticky 0
 set g_balance_grenadelauncher_secondary_damage 70
 set g_balance_grenadelauncher_secondary_edgedamage 38
 set g_balance_grenadelauncher_secondary_force 400
@@ -290,6 +294,7 @@ set g_balance_grenadelauncher_secondary_speed_up 200
 set g_balance_grenadelauncher_secondary_speed_z 0
 set g_balance_grenadelauncher_secondary_spread 0
 set g_balance_grenadelauncher_secondary_lifetime 2.5
+set g_balance_grenadelauncher_secondary_lifetime2 0
 set g_balance_grenadelauncher_secondary_refire 0.7
 set g_balance_grenadelauncher_secondary_animtime 0.3
 set g_balance_grenadelauncher_secondary_ammo 2
@@ -303,6 +308,7 @@ set g_balance_electro_lightning 0
 set g_balance_electro_primary_damage 65
 set g_balance_electro_primary_edgedamage 0
 set g_balance_electro_primary_force 200
+set g_balance_electro_primary_force_up 0
 set g_balance_electro_primary_radius 150
 set g_balance_electro_primary_comboradius 0
 set g_balance_electro_primary_speed 2000
@@ -311,6 +317,7 @@ set g_balance_electro_primary_lifetime 30
 set g_balance_electro_primary_refire 0.6
 set g_balance_electro_primary_animtime 0.3
 set g_balance_electro_primary_ammo 2
+set g_balance_electro_primary_range 0
 set g_balance_electro_secondary_damage 50
 set g_balance_electro_secondary_spread 0.05
 set g_balance_electro_secondary_edgedamage 0
@@ -376,15 +383,26 @@ set g_balance_crylink_secondary_line_lifetime 2 // range: 35000 full, fades to 7
 set g_balance_crylink_secondary_line_fadetime 2
 // }}}
 // {{{ nex
-set g_balance_nex_damage 100
-set g_balance_nex_force 600
-set g_balance_nex_refire 1.5
-set g_balance_nex_animtime 0.3
-set g_balance_nex_ammo 5
-set g_balance_nex_damagefalloff_mindist 0
-set g_balance_nex_damagefalloff_maxdist 0
-set g_balance_nex_damagefalloff_halflife 0
-set g_balance_nex_damagefalloff_forcehalflife 0
+set g_balance_nex_primary_damage 100
+set g_balance_nex_primary_force 600
+set g_balance_nex_primary_refire 1.5
+set g_balance_nex_primary_animtime 0.3
+set g_balance_nex_primary_ammo 5
+set g_balance_nex_primary_damagefalloff_mindist 0
+set g_balance_nex_primary_damagefalloff_maxdist 0
+set g_balance_nex_primary_damagefalloff_halflife 0
+set g_balance_nex_primary_damagefalloff_forcehalflife 0
+
+set g_balance_nex_secondary 0
+set g_balance_nex_secondary_damage 100
+set g_balance_nex_secondary_force 600
+set g_balance_nex_secondary_refire 1.5
+set g_balance_nex_secondary_animtime 0.3
+set g_balance_nex_secondary_ammo 5
+set g_balance_nex_secondary_damagefalloff_mindist 0
+set g_balance_nex_secondary_damagefalloff_maxdist 0
+set g_balance_nex_secondary_damagefalloff_halflife 0
+set g_balance_nex_secondary_damagefalloff_forcehalflife 0
 // }}}
 // {{{ minstanex
 set g_balance_minstanex_refire 1
@@ -438,6 +456,10 @@ set g_balance_rocketlauncher_laserguided_speedaccel 0
 set g_balance_rocketlauncher_laserguided_speedstart 1000
 set g_balance_rocketlauncher_laserguided_turnrate 0.75 //0.5
 set g_balance_rocketlauncher_laserguided_allow_steal 1
+set g_balance_rocketlauncher_remote_damage 105
+set g_balance_rocketlauncher_remote_edgedamage 40
+set g_balance_rocketlauncher_remote_radius 150
+set g_balance_rocketlauncher_remote_force 600
 // }}}
 // {{{ porto
 set g_balance_porto_primary_refire 1.5
@@ -518,6 +540,7 @@ set g_balance_campingrifle_primary_ammo 10
 set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu
 set g_balance_campingrifle_primary_burstcost 0
 set g_balance_campingrifle_primary_bullethail 0 // empty magazine on shot
+set g_balance_campingrifle_secondary 1
 set g_balance_campingrifle_secondary_damage 35
 set g_balance_campingrifle_secondary_headshotaddeddamage 15 // 50 damage only on head
 set g_balance_campingrifle_secondary_spread 0.008
diff --git a/balanceFruit.cfg b/balanceFruit.cfg
deleted file mode 100644 (file)
index 415a458..0000000
+++ /dev/null
@@ -1,633 +0,0 @@
-// {{{ starting gear
-set g_start_weapon_laser -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_shotgun -2 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_uzi 1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_grenadelauncher -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_electro -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_crylink -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_nex -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_hagar -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_rocketlauncher -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_minstanex 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_porto 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_hook 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_hlac 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_campingrifle 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_tuba 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_fireball 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_seeker 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_balance_health_start 125
-set g_balance_armor_start 0
-set g_start_ammo_shells 0
-set g_start_ammo_nails 90
-set g_start_ammo_rockets 0
-set g_start_ammo_cells 0
-set g_start_ammo_fuel 0
-set g_warmup_start_health 250 "starting values when being in warmup-stage"
-set g_warmup_start_armor 100 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_shells 50 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_nails 150 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_rockets 50 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_cells 50 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
-set g_lms_start_health 250
-set g_lms_start_armor 100
-set g_lms_start_ammo_shells 50
-set g_lms_start_ammo_nails 150
-set g_lms_start_ammo_rockets 50
-set g_lms_start_ammo_cells 50
-set g_lms_start_ammo_fuel 0
-set g_balance_nix_roundtime 25
-set g_balance_nix_incrtime 1.6
-set g_balance_nix_ammo_shells 15
-set g_balance_nix_ammo_nails 45
-set g_balance_nix_ammo_rockets 15
-set g_balance_nix_ammo_cells 15
-set g_balance_nix_ammo_fuel 0
-set g_balance_nix_ammoincr_shells 2
-set g_balance_nix_ammoincr_nails 6
-set g_balance_nix_ammoincr_rockets 2
-set g_balance_nix_ammoincr_cells 2
-set g_balance_nix_ammoincr_fuel 2
-// }}}
-
-// {{{ pickup items
-set g_pickup_ammo_anyway 1
-set g_pickup_weapons_anyway 1
-set g_pickup_shells 15
-set g_pickup_shells_max 100
-set g_pickup_nails 80
-set g_pickup_nails_max 400
-set g_pickup_rockets 15
-set g_pickup_rockets_max 200
-set g_pickup_cells 25
-set g_pickup_cells_max 200
-set g_pickup_fuel 25
-set g_pickup_fuel_jetpack 50
-set g_pickup_fuel_max 100
-set g_pickup_armorsmall 5
-set g_pickup_armorsmall_max 200
-set g_pickup_armorsmall_anyway 1
-set g_pickup_armormedium 25
-set g_pickup_armormedium_max 200
-set g_pickup_armormedium_anyway 1
-set g_pickup_armorbig 50
-set g_pickup_armorbig_max 200
-set g_pickup_armorbig_anyway 1
-set g_pickup_armorlarge 100
-set g_pickup_armorlarge_max 200
-set g_pickup_armorlarge_anyway 1
-set g_pickup_healthsmall 5
-set g_pickup_healthsmall_max 200
-set g_pickup_healthsmall_anyway 1
-set g_pickup_healthmedium 25
-set g_pickup_healthmedium_max 100
-set g_pickup_healthmedium_anyway 0
-set g_pickup_healthlarge 50
-set g_pickup_healthlarge_max 100
-set g_pickup_healthlarge_anyway 0
-set g_pickup_healthmega 100
-set g_pickup_healthmega_max 200
-set g_pickup_healthmega_anyway 1
-set g_pickup_respawntime_short 15
-set g_pickup_respawntime_medium 20
-set g_pickup_respawntime_long 30
-set g_pickup_respawntime_powerup 120
-set g_pickup_respawntime_weapon 5
-set g_pickup_respawntime_ammo 25
-set g_pickup_respawntimejitter_short 0
-set g_pickup_respawntimejitter_medium 0
-set g_pickup_respawntimejitter_long 0
-set g_pickup_respawntimejitter_powerup 10
-set g_pickup_respawntimejitter_weapon 0
-set g_pickup_respawntimejitter_ammo 0
-// }}}
-
-// {{{ regen/rot
-set g_balance_health_regen 0
-set g_balance_health_regenlinear 0
-set g_balance_pause_health_regen 0
-set g_balance_pause_health_regen_spawn 0
-set g_balance_health_rot 0
-set g_balance_health_rotlinear 1
-set g_balance_pause_health_rot 1
-set g_balance_pause_health_rot_spawn 0
-set g_balance_health_regenstable 100
-set g_balance_health_rotstable 100
-set g_balance_health_limit 200
-set g_balance_armor_regen 0
-set g_balance_armor_regenlinear 0
-set g_balance_armor_rot 0
-set g_balance_armor_rotlinear 1
-set g_balance_pause_armor_rot 1
-set g_balance_pause_armor_rot_spawn 0
-set g_balance_armor_regenstable 100
-set g_balance_armor_rotstable 100
-set g_balance_armor_limit 200
-set g_balance_armor_blockpercent 0.7
-set g_balance_fuel_regen 0.1 "fuel regeneration (only applies if the player owns IT_FUEL_REGEN)"
-set g_balance_fuel_regenlinear 0
-set g_balance_pause_fuel_regen 2 // other than this, fuel uses the health regen counter
-set g_balance_fuel_rot 0.05
-set g_balance_fuel_rotlinear 0
-set g_balance_pause_fuel_rot 5
-set g_balance_pause_fuel_rot_spawn 10
-set g_balance_fuel_regenstable 50
-set g_balance_fuel_rotstable 100
-set g_balance_fuel_limit 999
-// }}}
-
-// {{{ misc
-set g_balance_selfdamagepercent 0.65
-set g_balance_weaponswitchdelay 0.15
-set g_weaponspeedfactor 1 "weapon projectile speed multiplier"
-set g_weaponratefactor 1 "weapon fire rate multiplier"
-set g_weapondamagefactor 1 "weapon damage multiplier"
-set g_weaponforcefactor 1 "weapon force multiplier"
-set g_weaponspreadfactor 1 "weapon spread multiplier"
-set g_balance_firetransfer_time 0.9
-set g_balance_firetransfer_damage 0.8
-set g_throughfloor_damage 0.5
-set g_throughfloor_force 0.7
-set g_projectiles_newton_style 2
-// possible values:
-// 0: absolute velocity projectiles (like Quake)
-// 1: relative velocity projectiles, "Newtonian" (like Tribes 2)
-// 2: relative velocity projectiles, but aim is precorrected so projectiles hit the crosshair (note: strafe rockets then are SLOWER than ones shot while standing, happens in 1 too when aiming correctly which is hard)
-// 3: absolute velocity + player velocity component in shot direction (note: does NOT yield the right relative velocity, but may be good enough, but it is somewhat prone to sniper rockets)
-// 4: just add the player velocity length to the absolute velocity (tZork's sniper rockets)
-set g_projectiles_newton_style_2_minfactor 0.7
-set g_projectiles_newton_style_2_maxfactor 5
-set g_projectiles_spread_style 4
-// possible values:
-// 0: forward + solid sphere (like Quake) - varies velocity
-// 1: forward + flattened solid sphere
-// 2: forward + solid circle
-// 3: forward + normal distribution 3D - varies velocity
-// 4: forward + normal distribution on a plane
-// 5: forward + circle with 1-r falloff
-// 6: forward + circle with 1-r^2 falloff
-// 7: forward + circle with (1-r)(2-r) falloff
-set g_balance_falldamage_deadminspeed 150
-set g_balance_falldamage_minspeed 800
-set g_balance_falldamage_factor 0.20
-set g_balance_falldamage_maxdamage 15
-// }}}
-
-// {{{ powerups
-set g_balance_powerup_invincible_takedamage 0.3
-set g_balance_powerup_invincible_time 30
-set g_balance_powerup_strength_damage 3
-set g_balance_powerup_strength_force 4
-set g_balance_powerup_strength_time 30
-set g_balance_powerup_strength_selfdamage 1.5
-set g_balance_powerup_strength_selfforce 1.5
-// }}}
-
-// {{{ jetpack/hook
-set g_jetpack_antigravity 0.8 "factor of gravity compensation of the jetpack"
-set g_jetpack_acceleration_side 1200 "acceleration of the jetpack in xy direction"
-set g_jetpack_acceleration_up 600 "acceleration of the jetpack in z direction (note: you have to factor in gravity here, if antigravity is not 1)"
-set g_jetpack_maxspeed_side 1500 "max speed of the jetpack in xy direction"
-set g_jetpack_maxspeed_up 600 "max speed of the jetpack in z direction"
-set g_jetpack_fuel 8 "fuel per second for jetpack"
-set g_jetpack_attenuation 2 "jetpack sound attenuation"
-
-set g_grappling_hook_tarzan 2 // 2: can also pull players
-set g_balance_grapplehook_speed_fly 1800
-set g_balance_grapplehook_speed_pull 2000
-set g_balance_grapplehook_force_rubber 2000
-set g_balance_grapplehook_force_rubber_overstretch 1000
-set g_balance_grapplehook_length_min 50
-set g_balance_grapplehook_stretch 50
-set g_balance_grapplehook_airfriction 0.2
-set g_balance_grapplehook_health 130
-// }}}
-
-// {{{ weapon properties
-// {{{ laser
-set g_balance_laser_primary_damage 22
-set g_balance_laser_primary_edgedamage 0
-set g_balance_laser_primary_force 200
-set g_balance_laser_primary_radius 60
-set g_balance_laser_primary_speed 0
-set g_balance_laser_primary_spread 0
-set g_balance_laser_primary_refire 0.1
-set g_balance_laser_primary_animtime 0.1
-set g_balance_laser_primary_lifetime 0
-set g_balance_laser_primary_shotangle 0
-set g_balance_laser_primary_delay 0
-set g_balance_laser_gauntlet 1
-set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
-set g_balance_laser_secondary_damage 35
-set g_balance_laser_secondary_edgedamage 10
-set g_balance_laser_secondary_force 400
-set g_balance_laser_secondary_radius 70
-set g_balance_laser_secondary_speed 9000
-set g_balance_laser_secondary_spread 0
-set g_balance_laser_secondary_refire 0.7
-set g_balance_laser_secondary_animtime 0.3
-set g_balance_laser_secondary_lifetime 30
-set g_balance_laser_secondary_shotangle 0
-set g_balance_laser_secondary_delay 0
-// }}}
-// {{{ shotgun
-set g_balance_shotgun_primary_bullets 15
-set g_balance_shotgun_primary_damage 7
-set g_balance_shotgun_primary_force 20
-set g_balance_shotgun_primary_spread 0.16
-set g_balance_shotgun_primary_refire 1
-set g_balance_shotgun_primary_animtime 0.7
-set g_balance_shotgun_primary_ammo 1
-set g_balance_shotgun_primary_speed 12000
-set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
-set g_balance_shotgun_secondary 1
-set g_balance_shotgun_secondary_bullets 6 // one more per shot than 15/3 (primary bullets/amount of shots = 3)
-set g_balance_shotgun_secondary_damage 7
-set g_balance_shotgun_secondary_force 20
-set g_balance_shotgun_secondary_spread 0.20
-set g_balance_shotgun_secondary_refire 1.35
-set g_balance_shotgun_secondary_animtime 0.33
-set g_balance_shotgun_secondary_ammo 1
-set g_balance_shotgun_secondary_speed 12000
-set g_balance_shotgun_secondary_bulletconstant 75 // 3.8qu
-// }}}
-// {{{ uzi
-set g_balance_uzi_first 1
-set g_balance_uzi_first_damage 24
-set g_balance_uzi_first_force 30
-set g_balance_uzi_first_spread 0.0125
-set g_balance_uzi_first_refire 0.2
-set g_balance_uzi_first_ammo 1
-set g_balance_uzi_sustained_damage 12
-set g_balance_uzi_sustained_force 20
-set g_balance_uzi_sustained_spread 0.0125
-set g_balance_uzi_sustained_refire 0.1
-set g_balance_uzi_sustained_ammo 1
-set g_balance_uzi_speed 18000
-set g_balance_uzi_bulletconstant 115 // 13.1qu
-// }}}
-// {{{ mortar // TODO
-set g_balance_grenadelauncher_primary2secondary 0
-set g_balance_grenadelauncher_primary_damage 60
-set g_balance_grenadelauncher_primary_edgedamage 28
-set g_balance_grenadelauncher_primary_force 200
-set g_balance_grenadelauncher_primary_radius 140
-set g_balance_grenadelauncher_primary_speed 1200
-set g_balance_grenadelauncher_primary_speed_up 200
-set g_balance_grenadelauncher_primary_speed_z 0
-set g_balance_grenadelauncher_primary_spread 0
-set g_balance_grenadelauncher_primary_lifetime 10
-set g_balance_grenadelauncher_primary_refire 0.8
-set g_balance_grenadelauncher_primary_animtime 0.5
-set g_balance_grenadelauncher_primary_ammo 2
-set g_balance_grenadelauncher_secondary_damage 65
-set g_balance_grenadelauncher_secondary_edgedamage 30
-set g_balance_grenadelauncher_secondary_force 300
-set g_balance_grenadelauncher_secondary_radius 200
-set g_balance_grenadelauncher_secondary_speed 800
-set g_balance_grenadelauncher_secondary_speed_up 0
-set g_balance_grenadelauncher_secondary_speed_z 200
-set g_balance_grenadelauncher_secondary_spread 0
-set g_balance_grenadelauncher_secondary_lifetime 2
-set g_balance_grenadelauncher_secondary_refire 0.8
-set g_balance_grenadelauncher_secondary_animtime 0.5
-set g_balance_grenadelauncher_secondary_ammo 2
-set g_balance_grenadelauncher_secondary_health 0
-set g_balance_grenadelauncher_secondary_damageforcescale 0
-set g_balance_grenadelauncher_secondary_bouncefactor 0.5
-set g_balance_grenadelauncher_secondary_bouncestop 0.075
-// }}}
-// {{{ electro // TODO
-set g_balance_electro_lightning 0
-set g_balance_electro_primary_damage 65
-set g_balance_electro_primary_edgedamage 0
-set g_balance_electro_primary_force 200
-set g_balance_electro_primary_radius 150
-set g_balance_electro_primary_comboradius 0
-set g_balance_electro_primary_speed 2000
-set g_balance_electro_primary_spread 0
-set g_balance_electro_primary_lifetime 30
-set g_balance_electro_primary_refire 0.6
-set g_balance_electro_primary_animtime 0.3
-set g_balance_electro_primary_ammo 2
-set g_balance_electro_secondary_damage 50
-set g_balance_electro_secondary_spread 0.05
-set g_balance_electro_secondary_edgedamage 0
-set g_balance_electro_secondary_force 200
-set g_balance_electro_secondary_radius 150
-set g_balance_electro_secondary_speed 900
-set g_balance_electro_secondary_speed_up 200
-set g_balance_electro_secondary_speed_z 0
-set g_balance_electro_secondary_spread 0
-set g_balance_electro_secondary_lifetime 5
-set g_balance_electro_secondary_refire 0.3
-set g_balance_electro_secondary_refire2 0
-set g_balance_electro_secondary_animtime 0.3
-set g_balance_electro_secondary_ammo 2
-set g_balance_electro_secondary_health 5
-set g_balance_electro_secondary_damageforcescale 4
-set g_balance_electro_secondary_count 1
-set g_balance_electro_combo_damage 80
-set g_balance_electro_combo_edgedamage 0
-set g_balance_electro_combo_force 200
-set g_balance_electro_combo_radius 250
-set g_balance_electro_combo_comboradius 0
-set g_balance_electro_combo_speed 2000
-// }}}
-// {{{ crylink
-set g_balance_crylink_primary_damage 18
-set g_balance_crylink_primary_edgedamage 0
-set g_balance_crylink_primary_force -80
-set g_balance_crylink_primary_radius 100
-set g_balance_crylink_primary_speed 2000
-set g_balance_crylink_primary_spread 0.03
-set g_balance_crylink_primary_shots 4
-set g_balance_crylink_primary_bounces 1
-set g_balance_crylink_primary_refire 0.4
-set g_balance_crylink_primary_animtime 0.3
-set g_balance_crylink_primary_ammo 2
-set g_balance_crylink_primary_bouncedamagefactor 0.5
-
-set g_balance_crylink_primary_middle_lifetime 5 // range: 10000 full, fades to 20000
-set g_balance_crylink_primary_middle_fadetime 5
-set g_balance_crylink_primary_star_lifetime 0.4 // range: 800 full, fades to 1300
-set g_balance_crylink_primary_star_fadetime 0.25
-set g_balance_crylink_primary_other_lifetime 0.4 // range: 800 full, fades to 1300
-set g_balance_crylink_primary_other_fadetime 0.25
-
-set g_balance_crylink_secondary 1
-set g_balance_crylink_secondary_damage 18
-set g_balance_crylink_secondary_edgedamage 0
-set g_balance_crylink_secondary_force -80
-set g_balance_crylink_secondary_radius 5
-set g_balance_crylink_secondary_speed 2000
-set g_balance_crylink_secondary_spread 0.04
-set g_balance_crylink_secondary_shots 7
-set g_balance_crylink_secondary_bounces 0
-set g_balance_crylink_secondary_refire 0.5
-set g_balance_crylink_secondary_animtime 0.3
-set g_balance_crylink_secondary_ammo 2
-set g_balance_crylink_secondary_bouncedamagefactor 0.5
-
-set g_balance_crylink_secondary_middle_lifetime 5 // range: 10000 full, fades to 10000
-set g_balance_crylink_secondary_middle_fadetime 5
-set g_balance_crylink_secondary_line_lifetime 2 // range: 4000 full, fades to 8000
-set g_balance_crylink_secondary_line_fadetime 2
-// }}}
-// {{{ nex
-set g_balance_nex_damage 100
-set g_balance_nex_force 200
-set g_balance_nex_refire 1.25
-set g_balance_nex_animtime 1
-set g_balance_nex_ammo 5
-set g_balance_nex_damagefalloff_mindist 1000
-set g_balance_nex_damagefalloff_maxdist 3000
-set g_balance_nex_damagefalloff_halflife 2000
-set g_balance_nex_damagefalloff_forcehalflife 2000
-// }}}
-// {{{ minstanex
-set g_balance_minstanex_refire 1.25
-set g_balance_minstanex_animtime 1
-set g_balance_minstanex_ammo 10
-// }}}
-// {{{ hagar
-set g_balance_hagar_primary_damage 30
-set g_balance_hagar_primary_edgedamage 15
-set g_balance_hagar_primary_force 70
-set g_balance_hagar_primary_radius 50
-set g_balance_hagar_primary_spread 0.005
-set g_balance_hagar_primary_speed 2000
-set g_balance_hagar_primary_lifetime 30
-set g_balance_hagar_primary_refire 0.13
-set g_balance_hagar_primary_ammo 1
-set g_balance_hagar_secondary 1
-set g_balance_hagar_secondary_damage 30
-set g_balance_hagar_secondary_edgedamage 15
-set g_balance_hagar_secondary_force 70
-set g_balance_hagar_secondary_radius 50
-set g_balance_hagar_secondary_spread 0.01
-set g_balance_hagar_secondary_speed 1400
-set g_balance_hagar_secondary_lifetime_min 30
-set g_balance_hagar_secondary_lifetime_rand 0
-set g_balance_hagar_secondary_refire 0.13
-set g_balance_hagar_secondary_ammo 1
-// }}}
-// {{{ rocketlauncher // TODO
-set g_balance_rocketlauncher_damage 100
-set g_balance_rocketlauncher_edgedamage 33
-set g_balance_rocketlauncher_force 350
-set g_balance_rocketlauncher_radius 120
-set g_balance_rocketlauncher_speed 1000
-set g_balance_rocketlauncher_speedaccel 0
-set g_balance_rocketlauncher_speedstart 1000
-set g_balance_rocketlauncher_lifetime 30
-set g_balance_rocketlauncher_refire 1
-set g_balance_rocketlauncher_animtime 0.3
-set g_balance_rocketlauncher_ammo 3
-set g_balance_rocketlauncher_health 0
-set g_balance_rocketlauncher_damageforcescale 0
-set g_balance_rocketlauncher_detonatedelay 9999 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
-set g_balance_rocketlauncher_guiderate 45 // max degrees per second
-set g_balance_rocketlauncher_guideratedelay 0.01 // immediate
-set g_balance_rocketlauncher_guidegoal 512 // goal distance for (non-laser) guiding (higher = less control, lower = erratic)
-set g_balance_rocketlauncher_guidedelay 0.15 // delay before guiding kicks in
-set g_balance_rocketlauncher_guidestop 0 // stop guiding when firing again
-set g_balance_rocketlauncher_laserguided_speed 1000 //650
-set g_balance_rocketlauncher_laserguided_speedaccel 0
-set g_balance_rocketlauncher_laserguided_speedstart 1000
-set g_balance_rocketlauncher_laserguided_turnrate 0.75 //0.5
-set g_balance_rocketlauncher_laserguided_allow_steal 1
-// }}}
-// {{{ porto
-set g_balance_porto_primary_refire 1.5
-set g_balance_porto_primary_animtime 0.3
-set g_balance_porto_primary_speed 2000
-set g_balance_porto_primary_lifetime 30
-set g_balance_portal_health 200 // these get recharged whenever the portal is used
-set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
-// }}}
-// {{{ hook
-set g_balance_hook_primary_fuel 5 // hook monkeys set 0
-set g_balance_hook_primary_refire 0 // hook monkeys set 0
-set g_balance_hook_primary_animtime 0.3 // good shoot anim
-set g_balance_hook_primary_hooked_time_max 0 // infinite
-set g_balance_hook_primary_hooked_time_free 2 // 2s being hooked are free
-set g_balance_hook_primary_hooked_fuel 5 // fuel per second hooked
-set g_balance_hook_secondary_damage 25 // not much
-set g_balance_hook_secondary_edgedamage 5 // not much
-set g_balance_hook_secondary_radius 500 // LOTS
-set g_balance_hook_secondary_force -2000 // LOTS
-set g_balance_hook_secondary_ammo 50 // a whole pack
-set g_balance_hook_secondary_lifetime 30 // infinite
-set g_balance_hook_secondary_speed 0 // not much throwing
-set g_balance_hook_secondary_gravity 5 // fast falling
-set g_balance_hook_secondary_refire 3 // don't drop too many bombs...
-set g_balance_hook_secondary_animtime 0.3 // good shoot anim
-set g_balance_hook_secondary_power 3 // effect behaves like a square function
-set g_balance_hook_secondary_duration 1.5 // effect runs for three seconds
-// }}}
-// {{{ hlac
-set g_balance_hlac_primary_spread_min 0.01
-set g_balance_hlac_primary_spread_max 0.25
-set g_balance_hlac_primary_spread_add 0.0045
-set g_balance_hlac_primary_spread_crouchmod 0.25
-
-set g_balance_hlac_primary_damage 23
-set g_balance_hlac_primary_edgedamage 10
-set g_balance_hlac_primary_force 100
-set g_balance_hlac_primary_radius 70
-set g_balance_hlac_primary_speed 9000
-set g_balance_hlac_primary_lifetime 5
-
-set g_balance_hlac_primary_refire 0.1
-set g_balance_hlac_primary_animtime 0.4
-set g_balance_hlac_primary_ammo 1
-
-set g_balance_hlac_secondary 1
-set g_balance_hlac_secondary_spread 0.15
-set g_balance_hlac_secondary_spread_crouchmod 0.5
-
-set g_balance_hlac_secondary_damage 23
-set g_balance_hlac_secondary_edgedamage 10
-set g_balance_hlac_secondary_force 100
-set g_balance_hlac_secondary_radius 70
-set g_balance_hlac_secondary_speed 9000
-set g_balance_hlac_secondary_lifetime 5
-
-set g_balance_hlac_secondary_refire 1
-set g_balance_hlac_secondary_animtime 0.3
-set g_balance_hlac_secondary_ammo 10
-set g_balance_hlac_secondary_shots 6
-// }}}
-// {{{ campingrifle
-set g_balance_campingrifle_magazinecapacity 8
-set g_balance_campingrifle_reloadtime 2 // matches reload anim
-set g_balance_campingrifle_auto_reload_after_changing_weapons 0
-set g_balance_campingrifle_bursttime 0
-set g_balance_campingrifle_tracer 0
-set g_balance_campingrifle_primary_damage 60
-set g_balance_campingrifle_primary_headshotaddeddamage 100
-set g_balance_campingrifle_primary_spread 0
-set g_balance_campingrifle_primary_force 2
-set g_balance_campingrifle_primary_speed 35000
-set g_balance_campingrifle_primary_lifetime 5
-set g_balance_campingrifle_primary_refire 0.8
-set g_balance_campingrifle_primary_animtime 0.3
-set g_balance_campingrifle_primary_ammo 10
-set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu
-set g_balance_campingrifle_primary_burstcost 0
-set g_balance_campingrifle_primary_bullethail 0 // empty magazine on shot
-set g_balance_campingrifle_secondary_damage 35
-set g_balance_campingrifle_secondary_headshotaddeddamage 15 // 50 damage only on head
-set g_balance_campingrifle_secondary_spread 0.008
-set g_balance_campingrifle_secondary_force 1
-set g_balance_campingrifle_secondary_speed 20000
-set g_balance_campingrifle_secondary_lifetime 5
-set g_balance_campingrifle_secondary_refire 0.15
-set g_balance_campingrifle_secondary_animtime 0.1
-set g_balance_campingrifle_secondary_ammo 10
-set g_balance_campingrifle_secondary_bulletconstant 130 // 18.3qu
-set g_balance_campingrifle_secondary_burstcost 0
-set g_balance_campingrifle_secondary_bullethail 0 // empty magazine on shot
-// }}}
-// {{{ tuba
-set g_balance_tuba_refire 0.05
-set g_balance_tuba_animtime 0.05
-set g_balance_tuba_attenuation 0.5
-set g_balance_tuba_volume 1
-set g_balance_tuba_fadetime 0.25
-set g_balance_tuba_damage 5
-set g_balance_tuba_edgedamage 0
-set g_balance_tuba_radius 200
-set g_balance_tuba_force 40
-// }}}
-// {{{ fireball
-set g_balance_fireball_primary_ammo 40
-set g_balance_fireball_primary_animtime 0.15
-set g_balance_fireball_primary_bfgdamage 100
-set g_balance_fireball_primary_bfgforce 0
-set g_balance_fireball_primary_bfgradius 1000
-set g_balance_fireball_primary_damage 200
-set g_balance_fireball_primary_damageforcescale 4
-set g_balance_fireball_primary_edgedamage 0
-set g_balance_fireball_primary_force 700
-set g_balance_fireball_primary_health 50
-set g_balance_fireball_primary_laserburntime 0.5
-set g_balance_fireball_primary_laserdamage 80
-set g_balance_fireball_primary_laseredgedamage 20
-set g_balance_fireball_primary_laserradius 256
-set g_balance_fireball_primary_lifetime 15
-set g_balance_fireball_primary_radius 200
-set g_balance_fireball_primary_refire 5
-set g_balance_fireball_primary_refire2 0
-set g_balance_fireball_primary_speed 650
-set g_balance_fireball_primary_spread 0
-set g_balance_fireball_secondary_ammo 5
-set g_balance_fireball_secondary_animtime 0.3
-set g_balance_fireball_secondary_damage 40
-set g_balance_fireball_secondary_damageforcescale 4
-set g_balance_fireball_secondary_damagetime 5
-set g_balance_fireball_secondary_force 100
-set g_balance_fireball_secondary_laserburntime 0.5
-set g_balance_fireball_secondary_laserdamage 50
-set g_balance_fireball_secondary_laseredgedamage 20
-set g_balance_fireball_secondary_laserradius 110
-set g_balance_fireball_secondary_lifetime 7
-set g_balance_fireball_secondary_refire 2
-set g_balance_fireball_secondary_speed 900
-set g_balance_fireball_secondary_speed_up 100
-set g_balance_fireball_secondary_speed_z 0
-set g_balance_fireball_secondary_spread 0
-// }}}
-// {{{ seeker
-set g_balance_seeker_flac_ammo 0.5
-set g_balance_seeker_flac_animtime 0.1
-set g_balance_seeker_flac_damage 15
-set g_balance_seeker_flac_edgedamage 10
-set g_balance_seeker_flac_force 50
-set g_balance_seeker_flac_lifetime 0.1
-set g_balance_seeker_flac_lifetime_rand 0.05
-set g_balance_seeker_flac_radius 100
-set g_balance_seeker_flac_refire 0.1
-set g_balance_seeker_flac_speed 3000
-set g_balance_seeker_flac_speed_up 1000
-set g_balance_seeker_flac_speed_z 0
-set g_balance_seeker_flac_spread 0.4
-set g_balance_seeker_missile_accel 1.05
-set g_balance_seeker_missile_ammo 2
-set g_balance_seeker_missile_animtime 0.3
-set g_balance_seeker_missile_count 4
-set g_balance_seeker_missile_damage 40
-set g_balance_seeker_missile_damageforcescale 4
-set g_balance_seeker_missile_decel 0.9
-set g_balance_seeker_missile_delay 0.25
-set g_balance_seeker_missile_edgedamage 10
-set g_balance_seeker_missile_force 250
-set g_balance_seeker_missile_health 5
-set g_balance_seeker_missile_lifetime 15
-set g_balance_seeker_missile_proxy 0
-set g_balance_seeker_missile_proxy_delay 0.2
-set g_balance_seeker_missile_proxy_maxrange 45
-set g_balance_seeker_missile_radius 80
-set g_balance_seeker_missile_refire 0.5
-set g_balance_seeker_missile_smart 1
-set g_balance_seeker_missile_smart_mindist 800
-set g_balance_seeker_missile_smart_trace_max 2500
-set g_balance_seeker_missile_smart_trace_min 1000
-set g_balance_seeker_missile_speed 700
-set g_balance_seeker_missile_speed_accel 0
-set g_balance_seeker_missile_speed_up 300
-set g_balance_seeker_missile_speed_z 0
-set g_balance_seeker_missile_speed_max 1250
-set g_balance_seeker_missile_spread 0
-set g_balance_seeker_missile_turnrate 0.65
-set g_balance_seeker_tag_ammo 1
-set g_balance_seeker_tag_animtime 0.3
-set g_balance_seeker_tag_damageforcescale 4
-set g_balance_seeker_tag_health 5
-set g_balance_seeker_tag_lifetime 15
-set g_balance_seeker_tag_refire 0.7
-set g_balance_seeker_tag_speed 9000
-set g_balance_seeker_tag_spread 0
-// End new seeker
diff --git a/balanceNexSVN.cfg b/balanceNexSVN.cfg
new file mode 100644 (file)
index 0000000..0f8a8dc
--- /dev/null
@@ -0,0 +1,656 @@
+// {{{ starting gear
+set g_start_weapon_laser -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_shotgun -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_uzi -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_grenadelauncher -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_electro -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_crylink -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_nex -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_hagar -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_rocketlauncher -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_minstanex -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_porto -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_hook -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_hlac -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_campingrifle -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_tuba -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_fireball -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_seeker -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_balance_health_start 150
+set g_balance_armor_start 0
+set g_start_ammo_shells 40
+set g_start_ammo_nails 0
+set g_start_ammo_rockets 0
+set g_start_ammo_cells 0
+set g_start_ammo_fuel 0
+set g_warmup_start_health 250 "starting values when being in warmup-stage"
+set g_warmup_start_armor 100 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_shells 50 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_nails 150 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_rockets 50 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_cells 50 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
+set g_lms_start_health 250
+set g_lms_start_armor 100
+set g_lms_start_ammo_shells 50
+set g_lms_start_ammo_nails 150
+set g_lms_start_ammo_rockets 50
+set g_lms_start_ammo_cells 50
+set g_lms_start_ammo_fuel 0
+set g_balance_nix_roundtime 25
+set g_balance_nix_incrtime 1.6
+set g_balance_nix_ammo_shells 15
+set g_balance_nix_ammo_nails 45
+set g_balance_nix_ammo_rockets 15
+set g_balance_nix_ammo_cells 15
+set g_balance_nix_ammo_fuel 0
+set g_balance_nix_ammoincr_shells 2
+set g_balance_nix_ammoincr_nails 6
+set g_balance_nix_ammoincr_rockets 2
+set g_balance_nix_ammoincr_cells 2
+set g_balance_nix_ammoincr_fuel 2
+// }}}
+
+// {{{ pickup items
+set g_pickup_ammo_anyway 0
+set g_pickup_weapons_anyway 0
+set g_pickup_shells 15
+set g_pickup_shells_max 999
+set g_pickup_nails 80
+set g_pickup_nails_max 999
+set g_pickup_rockets 15
+set g_pickup_rockets_max 999
+set g_pickup_cells 25
+set g_pickup_cells_max 999
+set g_pickup_fuel 25
+set g_pickup_fuel_jetpack 50
+set g_pickup_fuel_max 999
+set g_pickup_armorsmall 5
+set g_pickup_armorsmall_max 999
+set g_pickup_armorsmall_anyway 0
+set g_pickup_armormedium 25
+set g_pickup_armormedium_max 999
+set g_pickup_armormedium_anyway 0
+set g_pickup_armorbig 50
+set g_pickup_armorbig_max 999
+set g_pickup_armorbig_anyway 0
+set g_pickup_armorlarge 100
+set g_pickup_armorlarge_max 999
+set g_pickup_armorlarge_anyway 0
+set g_pickup_healthsmall 5
+set g_pickup_healthsmall_max 999
+set g_pickup_healthsmall_anyway 0
+set g_pickup_healthmedium 25
+set g_pickup_healthmedium_max 999
+set g_pickup_healthmedium_anyway 0
+set g_pickup_healthlarge 50
+set g_pickup_healthlarge_max 999
+set g_pickup_healthlarge_anyway 0
+set g_pickup_healthmega 100
+set g_pickup_healthmega_max 999
+set g_pickup_healthmega_anyway 0
+set g_pickup_respawntime_short 15
+set g_pickup_respawntime_medium 20
+set g_pickup_respawntime_long 30
+set g_pickup_respawntime_powerup 120
+set g_pickup_respawntime_weapon 15
+set g_pickup_respawntime_ammo 15
+set g_pickup_respawntimejitter_short 0
+set g_pickup_respawntimejitter_medium 0
+set g_pickup_respawntimejitter_long 0
+set g_pickup_respawntimejitter_powerup 10
+set g_pickup_respawntimejitter_weapon 0
+set g_pickup_respawntimejitter_ammo 0
+// }}}
+
+// {{{ regen/rot
+set g_balance_health_regen 0.1
+set g_balance_health_regenlinear 0
+set g_balance_pause_health_regen 5
+set g_balance_pause_health_regen_spawn 0
+set g_balance_health_rot 0.1
+set g_balance_health_rotlinear 0
+set g_balance_pause_health_rot 5
+set g_balance_pause_health_rot_spawn 10
+set g_balance_health_regenstable 100
+set g_balance_health_rotstable 100
+set g_balance_health_limit 999
+set g_balance_armor_regen 0
+set g_balance_armor_regenlinear 0
+set g_balance_armor_rot 0.1
+set g_balance_armor_rotlinear 0
+set g_balance_pause_armor_rot 5
+set g_balance_pause_armor_rot_spawn 10
+set g_balance_armor_regenstable 100
+set g_balance_armor_rotstable 100
+set g_balance_armor_limit 999
+set g_balance_armor_blockpercent 0.6
+set g_balance_fuel_regen 0.1 "fuel regeneration (only applies if the player owns IT_FUEL_REGEN)"
+set g_balance_fuel_regenlinear 0
+set g_balance_pause_fuel_regen 2 // other than this, fuel uses the health regen counter
+set g_balance_fuel_rot 0.05
+set g_balance_fuel_rotlinear 0
+set g_balance_pause_fuel_rot 5
+set g_balance_pause_fuel_rot_spawn 10
+set g_balance_fuel_regenstable 50
+set g_balance_fuel_rotstable 100
+set g_balance_fuel_limit 999
+// }}}
+
+// {{{ misc
+set g_balance_selfdamagepercent 0.6
+set g_balance_weaponswitchdelay 0.15
+set g_weaponspeedfactor 1 "weapon projectile speed multiplier"
+set g_weaponratefactor 1 "weapon fire rate multiplier"
+set g_weapondamagefactor 1 "weapon damage multiplier"
+set g_weaponforcefactor 1 "weapon force multiplier"
+set g_weaponspreadfactor 1 "weapon spread multiplier"
+set g_balance_firetransfer_time 0.9
+set g_balance_firetransfer_damage 0.8
+set g_throughfloor_damage 0.4
+set g_throughfloor_force 0.7
+set g_projectiles_newton_style 2
+// possible values:
+// 0: absolute velocity projectiles (like Quake)
+// 1: relative velocity projectiles, "Newtonian" (like Tribes 2)
+// 2: relative velocity projectiles, but aim is precorrected so projectiles hit the crosshair (note: strafe rockets then are SLOWER than ones shot while standing, happens in 1 too when aiming correctly which is hard)
+// 3: absolute velocity + player velocity component in shot direction (note: does NOT yield the right relative velocity, but may be good enough, but it is somewhat prone to sniper rockets)
+// 4: just add the player velocity length to the absolute velocity (tZork's sniper rockets)
+set g_projectiles_newton_style_2_minfactor 0.7
+set g_projectiles_newton_style_2_maxfactor 5
+set g_projectiles_spread_style 0
+// possible values:
+// 0: forward + solid sphere (like Quake) - varies velocity
+// 1: forward + flattened solid sphere
+// 2: forward + solid circle
+// 3: forward + normal distribution 3D - varies velocity
+// 4: forward + normal distribution on a plane
+// 5: forward + circle with 1-r falloff
+// 6: forward + circle with 1-r^2 falloff
+// 7: forward + circle with (1-r)(2-r) falloff
+set g_balance_falldamage_deadminspeed 150
+set g_balance_falldamage_minspeed 1400
+set g_balance_falldamage_factor 0.15
+set g_balance_falldamage_maxdamage 25
+// }}}
+
+// {{{ powerups
+set g_balance_powerup_invincible_takedamage 0.2
+set g_balance_powerup_invincible_time 30
+set g_balance_powerup_strength_damage 3
+set g_balance_powerup_strength_force 3
+set g_balance_powerup_strength_time 30
+set g_balance_powerup_strength_selfdamage 1.5
+set g_balance_powerup_strength_selfforce 1.5
+// }}}
+
+// {{{ jetpack/hook
+set g_jetpack_antigravity 0.8 "factor of gravity compensation of the jetpack"
+set g_jetpack_acceleration_side 1200 "acceleration of the jetpack in xy direction"
+set g_jetpack_acceleration_up 600 "acceleration of the jetpack in z direction (note: you have to factor in gravity here, if antigravity is not 1)"
+set g_jetpack_maxspeed_side 1500 "max speed of the jetpack in xy direction"
+set g_jetpack_maxspeed_up 600 "max speed of the jetpack in z direction"
+set g_jetpack_fuel 8 "fuel per second for jetpack"
+set g_jetpack_attenuation 2 "jetpack sound attenuation"
+
+set g_grappling_hook_tarzan 2 // 2: can also pull players
+set g_balance_grapplehook_speed_fly 1800
+set g_balance_grapplehook_speed_pull 2000
+set g_balance_grapplehook_force_rubber 2000
+set g_balance_grapplehook_force_rubber_overstretch 1000
+set g_balance_grapplehook_length_min 50
+set g_balance_grapplehook_stretch 50
+set g_balance_grapplehook_airfriction 0.2
+set g_balance_grapplehook_health 130
+// }}}
+
+// {{{ weapon properties
+// {{{ laser
+set g_balance_laser_primary_damage 35
+set g_balance_laser_primary_edgedamage 10
+set g_balance_laser_primary_force 400
+set g_balance_laser_primary_radius 70
+set g_balance_laser_primary_speed 9000
+set g_balance_laser_primary_spread 0
+set g_balance_laser_primary_refire 0.7
+set g_balance_laser_primary_animtime 0.3
+set g_balance_laser_primary_lifetime 30
+set g_balance_laser_primary_shotangle 0
+set g_balance_laser_primary_delay 0.03
+set g_balance_laser_primary_gauntlet 0
+set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
+set g_balance_laser_secondary_damage 35
+set g_balance_laser_secondary_edgedamage 10
+set g_balance_laser_secondary_force 400
+set g_balance_laser_secondary_radius 70
+set g_balance_laser_secondary_speed 9000
+set g_balance_laser_secondary_spread 0
+set g_balance_laser_secondary_refire 0.7
+set g_balance_laser_secondary_animtime 0.3
+set g_balance_laser_secondary_lifetime 30
+set g_balance_laser_secondary_shotangle 0
+set g_balance_laser_secondary_delay 0
+set g_balance_laser_secondary_gauntlet 0
+// }}
+// {{{ shotgun
+set g_balance_shotgun_primary_bullets 6
+set g_balance_shotgun_primary_damage 9
+set g_balance_shotgun_primary_force 60
+set g_balance_shotgun_primary_spread 0.07
+set g_balance_shotgun_primary_refire 0.5
+set g_balance_shotgun_primary_animtime 0.2
+set g_balance_shotgun_primary_ammo 1
+set g_balance_shotgun_primary_speed 12000
+set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
+set g_balance_shotgun_secondary 1
+set g_balance_shotgun_secondary_melee_delay 0.35 // match the anim
+set g_balance_shotgun_secondary_melee_range 60
+set g_balance_shotgun_secondary_melee_swing 50
+set g_balance_shotgun_secondary_melee_time 0.1
+set g_balance_shotgun_secondary_damage 115
+set g_balance_shotgun_secondary_force 150
+set g_balance_shotgun_secondary_refire 1.1
+set g_balance_shotgun_secondary_animtime 1
+// }}}
+// {{{ uzi
+set g_balance_uzi_first 1
+set g_balance_uzi_first_damage 30
+set g_balance_uzi_first_force 50
+set g_balance_uzi_first_spread 0.015
+set g_balance_uzi_first_refire 0.2
+set g_balance_uzi_first_ammo 1
+set g_balance_uzi_sustained_damage 15
+set g_balance_uzi_sustained_force 27
+set g_balance_uzi_sustained_spread 0.05
+set g_balance_uzi_sustained_refire 0.1
+set g_balance_uzi_sustained_ammo 1
+set g_balance_uzi_speed 18000
+set g_balance_uzi_bulletconstant 115 // 13.1qu
+// }}}
+// {{{ mortar
+set g_balance_grenadelauncher_primary2secondary 0
+set g_balance_grenadelauncher_primary_sticky 0
+set g_balance_grenadelauncher_primary_damage 70
+set g_balance_grenadelauncher_primary_edgedamage 38
+set g_balance_grenadelauncher_primary_force 400
+set g_balance_grenadelauncher_primary_radius 140
+set g_balance_grenadelauncher_primary_speed 2000
+set g_balance_grenadelauncher_primary_speed_up 200
+set g_balance_grenadelauncher_primary_speed_z 0
+set g_balance_grenadelauncher_primary_spread 0
+set g_balance_grenadelauncher_primary_lifetime 30
+set g_balance_grenadelauncher_primary_lifetime2 1
+set g_balance_grenadelauncher_primary_refire 0.8
+set g_balance_grenadelauncher_primary_animtime 0.3
+set g_balance_grenadelauncher_primary_ammo 2
+set g_balance_grenadelauncher_primary_health 25
+set g_balance_grenadelauncher_secondary_sticky 0
+set g_balance_grenadelauncher_secondary_damage 70
+set g_balance_grenadelauncher_secondary_edgedamage 38
+set g_balance_grenadelauncher_secondary_force 400
+set g_balance_grenadelauncher_secondary_radius 140
+set g_balance_grenadelauncher_secondary_speed 1400
+set g_balance_grenadelauncher_secondary_speed_up 200
+set g_balance_grenadelauncher_secondary_speed_z 0
+set g_balance_grenadelauncher_secondary_spread 0
+set g_balance_grenadelauncher_secondary_lifetime 2.5
+set g_balance_grenadelauncher_secondary_lifetime2 0
+set g_balance_grenadelauncher_secondary_refire 0.7
+set g_balance_grenadelauncher_secondary_animtime 0.3
+set g_balance_grenadelauncher_secondary_ammo 2
+set g_balance_grenadelauncher_secondary_health 10
+set g_balance_grenadelauncher_secondary_damageforcescale 4
+set g_balance_grenadelauncher_secondary_bouncefactor 0.5
+set g_balance_grenadelauncher_secondary_bouncestop 0.075
+// }}}
+// {{{ electro
+set g_balance_electro_lightning 0
+set g_balance_electro_primary_damage 65
+set g_balance_electro_primary_edgedamage 0
+set g_balance_electro_primary_force 200
+set g_balance_electro_primary_force_up 0
+set g_balance_electro_primary_radius 150
+set g_balance_electro_primary_comboradius 0
+set g_balance_electro_primary_speed 2000
+set g_balance_electro_primary_spread 0
+set g_balance_electro_primary_lifetime 30
+set g_balance_electro_primary_refire 0.6
+set g_balance_electro_primary_animtime 0.3
+set g_balance_electro_primary_ammo 2
+set g_balance_electro_primary_range 0
+set g_balance_electro_secondary_damage 50
+set g_balance_electro_secondary_spread 0.05
+set g_balance_electro_secondary_edgedamage 0
+set g_balance_electro_secondary_force 200
+set g_balance_electro_secondary_radius 150
+set g_balance_electro_secondary_speed 900
+set g_balance_electro_secondary_speed_up 200
+set g_balance_electro_secondary_speed_z 0
+set g_balance_electro_secondary_spread 0
+set g_balance_electro_secondary_lifetime 5
+set g_balance_electro_secondary_refire 0.3
+set g_balance_electro_secondary_refire2 0
+set g_balance_electro_secondary_animtime 0.3
+set g_balance_electro_secondary_ammo 2
+set g_balance_electro_secondary_health 5
+set g_balance_electro_secondary_damageforcescale 4
+set g_balance_electro_secondary_count 1
+set g_balance_electro_combo_damage 80
+set g_balance_electro_combo_edgedamage 0
+set g_balance_electro_combo_force 200
+set g_balance_electro_combo_radius 250
+set g_balance_electro_combo_comboradius 0
+set g_balance_electro_combo_speed 2000
+// }}}
+// {{{ crylink
+set g_balance_crylink_primary_damage 18
+set g_balance_crylink_primary_edgedamage 0
+set g_balance_crylink_primary_force -55
+set g_balance_crylink_primary_radius 80
+set g_balance_crylink_primary_speed 7000
+set g_balance_crylink_primary_spread 0.03
+set g_balance_crylink_primary_shots 4
+set g_balance_crylink_primary_bounces 1
+set g_balance_crylink_primary_refire 0.4
+set g_balance_crylink_primary_animtime 0.3
+set g_balance_crylink_primary_ammo 2
+set g_balance_crylink_primary_bouncedamagefactor 0.5
+
+set g_balance_crylink_primary_middle_lifetime 5 // range: 35000 full, fades to 70000
+set g_balance_crylink_primary_middle_fadetime 5
+set g_balance_crylink_primary_star_lifetime 0.1 // range: 700 full, fades to 2450
+set g_balance_crylink_primary_star_fadetime 0.25
+set g_balance_crylink_primary_other_lifetime 0.1 // range: 700 full, fades to 2450
+set g_balance_crylink_primary_other_fadetime 0.25
+
+set g_balance_crylink_secondary 1
+set g_balance_crylink_secondary_damage 18
+set g_balance_crylink_secondary_edgedamage 0
+set g_balance_crylink_secondary_force -55
+set g_balance_crylink_secondary_radius 3
+set g_balance_crylink_secondary_speed 7000
+set g_balance_crylink_secondary_spread 0.08
+set g_balance_crylink_secondary_shots 7
+set g_balance_crylink_secondary_bounces 0
+set g_balance_crylink_secondary_refire 0.5
+set g_balance_crylink_secondary_animtime 0.3
+set g_balance_crylink_secondary_ammo 2
+set g_balance_crylink_secondary_bouncedamagefactor 0.5
+
+set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000
+set g_balance_crylink_secondary_middle_fadetime 5
+set g_balance_crylink_secondary_line_lifetime 2 // range: 35000 full, fades to 70000
+set g_balance_crylink_secondary_line_fadetime 2
+// }}}
+// {{{ nex
+set g_balance_nex_primary_damage 90
+set g_balance_nex_primary_force 200
+set g_balance_nex_primary_refire 1.5
+set g_balance_nex_primary_animtime 0.3
+set g_balance_nex_primary_ammo 5
+set g_balance_nex_primary_damagefalloff_mindist 1000
+set g_balance_nex_primary_damagefalloff_maxdist 3000
+set g_balance_nex_primary_damagefalloff_halflife 1500
+set g_balance_nex_primary_damagefalloff_forcehalflife 1500
+
+set g_balance_nex_secondary 0
+set g_balance_nex_secondary_damage 90
+set g_balance_nex_secondary_force 200
+set g_balance_nex_secondary_refire 1.5
+set g_balance_nex_secondary_animtime 0.3
+set g_balance_nex_secondary_ammo 5
+set g_balance_nex_secondary_damagefalloff_mindist 1000
+set g_balance_nex_secondary_damagefalloff_maxdist 3000
+set g_balance_nex_secondary_damagefalloff_halflife 1500
+set g_balance_nex_secondary_damagefalloff_forcehalflife 1500
+// }}}
+// {{{ minstanex
+set g_balance_minstanex_refire 1
+set g_balance_minstanex_animtime 0.3
+set g_balance_minstanex_ammo 10
+// }}}
+// {{{ hagar
+set g_balance_hagar_primary_damage 37
+set g_balance_hagar_primary_edgedamage 15
+set g_balance_hagar_primary_force 100
+set g_balance_hagar_primary_radius 65
+set g_balance_hagar_primary_spread 0.010
+set g_balance_hagar_primary_speed 3000
+set g_balance_hagar_primary_lifetime 30
+set g_balance_hagar_primary_refire 0.15
+set g_balance_hagar_primary_ammo 1
+set g_balance_hagar_secondary 1
+set g_balance_hagar_secondary_damage 37
+set g_balance_hagar_secondary_edgedamage 15
+set g_balance_hagar_secondary_force 100
+set g_balance_hagar_secondary_radius 65
+set g_balance_hagar_secondary_spread 0.015
+set g_balance_hagar_secondary_speed 1400
+set g_balance_hagar_secondary_lifetime_min 30
+set g_balance_hagar_secondary_lifetime_rand 0
+set g_balance_hagar_secondary_refire 0.15
+set g_balance_hagar_secondary_ammo 1
+// }}}
+// {{{ rocketlauncher
+set g_balance_rocketlauncher_damage 105
+set g_balance_rocketlauncher_edgedamage 40
+set g_balance_rocketlauncher_force 600
+set g_balance_rocketlauncher_radius 150
+set g_balance_rocketlauncher_speed 850
+set g_balance_rocketlauncher_speedaccel 0
+set g_balance_rocketlauncher_speedstart 850
+set g_balance_rocketlauncher_lifetime 30
+set g_balance_rocketlauncher_refire 1
+set g_balance_rocketlauncher_animtime 0.3
+set g_balance_rocketlauncher_ammo 3
+set g_balance_rocketlauncher_health 40
+set g_balance_rocketlauncher_damageforcescale 4
+set g_balance_rocketlauncher_detonatedelay 0.2 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
+set g_balance_rocketlauncher_guiderate 90 // max degrees per second
+set g_balance_rocketlauncher_guideratedelay 0.01 // immediate
+set g_balance_rocketlauncher_guidegoal 512 // goal distance for (non-laser) guiding (higher = less control, lower = erratic)
+set g_balance_rocketlauncher_guidedelay 0.15 // delay before guiding kicks in
+set g_balance_rocketlauncher_guidestop 0 // stop guiding when firing again
+set g_balance_rocketlauncher_laserguided_speed 1000 //650
+set g_balance_rocketlauncher_laserguided_speedaccel 0
+set g_balance_rocketlauncher_laserguided_speedstart 1000
+set g_balance_rocketlauncher_laserguided_turnrate 0.75 //0.5
+set g_balance_rocketlauncher_laserguided_allow_steal 1
+set g_balance_rocketlauncher_remote_damage 105
+set g_balance_rocketlauncher_remote_edgedamage 40
+set g_balance_rocketlauncher_remote_radius 150
+set g_balance_rocketlauncher_remote_force 600
+// }}}
+// {{{ porto
+set g_balance_porto_primary_refire 1.5
+set g_balance_porto_primary_animtime 0.3
+set g_balance_porto_primary_speed 5000
+set g_balance_porto_primary_lifetime 30
+set g_balance_portal_health 200 // these get recharged whenever the portal is used
+set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
+// }}}
+// {{{ hook
+set g_balance_hook_primary_fuel 5 // hook monkeys set 0
+set g_balance_hook_primary_refire 0 // hook monkeys set 0
+set g_balance_hook_primary_animtime 0.3 // good shoot anim
+set g_balance_hook_primary_hooked_time_max 0 // infinite
+set g_balance_hook_primary_hooked_time_free 2 // 2s being hooked are free
+set g_balance_hook_primary_hooked_fuel 5 // fuel per second hooked
+set g_balance_hook_secondary_damage 25 // not much
+set g_balance_hook_secondary_edgedamage 5 // not much
+set g_balance_hook_secondary_radius 500 // LOTS
+set g_balance_hook_secondary_force -2000 // LOTS
+set g_balance_hook_secondary_ammo 50 // a whole pack
+set g_balance_hook_secondary_lifetime 30 // infinite
+set g_balance_hook_secondary_speed 0 // not much throwing
+set g_balance_hook_secondary_gravity 5 // fast falling
+set g_balance_hook_secondary_refire 3 // don't drop too many bombs...
+set g_balance_hook_secondary_animtime 0.3 // good shoot anim
+set g_balance_hook_secondary_power 3 // effect behaves like a square function
+set g_balance_hook_secondary_duration 1.5 // effect runs for three seconds
+// }}}
+// {{{ hlac
+set g_balance_hlac_primary_spread_min 0.01
+set g_balance_hlac_primary_spread_max 0.25
+set g_balance_hlac_primary_spread_add 0.0045
+set g_balance_hlac_primary_spread_crouchmod 0.25
+
+set g_balance_hlac_primary_damage 23
+set g_balance_hlac_primary_edgedamage 10
+set g_balance_hlac_primary_force 100
+set g_balance_hlac_primary_radius 70
+set g_balance_hlac_primary_speed 9000
+set g_balance_hlac_primary_lifetime 5
+
+set g_balance_hlac_primary_refire 0.1
+set g_balance_hlac_primary_animtime 0.4
+set g_balance_hlac_primary_ammo 1
+
+set g_balance_hlac_secondary 1
+set g_balance_hlac_secondary_spread 0.15
+set g_balance_hlac_secondary_spread_crouchmod 0.5
+
+set g_balance_hlac_secondary_damage 23
+set g_balance_hlac_secondary_edgedamage 10
+set g_balance_hlac_secondary_force 100
+set g_balance_hlac_secondary_radius 70
+set g_balance_hlac_secondary_speed 9000
+set g_balance_hlac_secondary_lifetime 5
+
+set g_balance_hlac_secondary_refire 1
+set g_balance_hlac_secondary_animtime 0.3
+set g_balance_hlac_secondary_ammo 10
+set g_balance_hlac_secondary_shots 6
+// }}}
+// {{{ campingrifle
+set g_balance_campingrifle_magazinecapacity 0
+set g_balance_campingrifle_reloadtime 2 // matches reload anim
+set g_balance_campingrifle_auto_reload_after_changing_weapons 0
+set g_balance_campingrifle_bursttime 0.85 // 0.35 - 0.1 + 0.35 - 0.1 + 0.35 = three secondaries
+set g_balance_campingrifle_tracer 1
+set g_balance_campingrifle_primary_damage 50
+set g_balance_campingrifle_primary_headshotaddeddamage 50
+set g_balance_campingrifle_primary_spread 0
+set g_balance_campingrifle_primary_force 0
+set g_balance_campingrifle_primary_speed 35000
+set g_balance_campingrifle_primary_lifetime 5
+set g_balance_campingrifle_primary_refire 0.7
+set g_balance_campingrifle_primary_animtime 0.3
+set g_balance_campingrifle_primary_ammo 10
+set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu
+set g_balance_campingrifle_primary_burstcost 0.35 // require same cooldown as secondary, note it's smaller than primary refire time
+set g_balance_campingrifle_primary_bullethail 0
+set g_balance_campingrifle_secondary 1
+set g_balance_campingrifle_secondary_damage 15
+set g_balance_campingrifle_secondary_headshotaddeddamage 25
+set g_balance_campingrifle_secondary_spread 0.02
+set g_balance_campingrifle_secondary_force 0
+set g_balance_campingrifle_secondary_speed 20000
+set g_balance_campingrifle_secondary_lifetime 5
+set g_balance_campingrifle_secondary_refire 0.1
+set g_balance_campingrifle_secondary_animtime 0.1
+set g_balance_campingrifle_secondary_ammo 4
+set g_balance_campingrifle_secondary_bulletconstant 130 // 18.3qu
+set g_balance_campingrifle_secondary_burstcost 0.35
+set g_balance_campingrifle_secondary_bullethail 0
+// }}}
+// {{{ tuba
+set g_balance_tuba_refire 0.05
+set g_balance_tuba_animtime 0.05
+set g_balance_tuba_attenuation 0.5
+set g_balance_tuba_volume 1
+set g_balance_tuba_fadetime 0.25
+set g_balance_tuba_damage 5
+set g_balance_tuba_edgedamage 0
+set g_balance_tuba_radius 200
+set g_balance_tuba_force 40
+// }}}
+// {{{ fireball
+set g_balance_fireball_primary_ammo 40
+set g_balance_fireball_primary_animtime 0.15
+set g_balance_fireball_primary_bfgdamage 100
+set g_balance_fireball_primary_bfgforce 0
+set g_balance_fireball_primary_bfgradius 1000
+set g_balance_fireball_primary_damage 200
+set g_balance_fireball_primary_damageforcescale 4
+set g_balance_fireball_primary_edgedamage 0
+set g_balance_fireball_primary_force 700
+set g_balance_fireball_primary_health 50
+set g_balance_fireball_primary_laserburntime 0.5
+set g_balance_fireball_primary_laserdamage 80
+set g_balance_fireball_primary_laseredgedamage 20
+set g_balance_fireball_primary_laserradius 256
+set g_balance_fireball_primary_lifetime 15
+set g_balance_fireball_primary_radius 200
+set g_balance_fireball_primary_refire 5
+set g_balance_fireball_primary_refire2 0
+set g_balance_fireball_primary_speed 650
+set g_balance_fireball_primary_spread 0
+set g_balance_fireball_secondary_ammo 5
+set g_balance_fireball_secondary_animtime 0.3
+set g_balance_fireball_secondary_damage 40
+set g_balance_fireball_secondary_damageforcescale 4
+set g_balance_fireball_secondary_damagetime 5
+set g_balance_fireball_secondary_force 100
+set g_balance_fireball_secondary_laserburntime 0.5
+set g_balance_fireball_secondary_laserdamage 50
+set g_balance_fireball_secondary_laseredgedamage 20
+set g_balance_fireball_secondary_laserradius 110
+set g_balance_fireball_secondary_lifetime 7
+set g_balance_fireball_secondary_refire 2
+set g_balance_fireball_secondary_speed 900
+set g_balance_fireball_secondary_speed_up 100
+set g_balance_fireball_secondary_speed_z 0
+set g_balance_fireball_secondary_spread 0
+// }}}
+// {{{ seeker
+set g_balance_seeker_flac_ammo 0.5
+set g_balance_seeker_flac_animtime 0.1
+set g_balance_seeker_flac_damage 15
+set g_balance_seeker_flac_edgedamage 10
+set g_balance_seeker_flac_force 50
+set g_balance_seeker_flac_lifetime 0.1
+set g_balance_seeker_flac_lifetime_rand 0.05
+set g_balance_seeker_flac_radius 100
+set g_balance_seeker_flac_refire 0.1
+set g_balance_seeker_flac_speed 3000
+set g_balance_seeker_flac_speed_up 1000
+set g_balance_seeker_flac_speed_z 0
+set g_balance_seeker_flac_spread 0.4
+set g_balance_seeker_missile_accel 1.05
+set g_balance_seeker_missile_ammo 2
+set g_balance_seeker_missile_animtime 0.3
+set g_balance_seeker_missile_count 4
+set g_balance_seeker_missile_damage 40
+set g_balance_seeker_missile_damageforcescale 4
+set g_balance_seeker_missile_decel 0.9
+set g_balance_seeker_missile_delay 0.25
+set g_balance_seeker_missile_edgedamage 10
+set g_balance_seeker_missile_force 250
+set g_balance_seeker_missile_health 5
+set g_balance_seeker_missile_lifetime 15
+set g_balance_seeker_missile_proxy 0
+set g_balance_seeker_missile_proxy_delay 0.2
+set g_balance_seeker_missile_proxy_maxrange 45
+set g_balance_seeker_missile_radius 80
+set g_balance_seeker_missile_refire 0.5
+set g_balance_seeker_missile_smart 1
+set g_balance_seeker_missile_smart_mindist 800
+set g_balance_seeker_missile_smart_trace_max 2500
+set g_balance_seeker_missile_smart_trace_min 1000
+set g_balance_seeker_missile_speed 700
+set g_balance_seeker_missile_speed_accel 0
+set g_balance_seeker_missile_speed_up 300
+set g_balance_seeker_missile_speed_z 0
+set g_balance_seeker_missile_speed_max 1250
+set g_balance_seeker_missile_spread 0
+set g_balance_seeker_missile_turnrate 0.65
+set g_balance_seeker_tag_ammo 1
+set g_balance_seeker_tag_animtime 0.3
+set g_balance_seeker_tag_damageforcescale 4
+set g_balance_seeker_tag_health 5
+set g_balance_seeker_tag_lifetime 15
+set g_balance_seeker_tag_refire 0.7
+set g_balance_seeker_tag_speed 9000
+set g_balance_seeker_tag_spread 0
+// End new seeker
index 21242f16f0364632fbd0eaeb42bf0fba6d854283..e70157872ed1a52ab980be125b4184ca42a812f8 100644 (file)
@@ -217,7 +217,7 @@ set g_balance_laser_primary_animtime 0.3
 set g_balance_laser_primary_lifetime 30
 set g_balance_laser_primary_shotangle 0
 set g_balance_laser_primary_delay 0.03
-set g_balance_laser_gauntlet 0
+set g_balance_laser_primary_gauntlet 0
 set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
 set g_balance_laser_secondary_damage 25
 set g_balance_laser_secondary_edgedamage 10
@@ -230,6 +230,7 @@ set g_balance_laser_secondary_animtime 0.3
 set g_balance_laser_secondary_lifetime 30
 set g_balance_laser_secondary_shotangle -90
 set g_balance_laser_secondary_delay 0
+set g_balance_laser_secondary_gauntlet 0
 // }}}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 6
@@ -242,15 +243,14 @@ set g_balance_shotgun_primary_ammo 1
 set g_balance_shotgun_primary_speed 8000
 set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
 set g_balance_shotgun_secondary 1
-set g_balance_shotgun_secondary_bullets 6
-set g_balance_shotgun_secondary_damage 8
-set g_balance_shotgun_secondary_force 15
-set g_balance_shotgun_secondary_spread 0.17
-set g_balance_shotgun_secondary_refire 1.35
-set g_balance_shotgun_secondary_animtime 0.2
-set g_balance_shotgun_secondary_ammo 1
-set g_balance_shotgun_secondary_speed 8000
-set g_balance_shotgun_secondary_bulletconstant 75 // 3.8qu
+set g_balance_shotgun_secondary_melee_delay 0.35 // match the anim
+set g_balance_shotgun_secondary_melee_range 60
+set g_balance_shotgun_secondary_melee_swing 50
+set g_balance_shotgun_secondary_melee_time 0.1
+set g_balance_shotgun_secondary_damage 115
+set g_balance_shotgun_secondary_force 150
+set g_balance_shotgun_secondary_refire 1.1
+set g_balance_shotgun_secondary_animtime 1
 // }}}
 // {{{ uzi
 set g_balance_uzi_first 1
@@ -269,6 +269,7 @@ set g_balance_uzi_bulletconstant 115 // 13.1qu
 // }}}
 // {{{ mortar
 set g_balance_grenadelauncher_primary2secondary 0
+set g_balance_grenadelauncher_primary_sticky 0
 set g_balance_grenadelauncher_primary_damage 50
 set g_balance_grenadelauncher_primary_edgedamage 38
 set g_balance_grenadelauncher_primary_force 400
@@ -278,9 +279,12 @@ set g_balance_grenadelauncher_primary_speed_up 220
 set g_balance_grenadelauncher_primary_speed_z 0
 set g_balance_grenadelauncher_primary_spread 0
 set g_balance_grenadelauncher_primary_lifetime 30
+set g_balance_grenadelauncher_primary_lifetime2 1
 set g_balance_grenadelauncher_primary_refire 0.8
 set g_balance_grenadelauncher_primary_animtime 0.3
 set g_balance_grenadelauncher_primary_ammo 2
+set g_balance_grenadelauncher_primary_health 25
+set g_balance_grenadelauncher_secondary_sticky 0
 set g_balance_grenadelauncher_secondary_damage 60
 set g_balance_grenadelauncher_secondary_edgedamage 38
 set g_balance_grenadelauncher_secondary_force 400
@@ -290,6 +294,7 @@ set g_balance_grenadelauncher_secondary_speed_up 150
 set g_balance_grenadelauncher_secondary_speed_z 0
 set g_balance_grenadelauncher_secondary_spread 0
 set g_balance_grenadelauncher_secondary_lifetime 1
+set g_balance_grenadelauncher_secondary_lifetime2 0
 set g_balance_grenadelauncher_secondary_refire 0.7
 set g_balance_grenadelauncher_secondary_animtime 0.3
 set g_balance_grenadelauncher_secondary_ammo 2
@@ -303,6 +308,7 @@ set g_balance_electro_lightning 0
 set g_balance_electro_primary_damage 65
 set g_balance_electro_primary_edgedamage 0
 set g_balance_electro_primary_force 200
+set g_balance_electro_primary_force_up 0
 set g_balance_electro_primary_radius 150
 set g_balance_electro_primary_comboradius 0
 set g_balance_electro_primary_speed 2000
@@ -311,6 +317,7 @@ set g_balance_electro_primary_lifetime 30
 set g_balance_electro_primary_refire 0.6
 set g_balance_electro_primary_animtime 0.3
 set g_balance_electro_primary_ammo 2
+set g_balance_electro_primary_range 0
 set g_balance_electro_secondary_damage 50
 set g_balance_electro_secondary_spread 0.05
 set g_balance_electro_secondary_edgedamage 0
@@ -376,15 +383,26 @@ set g_balance_crylink_secondary_line_lifetime 2 // range: 35000 full, fades to 7
 set g_balance_crylink_secondary_line_fadetime 2
 // }}}
 // {{{ nex
-set g_balance_nex_damage 90
-set g_balance_nex_force 300
-set g_balance_nex_refire 1.5
-set g_balance_nex_animtime 0.3
-set g_balance_nex_ammo 5
-set g_balance_nex_damagefalloff_mindist 1000
-set g_balance_nex_damagefalloff_maxdist 3000
-set g_balance_nex_damagefalloff_halflife 1500
-set g_balance_nex_damagefalloff_forcehalflife 1500
+set g_balance_nex_primary_damage 90
+set g_balance_nex_primary_force 300
+set g_balance_nex_primary_refire 1.5
+set g_balance_nex_primary_animtime 0.3
+set g_balance_nex_primary_ammo 5
+set g_balance_nex_primary_damagefalloff_mindist 1000
+set g_balance_nex_primary_damagefalloff_maxdist 3000
+set g_balance_nex_primary_damagefalloff_halflife 1500
+set g_balance_nex_primary_damagefalloff_forcehalflife 1500
+
+set g_balance_nex_secondary 0
+set g_balance_nex_secondary_damage 90
+set g_balance_nex_secondary_force 300
+set g_balance_nex_secondary_refire 1.5
+set g_balance_nex_secondary_animtime 0.3
+set g_balance_nex_secondary_ammo 5
+set g_balance_nex_secondary_damagefalloff_mindist 1000
+set g_balance_nex_secondary_damagefalloff_maxdist 3000
+set g_balance_nex_secondary_damagefalloff_halflife 1500
+set g_balance_nex_secondary_damagefalloff_forcehalflife 1500
 // }}}
 // {{{ minstanex
 set g_balance_minstanex_refire 1
@@ -438,6 +456,10 @@ set g_balance_rocketlauncher_laserguided_speedaccel 0
 set g_balance_rocketlauncher_laserguided_speedstart 1000
 set g_balance_rocketlauncher_laserguided_turnrate 0.75 //0.5
 set g_balance_rocketlauncher_laserguided_allow_steal 1
+set g_balance_rocketlauncher_remote_damage 80
+set g_balance_rocketlauncher_remote_edgedamage 40
+set g_balance_rocketlauncher_remote_radius 100
+set g_balance_rocketlauncher_remote_force 600
 // }}}
 // {{{ porto
 set g_balance_porto_primary_refire 1.5
@@ -518,6 +540,7 @@ set g_balance_campingrifle_primary_ammo 10
 set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu
 set g_balance_campingrifle_primary_burstcost 0.35 // require same cooldown as secondary, note it's smaller than primary refire time
 set g_balance_campingrifle_primary_bullethail 0
+set g_balance_campingrifle_secondary 1
 set g_balance_campingrifle_secondary_damage 15
 set g_balance_campingrifle_secondary_headshotaddeddamage 25
 set g_balance_campingrifle_secondary_spread 0.02
diff --git a/balanceXPM.cfg b/balanceXPM.cfg
deleted file mode 100644 (file)
index bb0416a..0000000
+++ /dev/null
@@ -1,634 +0,0 @@
-// {{{ starting gear
-set g_start_weapon_laser -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_shotgun -2 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_uzi 1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_grenadelauncher -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_electro -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_crylink -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_nex -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_hagar -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_rocketlauncher -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_minstanex -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_porto -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_hook -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_hlac 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_campingrifle 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_tuba -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_fireball -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_start_weapon_seeker 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_balance_health_start 125
-set g_balance_armor_start 0
-set g_start_ammo_shells 0
-set g_start_ammo_nails 100
-set g_start_ammo_rockets 0
-set g_start_ammo_cells 0
-set g_start_ammo_fuel 0
-set g_warmup_start_health 200 "starting values when being in warmup-stage"
-set g_warmup_start_armor 100 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_shells 50 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_nails 150 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_rockets 50 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_cells 50 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
-set g_lms_start_health 200
-set g_lms_start_armor 100
-set g_lms_start_ammo_shells 30
-set g_lms_start_ammo_nails 210
-set g_lms_start_ammo_rockets 150
-set g_lms_start_ammo_cells 150
-set g_lms_start_ammo_fuel 0
-set g_balance_nix_roundtime 25
-set g_balance_nix_incrtime 1.6
-set g_balance_nix_ammo_shells 15
-set g_balance_nix_ammo_nails 45
-set g_balance_nix_ammo_rockets 15
-set g_balance_nix_ammo_cells 15
-set g_balance_nix_ammo_fuel 0
-set g_balance_nix_ammoincr_shells 2
-set g_balance_nix_ammoincr_nails 6
-set g_balance_nix_ammoincr_rockets 2
-set g_balance_nix_ammoincr_cells 2
-set g_balance_nix_ammoincr_fuel 2
-// }}}
-
-// {{{ pickup items
-set g_pickup_ammo_anyway 0
-set g_pickup_weapons_anyway 0
-set g_pickup_shells 10
-set g_pickup_shells_max 30
-set g_pickup_nails 30
-set g_pickup_nails_max 210
-set g_pickup_rockets 20
-set g_pickup_rockets_max 150
-set g_pickup_cells 50
-set g_pickup_cells_max 150
-set g_pickup_fuel 25
-set g_pickup_fuel_jetpack 50
-set g_pickup_fuel_max 999
-set g_pickup_armorsmall 5
-set g_pickup_armorsmall_max 200
-set g_pickup_armorsmall_anyway 0
-set g_pickup_armormedium 25
-set g_pickup_armormedium_max 200
-set g_pickup_armormedium_anyway 0
-set g_pickup_armorbig 50
-set g_pickup_armorbig_max 200
-set g_pickup_armorbig_anyway 0
-set g_pickup_armorlarge 100
-set g_pickup_armorlarge_max 200
-set g_pickup_armorlarge_anyway 0
-set g_pickup_healthsmall 5
-set g_pickup_healthsmall_max 200
-set g_pickup_healthsmall_anyway 0
-set g_pickup_healthmedium 25
-set g_pickup_healthmedium_max 100
-set g_pickup_healthmedium_anyway 0
-set g_pickup_healthlarge 50
-set g_pickup_healthlarge_max 100
-set g_pickup_healthlarge_anyway 0
-set g_pickup_healthmega 100
-set g_pickup_healthmega_max 200
-set g_pickup_healthmega_anyway 0
-set g_pickup_respawntime_short 30
-set g_pickup_respawntime_medium 30
-set g_pickup_respawntime_long 30
-set g_pickup_respawntime_powerup 90
-set g_pickup_respawntime_weapon 5
-set g_pickup_respawntime_ammo 30
-set g_pickup_respawntimejitter_short 0
-set g_pickup_respawntimejitter_medium 0
-set g_pickup_respawntimejitter_long 0
-set g_pickup_respawntimejitter_powerup 15
-set g_pickup_respawntimejitter_weapon 0
-set g_pickup_respawntimejitter_ammo 0
-// }}}
-
-// {{{ regen/rot
-set g_balance_health_regen 0
-set g_balance_health_regenlinear 0
-set g_balance_pause_health_regen 0
-set g_balance_pause_health_regen_spawn 0
-set g_balance_health_rot 0
-set g_balance_health_rotlinear 1
-set g_balance_pause_health_rot 1
-set g_balance_pause_health_rot_spawn 0
-set g_balance_health_regenstable 100
-set g_balance_health_rotstable 100
-set g_balance_health_limit 999
-set g_balance_armor_regen 0
-set g_balance_armor_regenlinear 0
-set g_balance_armor_rot 0
-set g_balance_armor_rotlinear 1
-set g_balance_pause_armor_rot 1
-set g_balance_pause_armor_rot_spawn 0
-set g_balance_armor_regenstable 100
-set g_balance_armor_rotstable 100
-set g_balance_armor_limit 999
-set g_balance_armor_blockpercent 0.66
-
-set g_balance_fuel_regen 0.1 "fuel regeneration (only applies if the player owns IT_FUEL_REGEN)"
-set g_balance_fuel_regenlinear 0
-set g_balance_pause_fuel_regen 2 // other than this, fuel uses the health regen counter
-set g_balance_fuel_rot 0.05
-set g_balance_fuel_rotlinear 0
-set g_balance_pause_fuel_rot 5
-set g_balance_pause_fuel_rot_spawn 10
-set g_balance_fuel_regenstable 50
-set g_balance_fuel_rotstable 100
-set g_balance_fuel_limit 999
-// }}}
-
-// {{{ misc
-set g_balance_selfdamagepercent 0.75
-set g_balance_weaponswitchdelay 0.05
-set g_weaponspeedfactor 1 "weapon projectile speed multiplier"
-set g_weaponratefactor 1 "weapon fire rate multiplier"
-set g_weapondamagefactor 1 "weapon damage multiplier"
-set g_weaponforcefactor 1 "weapon force multiplier"
-set g_weaponspreadfactor 1 "weapon spread multiplier"
-set g_balance_firetransfer_time 0.9
-set g_balance_firetransfer_damage 0.8
-set g_throughfloor_damage 0.5
-set g_throughfloor_force 0.7
-set g_projectiles_newton_style 0
-// possible values:
-// 0: absolute velocity projectiles (like Quake)
-// 1: relative velocity projectiles, "Newtonian" (like Tribes 2)
-// 2: relative velocity projectiles, but aim is precorrected so projectiles hit the crosshair (note: strafe rockets then are SLOWER than ones shot while standing, happens in 1 too when aiming correctly which is hard)
-// 3: absolute velocity + player velocity component in shot direction (note: does NOT yield the right relative velocity, but may be good enough, but it is somewhat prone to sniper rockets)
-// 4: just add the player velocity length to the absolute velocity (tZork's sniper rockets)
-set g_projectiles_newton_style_2_minfactor 0.7
-set g_projectiles_newton_style_2_maxfactor 5
-set g_projectiles_spread_style 4
-// possible values:
-// 0: forward + solid sphere (like Quake) - varies velocity
-// 1: forward + flattened solid sphere
-// 2: forward + solid circle
-// 3: forward + normal distribution 3D - varies velocity
-// 4: forward + normal distribution on a plane
-// 5: forward + circle with 1-r falloff
-// 6: forward + circle with 1-r^2 falloff
-// 7: forward + circle with (1-r)(2-r) falloff
-set g_balance_falldamage_deadminspeed 150
-set g_balance_falldamage_minspeed 675
-set g_balance_falldamage_factor 0.25
-set g_balance_falldamage_maxdamage 10
-// }}}
-
-// {{{ powerups
-set g_balance_powerup_invincible_takedamage 0.25
-set g_balance_powerup_invincible_time 30
-set g_balance_powerup_strength_damage 4
-set g_balance_powerup_strength_force 4
-set g_balance_powerup_strength_time 30
-set g_balance_powerup_strength_selfdamage 2
-set g_balance_powerup_strength_selfforce 2
-// }}}
-
-// {{{ jetpack/hook
-set g_jetpack_antigravity 0.8 "factor of gravity compensation of the jetpack"
-set g_jetpack_acceleration_side 1200 "acceleration of the jetpack in xy direction"
-set g_jetpack_acceleration_up 600 "acceleration of the jetpack in z direction (note: you have to factor in gravity here, if antigravity is not 1)"
-set g_jetpack_maxspeed_side 1200 "max speed of the jetpack in xy direction"
-set g_jetpack_maxspeed_up 600 "max speed of the jetpack in z direction"
-set g_jetpack_fuel 8 "fuel per second for jetpack"
-set g_jetpack_attenuation 2 "jetpack sound attenuation"
-
-set g_grappling_hook_tarzan 2 // 2: can also pull players
-set g_balance_grapplehook_speed_fly 1800
-set g_balance_grapplehook_speed_pull 2000
-set g_balance_grapplehook_force_rubber 2000
-set g_balance_grapplehook_force_rubber_overstretch 1000
-set g_balance_grapplehook_length_min 50
-set g_balance_grapplehook_stretch 50
-set g_balance_grapplehook_airfriction 0.2
-set g_balance_grapplehook_health 130
-// }}}
-
-// {{{ weapon properties
-// {{{ laser
-set g_balance_laser_primary_damage 22
-set g_balance_laser_primary_edgedamage 0
-set g_balance_laser_primary_force 200
-set g_balance_laser_primary_radius 52
-set g_balance_laser_primary_speed 0
-set g_balance_laser_primary_spread 0
-set g_balance_laser_primary_refire 0.1
-set g_balance_laser_primary_animtime 0.1
-set g_balance_laser_primary_lifetime 0
-set g_balance_laser_primary_shotangle 0
-set g_balance_laser_primary_delay 0
-set g_balance_laser_gauntlet 1
-set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
-set g_balance_laser_secondary_damage 30
-set g_balance_laser_secondary_edgedamage 0
-set g_balance_laser_secondary_force 100
-set g_balance_laser_secondary_radius 3
-set g_balance_laser_secondary_speed 1500
-set g_balance_laser_secondary_spread 0
-set g_balance_laser_secondary_refire 0
-set g_balance_laser_secondary_animtime 0.15
-set g_balance_laser_secondary_lifetime 0.066
-set g_balance_laser_secondary_shotangle 0
-set g_balance_laser_secondary_delay 0
-// }}}
-// {{{ shotgun
-set g_balance_shotgun_primary_bullets 25
-set g_balance_shotgun_primary_damage 4
-set g_balance_shotgun_primary_force 10
-set g_balance_shotgun_primary_spread 0.18
-set g_balance_shotgun_primary_refire 1
-set g_balance_shotgun_primary_animtime 0.7
-set g_balance_shotgun_primary_ammo 1
-set g_balance_shotgun_primary_speed 12000
-set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
-set g_balance_shotgun_secondary 0
-set g_balance_shotgun_secondary_bullets 22
-set g_balance_shotgun_secondary_damage 2
-set g_balance_shotgun_secondary_force 12
-set g_balance_shotgun_secondary_spread 0.25
-set g_balance_shotgun_secondary_refire 1.5
-set g_balance_shotgun_secondary_animtime 0.2
-set g_balance_shotgun_secondary_ammo 0.5
-set g_balance_shotgun_secondary_speed 12000
-set g_balance_shotgun_secondary_bulletconstant 75 // 3.8qu
-// }}}
-// {{{ uzi
-set g_balance_uzi_first 0
-set g_balance_uzi_first_damage 10
-set g_balance_uzi_first_force 50
-set g_balance_uzi_first_spread 0.007
-set g_balance_uzi_first_refire 0.15
-set g_balance_uzi_first_ammo 1
-set g_balance_uzi_sustained_damage 5
-set g_balance_uzi_sustained_force 10
-set g_balance_uzi_sustained_spread 0.02
-set g_balance_uzi_sustained_refire 0.1
-set g_balance_uzi_sustained_ammo 1
-set g_balance_uzi_speed 18000
-set g_balance_uzi_bulletconstant 115 // 13.1qu
-// }}}
-// {{{ mortar
-set g_balance_grenadelauncher_primary2secondary 1
-set g_balance_grenadelauncher_primary_damage 60
-set g_balance_grenadelauncher_primary_edgedamage 10
-set g_balance_grenadelauncher_primary_force 250
-set g_balance_grenadelauncher_primary_radius 100
-set g_balance_grenadelauncher_primary_speed 2000
-set g_balance_grenadelauncher_primary_speed_up 200
-set g_balance_grenadelauncher_primary_speed_z 0
-set g_balance_grenadelauncher_primary_spread 0
-set g_balance_grenadelauncher_primary_lifetime 5
-set g_balance_grenadelauncher_primary_refire 0.7
-set g_balance_grenadelauncher_primary_animtime 0.3
-set g_balance_grenadelauncher_primary_ammo 2
-set g_balance_grenadelauncher_secondary_damage 65
-set g_balance_grenadelauncher_secondary_edgedamage 10
-set g_balance_grenadelauncher_secondary_force 300
-set g_balance_grenadelauncher_secondary_radius 200
-set g_balance_grenadelauncher_secondary_speed 800
-set g_balance_grenadelauncher_secondary_speed_up 0
-set g_balance_grenadelauncher_secondary_speed_z 200
-set g_balance_grenadelauncher_secondary_spread 0
-set g_balance_grenadelauncher_secondary_lifetime 2
-set g_balance_grenadelauncher_secondary_refire 0.8
-set g_balance_grenadelauncher_secondary_animtime 0.5
-set g_balance_grenadelauncher_secondary_ammo 2
-set g_balance_grenadelauncher_secondary_health 0
-set g_balance_grenadelauncher_secondary_damageforcescale 0
-set g_balance_grenadelauncher_secondary_bouncefactor 0.5
-set g_balance_grenadelauncher_secondary_bouncestop 0.075
-// }}}
-// {{{ electro
-set g_balance_electro_lightning 1
-set g_balance_electro_primary_damage 6
-set g_balance_electro_primary_edgedamage 0
-set g_balance_electro_primary_force 60 // todo: probaby needs movement nerfing code when hit?
-set g_balance_electro_primary_radius 850
-set g_balance_electro_primary_comboradius 0
-set g_balance_electro_primary_speed 0
-set g_balance_electro_primary_spread 0
-set g_balance_electro_primary_lifetime 0
-set g_balance_electro_primary_refire 0.066
-set g_balance_electro_primary_animtime 0.066
-set g_balance_electro_primary_ammo 0.66
-set g_balance_electro_secondary_damage 45
-set g_balance_electro_secondary_spread 0.10
-set g_balance_electro_secondary_edgedamage 10
-set g_balance_electro_secondary_force 100
-set g_balance_electro_secondary_radius 150
-set g_balance_electro_secondary_speed 900
-set g_balance_electro_secondary_speed_up 200
-set g_balance_electro_secondary_speed_z 0
-set g_balance_electro_secondary_spread 0.05
-set g_balance_electro_secondary_lifetime 2.5
-set g_balance_electro_secondary_refire 0.1
-set g_balance_electro_secondary_refire2 2
-set g_balance_electro_secondary_animtime 0.2
-set g_balance_electro_secondary_ammo 2
-set g_balance_electro_secondary_health 5
-set g_balance_electro_secondary_damageforcescale 4
-set g_balance_electro_secondary_count 3
-set g_balance_electro_combo_damage 50
-set g_balance_electro_combo_edgedamage 0
-set g_balance_electro_combo_force 100
-set g_balance_electro_combo_radius 250
-set g_balance_electro_combo_comboradius 0
-set g_balance_electro_combo_speed 2000
-// }}}
-// {{{ crylink
-set g_balance_crylink_primary_damage 18
-set g_balance_crylink_primary_edgedamage 18
-set g_balance_crylink_primary_force 50
-set g_balance_crylink_primary_radius 100
-set g_balance_crylink_primary_speed 1100
-set g_balance_crylink_primary_spread 0.01
-set g_balance_crylink_primary_shots 4
-set g_balance_crylink_primary_bounces 0
-set g_balance_crylink_primary_refire 0.4
-set g_balance_crylink_primary_animtime 0.4
-set g_balance_crylink_primary_ammo 2
-set g_balance_crylink_primary_bouncedamagefactor 0.5
-
-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_star_lifetime 3 // range: 700 full, fades to 2450
-set g_balance_crylink_primary_star_fadetime 5
-set g_balance_crylink_primary_other_lifetime 3 // range: 700 full, fades to 2450
-set g_balance_crylink_primary_other_fadetime 5
-
-set g_balance_crylink_secondary 0
-set g_balance_crylink_secondary_damage 8
-set g_balance_crylink_secondary_edgedamage 8
-set g_balance_crylink_secondary_force -40
-set g_balance_crylink_secondary_radius 10
-set g_balance_crylink_secondary_speed 4000
-set g_balance_crylink_secondary_spread 0.01
-set g_balance_crylink_secondary_shots 3
-set g_balance_crylink_secondary_bounces 0
-set g_balance_crylink_secondary_refire 0.1
-set g_balance_crylink_secondary_animtime 0.1
-set g_balance_crylink_secondary_ammo 1
-set g_balance_crylink_secondary_bouncedamagefactor 0.5
-
-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 2 // range: 35000 full, fades to 70000
-set g_balance_crylink_secondary_line_fadetime 2
-// }}}
-// {{{ nex
-set g_balance_nex_damage 80
-set g_balance_nex_force 200
-set g_balance_nex_refire 1.25
-set g_balance_nex_animtime 1.25
-set g_balance_nex_ammo 5
-set g_balance_nex_damagefalloff_mindist 1000
-set g_balance_nex_damagefalloff_maxdist 3000
-set g_balance_nex_damagefalloff_halflife 1500
-set g_balance_nex_damagefalloff_forcehalflife 1500
-// }}}
-// {{{ minstanex
-set g_balance_minstanex_refire 1
-set g_balance_minstanex_animtime 1
-set g_balance_minstanex_ammo 10
-// }}}
-// {{{ hagar
-set g_balance_hagar_primary_damage 12
-set g_balance_hagar_primary_edgedamage 5
-set g_balance_hagar_primary_force 70
-set g_balance_hagar_primary_radius 50
-set g_balance_hagar_primary_spread 0
-set g_balance_hagar_primary_speed 1800
-set g_balance_hagar_primary_lifetime 5
-set g_balance_hagar_primary_refire 0.1
-set g_balance_hagar_primary_ammo 1
-set g_balance_hagar_secondary 0
-set g_balance_hagar_secondary_damage 11
-set g_balance_hagar_secondary_edgedamage 4
-set g_balance_hagar_secondary_force 60
-set g_balance_hagar_secondary_radius 70
-set g_balance_hagar_secondary_spread 0.05
-set g_balance_hagar_secondary_speed 1800
-set g_balance_hagar_secondary_lifetime_min 5
-set g_balance_hagar_secondary_lifetime_rand 0
-set g_balance_hagar_secondary_refire 0.1
-set g_balance_hagar_secondary_ammo 1
-// }}}
-// {{{ rocketlauncher
-set g_balance_rocketlauncher_damage 90
-set g_balance_rocketlauncher_edgedamage 30
-set g_balance_rocketlauncher_force 350
-set g_balance_rocketlauncher_radius 110
-set g_balance_rocketlauncher_speed 1000
-set g_balance_rocketlauncher_speedaccel 0
-set g_balance_rocketlauncher_speedstart 1000
-set g_balance_rocketlauncher_lifetime 10
-set g_balance_rocketlauncher_refire 0.9
-set g_balance_rocketlauncher_animtime 0.7
-set g_balance_rocketlauncher_ammo 3
-set g_balance_rocketlauncher_health 0
-set g_balance_rocketlauncher_damageforcescale 0
-set g_balance_rocketlauncher_detonatedelay 9999 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
-set g_balance_rocketlauncher_guiderate 0 // max degrees per second
-set g_balance_rocketlauncher_guideratedelay 0.01 // immediate
-set g_balance_rocketlauncher_guidegoal 512 // goal distance for (non-laser) guiding (higher = less control, lower = erratic)
-set g_balance_rocketlauncher_guidedelay 0.15 // delay before guiding kicks in
-set g_balance_rocketlauncher_guidestop 1 // stop guiding when firing again
-set g_balance_rocketlauncher_laserguided_speed 1000 //650
-set g_balance_rocketlauncher_laserguided_speedaccel 0
-set g_balance_rocketlauncher_laserguided_speedstart 1000
-set g_balance_rocketlauncher_laserguided_turnrate 0.75 //0.5
-set g_balance_rocketlauncher_laserguided_allow_steal 1
-// }}}
-// {{{ porto
-set g_balance_porto_primary_refire 1.5
-set g_balance_porto_primary_animtime 0.3
-set g_balance_porto_primary_speed 5000
-set g_balance_porto_primary_lifetime 30
-set g_balance_portal_health 200 // these get recharged whenever the portal is used
-set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
-// }}}
-// {{{ hook
-set g_balance_hook_primary_fuel 2 // hook monkeys set 0
-set g_balance_hook_primary_refire 0 // hook monkeys set 0
-set g_balance_hook_primary_animtime 0.3 // good shoot anim
-set g_balance_hook_primary_hooked_time_max 0 // infinite
-set g_balance_hook_primary_hooked_time_free 2 // 2s being hooked are free
-set g_balance_hook_primary_hooked_fuel 3 // fuel per second hooked
-set g_balance_hook_secondary_damage 25 // not much
-set g_balance_hook_secondary_edgedamage 5 // not much
-set g_balance_hook_secondary_radius 500 // LOTS
-set g_balance_hook_secondary_force -2000 // LOTS
-set g_balance_hook_secondary_ammo 50 // a whole pack
-set g_balance_hook_secondary_lifetime 10 // infinite
-set g_balance_hook_secondary_speed 0 // not much throwing
-set g_balance_hook_secondary_gravity 5 // fast falling
-set g_balance_hook_secondary_refire 3 // don't drop too many bombs...
-set g_balance_hook_secondary_animtime 0.3 // good shoot anim
-set g_balance_hook_secondary_power 3 // effect behaves like a square function
-set g_balance_hook_secondary_duration 1.5 // effect runs for three seconds
-// }}}
-// {{{ hlac
-set g_balance_hlac_primary_spread_min 0.01
-set g_balance_hlac_primary_spread_max 0.03
-set g_balance_hlac_primary_spread_add 0.002
-set g_balance_hlac_primary_spread_crouchmod 0.5
-
-set g_balance_hlac_primary_damage 6
-set g_balance_hlac_primary_edgedamage 0
-set g_balance_hlac_primary_force 60 // todo: probably needs movement nerfing code when hit
-set g_balance_hlac_primary_radius 850
-set g_balance_hlac_primary_speed 0
-set g_balance_hlac_primary_lifetime 0
-
-set g_balance_hlac_primary_refire 0.066
-set g_balance_hlac_primary_animtime 0.066
-set g_balance_hlac_primary_ammo 0.066
-
-set g_balance_hlac_secondary 0
-set g_balance_hlac_secondary_spread 0.06
-set g_balance_hlac_secondary_spread_crouchmod 0.5
-
-set g_balance_hlac_secondary_damage 11
-set g_balance_hlac_secondary_edgedamage 10
-set g_balance_hlac_secondary_force 60
-set g_balance_hlac_secondary_radius 70
-set g_balance_hlac_secondary_speed 20000
-set g_balance_hlac_secondary_lifetime 5
-
-set g_balance_hlac_secondary_refire 0.6
-set g_balance_hlac_secondary_animtime 0.6
-set g_balance_hlac_secondary_ammo 10
-set g_balance_hlac_secondary_shots 5
-// }}}
-// {{{ campingrifle
-set g_balance_campingrifle_magazinecapacity 0
-set g_balance_campingrifle_reloadtime 2 // matches reload anim
-set g_balance_campingrifle_auto_reload_after_changing_weapons 0
-set g_balance_campingrifle_bursttime 0.85 // 0.35 - 0.1 + 0.35 - 0.1 + 0.35 = three secondaries
-set g_balance_campingrifle_tracer 1
-set g_balance_campingrifle_primary_damage 50
-set g_balance_campingrifle_primary_headshotaddeddamage 80
-set g_balance_campingrifle_primary_spread 0
-set g_balance_campingrifle_primary_force 0
-set g_balance_campingrifle_primary_speed 35000
-set g_balance_campingrifle_primary_lifetime 5
-set g_balance_campingrifle_primary_refire 0.7
-set g_balance_campingrifle_primary_animtime 0.7
-set g_balance_campingrifle_primary_ammo 10
-set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu
-set g_balance_campingrifle_primary_burstcost 0.35 // require same cooldown as secondary, note it's smaller than primary refire time
-set g_balance_campingrifle_primary_bullethail 0
-set g_balance_campingrifle_secondary_damage 15
-set g_balance_campingrifle_secondary_headshotaddeddamage 25
-set g_balance_campingrifle_secondary_spread 0.02
-set g_balance_campingrifle_secondary_force 0
-set g_balance_campingrifle_secondary_speed 20000
-set g_balance_campingrifle_secondary_lifetime 5
-set g_balance_campingrifle_secondary_refire 0.1
-set g_balance_campingrifle_secondary_animtime 0.1
-set g_balance_campingrifle_secondary_ammo 4
-set g_balance_campingrifle_secondary_bulletconstant 130 // 18.3qu
-set g_balance_campingrifle_secondary_burstcost 0.35
-set g_balance_campingrifle_secondary_bullethail 0
-// }}}
-// {{{ tuba
-set g_balance_tuba_refire 0.05
-set g_balance_tuba_animtime 0.05
-set g_balance_tuba_attenuation 0.5
-set g_balance_tuba_volume 1
-set g_balance_tuba_fadetime 0.25
-set g_balance_tuba_damage 5
-set g_balance_tuba_edgedamage 0
-set g_balance_tuba_radius 200
-set g_balance_tuba_force 40
-// }}}
-// {{{ fireball
-set g_balance_fireball_primary_ammo 40
-set g_balance_fireball_primary_animtime 0.15
-set g_balance_fireball_primary_bfgdamage 100
-set g_balance_fireball_primary_bfgforce 0
-set g_balance_fireball_primary_bfgradius 1000
-set g_balance_fireball_primary_damage 200
-set g_balance_fireball_primary_damageforcescale 4
-set g_balance_fireball_primary_edgedamage 0
-set g_balance_fireball_primary_force 700
-set g_balance_fireball_primary_health 50
-set g_balance_fireball_primary_laserburntime 0.5
-set g_balance_fireball_primary_laserdamage 80
-set g_balance_fireball_primary_laseredgedamage 20
-set g_balance_fireball_primary_laserradius 256
-set g_balance_fireball_primary_lifetime 15
-set g_balance_fireball_primary_radius 200
-set g_balance_fireball_primary_refire 5
-set g_balance_fireball_primary_refire2 0
-set g_balance_fireball_primary_speed 650
-set g_balance_fireball_primary_spread 0
-set g_balance_fireball_secondary_ammo 5
-set g_balance_fireball_secondary_animtime 0.3
-set g_balance_fireball_secondary_damage 40
-set g_balance_fireball_secondary_damageforcescale 4
-set g_balance_fireball_secondary_damagetime 5
-set g_balance_fireball_secondary_force 100
-set g_balance_fireball_secondary_laserburntime 0.5
-set g_balance_fireball_secondary_laserdamage 50
-set g_balance_fireball_secondary_laseredgedamage 20
-set g_balance_fireball_secondary_laserradius 110
-set g_balance_fireball_secondary_lifetime 7
-set g_balance_fireball_secondary_refire 2
-set g_balance_fireball_secondary_speed 900
-set g_balance_fireball_secondary_speed_up 100
-set g_balance_fireball_secondary_speed_z 0
-set g_balance_fireball_secondary_spread 0
-// }}}
-// {{{ seeker
-set g_balance_seeker_flac_ammo 0.5
-set g_balance_seeker_flac_animtime 0.1
-set g_balance_seeker_flac_damage 15
-set g_balance_seeker_flac_edgedamage 10
-set g_balance_seeker_flac_force 50
-set g_balance_seeker_flac_lifetime 0.1
-set g_balance_seeker_flac_lifetime_rand 0.05
-set g_balance_seeker_flac_radius 100
-set g_balance_seeker_flac_refire 0.1
-set g_balance_seeker_flac_speed 3000
-set g_balance_seeker_flac_speed_up 1000
-set g_balance_seeker_flac_speed_z 0
-set g_balance_seeker_flac_spread 0.4
-set g_balance_seeker_missile_accel 1.05
-set g_balance_seeker_missile_ammo 2
-set g_balance_seeker_missile_animtime 0.3
-set g_balance_seeker_missile_count 4
-set g_balance_seeker_missile_damage 40
-set g_balance_seeker_missile_damageforcescale 4
-set g_balance_seeker_missile_decel 0.9
-set g_balance_seeker_missile_delay 0.25
-set g_balance_seeker_missile_edgedamage 10
-set g_balance_seeker_missile_force 250
-set g_balance_seeker_missile_health 5
-set g_balance_seeker_missile_lifetime 15
-set g_balance_seeker_missile_proxy 0
-set g_balance_seeker_missile_proxy_delay 0.2
-set g_balance_seeker_missile_proxy_maxrange 45
-set g_balance_seeker_missile_radius 80
-set g_balance_seeker_missile_refire 0.5
-set g_balance_seeker_missile_smart 1
-set g_balance_seeker_missile_smart_mindist 800
-set g_balance_seeker_missile_smart_trace_max 2500
-set g_balance_seeker_missile_smart_trace_min 1000
-set g_balance_seeker_missile_speed 700
-set g_balance_seeker_missile_speed_accel 0
-set g_balance_seeker_missile_speed_up 300
-set g_balance_seeker_missile_speed_z 0
-set g_balance_seeker_missile_speed_max 1250
-set g_balance_seeker_missile_spread 0
-set g_balance_seeker_missile_turnrate 0.65
-set g_balance_seeker_tag_ammo 1
-set g_balance_seeker_tag_animtime 0.3
-set g_balance_seeker_tag_damageforcescale 4
-set g_balance_seeker_tag_health 5
-set g_balance_seeker_tag_lifetime 15
-set g_balance_seeker_tag_refire 0.7
-set g_balance_seeker_tag_speed 9000
-set g_balance_seeker_tag_spread 0
-// End new seeker
diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
new file mode 100644 (file)
index 0000000..39b9b26
--- /dev/null
@@ -0,0 +1,656 @@
+// {{{ starting gear
+set g_start_weapon_laser -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_shotgun -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_uzi -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_grenadelauncher -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_electro -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_crylink -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_nex -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_hagar -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_rocketlauncher -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_minstanex -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_porto -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_hook -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_hlac -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_campingrifle -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_tuba -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_fireball -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_seeker -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_balance_health_start 125
+set g_balance_armor_start 0
+set g_start_ammo_shells 20
+set g_start_ammo_nails 0
+set g_start_ammo_rockets 0
+set g_start_ammo_cells 0
+set g_start_ammo_fuel 0
+set g_warmup_start_health 200 "starting values when being in warmup-stage"
+set g_warmup_start_armor 100 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_shells 50 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_nails 150 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_rockets 50 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_cells 50 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
+set g_lms_start_health 200
+set g_lms_start_armor 100
+set g_lms_start_ammo_shells 30
+set g_lms_start_ammo_nails 250
+set g_lms_start_ammo_rockets 100
+set g_lms_start_ammo_cells 200
+set g_lms_start_ammo_fuel 0
+set g_balance_nix_roundtime 25
+set g_balance_nix_incrtime 1.6
+set g_balance_nix_ammo_shells 15
+set g_balance_nix_ammo_nails 45
+set g_balance_nix_ammo_rockets 15
+set g_balance_nix_ammo_cells 15
+set g_balance_nix_ammo_fuel 0
+set g_balance_nix_ammoincr_shells 2
+set g_balance_nix_ammoincr_nails 6
+set g_balance_nix_ammoincr_rockets 2
+set g_balance_nix_ammoincr_cells 2
+set g_balance_nix_ammoincr_fuel 2
+// }}}
+
+// {{{ pickup items
+set g_pickup_ammo_anyway 1
+set g_pickup_weapons_anyway 1
+set g_pickup_shells 20
+set g_pickup_shells_max 45
+set g_pickup_nails 120
+set g_pickup_nails_max 300
+set g_pickup_rockets 25
+set g_pickup_rockets_max 150
+set g_pickup_cells 25
+set g_pickup_cells_max 200
+set g_pickup_fuel 25
+set g_pickup_fuel_jetpack 50
+set g_pickup_fuel_max 100
+set g_pickup_armorsmall 5
+set g_pickup_armorsmall_max 200
+set g_pickup_armorsmall_anyway 1
+set g_pickup_armormedium 25
+set g_pickup_armormedium_max 200
+set g_pickup_armormedium_anyway 1
+set g_pickup_armorbig 50
+set g_pickup_armorbig_max 200
+set g_pickup_armorbig_anyway 1
+set g_pickup_armorlarge 100
+set g_pickup_armorlarge_max 200
+set g_pickup_armorlarge_anyway 1
+set g_pickup_healthsmall 5
+set g_pickup_healthsmall_max 200
+set g_pickup_healthsmall_anyway 1
+set g_pickup_healthmedium 25
+set g_pickup_healthmedium_max 100
+set g_pickup_healthmedium_anyway 0
+set g_pickup_healthlarge 50
+set g_pickup_healthlarge_max 100
+set g_pickup_healthlarge_anyway 0
+set g_pickup_healthmega 100
+set g_pickup_healthmega_max 200
+set g_pickup_healthmega_anyway 1
+set g_pickup_respawntime_short 15
+set g_pickup_respawntime_medium 20
+set g_pickup_respawntime_long 30
+set g_pickup_respawntime_powerup 120
+set g_pickup_respawntime_weapon 5
+set g_pickup_respawntime_ammo 25
+set g_pickup_respawntimejitter_short 0
+set g_pickup_respawntimejitter_medium 0
+set g_pickup_respawntimejitter_long 0
+set g_pickup_respawntimejitter_powerup 10
+set g_pickup_respawntimejitter_weapon 0
+set g_pickup_respawntimejitter_ammo 0
+// }}}
+
+// {{{ regen/rot
+set g_balance_health_regen 0.05
+set g_balance_health_regenlinear 0
+set g_balance_pause_health_regen 5
+set g_balance_pause_health_regen_spawn 0
+set g_balance_health_rot 0
+set g_balance_health_rotlinear 1
+set g_balance_pause_health_rot 1
+set g_balance_pause_health_rot_spawn 0
+set g_balance_health_regenstable 100
+set g_balance_health_rotstable 100
+set g_balance_health_limit 200
+set g_balance_armor_regen 0
+set g_balance_armor_regenlinear 0
+set g_balance_armor_rot 0
+set g_balance_armor_rotlinear 1
+set g_balance_pause_armor_rot 1
+set g_balance_pause_armor_rot_spawn 0
+set g_balance_armor_regenstable 100
+set g_balance_armor_rotstable 100
+set g_balance_armor_limit 200
+set g_balance_armor_blockpercent 0.7
+set g_balance_fuel_regen 0.1 "fuel regeneration (only applies if the player owns IT_FUEL_REGEN)"
+set g_balance_fuel_regenlinear 0
+set g_balance_pause_fuel_regen 2 // other than this, fuel uses the health regen counter
+set g_balance_fuel_rot 0.05
+set g_balance_fuel_rotlinear 0
+set g_balance_pause_fuel_rot 5
+set g_balance_pause_fuel_rot_spawn 10
+set g_balance_fuel_regenstable 50
+set g_balance_fuel_rotstable 100
+set g_balance_fuel_limit 999
+// }}}
+
+// {{{ misc
+set g_balance_selfdamagepercent 0.65
+set g_balance_weaponswitchdelay 0.1
+set g_weaponspeedfactor 1 "weapon projectile speed multiplier"
+set g_weaponratefactor 1 "weapon fire rate multiplier"
+set g_weapondamagefactor 1 "weapon damage multiplier"
+set g_weaponforcefactor 1 "weapon force multiplier"
+set g_weaponspreadfactor 1 "weapon spread multiplier"
+set g_balance_firetransfer_time 0.9
+set g_balance_firetransfer_damage 0.8
+set g_throughfloor_damage 0.5
+set g_throughfloor_force 0.7
+set g_projectiles_newton_style 0
+// possible values:
+// 0: absolute velocity projectiles (like Quake)
+// 1: relative velocity projectiles, "Newtonian" (like Tribes 2)
+// 2: relative velocity projectiles, but aim is precorrected so projectiles hit the crosshair (note: strafe rockets then are SLOWER than ones shot while standing, happens in 1 too when aiming correctly which is hard)
+// 3: absolute velocity + player velocity component in shot direction (note: does NOT yield the right relative velocity, but may be good enough, but it is somewhat prone to sniper rockets)
+// 4: just add the player velocity length to the absolute velocity (tZork's sniper rockets)
+set g_projectiles_newton_style_2_minfactor 0.7
+set g_projectiles_newton_style_2_maxfactor 5
+set g_projectiles_spread_style 4
+// possible values:
+// 0: forward + solid sphere (like Quake) - varies velocity
+// 1: forward + flattened solid sphere
+// 2: forward + solid circle
+// 3: forward + normal distribution 3D - varies velocity
+// 4: forward + normal distribution on a plane
+// 5: forward + circle with 1-r falloff
+// 6: forward + circle with 1-r^2 falloff
+// 7: forward + circle with (1-r)(2-r) falloff
+set g_balance_falldamage_deadminspeed 150
+set g_balance_falldamage_minspeed 800
+set g_balance_falldamage_factor 0.20
+set g_balance_falldamage_maxdamage 15
+// }}}
+
+// {{{ powerups
+set g_balance_powerup_invincible_takedamage 0.3
+set g_balance_powerup_invincible_time 30
+set g_balance_powerup_strength_damage 3
+set g_balance_powerup_strength_force 4
+set g_balance_powerup_strength_time 30
+set g_balance_powerup_strength_selfdamage 1.5
+set g_balance_powerup_strength_selfforce 1.5
+// }}}
+
+// {{{ jetpack/hook
+set g_jetpack_antigravity 0.8 "factor of gravity compensation of the jetpack"
+set g_jetpack_acceleration_side 1200 "acceleration of the jetpack in xy direction"
+set g_jetpack_acceleration_up 600 "acceleration of the jetpack in z direction (note: you have to factor in gravity here, if antigravity is not 1)"
+set g_jetpack_maxspeed_side 1500 "max speed of the jetpack in xy direction"
+set g_jetpack_maxspeed_up 600 "max speed of the jetpack in z direction"
+set g_jetpack_fuel 8 "fuel per second for jetpack"
+set g_jetpack_attenuation 2 "jetpack sound attenuation"
+
+set g_grappling_hook_tarzan 2 // 2: can also pull players
+set g_balance_grapplehook_speed_fly 1800
+set g_balance_grapplehook_speed_pull 2000
+set g_balance_grapplehook_force_rubber 2000
+set g_balance_grapplehook_force_rubber_overstretch 1000
+set g_balance_grapplehook_length_min 50
+set g_balance_grapplehook_stretch 50
+set g_balance_grapplehook_airfriction 0.2
+set g_balance_grapplehook_health 130
+// }}}
+
+// {{{ weapon properties
+// {{{ laser
+set g_balance_laser_primary_damage 20 // dps 33, hope that's not too high
+set g_balance_laser_primary_edgedamage 20
+set g_balance_laser_primary_force 235
+set g_balance_laser_primary_radius 60
+set g_balance_laser_primary_speed 4000
+set g_balance_laser_primary_spread 0
+set g_balance_laser_primary_refire 0.6
+set g_balance_laser_primary_animtime 0.6
+set g_balance_laser_primary_lifetime 5
+set g_balance_laser_primary_shotangle 0
+set g_balance_laser_primary_delay 0
+set g_balance_laser_primary_gauntlet 0
+set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
+set g_balance_laser_secondary_damage 200 // dps
+set g_balance_laser_secondary_edgedamage 0
+set g_balance_laser_secondary_force 1300
+set g_balance_laser_secondary_radius 60
+set g_balance_laser_secondary_speed 0
+set g_balance_laser_secondary_spread 0
+set g_balance_laser_secondary_refire 0.066
+set g_balance_laser_secondary_animtime 0.066
+set g_balance_laser_secondary_lifetime 0
+set g_balance_laser_secondary_shotangle 0
+set g_balance_laser_secondary_delay 0
+set g_balance_laser_secondary_gauntlet 1
+// }}}
+// {{{ shotgun
+set g_balance_shotgun_primary_bullets 20
+set g_balance_shotgun_primary_damage 3
+set g_balance_shotgun_primary_force 20
+set g_balance_shotgun_primary_spread 0.16
+set g_balance_shotgun_primary_refire 1
+set g_balance_shotgun_primary_animtime 0.4
+set g_balance_shotgun_primary_ammo 1
+set g_balance_shotgun_primary_speed 12000
+set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
+set g_balance_shotgun_secondary 1
+set g_balance_shotgun_secondary_melee_delay 0.35 // match the anim
+set g_balance_shotgun_secondary_melee_range 60
+set g_balance_shotgun_secondary_melee_swing 50
+set g_balance_shotgun_secondary_melee_time 0.1
+set g_balance_shotgun_secondary_damage 115
+set g_balance_shotgun_secondary_force 150
+set g_balance_shotgun_secondary_refire 1.1
+set g_balance_shotgun_secondary_animtime 1
+// }}}
+// {{{ uzi
+set g_balance_uzi_first 1
+set g_balance_uzi_first_damage 17
+set g_balance_uzi_first_force 35
+set g_balance_uzi_first_spread 0.03
+set g_balance_uzi_first_refire 0.2
+set g_balance_uzi_first_ammo 2
+set g_balance_uzi_sustained_damage 7
+set g_balance_uzi_sustained_force 7.5
+set g_balance_uzi_sustained_spread 0.1
+set g_balance_uzi_sustained_refire 0.075
+set g_balance_uzi_sustained_ammo 1
+set g_balance_uzi_speed 18000
+set g_balance_uzi_bulletconstant 115 // 13.1qu
+// }}}
+// {{{ mortar // TODO
+set g_balance_grenadelauncher_primary2secondary 0
+set g_balance_grenadelauncher_primary_sticky 0
+set g_balance_grenadelauncher_primary_damage 60
+set g_balance_grenadelauncher_primary_edgedamage 25
+set g_balance_grenadelauncher_primary_force 300
+set g_balance_grenadelauncher_primary_radius 100
+set g_balance_grenadelauncher_primary_speed 1400
+set g_balance_grenadelauncher_primary_speed_up 225
+set g_balance_grenadelauncher_primary_speed_z 0
+set g_balance_grenadelauncher_primary_spread 0
+set g_balance_grenadelauncher_primary_lifetime 5
+set g_balance_grenadelauncher_primary_lifetime2 0.65
+set g_balance_grenadelauncher_primary_refire 0.8
+set g_balance_grenadelauncher_primary_animtime 0.2
+set g_balance_grenadelauncher_primary_ammo 2
+set g_balance_grenadelauncher_primary_health 72
+set g_balance_grenadelauncher_secondary_sticky 1
+set g_balance_grenadelauncher_secondary_damage 90
+set g_balance_grenadelauncher_secondary_edgedamage 32
+set g_balance_grenadelauncher_secondary_force 300
+set g_balance_grenadelauncher_secondary_radius 150
+set g_balance_grenadelauncher_secondary_speed 1400
+set g_balance_grenadelauncher_secondary_speed_up 225
+set g_balance_grenadelauncher_secondary_speed_z 0
+set g_balance_grenadelauncher_secondary_spread 0
+set g_balance_grenadelauncher_secondary_lifetime 5
+set g_balance_grenadelauncher_secondary_lifetime2 1
+set g_balance_grenadelauncher_secondary_refire 0.8
+set g_balance_grenadelauncher_secondary_animtime 0.2
+set g_balance_grenadelauncher_secondary_ammo 2
+set g_balance_grenadelauncher_secondary_health 40
+set g_balance_grenadelauncher_secondary_damageforcescale 0
+set g_balance_grenadelauncher_secondary_bouncefactor 0.7
+set g_balance_grenadelauncher_secondary_bouncestop 0.12
+// }}}
+// {{{ electro // TODO
+set g_balance_electro_lightning 1
+set g_balance_electro_primary_damage 90
+set g_balance_electro_primary_edgedamage 0
+set g_balance_electro_primary_force 550
+set g_balance_electro_primary_force_up 125
+set g_balance_electro_primary_radius 850
+set g_balance_electro_primary_comboradius 75
+set g_balance_electro_primary_speed 0
+set g_balance_electro_primary_spread 0
+set g_balance_electro_primary_lifetime 0
+set g_balance_electro_primary_refire 0.03333333
+set g_balance_electro_primary_animtime 0.03333333
+set g_balance_electro_primary_ammo 10
+set g_balance_electro_primary_range 800
+set g_balance_electro_secondary_damage 25
+set g_balance_electro_secondary_spread 0
+set g_balance_electro_secondary_edgedamage 0
+set g_balance_electro_secondary_force 100
+set g_balance_electro_secondary_radius 100
+set g_balance_electro_secondary_speed 700
+set g_balance_electro_secondary_speed_up 200
+set g_balance_electro_secondary_speed_z 0
+set g_balance_electro_secondary_spread 0.08
+set g_balance_electro_secondary_lifetime 3.5
+set g_balance_electro_secondary_refire 0.2
+set g_balance_electro_secondary_refire2 2
+set g_balance_electro_secondary_animtime 0.2
+set g_balance_electro_secondary_ammo 2
+set g_balance_electro_secondary_health 10
+set g_balance_electro_secondary_damageforcescale 4
+set g_balance_electro_secondary_count 3
+set g_balance_electro_combo_damage 40
+set g_balance_electro_combo_edgedamage 0
+set g_balance_electro_combo_force 80
+set g_balance_electro_combo_radius 250
+set g_balance_electro_combo_comboradius 0
+set g_balance_electro_combo_speed 400
+// }}}
+// {{{ crylink
+set g_balance_crylink_primary_damage 10
+set g_balance_crylink_primary_edgedamage 8
+set g_balance_crylink_primary_force -60
+set g_balance_crylink_primary_radius 100
+set g_balance_crylink_primary_speed 1100
+set g_balance_crylink_primary_spread 0.1
+set g_balance_crylink_primary_shots 7
+set g_balance_crylink_primary_bounces 2
+set g_balance_crylink_primary_refire 0.8
+set g_balance_crylink_primary_animtime 0.4
+set g_balance_crylink_primary_ammo 2
+set g_balance_crylink_primary_bouncedamagefactor 0.2
+
+set g_balance_crylink_primary_middle_lifetime 5 // range: 10000 full, fades to 20000
+set g_balance_crylink_primary_middle_fadetime 5
+set g_balance_crylink_primary_star_lifetime 2 // range: 800 full, fades to 1300
+set g_balance_crylink_primary_star_fadetime 0.25
+set g_balance_crylink_primary_other_lifetime 2 // range: 800 full, fades to 1300
+set g_balance_crylink_primary_other_fadetime 0.25
+
+set g_balance_crylink_secondary 1
+set g_balance_crylink_secondary_damage 4
+set g_balance_crylink_secondary_edgedamage 0
+set g_balance_crylink_secondary_force -20
+set g_balance_crylink_secondary_radius 15
+set g_balance_crylink_secondary_speed 1600
+set g_balance_crylink_secondary_spread 0.03
+set g_balance_crylink_secondary_shots 3
+set g_balance_crylink_secondary_bounces 0
+set g_balance_crylink_secondary_refire 0.1
+set g_balance_crylink_secondary_animtime 0.1
+set g_balance_crylink_secondary_ammo 1
+set g_balance_crylink_secondary_bouncedamagefactor 0.5
+
+set g_balance_crylink_secondary_middle_lifetime 5 // range: 10000 full, fades to 10000
+set g_balance_crylink_secondary_middle_fadetime 5
+set g_balance_crylink_secondary_line_lifetime 2 // range: 4000 full, fades to 8000
+set g_balance_crylink_secondary_line_fadetime 2
+// }}}
+// {{{ nex
+set g_balance_nex_primary_damage 80
+set g_balance_nex_primary_force 200
+set g_balance_nex_primary_refire 1.25
+set g_balance_nex_primary_animtime 0.75
+set g_balance_nex_primary_ammo 5
+set g_balance_nex_primary_damagefalloff_mindist 1000
+set g_balance_nex_primary_damagefalloff_maxdist 3000
+set g_balance_nex_primary_damagefalloff_halflife 4000
+set g_balance_nex_primary_damagefalloff_forcehalflife 4000
+
+set g_balance_nex_secondary 1
+set g_balance_nex_secondary_damage 80
+set g_balance_nex_secondary_force -200
+set g_balance_nex_secondary_refire 1.25
+set g_balance_nex_secondary_animtime 0.75
+set g_balance_nex_secondary_ammo 5
+set g_balance_nex_secondary_damagefalloff_mindist 1000
+set g_balance_nex_secondary_damagefalloff_maxdist 3000
+set g_balance_nex_secondary_damagefalloff_halflife 4000
+set g_balance_nex_secondary_damagefalloff_forcehalflife 4000
+// }}}
+// {{{ minstanex
+set g_balance_minstanex_refire 1.25
+set g_balance_minstanex_animtime 1
+set g_balance_minstanex_ammo 10
+// }}}
+// {{{ hagar
+set g_balance_hagar_primary_damage 12
+set g_balance_hagar_primary_edgedamage 12
+set g_balance_hagar_primary_force 70
+set g_balance_hagar_primary_radius 70
+set g_balance_hagar_primary_spread 0.1
+set g_balance_hagar_primary_speed 1800
+set g_balance_hagar_primary_lifetime 5
+set g_balance_hagar_primary_refire 0.12
+set g_balance_hagar_primary_ammo 1
+set g_balance_hagar_secondary 1
+set g_balance_hagar_secondary_damage 12
+set g_balance_hagar_secondary_edgedamage 12
+set g_balance_hagar_secondary_force 70
+set g_balance_hagar_secondary_radius 50
+set g_balance_hagar_secondary_spread 0.15
+set g_balance_hagar_secondary_speed 1800
+set g_balance_hagar_secondary_lifetime_min 5
+set g_balance_hagar_secondary_lifetime_rand 0
+set g_balance_hagar_secondary_refire 0.12
+set g_balance_hagar_secondary_ammo 1
+// }}}
+// {{{ rocketlauncher // TODO
+set g_balance_rocketlauncher_damage 100
+set g_balance_rocketlauncher_edgedamage 33
+set g_balance_rocketlauncher_force 350
+set g_balance_rocketlauncher_radius 125
+set g_balance_rocketlauncher_speed 1000
+set g_balance_rocketlauncher_speedaccel 0
+set g_balance_rocketlauncher_speedstart 1000
+set g_balance_rocketlauncher_lifetime 5
+set g_balance_rocketlauncher_refire 1
+set g_balance_rocketlauncher_animtime 0.2
+set g_balance_rocketlauncher_ammo 3
+set g_balance_rocketlauncher_health 0
+set g_balance_rocketlauncher_damageforcescale 0
+set g_balance_rocketlauncher_detonatedelay -1 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
+set g_balance_rocketlauncher_guiderate 45 // max degrees per second
+set g_balance_rocketlauncher_guideratedelay 0.01 // immediate
+set g_balance_rocketlauncher_guidegoal 512 // goal distance for (non-laser) guiding (higher = less control, lower = erratic)
+set g_balance_rocketlauncher_guidedelay 0.15 // delay before guiding kicks in
+set g_balance_rocketlauncher_guidestop 0 // stop guiding when firing again
+set g_balance_rocketlauncher_laserguided_speed 1000 //650
+set g_balance_rocketlauncher_laserguided_speedaccel 0
+set g_balance_rocketlauncher_laserguided_speedstart 1000
+set g_balance_rocketlauncher_laserguided_turnrate 0.75 //0.5
+set g_balance_rocketlauncher_laserguided_allow_steal 1
+set g_balance_rocketlauncher_remote_damage 50
+set g_balance_rocketlauncher_remote_edgedamage 16.5
+set g_balance_rocketlauncher_remote_radius 120
+set g_balance_rocketlauncher_remote_force 350
+// }}}
+// {{{ porto
+set g_balance_porto_primary_refire 1.5
+set g_balance_porto_primary_animtime 0.3
+set g_balance_porto_primary_speed 2000
+set g_balance_porto_primary_lifetime 5
+set g_balance_portal_health 200 // these get recharged whenever the portal is used
+set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
+// }}}
+// {{{ hook
+set g_balance_hook_primary_fuel 5 // hook monkeys set 0
+set g_balance_hook_primary_refire 0 // hook monkeys set 0
+set g_balance_hook_primary_animtime 0.3 // good shoot anim
+set g_balance_hook_primary_hooked_time_max 0 // infinite
+set g_balance_hook_primary_hooked_time_free 2 // 2s being hooked are free
+set g_balance_hook_primary_hooked_fuel 5 // fuel per second hooked
+set g_balance_hook_secondary_damage 25 // not much
+set g_balance_hook_secondary_edgedamage 5 // not much
+set g_balance_hook_secondary_radius 500 // LOTS
+set g_balance_hook_secondary_force -2000 // LOTS
+set g_balance_hook_secondary_ammo 50 // a whole pack
+set g_balance_hook_secondary_lifetime 5 // infinite
+set g_balance_hook_secondary_speed 0 // not much throwing
+set g_balance_hook_secondary_gravity 5 // fast falling
+set g_balance_hook_secondary_refire 3 // don't drop too many bombs...
+set g_balance_hook_secondary_animtime 0.3 // good shoot anim
+set g_balance_hook_secondary_power 3 // effect behaves like a square function
+set g_balance_hook_secondary_duration 1.5 // effect runs for three seconds
+// }}}
+// {{{ hlac
+set g_balance_hlac_primary_spread_min 0
+set g_balance_hlac_primary_spread_max 0
+set g_balance_hlac_primary_spread_add 0
+set g_balance_hlac_primary_spread_crouchmod 0
+
+set g_balance_hlac_primary_damage 15
+set g_balance_hlac_primary_edgedamage 0
+set g_balance_hlac_primary_force 70
+set g_balance_hlac_primary_radius 30
+set g_balance_hlac_primary_speed 2500
+set g_balance_hlac_primary_lifetime 5
+
+set g_balance_hlac_primary_refire 0.1
+set g_balance_hlac_primary_animtime 0.4
+set g_balance_hlac_primary_ammo 1
+
+set g_balance_hlac_secondary 1
+set g_balance_hlac_secondary_spread 0.15
+set g_balance_hlac_secondary_spread_crouchmod 0.5
+
+set g_balance_hlac_secondary_damage 20
+set g_balance_hlac_secondary_edgedamage 0
+set g_balance_hlac_secondary_force 40
+set g_balance_hlac_secondary_radius 35
+set g_balance_hlac_secondary_speed 2500
+set g_balance_hlac_secondary_lifetime 5
+
+set g_balance_hlac_secondary_refire 1
+set g_balance_hlac_secondary_animtime 0.7
+set g_balance_hlac_secondary_ammo 10
+set g_balance_hlac_secondary_shots 6
+// }}}
+// {{{ campingrifle
+set g_balance_campingrifle_magazinecapacity 4 // make it pretty much useless in close combat
+set g_balance_campingrifle_reloadtime 2 // matches reload anim
+set g_balance_campingrifle_auto_reload_after_changing_weapons 0
+set g_balance_campingrifle_bursttime 0
+set g_balance_campingrifle_tracer 1
+set g_balance_campingrifle_primary_damage 60
+set g_balance_campingrifle_primary_headshotaddeddamage 50
+set g_balance_campingrifle_primary_spread 0
+set g_balance_campingrifle_primary_force 2
+set g_balance_campingrifle_primary_speed 35000
+set g_balance_campingrifle_primary_lifetime 5
+set g_balance_campingrifle_primary_refire 0.8
+set g_balance_campingrifle_primary_animtime 0.8
+set g_balance_campingrifle_primary_ammo 10
+set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu
+set g_balance_campingrifle_primary_burstcost 0
+set g_balance_campingrifle_primary_bullethail 0 // empty magazine on shot
+set g_balance_campingrifle_secondary 1
+set g_balance_campingrifle_secondary_damage 25
+set g_balance_campingrifle_secondary_headshotaddeddamage 20 // 45 damage only on head
+set g_balance_campingrifle_secondary_spread 0.008
+set g_balance_campingrifle_secondary_force 1
+set g_balance_campingrifle_secondary_speed 20000
+set g_balance_campingrifle_secondary_lifetime 5
+set g_balance_campingrifle_secondary_refire 0.15
+set g_balance_campingrifle_secondary_animtime 0.1
+set g_balance_campingrifle_secondary_ammo 10
+set g_balance_campingrifle_secondary_bulletconstant 130 // 18.3qu
+set g_balance_campingrifle_secondary_burstcost 0
+set g_balance_campingrifle_secondary_bullethail 0 // empty magazine on shot
+// }}}
+// {{{ tuba
+set g_balance_tuba_refire 0.05
+set g_balance_tuba_animtime 0.05
+set g_balance_tuba_attenuation 0.5
+set g_balance_tuba_volume 1
+set g_balance_tuba_fadetime 0.25
+set g_balance_tuba_damage 5
+set g_balance_tuba_edgedamage 0
+set g_balance_tuba_radius 200
+set g_balance_tuba_force 40
+// }}}
+// {{{ fireball
+set g_balance_fireball_primary_ammo 40
+set g_balance_fireball_primary_animtime 0.15
+set g_balance_fireball_primary_bfgdamage 100
+set g_balance_fireball_primary_bfgforce 0
+set g_balance_fireball_primary_bfgradius 1000
+set g_balance_fireball_primary_damage 200
+set g_balance_fireball_primary_damageforcescale 4
+set g_balance_fireball_primary_edgedamage 0
+set g_balance_fireball_primary_force 700
+set g_balance_fireball_primary_health 50
+set g_balance_fireball_primary_laserburntime 0.5
+set g_balance_fireball_primary_laserdamage 80
+set g_balance_fireball_primary_laseredgedamage 20
+set g_balance_fireball_primary_laserradius 256
+set g_balance_fireball_primary_lifetime 15
+set g_balance_fireball_primary_radius 200
+set g_balance_fireball_primary_refire 5
+set g_balance_fireball_primary_refire2 0
+set g_balance_fireball_primary_speed 650
+set g_balance_fireball_primary_spread 0
+set g_balance_fireball_secondary_ammo 5
+set g_balance_fireball_secondary_animtime 0.3
+set g_balance_fireball_secondary_damage 40
+set g_balance_fireball_secondary_damageforcescale 4
+set g_balance_fireball_secondary_damagetime 5
+set g_balance_fireball_secondary_force 100
+set g_balance_fireball_secondary_laserburntime 0.5
+set g_balance_fireball_secondary_laserdamage 50
+set g_balance_fireball_secondary_laseredgedamage 20
+set g_balance_fireball_secondary_laserradius 110
+set g_balance_fireball_secondary_lifetime 7
+set g_balance_fireball_secondary_refire 2
+set g_balance_fireball_secondary_speed 900
+set g_balance_fireball_secondary_speed_up 100
+set g_balance_fireball_secondary_speed_z 0
+set g_balance_fireball_secondary_spread 0
+// }}}
+// {{{ seeker
+set g_balance_seeker_flac_ammo 0.5
+set g_balance_seeker_flac_animtime 0.1
+set g_balance_seeker_flac_damage 15
+set g_balance_seeker_flac_edgedamage 10
+set g_balance_seeker_flac_force 50
+set g_balance_seeker_flac_lifetime 0.1
+set g_balance_seeker_flac_lifetime_rand 0.05
+set g_balance_seeker_flac_radius 100
+set g_balance_seeker_flac_refire 0.1
+set g_balance_seeker_flac_speed 3000
+set g_balance_seeker_flac_speed_up 1000
+set g_balance_seeker_flac_speed_z 0
+set g_balance_seeker_flac_spread 0.4
+set g_balance_seeker_missile_accel 1.05
+set g_balance_seeker_missile_ammo 2
+set g_balance_seeker_missile_animtime 0.3
+set g_balance_seeker_missile_count 8
+set g_balance_seeker_missile_damage 15
+set g_balance_seeker_missile_damageforcescale 4
+set g_balance_seeker_missile_decel 0.9
+set g_balance_seeker_missile_delay 0.25
+set g_balance_seeker_missile_edgedamage 10
+set g_balance_seeker_missile_force 250
+set g_balance_seeker_missile_health 5
+set g_balance_seeker_missile_lifetime 15
+set g_balance_seeker_missile_proxy 0
+set g_balance_seeker_missile_proxy_delay 0.2
+set g_balance_seeker_missile_proxy_maxrange 45
+set g_balance_seeker_missile_radius 80
+set g_balance_seeker_missile_refire 0.5
+set g_balance_seeker_missile_smart 1
+set g_balance_seeker_missile_smart_mindist 800
+set g_balance_seeker_missile_smart_trace_max 2500
+set g_balance_seeker_missile_smart_trace_min 1000
+set g_balance_seeker_missile_speed 700
+set g_balance_seeker_missile_speed_accel 0
+set g_balance_seeker_missile_speed_up 300
+set g_balance_seeker_missile_speed_z 0
+set g_balance_seeker_missile_speed_max 1250
+set g_balance_seeker_missile_spread 0
+set g_balance_seeker_missile_turnrate 0.65
+set g_balance_seeker_tag_ammo 1
+set g_balance_seeker_tag_animtime 0.3
+set g_balance_seeker_tag_damageforcescale 4
+set g_balance_seeker_tag_health 5
+set g_balance_seeker_tag_lifetime 15
+set g_balance_seeker_tag_refire 0.7
+set g_balance_seeker_tag_speed 9000
+set g_balance_seeker_tag_spread 0
+// End new seeker
index f480e22215a7ee43a9480584136a1f1f5a6b929b..37aee96d07a9f96acdff42e9cccfae4441f29119 100644 (file)
@@ -1,23 +1,22 @@
 exec defaultXonotic.cfg
+exec physicsXPM.cfg
 
-set g_weaponreplace_laser ""
-set g_weaponreplace_shotgun "uzi"
-set g_weaponreplace_uzi "shotgun"
-set g_weaponreplace_grenadelauncher ""
-set g_weaponreplace_electro ""
-set g_weaponreplace_crylink ""
-set g_weaponreplace_nex ""
-set g_weaponreplace_hagar ""
-set g_weaponreplace_rocketlauncher ""
-set g_weaponreplace_porto ""
-set g_weaponreplace_minstanex ""
-set g_weaponreplace_hook 0
-set g_weaponreplace_hlac 0
-set g_weaponreplace_campingrifle 0
-set g_weaponreplace_tuba ""
-set g_weaponreplace_fireball 0
-set g_weaponreplace_seeker 0
-set sv_q3acompat_machineshotgunswap 0
+set g_start_weapon_laser 0
+set g_balance_weaponswitchdelay 0
 
-exec physicsXPM.cfg
-exec balanceXPM.cfg
+set g_shootfromcenter 1
+
+set g_forced_respawn 1
+
+set g_mirrordamage 0
+set g_friendlyfire 1
+
+set timelimit_overtimes 1
+
+set sv_fragmessage_information_stats 0
+
+// force a visible playermodel!
+set sv_defaultcharacter 1
+set sv_defaultplayermodel "models/player/nyx.iqm"
+set sv_defaultplayercolors 60
+set g_fullbrightplayers 1
index 19fe9fef501474f09ddbd1450be10692d2196a65..6b0a9be7d9233b766832a72252b3baaca8573dae 100644 (file)
@@ -298,6 +298,8 @@ set sv_ready_restart 0 "if set to 1 allow a map to be restarted once all players
 set sv_ready_restart_after_countdown 0 "if set to 1 the players and map items are reset after the countdown ended, otherwise they're reset already at the beginning of the countdown"
 set sv_ready_restart_repeatable 0      "allows the players to restart the game as often as needed"
 
+set sv_hitsound_antispam_time 0.05 "don't play the hitsound more often than this for the electro lightning gun or the laser gauntlet"
+
 //nifreks lockonrestart feature, used in team-based game modes, if set to 1 and all players readied up no other player can then join the game anymore, useful to block spectators from joining
 set teamplay_lockonrestart 0 "it set to 1 in a team-based game, the teams are locked once all players readied up and the game restarted (no new players can join after restart unless using the server-command unlockteams)"
 
@@ -336,14 +338,14 @@ set g_respawn_ghosts_speed 5 "the speed with which respawn ghosts float and rota
 set g_respawn_ghosts_maxtime 6 "maximum amount of time a respawn ghost can last, minimum time is half this value. 0 disables and ghosts fade when the body would"
 
 // fragmessage: This allows extra information to be displayed with the frag centerprints. 
-set sv_fragmessage_information_ping 0 "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_fragmessage_information_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_fragmessage_information_handicap 1 "Enable handicap display information, 0 = Never display; 1 = Only when the player has handicap on; 2 = Always display (Displays Off if off)"
-set sv_fragmessage_information_stats 0 "Enable statistics (health/armor) display information, 0 = Never display; 1 = Always display (Only available for the person who was killed)"
+set sv_fragmessage_information_stats 1 "Enable statistics (health/armor) display information, 0 = Never display; 1 = Always display (Only available for the person who was killed)"
 set sv_fragmessage_information_typefrag 1 "Enable typefrag display information, 0 = Never display; 1 = Always display"
 
 // use default physics
 set sv_friction_on_land 0
-exec physicsNoQWBunny.cfg
+exec physicsNoQWBunny-nexbased.cfg
 
 set sv_player_viewoffset "0 0 35" "view offset of the player model"
 set sv_player_mins "-16 -16 -24" "playermodel mins"
@@ -843,11 +845,13 @@ set g_nexball_radar_showallplayers 1  "1: show every player and the ball on the
 // server game balance settings
 // powerup balance settings
 // weapon balance settings follow
-exec balance.cfg
+exec balanceXonotic.cfg
 
 set g_bloodloss 0   "amount of health below which blood loss occurs"
 
-set g_footsteps 0      "serverside footstep sounds"
+set g_footsteps 1      "serverside footstep sounds"
+
+set g_deathglow 1.25 "when enabled, players stop glowing after they die (the value specifies glow fading speed)"
 
 // effects
 r_picmipsprites 0 // Xonotic uses sprites that should never be picmipped (team mate, typing, waypoints)
@@ -1324,16 +1328,49 @@ con_notifyalign 0
 
 // hud variables
 set _hud_configure 0 "1 = configure the HUD"
+seta hud_configure_teamcolorforced 1 "1 = force display of team colors in configure mode"
 seta hud_configure_checkcollisions 1 "check for collisions against other panels when in hud configure mode"
 seta hud_configure_bg_minalpha 0.25 "minimum panel background alpha when in hud configure mode"
-seta hud_configure_grid 1 "snap to grid when moving/resizing panels"
-seta hud_configure_grid_x 0.01 "snap to X * vid_conwidth"
-seta hud_configure_grid_y 0.01 "snap to Y * vid_conheight"
 seta hud_configure_grid_alpha 0.15 "alpha for visible grid when in configure mode"
 
 seta sbar_info_pos 0 "Y-axis distance from lower right corner for engine info prints"
 
-exec hud_wickedhud_default.cfg
+// hud cvar descriptions
+exec _hud_descriptions.cfg
+// exec the default skin config. remember, NO menu_restart in the deafault cfg (dp segfaults at startup otherwise)
+exec hud_default.cfg
+
+// user preference cvars (i.e. shouldn't be adjusted by a skin config) 
+seta hud_panel_weapons_label 1 "1 = show number of weapon, 2 = show bound key of weapon"
+seta hud_panel_weapons_complainbubble_time 1 "time that a new entry stays until it fades out"
+seta hud_panel_weapons_complainbubble_fadetime 0.25 "fade out time"
+seta hud_panel_weapons_accuracy 1 "show accuracy color as the weapon icon background"
+seta hud_panel_weapons_accuracy_color0 "1 0 0"
+seta hud_panel_weapons_accuracy_color1 "1 1 0"
+seta hud_panel_weapons_accuracy_color2 "0 1 0"
+seta hud_panel_weapons_accuracy_color_levels "0 20 100" "accuracy values at which a specified color (hud_panel_weapons_accuracy_color<X>) will be used. If your accuracy is between 2 of these values then a mix of the Xth and X+1th colors will be used. You can specify up to 10 values, in increasing order"
+seta hud_panel_weapons_ammo 1 "show ammo as a status bar"
+seta hud_panel_weapons_ammo_full_shells 50 "show 100% of the status bar at this ammo count"
+seta hud_panel_weapons_ammo_full_nails 200 "show 100% of the status bar at this ammo count"
+seta hud_panel_weapons_ammo_full_cells 80 "show 100% of the status bar at this ammo count"
+seta hud_panel_weapons_ammo_full_rockets 80 "show 100% of the status bar at this ammo count"
+seta hud_panel_weapons_ammo_full_fuel 100 "show 100% of the status bar at this ammo count"
+
+seta hud_panel_notify_time 10 "time that a new entry stays until it fades out"
+seta hud_panel_notify_fadetime 3 "fade out time"
+
+seta hud_panel_timer_increment 0 "show elapsed time instead of remaining time"
+
+seta hud_panel_radar_scale 4096 "distance you can see on the team radar"
+seta hud_panel_radar_rotation 0        "rotation mode: you set what points up. 0 = player, 1 = west, 2 = south, 3 = east, 4 = north"
+seta hud_panel_radar_zoommode 0        "zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out"
+alias hud_panel_radar_rotate "toggle hud_panel_radar_rotation 0 1 2 3 4"
+
+seta hud_panel_engineinfo_framecounter_time 1 "time between framerate display updates, smaller values yield less accuracy"
+seta hud_panel_engineinfo_framecounter_decimals 0 "amount of decimals to show"
+seta hud_panel_engineinfo_framecounter_exponentialmovingaverage 1 "use an averaging method for calculating fps instead of counting frametime like engine does"
+seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_new_weight 0.1 "weight of latest data point"
+seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold 0.5 "threshold for fps change when to update instantly, to make big fps changes update faster"
 
 // scoreboard
 seta scoreboard_columns default
@@ -1380,15 +1417,27 @@ alias reducematchtime "sv_cmd rpn /timelimit timelimit timelimit_decrement sub t
 alias endmatch "timelimit -1"
 
 // useful keybind to maximize the chat area temporarily
+// HUD code takes care of many of these now...
+//set _backup_con_chatvars_set 0
+//alias _restore_con_chatvars_0 ""
+//alias _restore_con_chatvars_1 "set _backup_con_chatvars_set 0; con_chatpos $_backup_con_chatpos; con_chat $_backup_con_chat; con_notify $_backup_con_notify; con_chattime $_backup_con_chattime; cl_deathscoreboard $_backup_cl_deathscoreboard; scr_centertime $_backup_scr_centertime;r_track_sprites $_backup_r_track_sprites"
+//alias _restore_con_chatvars "_restore_con_chatvars_$_backup_con_chatvars_set"
+//alias _backup_con_chatvars_0 "set _backup_con_chatvars_set 1; set _backup_con_chatpos $con_chatpos; set _backup_con_chat $con_chat; set _backup_con_notify $con_notify; set _backup_con_chattime $con_chattime; set _backup_cl_deathscoreboard $cl_deathscoreboard; set _backup_scr_centertime $scr_centertime;set _backup_r_track_sprites $r_track_sprites"
+//alias _backup_con_chatvars_1 ""
+//alias _backup_con_chatvars "_backup_con_chatvars_$_backup_con_chatvars_set"
+//alias +con_chat_maximize "_backup_con_chatvars; con_chatpos -9; con_chat 100; con_notify 0; con_chattime 3600; cl_deathscoreboard 0; scr_centertime 0; r_track_sprites 0"
+//alias -con_chat_maximize "_restore_con_chatvars"
+
+set _con_chat_maximized 0
 set _backup_con_chatvars_set 0
 alias _restore_con_chatvars_0 ""
-alias _restore_con_chatvars_1 "set _backup_con_chatvars_set 0; con_chatpos $_backup_con_chatpos; con_chat $_backup_con_chat; con_notify $_backup_con_notify; con_chattime $_backup_con_chattime; cl_deathscoreboard $_backup_cl_deathscoreboard; scr_centertime $_backup_scr_centertime;r_track_sprites $_backup_r_track_sprites"
+alias _restore_con_chatvars_1 "set _backup_con_chatvars_set 0; con_notify $_backup_con_notify; con_chattime $_backup_con_chattime; cl_deathscoreboard $_backup_cl_deathscoreboard; scr_centertime $_backup_scr_centertime;r_track_sprites $_backup_r_track_sprites"
 alias _restore_con_chatvars "_restore_con_chatvars_$_backup_con_chatvars_set"
-alias _backup_con_chatvars_0 "set _backup_con_chatvars_set 1; set _backup_con_chatpos $con_chatpos; set _backup_con_chat $con_chat; set _backup_con_notify $con_notify; set _backup_con_chattime $con_chattime; set _backup_cl_deathscoreboard $cl_deathscoreboard; set _backup_scr_centertime $scr_centertime;set _backup_r_track_sprites $r_track_sprites"
+alias _backup_con_chatvars_0 "set _backup_con_chatvars_set 1; set _backup_con_notify $con_notify; set _backup_con_chattime $con_chattime; set _backup_cl_deathscoreboard $cl_deathscoreboard; set _backup_scr_centertime $scr_centertime;set _backup_r_track_sprites $r_track_sprites"
 alias _backup_con_chatvars_1 ""
 alias _backup_con_chatvars "_backup_con_chatvars_$_backup_con_chatvars_set"
-alias +con_chat_maximize "_backup_con_chatvars; con_chatpos -9; con_chat 100; con_notify 0; con_chattime 3600; cl_deathscoreboard 0; scr_centertime 0; r_track_sprites 0"
-alias -con_chat_maximize "_restore_con_chatvars"
+alias +con_chat_maximize "_con_chat_maximized 1; _backup_con_chatvars; con_notify 0; con_chattime 3600; cl_deathscoreboard 0; scr_centertime 0; r_track_sprites 0"
+alias -con_chat_maximize "_con_chat_maximized 0; _restore_con_chatvars"
 
 // tab completion
 set con_completion_playdemo    *.dem
@@ -1473,8 +1522,6 @@ seta hud_width 560
 // alias hud_font "loadfont user1 ${1},gfx/fallback ${2-}; loadfont user2 ${1}-big ${2-}; scoreboard_columns_set"
 alias sbar_font "set _requested_sbar_font \"${*}\""
 sbar_font gfx/vera-sans 8 12 16 24 32
-seta hud_showbinds 1   "display actions / bound keys in the strings shown during the game. 0 displays only actions, 1 displays only bound keys, 2 displays both"
-seta hud_showbinds_limit 2     "maximum number of bound keys to show for an action. 0 for unlimited"
 
 // these entities are not referenced by anything directly, they just represent
 // teams and are found by find() when needed
@@ -1482,7 +1529,7 @@ prvm_leaktest_ignore_classnames "ctf_team dom_team tdm_team"
 
 sv_allowdownloads_inarchive 1 // for csprogs.dat
 
-set g_jump_grunt 0     "Do you make a grunting noise every time you jump? Is it the same grunting noise every time?"
+set g_jump_grunt 1     "Do you make a grunting noise every time you jump? Is it the same grunting noise every time?"
 
 alias allready "sv_cmd allready"
 
@@ -1618,8 +1665,10 @@ set camera_look_attenuation      8       "Attenuation of \"looking\" movements, only if ca
 set camera_forward_follows     1       "0: Move the camera forwards without changing altitude. 1: Move towards what you are looking"
 
 // "Gentle mode": show no blood
-seta sv_gentle 0       "force gentle mode for everyone, also remove references to acts of killing from the messages"
-seta cl_gentle 0       "client side gentle mode (only replaces gibs); when set to 1, white smoke replaces gibs, when set to 2, colorful clouds replace gibs"
+seta sv_gentle 0               "force gentle mode for everyone, also remove references to acts of killing from the messages"
+seta cl_gentle 0               "client side gentle mode, master switch for removing both gibs and messages"
+seta cl_gentle_gibs 0          "client side gentle mode (only replaces gibs); when set to 1, white smoke replaces gibs, when set to 2, colorful clouds replace gibs"
+seta cl_gentle_messages 0      "client side gentle mode (only replaces frag messages/centerprints)"
 
 seta cl_racetimer_position 0.25 "Y-axis positioning of the race timer (from 0 to 1)"
 seta cl_showpressedkeys        0       "Show which movement keys someone is pressing: 1 for spectating, 2 for always"
@@ -1849,3 +1898,16 @@ set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (f
 set g_movement_highspeed 1 "movement speed modification factor (only changes movement when above maxspeed)"
 
 set g_maxspeed 0 "player speed limit, faster players are killed (0 for unlimited speed)"
+
+scr_conalpha 1
+scr_conalpha2factor 0.3
+scr_conalpha3factor 1
+scr_conalphafactor 0.8
+scr_conbrightness 0.35
+scr_conforcewhiledisconnected 1
+scr_conscroll2_x 0.11
+scr_conscroll2_y 0.2
+scr_conscroll3_x 0
+scr_conscroll3_y 0
+scr_conscroll_x -0.1
+scr_conscroll_y -0.3
index 53926a7a0b203cb37859fb8cc5a92443d0d15ee1..4116ae438241bf98c1d92ae2002bd69999262615 100644 (file)
@@ -4743,19 +4743,82 @@ alpha 100 100 500
 // based off morphed's cl_gentle
 // used in qcsrc/server/w_laser.qc
 effect laser_gauntlet
+count 3
+type spark
+color 0xb44215 0x880000
 tex 43 43
-count 1.5
+size 7 10
+alpha 128 512 6280
+airfriction 10
+originjitter 2 2 2
+velocityjitter 150 150 150
+velocitymultiplier 0.2
+sizeincrease -100
+stretchfactor 2.3
+rotate -180 180 4000 -4000
+
+effect laser_gauntlet
+count 6
 type spark
-color 0xff00ff 0xff0000
-size 4 8
-sizeincrease 34
-alpha 128 128 292
-gravity 0
-airfriction 5
-liquidfriction 10
-velocityjitter 50 50 50
+color 0xff4200 0xff0000
+tex 8 15
+size 7 9
+alpha 256 512 6280
+airfriction 12
+originjitter 2 2 2
+velocityjitter 100 100 100
+velocitymultiplier 0.2
+sizeincrease -100
+stretchfactor 2
 
 
+// muzzle flash
+effect laser_gauntletmuzzleflash
+// glow and light
+countabsolute 1
+type smoke
+color 0x220000 0x880000
+tex 65 65
+size 10 15
+alpha 256 512 6280
+airfriction 10
+sizeincrease -100
+stretchfactor 2
+lightradius 150
+lightradiusfade 500
+lightcolor 3 0.1 0.1
+// electricity
+effect laser_gauntletmuzzleflash
+count 3
+type spark
+color 0xb44215 0x880000
+tex 43 43
+size 7 10
+alpha 128 512 6280
+airfriction 10
+originjitter 2 2 2
+velocityjitter 150 150 150
+velocitymultiplier 0.2
+sizeincrease -100
+stretchfactor 2.3
+rotate -180 180 4000 -4000
+
+
+// fire
+effect laser_gauntletmuzzleflash
+count 6
+type spark
+color 0xff4200 0xff0000
+tex 8 15
+size 7 9
+alpha 256 512 6280
+airfriction 12
+originjitter 2 2 2
+velocityjitter 100 100 100
+velocitymultiplier 0.2
+sizeincrease -100
+stretchfactor 2
+
 //torch flame, spawn it as fast as you can  20 times per second or more, supports direction but not required
 //fast fire
 // used nowhere in code, meant for maps
@@ -4907,3 +4970,92 @@ bounce 1.5
 airfriction 5
 liquidfriction 10
 velocityjitter 156 156 156
+
+
+
+// used in qcsrc/server/w_electro.qc:  pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
+// used in qcsrc/server/w_electro.qc:  pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
+effect electro_lightning
+countabsolute 1
+type decal
+tex 59 59
+size 16 16
+alpha 256 256 0
+originjitter 2 2 2
+lightradius 50
+lightradiusfade 200
+lightcolor 3.125 4.375 10
+effect electro_lightning
+count 300
+type spark
+color 0x501860 0x501860 // 0x202020 0x404040
+tex 65 65
+size 6 6
+alpha 100 206 1724
+originjitter 1.5 1.5 1.5
+velocityjitter 6 6 6
+sizeincrease 10
+velocitymultiplier 2000
+effect electro_lightning
+count 30
+type spark
+tex 8 15
+color 0xDDFDFF 0xFDFDFF
+size 2 5
+alpha 110 170 1500
+originjitter 1 1 1
+velocityjitter 150 150 150
+velocitymultiplier 0.5
+airfriction 2
+stretchfactor 1.5
+effect electro_lightning
+count 50
+type spark
+tex 41 41
+color 0xFDFDFF 0xF9FDFF
+size 2 3
+alpha 110 170 1500
+originjitter 1 1 1
+velocityjitter 350 350 350
+velocitymultiplier 2.5
+airfriction 8
+gravity 1.3
+stretchfactor 0.1
+
+// used in qcsrc/server/w_gauntlet.qc: pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
+effect gauntlet_lightning
+count 300
+type spark
+color 0x280000 0x280000 // 0x202020 0x404040
+tex 65 65
+size 3 3
+alpha 256 256 1024
+originjitter 1.5 1.5 1.5
+velocityjitter 6 6 6
+sizeincrease 15
+velocitymultiplier 2000
+effect gauntlet_lightning
+count 30
+type spark
+tex 8 15
+color 0xDD0000 0xFD0000
+size 2 5
+alpha 110 228 1024
+originjitter 1 1 1
+velocityjitter 150 150 150
+velocitymultiplier 0.5
+airfriction 2
+stretchfactor 1.5
+effect gauntlet_lightning
+count 50
+type spark
+tex 41 41
+color 0xFD0000 0xF90000
+size 2 3
+alpha 110 228 600
+originjitter 1 1 1
+velocityjitter 350 350 350
+velocitymultiplier 2.5
+airfriction 8
+gravity 1.3
+stretchfactor 0.1
index d8d927739b3fd02726912cae0b86cbb43eb0c9f1..39beb59eaf87602a7c7174bba3557289cfc99b78 100644 (file)
Binary files a/gfx/conback.tga and b/gfx/conback.tga differ
diff --git a/gfx/conback2.tga b/gfx/conback2.tga
new file mode 100644 (file)
index 0000000..39c5dff
Binary files /dev/null and b/gfx/conback2.tga differ
diff --git a/gfx/conback3.tga b/gfx/conback3.tga
new file mode 100644 (file)
index 0000000..b662dba
Binary files /dev/null and b/gfx/conback3.tga differ
diff --git a/gfx/hud/default/ammo_bullets.tga b/gfx/hud/default/ammo_bullets.tga
new file mode 100644 (file)
index 0000000..8f3739d
Binary files /dev/null and b/gfx/hud/default/ammo_bullets.tga differ
diff --git a/gfx/hud/default/ammo_cells.tga b/gfx/hud/default/ammo_cells.tga
new file mode 100644 (file)
index 0000000..4850763
Binary files /dev/null and b/gfx/hud/default/ammo_cells.tga differ
diff --git a/gfx/hud/default/ammo_current_bg.tga b/gfx/hud/default/ammo_current_bg.tga
new file mode 100644 (file)
index 0000000..7036279
Binary files /dev/null and b/gfx/hud/default/ammo_current_bg.tga differ
diff --git a/gfx/hud/default/ammo_fuel.tga b/gfx/hud/default/ammo_fuel.tga
new file mode 100644 (file)
index 0000000..4a3a2d5
Binary files /dev/null and b/gfx/hud/default/ammo_fuel.tga differ
diff --git a/gfx/hud/default/ammo_rockets.tga b/gfx/hud/default/ammo_rockets.tga
new file mode 100644 (file)
index 0000000..9b34ea7
Binary files /dev/null and b/gfx/hud/default/ammo_rockets.tga differ
diff --git a/gfx/hud/default/ammo_shells.tga b/gfx/hud/default/ammo_shells.tga
new file mode 100644 (file)
index 0000000..f62c715
Binary files /dev/null and b/gfx/hud/default/ammo_shells.tga differ
diff --git a/gfx/hud/default/armor.tga b/gfx/hud/default/armor.tga
new file mode 100644 (file)
index 0000000..f9e4701
Binary files /dev/null and b/gfx/hud/default/armor.tga differ
index 6535f36e89caebe59d19f1adaa587e1beb57dcbe..3b76811ee60e8f8638625dd73cc73d4fb92d44b8 100644 (file)
Binary files a/gfx/hud/default/border.tga and b/gfx/hud/default/border.tga differ
diff --git a/gfx/hud/default/border_highlighted.tga b/gfx/hud/default/border_highlighted.tga
new file mode 100644 (file)
index 0000000..542f82a
Binary files /dev/null and b/gfx/hud/default/border_highlighted.tga differ
diff --git a/gfx/hud/default/border_highlighted2.tga b/gfx/hud/default/border_highlighted2.tga
new file mode 100644 (file)
index 0000000..7e460e5
Binary files /dev/null and b/gfx/hud/default/border_highlighted2.tga differ
diff --git a/gfx/hud/default/borderx.tga b/gfx/hud/default/borderx.tga
deleted file mode 100644 (file)
index 8ef37d3..0000000
Binary files a/gfx/hud/default/borderx.tga and /dev/null differ
diff --git a/gfx/hud/default/dock.tga b/gfx/hud/default/dock.tga
new file mode 100644 (file)
index 0000000..3163382
Binary files /dev/null and b/gfx/hud/default/dock.tga differ
diff --git a/gfx/hud/default/flag_blue_carrying.tga b/gfx/hud/default/flag_blue_carrying.tga
new file mode 100644 (file)
index 0000000..1ddcbfa
Binary files /dev/null and b/gfx/hud/default/flag_blue_carrying.tga differ
diff --git a/gfx/hud/default/flag_blue_lost.tga b/gfx/hud/default/flag_blue_lost.tga
new file mode 100644 (file)
index 0000000..b37ccd0
Binary files /dev/null and b/gfx/hud/default/flag_blue_lost.tga differ
diff --git a/gfx/hud/default/flag_blue_shielded.tga b/gfx/hud/default/flag_blue_shielded.tga
new file mode 100644 (file)
index 0000000..c1e89c5
Binary files /dev/null and b/gfx/hud/default/flag_blue_shielded.tga differ
diff --git a/gfx/hud/default/flag_blue_taken.tga b/gfx/hud/default/flag_blue_taken.tga
new file mode 100644 (file)
index 0000000..70079ca
Binary files /dev/null and b/gfx/hud/default/flag_blue_taken.tga differ
diff --git a/gfx/hud/default/flag_red_carrying.tga b/gfx/hud/default/flag_red_carrying.tga
new file mode 100644 (file)
index 0000000..8fda6e1
Binary files /dev/null and b/gfx/hud/default/flag_red_carrying.tga differ
diff --git a/gfx/hud/default/flag_red_lost.tga b/gfx/hud/default/flag_red_lost.tga
new file mode 100644 (file)
index 0000000..083ac46
Binary files /dev/null and b/gfx/hud/default/flag_red_lost.tga differ
diff --git a/gfx/hud/default/flag_red_shielded.tga b/gfx/hud/default/flag_red_shielded.tga
new file mode 100644 (file)
index 0000000..550d0b7
Binary files /dev/null and b/gfx/hud/default/flag_red_shielded.tga differ
diff --git a/gfx/hud/default/flag_red_taken.tga b/gfx/hud/default/flag_red_taken.tga
new file mode 100644 (file)
index 0000000..a21a5ee
Binary files /dev/null and b/gfx/hud/default/flag_red_taken.tga differ
diff --git a/gfx/hud/default/health.tga b/gfx/hud/default/health.tga
new file mode 100644 (file)
index 0000000..26e4086
Binary files /dev/null and b/gfx/hud/default/health.tga differ
diff --git a/gfx/hud/default/key_backward.tga b/gfx/hud/default/key_backward.tga
new file mode 100644 (file)
index 0000000..2a2cbab
Binary files /dev/null and b/gfx/hud/default/key_backward.tga differ
diff --git a/gfx/hud/default/key_backward_inv.tga b/gfx/hud/default/key_backward_inv.tga
new file mode 100644 (file)
index 0000000..1b6b973
Binary files /dev/null and b/gfx/hud/default/key_backward_inv.tga differ
diff --git a/gfx/hud/default/key_crouch.tga b/gfx/hud/default/key_crouch.tga
new file mode 100644 (file)
index 0000000..7016441
Binary files /dev/null and b/gfx/hud/default/key_crouch.tga differ
diff --git a/gfx/hud/default/key_crouch_inv.tga b/gfx/hud/default/key_crouch_inv.tga
new file mode 100644 (file)
index 0000000..0f47c09
Binary files /dev/null and b/gfx/hud/default/key_crouch_inv.tga differ
diff --git a/gfx/hud/default/key_forward.tga b/gfx/hud/default/key_forward.tga
new file mode 100644 (file)
index 0000000..0354b18
Binary files /dev/null and b/gfx/hud/default/key_forward.tga differ
diff --git a/gfx/hud/default/key_forward_inv.tga b/gfx/hud/default/key_forward_inv.tga
new file mode 100644 (file)
index 0000000..47c6154
Binary files /dev/null and b/gfx/hud/default/key_forward_inv.tga differ
diff --git a/gfx/hud/default/key_jump.tga b/gfx/hud/default/key_jump.tga
new file mode 100644 (file)
index 0000000..70a92fa
Binary files /dev/null and b/gfx/hud/default/key_jump.tga differ
diff --git a/gfx/hud/default/key_jump_inv.tga b/gfx/hud/default/key_jump_inv.tga
new file mode 100644 (file)
index 0000000..a62bcf2
Binary files /dev/null and b/gfx/hud/default/key_jump_inv.tga differ
diff --git a/gfx/hud/default/key_left.tga b/gfx/hud/default/key_left.tga
new file mode 100644 (file)
index 0000000..4bcf85f
Binary files /dev/null and b/gfx/hud/default/key_left.tga differ
diff --git a/gfx/hud/default/key_left_inv.tga b/gfx/hud/default/key_left_inv.tga
new file mode 100644 (file)
index 0000000..b6d6a2d
Binary files /dev/null and b/gfx/hud/default/key_left_inv.tga differ
diff --git a/gfx/hud/default/key_right.tga b/gfx/hud/default/key_right.tga
new file mode 100644 (file)
index 0000000..4d4ee21
Binary files /dev/null and b/gfx/hud/default/key_right.tga differ
diff --git a/gfx/hud/default/key_right_inv.tga b/gfx/hud/default/key_right_inv.tga
new file mode 100644 (file)
index 0000000..f6fe631
Binary files /dev/null and b/gfx/hud/default/key_right_inv.tga differ
diff --git a/gfx/hud/default/kh_blue.tga b/gfx/hud/default/kh_blue.tga
new file mode 100644 (file)
index 0000000..467b229
Binary files /dev/null and b/gfx/hud/default/kh_blue.tga differ
diff --git a/gfx/hud/default/kh_bluearrow.tga b/gfx/hud/default/kh_bluearrow.tga
new file mode 100644 (file)
index 0000000..b686d1b
Binary files /dev/null and b/gfx/hud/default/kh_bluearrow.tga differ
diff --git a/gfx/hud/default/kh_pink.tga b/gfx/hud/default/kh_pink.tga
new file mode 100644 (file)
index 0000000..b40967a
Binary files /dev/null and b/gfx/hud/default/kh_pink.tga differ
diff --git a/gfx/hud/default/kh_pinkarrow.tga b/gfx/hud/default/kh_pinkarrow.tga
new file mode 100644 (file)
index 0000000..17427e5
Binary files /dev/null and b/gfx/hud/default/kh_pinkarrow.tga differ
diff --git a/gfx/hud/default/kh_red.tga b/gfx/hud/default/kh_red.tga
new file mode 100644 (file)
index 0000000..3201f8a
Binary files /dev/null and b/gfx/hud/default/kh_red.tga differ
diff --git a/gfx/hud/default/kh_redarrow.tga b/gfx/hud/default/kh_redarrow.tga
new file mode 100644 (file)
index 0000000..edd1fab
Binary files /dev/null and b/gfx/hud/default/kh_redarrow.tga differ
diff --git a/gfx/hud/default/kh_yellow.tga b/gfx/hud/default/kh_yellow.tga
new file mode 100644 (file)
index 0000000..bb83475
Binary files /dev/null and b/gfx/hud/default/kh_yellow.tga differ
diff --git a/gfx/hud/default/kh_yellowarrow.tga b/gfx/hud/default/kh_yellowarrow.tga
new file mode 100644 (file)
index 0000000..8e754cc
Binary files /dev/null and b/gfx/hud/default/kh_yellowarrow.tga differ
diff --git a/gfx/hud/default/nexball_carrying.tga b/gfx/hud/default/nexball_carrying.tga
new file mode 100644 (file)
index 0000000..04ada8c
Binary files /dev/null and b/gfx/hud/default/nexball_carrying.tga differ
diff --git a/gfx/hud/default/notify_blue_captured.tga b/gfx/hud/default/notify_blue_captured.tga
new file mode 100644 (file)
index 0000000..55a2991
Binary files /dev/null and b/gfx/hud/default/notify_blue_captured.tga differ
diff --git a/gfx/hud/default/notify_blue_lost.tga b/gfx/hud/default/notify_blue_lost.tga
new file mode 100644 (file)
index 0000000..435928d
Binary files /dev/null and b/gfx/hud/default/notify_blue_lost.tga differ
diff --git a/gfx/hud/default/notify_blue_returned.tga b/gfx/hud/default/notify_blue_returned.tga
new file mode 100644 (file)
index 0000000..0c663d7
Binary files /dev/null and b/gfx/hud/default/notify_blue_returned.tga differ
diff --git a/gfx/hud/default/notify_blue_shielded.tga b/gfx/hud/default/notify_blue_shielded.tga
new file mode 100644 (file)
index 0000000..977fe9a
Binary files /dev/null and b/gfx/hud/default/notify_blue_shielded.tga differ
diff --git a/gfx/hud/default/notify_blue_taken.tga b/gfx/hud/default/notify_blue_taken.tga
new file mode 100644 (file)
index 0000000..43f73aa
Binary files /dev/null and b/gfx/hud/default/notify_blue_taken.tga differ
diff --git a/gfx/hud/default/notify_camping.tga b/gfx/hud/default/notify_camping.tga
new file mode 100644 (file)
index 0000000..a11e324
Binary files /dev/null and b/gfx/hud/default/notify_camping.tga differ
diff --git a/gfx/hud/default/notify_death.tga b/gfx/hud/default/notify_death.tga
new file mode 100644 (file)
index 0000000..3a32ae3
Binary files /dev/null and b/gfx/hud/default/notify_death.tga differ
diff --git a/gfx/hud/default/notify_fall.tga b/gfx/hud/default/notify_fall.tga
new file mode 100644 (file)
index 0000000..98a7f49
Binary files /dev/null and b/gfx/hud/default/notify_fall.tga differ
diff --git a/gfx/hud/default/notify_headshot.tga b/gfx/hud/default/notify_headshot.tga
new file mode 100644 (file)
index 0000000..17a76f8
Binary files /dev/null and b/gfx/hud/default/notify_headshot.tga differ
diff --git a/gfx/hud/default/notify_lava.tga b/gfx/hud/default/notify_lava.tga
new file mode 100644 (file)
index 0000000..1c77758
Binary files /dev/null and b/gfx/hud/default/notify_lava.tga differ
diff --git a/gfx/hud/default/notify_melee_laser.tga b/gfx/hud/default/notify_melee_laser.tga
new file mode 100644 (file)
index 0000000..2223d93
Binary files /dev/null and b/gfx/hud/default/notify_melee_laser.tga differ
diff --git a/gfx/hud/default/notify_melee_shotgun.tga b/gfx/hud/default/notify_melee_shotgun.tga
new file mode 100644 (file)
index 0000000..cf003bd
Binary files /dev/null and b/gfx/hud/default/notify_melee_shotgun.tga differ
diff --git a/gfx/hud/default/notify_outofammo.tga b/gfx/hud/default/notify_outofammo.tga
new file mode 100644 (file)
index 0000000..ecacf50
Binary files /dev/null and b/gfx/hud/default/notify_outofammo.tga differ
diff --git a/gfx/hud/default/notify_red_captured.tga b/gfx/hud/default/notify_red_captured.tga
new file mode 100644 (file)
index 0000000..9c2077f
Binary files /dev/null and b/gfx/hud/default/notify_red_captured.tga differ
diff --git a/gfx/hud/default/notify_red_lost.tga b/gfx/hud/default/notify_red_lost.tga
new file mode 100644 (file)
index 0000000..ffc7dc0
Binary files /dev/null and b/gfx/hud/default/notify_red_lost.tga differ
diff --git a/gfx/hud/default/notify_red_returned.tga b/gfx/hud/default/notify_red_returned.tga
new file mode 100644 (file)
index 0000000..3f3b54a
Binary files /dev/null and b/gfx/hud/default/notify_red_returned.tga differ
diff --git a/gfx/hud/default/notify_red_shielded.tga b/gfx/hud/default/notify_red_shielded.tga
new file mode 100644 (file)
index 0000000..d3cef48
Binary files /dev/null and b/gfx/hud/default/notify_red_shielded.tga differ
diff --git a/gfx/hud/default/notify_red_taken.tga b/gfx/hud/default/notify_red_taken.tga
new file mode 100644 (file)
index 0000000..9fa31f1
Binary files /dev/null and b/gfx/hud/default/notify_red_taken.tga differ
diff --git a/gfx/hud/default/notify_selfkill.tga b/gfx/hud/default/notify_selfkill.tga
new file mode 100644 (file)
index 0000000..98e62cf
Binary files /dev/null and b/gfx/hud/default/notify_selfkill.tga differ
diff --git a/gfx/hud/default/notify_shootingstar.tga b/gfx/hud/default/notify_shootingstar.tga
new file mode 100644 (file)
index 0000000..c8077a2
Binary files /dev/null and b/gfx/hud/default/notify_shootingstar.tga differ
diff --git a/gfx/hud/default/notify_slime.tga b/gfx/hud/default/notify_slime.tga
new file mode 100644 (file)
index 0000000..11ae58b
Binary files /dev/null and b/gfx/hud/default/notify_slime.tga differ
diff --git a/gfx/hud/default/notify_teamkill_blue.tga b/gfx/hud/default/notify_teamkill_blue.tga
new file mode 100644 (file)
index 0000000..885b929
Binary files /dev/null and b/gfx/hud/default/notify_teamkill_blue.tga differ
diff --git a/gfx/hud/default/notify_teamkill_red.tga b/gfx/hud/default/notify_teamkill_red.tga
new file mode 100644 (file)
index 0000000..96f007a
Binary files /dev/null and b/gfx/hud/default/notify_teamkill_red.tga differ
diff --git a/gfx/hud/default/notify_void.tga b/gfx/hud/default/notify_void.tga
new file mode 100644 (file)
index 0000000..8ebe761
Binary files /dev/null and b/gfx/hud/default/notify_void.tga differ
diff --git a/gfx/hud/default/notify_water.tga b/gfx/hud/default/notify_water.tga
new file mode 100644 (file)
index 0000000..f04b3e5
Binary files /dev/null and b/gfx/hud/default/notify_water.tga differ
diff --git a/gfx/hud/default/num_leading.tga b/gfx/hud/default/num_leading.tga
new file mode 100644 (file)
index 0000000..668fbc6
Binary files /dev/null and b/gfx/hud/default/num_leading.tga differ
diff --git a/gfx/hud/default/race_newfail.tga b/gfx/hud/default/race_newfail.tga
new file mode 100644 (file)
index 0000000..360d68a
Binary files /dev/null and b/gfx/hud/default/race_newfail.tga differ
diff --git a/gfx/hud/default/race_newrankgreen.tga b/gfx/hud/default/race_newrankgreen.tga
new file mode 100644 (file)
index 0000000..ec3e225
Binary files /dev/null and b/gfx/hud/default/race_newrankgreen.tga differ
diff --git a/gfx/hud/default/race_newrankyellow.tga b/gfx/hud/default/race_newrankyellow.tga
new file mode 100644 (file)
index 0000000..ec3e225
Binary files /dev/null and b/gfx/hud/default/race_newrankyellow.tga differ
diff --git a/gfx/hud/default/race_newrecordserver.tga b/gfx/hud/default/race_newrecordserver.tga
new file mode 100644 (file)
index 0000000..99ed22b
Binary files /dev/null and b/gfx/hud/default/race_newrecordserver.tga differ
diff --git a/gfx/hud/default/race_newtime.tga b/gfx/hud/default/race_newtime.tga
new file mode 100644 (file)
index 0000000..ab2f905
Binary files /dev/null and b/gfx/hud/default/race_newtime.tga differ
diff --git a/gfx/hud/default/shield.tga b/gfx/hud/default/shield.tga
new file mode 100644 (file)
index 0000000..f13f0b4
Binary files /dev/null and b/gfx/hud/default/shield.tga differ
diff --git a/gfx/hud/default/statusbar.tga b/gfx/hud/default/statusbar.tga
new file mode 100644 (file)
index 0000000..987c8f5
Binary files /dev/null and b/gfx/hud/default/statusbar.tga differ
diff --git a/gfx/hud/default/statusbar_vertical.tga b/gfx/hud/default/statusbar_vertical.tga
new file mode 100644 (file)
index 0000000..3c2d1a8
Binary files /dev/null and b/gfx/hud/default/statusbar_vertical.tga differ
diff --git a/gfx/hud/default/strength.tga b/gfx/hud/default/strength.tga
new file mode 100644 (file)
index 0000000..b19019d
Binary files /dev/null and b/gfx/hud/default/strength.tga differ
diff --git a/gfx/hud/default/voteprogress_back.tga b/gfx/hud/default/voteprogress_back.tga
new file mode 100644 (file)
index 0000000..0ba103e
Binary files /dev/null and b/gfx/hud/default/voteprogress_back.tga differ
diff --git a/gfx/hud/default/voteprogress_prog.tga b/gfx/hud/default/voteprogress_prog.tga
new file mode 100644 (file)
index 0000000..f24f524
Binary files /dev/null and b/gfx/hud/default/voteprogress_prog.tga differ
diff --git a/gfx/hud/default/voteprogress_voted.tga b/gfx/hud/default/voteprogress_voted.tga
new file mode 100644 (file)
index 0000000..ee06048
Binary files /dev/null and b/gfx/hud/default/voteprogress_voted.tga differ
diff --git a/gfx/hud/default/weapon_accuracy.tga b/gfx/hud/default/weapon_accuracy.tga
new file mode 100644 (file)
index 0000000..8dcf3aa
Binary files /dev/null and b/gfx/hud/default/weapon_accuracy.tga differ
diff --git a/gfx/hud/default/weapon_ammo.tga b/gfx/hud/default/weapon_ammo.tga
new file mode 100644 (file)
index 0000000..de4148c
Binary files /dev/null and b/gfx/hud/default/weapon_ammo.tga differ
diff --git a/gfx/hud/default/weapon_complainbubble.tga b/gfx/hud/default/weapon_complainbubble.tga
new file mode 100644 (file)
index 0000000..349274f
Binary files /dev/null and b/gfx/hud/default/weapon_complainbubble.tga differ
diff --git a/gfx/hud/default/weapon_current_bg.tga b/gfx/hud/default/weapon_current_bg.tga
new file mode 100644 (file)
index 0000000..688d805
Binary files /dev/null and b/gfx/hud/default/weapon_current_bg.tga differ
diff --git a/gfx/hud/default/weapon_hlacmod_renameit.tga b/gfx/hud/default/weapon_hlacmod_renameit.tga
new file mode 100644 (file)
index 0000000..601f3d7
Binary files /dev/null and b/gfx/hud/default/weapon_hlacmod_renameit.tga differ
diff --git a/gfx/hud/default/weaponcampingrifle.tga b/gfx/hud/default/weaponcampingrifle.tga
new file mode 100644 (file)
index 0000000..f5c2e55
Binary files /dev/null and b/gfx/hud/default/weaponcampingrifle.tga differ
diff --git a/gfx/hud/default/weaponcrylink.tga b/gfx/hud/default/weaponcrylink.tga
new file mode 100644 (file)
index 0000000..e7e283f
Binary files /dev/null and b/gfx/hud/default/weaponcrylink.tga differ
diff --git a/gfx/hud/default/weaponelectro.tga b/gfx/hud/default/weaponelectro.tga
new file mode 100644 (file)
index 0000000..75cdf02
Binary files /dev/null and b/gfx/hud/default/weaponelectro.tga differ
diff --git a/gfx/hud/default/weaponfireball.tga b/gfx/hud/default/weaponfireball.tga
new file mode 100644 (file)
index 0000000..05fc4fe
Binary files /dev/null and b/gfx/hud/default/weaponfireball.tga differ
diff --git a/gfx/hud/default/weapongrenadelauncher.tga b/gfx/hud/default/weapongrenadelauncher.tga
new file mode 100644 (file)
index 0000000..24135f3
Binary files /dev/null and b/gfx/hud/default/weapongrenadelauncher.tga differ
diff --git a/gfx/hud/default/weaponhagar.tga b/gfx/hud/default/weaponhagar.tga
new file mode 100644 (file)
index 0000000..5c04c8f
Binary files /dev/null and b/gfx/hud/default/weaponhagar.tga differ
diff --git a/gfx/hud/default/weaponhlac.tga b/gfx/hud/default/weaponhlac.tga
new file mode 100644 (file)
index 0000000..5375ab4
Binary files /dev/null and b/gfx/hud/default/weaponhlac.tga differ
diff --git a/gfx/hud/default/weaponhook.tga b/gfx/hud/default/weaponhook.tga
new file mode 100644 (file)
index 0000000..eaee838
Binary files /dev/null and b/gfx/hud/default/weaponhook.tga differ
diff --git a/gfx/hud/default/weaponlaser.tga b/gfx/hud/default/weaponlaser.tga
new file mode 100644 (file)
index 0000000..0afbb37
Binary files /dev/null and b/gfx/hud/default/weaponlaser.tga differ
diff --git a/gfx/hud/default/weaponminstanex.tga b/gfx/hud/default/weaponminstanex.tga
new file mode 100644 (file)
index 0000000..3618778
Binary files /dev/null and b/gfx/hud/default/weaponminstanex.tga differ
diff --git a/gfx/hud/default/weaponnex.tga b/gfx/hud/default/weaponnex.tga
new file mode 100644 (file)
index 0000000..e98e318
Binary files /dev/null and b/gfx/hud/default/weaponnex.tga differ
diff --git a/gfx/hud/default/weaponporto.tga b/gfx/hud/default/weaponporto.tga
new file mode 100644 (file)
index 0000000..3fbccf9
Binary files /dev/null and b/gfx/hud/default/weaponporto.tga differ
diff --git a/gfx/hud/default/weaponrocketlauncher.tga b/gfx/hud/default/weaponrocketlauncher.tga
new file mode 100644 (file)
index 0000000..0fea766
Binary files /dev/null and b/gfx/hud/default/weaponrocketlauncher.tga differ
diff --git a/gfx/hud/default/weaponseeker.tga b/gfx/hud/default/weaponseeker.tga
new file mode 100644 (file)
index 0000000..5630d52
Binary files /dev/null and b/gfx/hud/default/weaponseeker.tga differ
diff --git a/gfx/hud/default/weaponshotgun.tga b/gfx/hud/default/weaponshotgun.tga
new file mode 100644 (file)
index 0000000..438b121
Binary files /dev/null and b/gfx/hud/default/weaponshotgun.tga differ
diff --git a/gfx/hud/default/weapontuba.tga b/gfx/hud/default/weapontuba.tga
new file mode 100644 (file)
index 0000000..1617b7f
Binary files /dev/null and b/gfx/hud/default/weapontuba.tga differ
diff --git a/gfx/hud/default/weaponuzi.tga b/gfx/hud/default/weaponuzi.tga
new file mode 100644 (file)
index 0000000..4c03732
Binary files /dev/null and b/gfx/hud/default/weaponuzi.tga differ
diff --git a/gfx/hud/luminos/ammo_bullets.tga b/gfx/hud/luminos/ammo_bullets.tga
new file mode 100644 (file)
index 0000000..c06e994
Binary files /dev/null and b/gfx/hud/luminos/ammo_bullets.tga differ
diff --git a/gfx/hud/luminos/ammo_cells.tga b/gfx/hud/luminos/ammo_cells.tga
new file mode 100644 (file)
index 0000000..eda3e46
Binary files /dev/null and b/gfx/hud/luminos/ammo_cells.tga differ
diff --git a/gfx/hud/luminos/ammo_current_bg.tga b/gfx/hud/luminos/ammo_current_bg.tga
new file mode 100644 (file)
index 0000000..7036279
Binary files /dev/null and b/gfx/hud/luminos/ammo_current_bg.tga differ
diff --git a/gfx/hud/luminos/ammo_fuel.tga b/gfx/hud/luminos/ammo_fuel.tga
new file mode 100644 (file)
index 0000000..3f3a891
Binary files /dev/null and b/gfx/hud/luminos/ammo_fuel.tga differ
diff --git a/gfx/hud/luminos/ammo_rockets.tga b/gfx/hud/luminos/ammo_rockets.tga
new file mode 100644 (file)
index 0000000..a7bf03e
Binary files /dev/null and b/gfx/hud/luminos/ammo_rockets.tga differ
diff --git a/gfx/hud/luminos/ammo_shells.tga b/gfx/hud/luminos/ammo_shells.tga
new file mode 100644 (file)
index 0000000..5fe6469
Binary files /dev/null and b/gfx/hud/luminos/ammo_shells.tga differ
diff --git a/gfx/hud/luminos/armor.tga b/gfx/hud/luminos/armor.tga
new file mode 100644 (file)
index 0000000..b52445d
Binary files /dev/null and b/gfx/hud/luminos/armor.tga differ
diff --git a/gfx/hud/luminos/border.tga b/gfx/hud/luminos/border.tga
new file mode 100644 (file)
index 0000000..3b76811
Binary files /dev/null and b/gfx/hud/luminos/border.tga differ
diff --git a/gfx/hud/luminos/border_highlighted.tga b/gfx/hud/luminos/border_highlighted.tga
new file mode 100644 (file)
index 0000000..542f82a
Binary files /dev/null and b/gfx/hud/luminos/border_highlighted.tga differ
diff --git a/gfx/hud/luminos/border_highlighted2.tga b/gfx/hud/luminos/border_highlighted2.tga
new file mode 100644 (file)
index 0000000..7e460e5
Binary files /dev/null and b/gfx/hud/luminos/border_highlighted2.tga differ
diff --git a/gfx/hud/luminos/dock.tga b/gfx/hud/luminos/dock.tga
new file mode 100644 (file)
index 0000000..3163382
Binary files /dev/null and b/gfx/hud/luminos/dock.tga differ
diff --git a/gfx/hud/luminos/flag_blue_carrying.tga b/gfx/hud/luminos/flag_blue_carrying.tga
new file mode 100644 (file)
index 0000000..1ddcbfa
Binary files /dev/null and b/gfx/hud/luminos/flag_blue_carrying.tga differ
diff --git a/gfx/hud/luminos/flag_blue_lost.tga b/gfx/hud/luminos/flag_blue_lost.tga
new file mode 100644 (file)
index 0000000..b37ccd0
Binary files /dev/null and b/gfx/hud/luminos/flag_blue_lost.tga differ
diff --git a/gfx/hud/luminos/flag_blue_shielded.tga b/gfx/hud/luminos/flag_blue_shielded.tga
new file mode 100644 (file)
index 0000000..c1e89c5
Binary files /dev/null and b/gfx/hud/luminos/flag_blue_shielded.tga differ
diff --git a/gfx/hud/luminos/flag_blue_taken.tga b/gfx/hud/luminos/flag_blue_taken.tga
new file mode 100644 (file)
index 0000000..70079ca
Binary files /dev/null and b/gfx/hud/luminos/flag_blue_taken.tga differ
diff --git a/gfx/hud/luminos/flag_red_carrying.tga b/gfx/hud/luminos/flag_red_carrying.tga
new file mode 100644 (file)
index 0000000..8fda6e1
Binary files /dev/null and b/gfx/hud/luminos/flag_red_carrying.tga differ
diff --git a/gfx/hud/luminos/flag_red_lost.tga b/gfx/hud/luminos/flag_red_lost.tga
new file mode 100644 (file)
index 0000000..083ac46
Binary files /dev/null and b/gfx/hud/luminos/flag_red_lost.tga differ
diff --git a/gfx/hud/luminos/flag_red_shielded.tga b/gfx/hud/luminos/flag_red_shielded.tga
new file mode 100644 (file)
index 0000000..550d0b7
Binary files /dev/null and b/gfx/hud/luminos/flag_red_shielded.tga differ
diff --git a/gfx/hud/luminos/flag_red_taken.tga b/gfx/hud/luminos/flag_red_taken.tga
new file mode 100644 (file)
index 0000000..a21a5ee
Binary files /dev/null and b/gfx/hud/luminos/flag_red_taken.tga differ
diff --git a/gfx/hud/luminos/health.tga b/gfx/hud/luminos/health.tga
new file mode 100644 (file)
index 0000000..d19db50
Binary files /dev/null and b/gfx/hud/luminos/health.tga differ
diff --git a/gfx/hud/luminos/key_backward.tga b/gfx/hud/luminos/key_backward.tga
new file mode 100644 (file)
index 0000000..2a2cbab
Binary files /dev/null and b/gfx/hud/luminos/key_backward.tga differ
diff --git a/gfx/hud/luminos/key_backward_inv.tga b/gfx/hud/luminos/key_backward_inv.tga
new file mode 100644 (file)
index 0000000..1b6b973
Binary files /dev/null and b/gfx/hud/luminos/key_backward_inv.tga differ
diff --git a/gfx/hud/luminos/key_crouch.tga b/gfx/hud/luminos/key_crouch.tga
new file mode 100644 (file)
index 0000000..7016441
Binary files /dev/null and b/gfx/hud/luminos/key_crouch.tga differ
diff --git a/gfx/hud/luminos/key_crouch_inv.tga b/gfx/hud/luminos/key_crouch_inv.tga
new file mode 100644 (file)
index 0000000..0f47c09
Binary files /dev/null and b/gfx/hud/luminos/key_crouch_inv.tga differ
diff --git a/gfx/hud/luminos/key_forward.tga b/gfx/hud/luminos/key_forward.tga
new file mode 100644 (file)
index 0000000..0354b18
Binary files /dev/null and b/gfx/hud/luminos/key_forward.tga differ
diff --git a/gfx/hud/luminos/key_forward_inv.tga b/gfx/hud/luminos/key_forward_inv.tga
new file mode 100644 (file)
index 0000000..47c6154
Binary files /dev/null and b/gfx/hud/luminos/key_forward_inv.tga differ
diff --git a/gfx/hud/luminos/key_jump.tga b/gfx/hud/luminos/key_jump.tga
new file mode 100644 (file)
index 0000000..70a92fa
Binary files /dev/null and b/gfx/hud/luminos/key_jump.tga differ
diff --git a/gfx/hud/luminos/key_jump_inv.tga b/gfx/hud/luminos/key_jump_inv.tga
new file mode 100644 (file)
index 0000000..a62bcf2
Binary files /dev/null and b/gfx/hud/luminos/key_jump_inv.tga differ
diff --git a/gfx/hud/luminos/key_left.tga b/gfx/hud/luminos/key_left.tga
new file mode 100644 (file)
index 0000000..4bcf85f
Binary files /dev/null and b/gfx/hud/luminos/key_left.tga differ
diff --git a/gfx/hud/luminos/key_left_inv.tga b/gfx/hud/luminos/key_left_inv.tga
new file mode 100644 (file)
index 0000000..b6d6a2d
Binary files /dev/null and b/gfx/hud/luminos/key_left_inv.tga differ
diff --git a/gfx/hud/luminos/key_right.tga b/gfx/hud/luminos/key_right.tga
new file mode 100644 (file)
index 0000000..4d4ee21
Binary files /dev/null and b/gfx/hud/luminos/key_right.tga differ
diff --git a/gfx/hud/luminos/key_right_inv.tga b/gfx/hud/luminos/key_right_inv.tga
new file mode 100644 (file)
index 0000000..f6fe631
Binary files /dev/null and b/gfx/hud/luminos/key_right_inv.tga differ
diff --git a/gfx/hud/luminos/nexball_carrying.tga b/gfx/hud/luminos/nexball_carrying.tga
new file mode 100644 (file)
index 0000000..2f993e0
Binary files /dev/null and b/gfx/hud/luminos/nexball_carrying.tga differ
diff --git a/gfx/hud/luminos/notify_blue_captured.tga b/gfx/hud/luminos/notify_blue_captured.tga
new file mode 100644 (file)
index 0000000..55a2991
Binary files /dev/null and b/gfx/hud/luminos/notify_blue_captured.tga differ
diff --git a/gfx/hud/luminos/notify_blue_carrying.tga b/gfx/hud/luminos/notify_blue_carrying.tga
new file mode 100644 (file)
index 0000000..109ba09
Binary files /dev/null and b/gfx/hud/luminos/notify_blue_carrying.tga differ
diff --git a/gfx/hud/luminos/notify_blue_lost.tga b/gfx/hud/luminos/notify_blue_lost.tga
new file mode 100644 (file)
index 0000000..435928d
Binary files /dev/null and b/gfx/hud/luminos/notify_blue_lost.tga differ
diff --git a/gfx/hud/luminos/notify_blue_returned.tga b/gfx/hud/luminos/notify_blue_returned.tga
new file mode 100644 (file)
index 0000000..0c663d7
Binary files /dev/null and b/gfx/hud/luminos/notify_blue_returned.tga differ
diff --git a/gfx/hud/luminos/notify_blue_shielded.tga b/gfx/hud/luminos/notify_blue_shielded.tga
new file mode 100644 (file)
index 0000000..977fe9a
Binary files /dev/null and b/gfx/hud/luminos/notify_blue_shielded.tga differ
diff --git a/gfx/hud/luminos/notify_blue_taken.tga b/gfx/hud/luminos/notify_blue_taken.tga
new file mode 100644 (file)
index 0000000..43f73aa
Binary files /dev/null and b/gfx/hud/luminos/notify_blue_taken.tga differ
diff --git a/gfx/hud/luminos/notify_camping.tga b/gfx/hud/luminos/notify_camping.tga
new file mode 100644 (file)
index 0000000..a11e324
Binary files /dev/null and b/gfx/hud/luminos/notify_camping.tga differ
diff --git a/gfx/hud/luminos/notify_death.tga b/gfx/hud/luminos/notify_death.tga
new file mode 100644 (file)
index 0000000..3a32ae3
Binary files /dev/null and b/gfx/hud/luminos/notify_death.tga differ
diff --git a/gfx/hud/luminos/notify_fall.tga b/gfx/hud/luminos/notify_fall.tga
new file mode 100644 (file)
index 0000000..98a7f49
Binary files /dev/null and b/gfx/hud/luminos/notify_fall.tga differ
diff --git a/gfx/hud/luminos/notify_headshot.tga b/gfx/hud/luminos/notify_headshot.tga
new file mode 100644 (file)
index 0000000..17a76f8
Binary files /dev/null and b/gfx/hud/luminos/notify_headshot.tga differ
diff --git a/gfx/hud/luminos/notify_lava.tga b/gfx/hud/luminos/notify_lava.tga
new file mode 100644 (file)
index 0000000..1c77758
Binary files /dev/null and b/gfx/hud/luminos/notify_lava.tga differ
diff --git a/gfx/hud/luminos/notify_melee_laser.tga b/gfx/hud/luminos/notify_melee_laser.tga
new file mode 100644 (file)
index 0000000..2223d93
Binary files /dev/null and b/gfx/hud/luminos/notify_melee_laser.tga differ
diff --git a/gfx/hud/luminos/notify_melee_shotgun.tga b/gfx/hud/luminos/notify_melee_shotgun.tga
new file mode 100644 (file)
index 0000000..cf003bd
Binary files /dev/null and b/gfx/hud/luminos/notify_melee_shotgun.tga differ
diff --git a/gfx/hud/luminos/notify_outofammo.tga b/gfx/hud/luminos/notify_outofammo.tga
new file mode 100644 (file)
index 0000000..ecacf50
Binary files /dev/null and b/gfx/hud/luminos/notify_outofammo.tga differ
diff --git a/gfx/hud/luminos/notify_red_captured.tga b/gfx/hud/luminos/notify_red_captured.tga
new file mode 100644 (file)
index 0000000..9c2077f
Binary files /dev/null and b/gfx/hud/luminos/notify_red_captured.tga differ
diff --git a/gfx/hud/luminos/notify_red_carrying.tga b/gfx/hud/luminos/notify_red_carrying.tga
new file mode 100644 (file)
index 0000000..0e17a56
Binary files /dev/null and b/gfx/hud/luminos/notify_red_carrying.tga differ
diff --git a/gfx/hud/luminos/notify_red_lost.tga b/gfx/hud/luminos/notify_red_lost.tga
new file mode 100644 (file)
index 0000000..ffc7dc0
Binary files /dev/null and b/gfx/hud/luminos/notify_red_lost.tga differ
diff --git a/gfx/hud/luminos/notify_red_returned.tga b/gfx/hud/luminos/notify_red_returned.tga
new file mode 100644 (file)
index 0000000..3f3b54a
Binary files /dev/null and b/gfx/hud/luminos/notify_red_returned.tga differ
diff --git a/gfx/hud/luminos/notify_red_shielded.tga b/gfx/hud/luminos/notify_red_shielded.tga
new file mode 100644 (file)
index 0000000..d3cef48
Binary files /dev/null and b/gfx/hud/luminos/notify_red_shielded.tga differ
diff --git a/gfx/hud/luminos/notify_red_taken.tga b/gfx/hud/luminos/notify_red_taken.tga
new file mode 100644 (file)
index 0000000..9fa31f1
Binary files /dev/null and b/gfx/hud/luminos/notify_red_taken.tga differ
diff --git a/gfx/hud/luminos/notify_selfkill.tga b/gfx/hud/luminos/notify_selfkill.tga
new file mode 100644 (file)
index 0000000..98e62cf
Binary files /dev/null and b/gfx/hud/luminos/notify_selfkill.tga differ
diff --git a/gfx/hud/luminos/notify_shootingstar.tga b/gfx/hud/luminos/notify_shootingstar.tga
new file mode 100644 (file)
index 0000000..c8077a2
Binary files /dev/null and b/gfx/hud/luminos/notify_shootingstar.tga differ
diff --git a/gfx/hud/luminos/notify_slime.tga b/gfx/hud/luminos/notify_slime.tga
new file mode 100644 (file)
index 0000000..11ae58b
Binary files /dev/null and b/gfx/hud/luminos/notify_slime.tga differ
diff --git a/gfx/hud/luminos/notify_teamkill_blue.tga b/gfx/hud/luminos/notify_teamkill_blue.tga
new file mode 100644 (file)
index 0000000..885b929
Binary files /dev/null and b/gfx/hud/luminos/notify_teamkill_blue.tga differ
diff --git a/gfx/hud/luminos/notify_teamkill_red.tga b/gfx/hud/luminos/notify_teamkill_red.tga
new file mode 100644 (file)
index 0000000..96f007a
Binary files /dev/null and b/gfx/hud/luminos/notify_teamkill_red.tga differ
diff --git a/gfx/hud/luminos/notify_telefrag.tga b/gfx/hud/luminos/notify_telefrag.tga
new file mode 100644 (file)
index 0000000..279910f
Binary files /dev/null and b/gfx/hud/luminos/notify_telefrag.tga differ
diff --git a/gfx/hud/luminos/notify_void.tga b/gfx/hud/luminos/notify_void.tga
new file mode 100644 (file)
index 0000000..8ebe761
Binary files /dev/null and b/gfx/hud/luminos/notify_void.tga differ
diff --git a/gfx/hud/luminos/notify_water.tga b/gfx/hud/luminos/notify_water.tga
new file mode 100644 (file)
index 0000000..f04b3e5
Binary files /dev/null and b/gfx/hud/luminos/notify_water.tga differ
diff --git a/gfx/hud/luminos/num_leading.tga b/gfx/hud/luminos/num_leading.tga
new file mode 100644 (file)
index 0000000..668fbc6
Binary files /dev/null and b/gfx/hud/luminos/num_leading.tga differ
diff --git a/gfx/hud/luminos/race_newfail.tga b/gfx/hud/luminos/race_newfail.tga
new file mode 100644 (file)
index 0000000..360d68a
Binary files /dev/null and b/gfx/hud/luminos/race_newfail.tga differ
diff --git a/gfx/hud/luminos/race_newrankgreen.tga b/gfx/hud/luminos/race_newrankgreen.tga
new file mode 100644 (file)
index 0000000..ec3e225
Binary files /dev/null and b/gfx/hud/luminos/race_newrankgreen.tga differ
diff --git a/gfx/hud/luminos/race_newrankyellow.tga b/gfx/hud/luminos/race_newrankyellow.tga
new file mode 100644 (file)
index 0000000..ec3e225
Binary files /dev/null and b/gfx/hud/luminos/race_newrankyellow.tga differ
diff --git a/gfx/hud/luminos/race_newrecordserver.tga b/gfx/hud/luminos/race_newrecordserver.tga
new file mode 100644 (file)
index 0000000..6bf5288
Binary files /dev/null and b/gfx/hud/luminos/race_newrecordserver.tga differ
diff --git a/gfx/hud/luminos/race_newtime.tga b/gfx/hud/luminos/race_newtime.tga
new file mode 100644 (file)
index 0000000..ab2f905
Binary files /dev/null and b/gfx/hud/luminos/race_newtime.tga differ
diff --git a/gfx/hud/luminos/statusbar.tga b/gfx/hud/luminos/statusbar.tga
new file mode 100644 (file)
index 0000000..987c8f5
Binary files /dev/null and b/gfx/hud/luminos/statusbar.tga differ
diff --git a/gfx/hud/luminos/statusbar_vertical.tga b/gfx/hud/luminos/statusbar_vertical.tga
new file mode 100644 (file)
index 0000000..3c2d1a8
Binary files /dev/null and b/gfx/hud/luminos/statusbar_vertical.tga differ
diff --git a/gfx/hud/luminos/voteprogress_back.tga b/gfx/hud/luminos/voteprogress_back.tga
new file mode 100644 (file)
index 0000000..0ba103e
Binary files /dev/null and b/gfx/hud/luminos/voteprogress_back.tga differ
diff --git a/gfx/hud/luminos/voteprogress_prog.tga b/gfx/hud/luminos/voteprogress_prog.tga
new file mode 100644 (file)
index 0000000..f24f524
Binary files /dev/null and b/gfx/hud/luminos/voteprogress_prog.tga differ
diff --git a/gfx/hud/luminos/voteprogress_voted.tga b/gfx/hud/luminos/voteprogress_voted.tga
new file mode 100644 (file)
index 0000000..ee06048
Binary files /dev/null and b/gfx/hud/luminos/voteprogress_voted.tga differ
diff --git a/gfx/hud/luminos/weapon_accuracy.tga b/gfx/hud/luminos/weapon_accuracy.tga
new file mode 100644 (file)
index 0000000..8dcf3aa
Binary files /dev/null and b/gfx/hud/luminos/weapon_accuracy.tga differ
diff --git a/gfx/hud/luminos/weapon_ammo.tga b/gfx/hud/luminos/weapon_ammo.tga
new file mode 100644 (file)
index 0000000..de4148c
Binary files /dev/null and b/gfx/hud/luminos/weapon_ammo.tga differ
diff --git a/gfx/hud/luminos/weapon_complainbubble.tga b/gfx/hud/luminos/weapon_complainbubble.tga
new file mode 100644 (file)
index 0000000..349274f
Binary files /dev/null and b/gfx/hud/luminos/weapon_complainbubble.tga differ
diff --git a/gfx/hud/luminos/weapon_current_bg.tga b/gfx/hud/luminos/weapon_current_bg.tga
new file mode 100644 (file)
index 0000000..688d805
Binary files /dev/null and b/gfx/hud/luminos/weapon_current_bg.tga differ
diff --git a/gfx/hud/luminos/weapon_hlacmod_renameit.tga b/gfx/hud/luminos/weapon_hlacmod_renameit.tga
new file mode 100644 (file)
index 0000000..601f3d7
Binary files /dev/null and b/gfx/hud/luminos/weapon_hlacmod_renameit.tga differ
diff --git a/gfx/hud/luminos/weaponcampingrifle.tga b/gfx/hud/luminos/weaponcampingrifle.tga
new file mode 100644 (file)
index 0000000..f5c2e55
Binary files /dev/null and b/gfx/hud/luminos/weaponcampingrifle.tga differ
diff --git a/gfx/hud/luminos/weaponcrylink.tga b/gfx/hud/luminos/weaponcrylink.tga
new file mode 100644 (file)
index 0000000..e7e283f
Binary files /dev/null and b/gfx/hud/luminos/weaponcrylink.tga differ
diff --git a/gfx/hud/luminos/weaponelectro.tga b/gfx/hud/luminos/weaponelectro.tga
new file mode 100644 (file)
index 0000000..75cdf02
Binary files /dev/null and b/gfx/hud/luminos/weaponelectro.tga differ
diff --git a/gfx/hud/luminos/weaponfireball.tga b/gfx/hud/luminos/weaponfireball.tga
new file mode 100644 (file)
index 0000000..05fc4fe
Binary files /dev/null and b/gfx/hud/luminos/weaponfireball.tga differ
diff --git a/gfx/hud/luminos/weapongrenadelauncher.tga b/gfx/hud/luminos/weapongrenadelauncher.tga
new file mode 100644 (file)
index 0000000..24135f3
Binary files /dev/null and b/gfx/hud/luminos/weapongrenadelauncher.tga differ
diff --git a/gfx/hud/luminos/weaponhagar.tga b/gfx/hud/luminos/weaponhagar.tga
new file mode 100644 (file)
index 0000000..5c04c8f
Binary files /dev/null and b/gfx/hud/luminos/weaponhagar.tga differ
diff --git a/gfx/hud/luminos/weaponhlac.tga b/gfx/hud/luminos/weaponhlac.tga
new file mode 100644 (file)
index 0000000..5375ab4
Binary files /dev/null and b/gfx/hud/luminos/weaponhlac.tga differ
diff --git a/gfx/hud/luminos/weaponhook.tga b/gfx/hud/luminos/weaponhook.tga
new file mode 100644 (file)
index 0000000..eaee838
Binary files /dev/null and b/gfx/hud/luminos/weaponhook.tga differ
diff --git a/gfx/hud/luminos/weaponlaser.tga b/gfx/hud/luminos/weaponlaser.tga
new file mode 100644 (file)
index 0000000..0afbb37
Binary files /dev/null and b/gfx/hud/luminos/weaponlaser.tga differ
diff --git a/gfx/hud/luminos/weaponminstanex.tga b/gfx/hud/luminos/weaponminstanex.tga
new file mode 100644 (file)
index 0000000..3618778
Binary files /dev/null and b/gfx/hud/luminos/weaponminstanex.tga differ
diff --git a/gfx/hud/luminos/weaponnex.tga b/gfx/hud/luminos/weaponnex.tga
new file mode 100644 (file)
index 0000000..e98e318
Binary files /dev/null and b/gfx/hud/luminos/weaponnex.tga differ
diff --git a/gfx/hud/luminos/weaponporto.tga b/gfx/hud/luminos/weaponporto.tga
new file mode 100644 (file)
index 0000000..3fbccf9
Binary files /dev/null and b/gfx/hud/luminos/weaponporto.tga differ
diff --git a/gfx/hud/luminos/weaponrocketlauncher.tga b/gfx/hud/luminos/weaponrocketlauncher.tga
new file mode 100644 (file)
index 0000000..0fea766
Binary files /dev/null and b/gfx/hud/luminos/weaponrocketlauncher.tga differ
diff --git a/gfx/hud/luminos/weaponseeker.tga b/gfx/hud/luminos/weaponseeker.tga
new file mode 100644 (file)
index 0000000..5630d52
Binary files /dev/null and b/gfx/hud/luminos/weaponseeker.tga differ
diff --git a/gfx/hud/luminos/weaponshotgun.tga b/gfx/hud/luminos/weaponshotgun.tga
new file mode 100644 (file)
index 0000000..438b121
Binary files /dev/null and b/gfx/hud/luminos/weaponshotgun.tga differ
diff --git a/gfx/hud/luminos/weapontuba.tga b/gfx/hud/luminos/weapontuba.tga
new file mode 100644 (file)
index 0000000..1617b7f
Binary files /dev/null and b/gfx/hud/luminos/weapontuba.tga differ
diff --git a/gfx/hud/luminos/weaponuzi.tga b/gfx/hud/luminos/weaponuzi.tga
new file mode 100644 (file)
index 0000000..4c03732
Binary files /dev/null and b/gfx/hud/luminos/weaponuzi.tga differ
diff --git a/gfx/hud/old/num_0.tga b/gfx/hud/old/num_0.tga
deleted file mode 100644 (file)
index f0ab2f1..0000000
Binary files a/gfx/hud/old/num_0.tga and /dev/null differ
diff --git a/gfx/hud/old/num_0_stroke.tga b/gfx/hud/old/num_0_stroke.tga
deleted file mode 100644 (file)
index e9c6e5b..0000000
Binary files a/gfx/hud/old/num_0_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_1.tga b/gfx/hud/old/num_1.tga
deleted file mode 100644 (file)
index 78f1f45..0000000
Binary files a/gfx/hud/old/num_1.tga and /dev/null differ
diff --git a/gfx/hud/old/num_1_stroke.tga b/gfx/hud/old/num_1_stroke.tga
deleted file mode 100644 (file)
index 1ff552f..0000000
Binary files a/gfx/hud/old/num_1_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_2.tga b/gfx/hud/old/num_2.tga
deleted file mode 100644 (file)
index 205dd03..0000000
Binary files a/gfx/hud/old/num_2.tga and /dev/null differ
diff --git a/gfx/hud/old/num_2_stroke.tga b/gfx/hud/old/num_2_stroke.tga
deleted file mode 100644 (file)
index 08d26df..0000000
Binary files a/gfx/hud/old/num_2_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_3.tga b/gfx/hud/old/num_3.tga
deleted file mode 100644 (file)
index 335b5da..0000000
Binary files a/gfx/hud/old/num_3.tga and /dev/null differ
diff --git a/gfx/hud/old/num_3_stroke.tga b/gfx/hud/old/num_3_stroke.tga
deleted file mode 100644 (file)
index a5fddda..0000000
Binary files a/gfx/hud/old/num_3_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_4.tga b/gfx/hud/old/num_4.tga
deleted file mode 100644 (file)
index 2b9f46f..0000000
Binary files a/gfx/hud/old/num_4.tga and /dev/null differ
diff --git a/gfx/hud/old/num_4_stroke.tga b/gfx/hud/old/num_4_stroke.tga
deleted file mode 100644 (file)
index fe87933..0000000
Binary files a/gfx/hud/old/num_4_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_5.tga b/gfx/hud/old/num_5.tga
deleted file mode 100644 (file)
index 8bb7043..0000000
Binary files a/gfx/hud/old/num_5.tga and /dev/null differ
diff --git a/gfx/hud/old/num_5_stroke.tga b/gfx/hud/old/num_5_stroke.tga
deleted file mode 100644 (file)
index 3a6978a..0000000
Binary files a/gfx/hud/old/num_5_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_6.tga b/gfx/hud/old/num_6.tga
deleted file mode 100644 (file)
index 1db8c0e..0000000
Binary files a/gfx/hud/old/num_6.tga and /dev/null differ
diff --git a/gfx/hud/old/num_6_stroke.tga b/gfx/hud/old/num_6_stroke.tga
deleted file mode 100644 (file)
index f64e178..0000000
Binary files a/gfx/hud/old/num_6_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_7.tga b/gfx/hud/old/num_7.tga
deleted file mode 100644 (file)
index 0099d68..0000000
Binary files a/gfx/hud/old/num_7.tga and /dev/null differ
diff --git a/gfx/hud/old/num_7_stroke.tga b/gfx/hud/old/num_7_stroke.tga
deleted file mode 100644 (file)
index 252e796..0000000
Binary files a/gfx/hud/old/num_7_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_8.tga b/gfx/hud/old/num_8.tga
deleted file mode 100644 (file)
index aa20157..0000000
Binary files a/gfx/hud/old/num_8.tga and /dev/null differ
diff --git a/gfx/hud/old/num_8_stroke.tga b/gfx/hud/old/num_8_stroke.tga
deleted file mode 100644 (file)
index e2cd39d..0000000
Binary files a/gfx/hud/old/num_8_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_9.tga b/gfx/hud/old/num_9.tga
deleted file mode 100644 (file)
index 87b9c21..0000000
Binary files a/gfx/hud/old/num_9.tga and /dev/null differ
diff --git a/gfx/hud/old/num_9_stroke.tga b/gfx/hud/old/num_9_stroke.tga
deleted file mode 100644 (file)
index 5a8d610..0000000
Binary files a/gfx/hud/old/num_9_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_colon.tga b/gfx/hud/old/num_colon.tga
deleted file mode 100644 (file)
index e22c09a..0000000
Binary files a/gfx/hud/old/num_colon.tga and /dev/null differ
diff --git a/gfx/hud/old/num_colon_stroke.tga b/gfx/hud/old/num_colon_stroke.tga
deleted file mode 100644 (file)
index 68ad28a..0000000
Binary files a/gfx/hud/old/num_colon_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_dot.tga b/gfx/hud/old/num_dot.tga
deleted file mode 100644 (file)
index 7fbfdd0..0000000
Binary files a/gfx/hud/old/num_dot.tga and /dev/null differ
diff --git a/gfx/hud/old/num_dot_stroke.tga b/gfx/hud/old/num_dot_stroke.tga
deleted file mode 100644 (file)
index 29ad696..0000000
Binary files a/gfx/hud/old/num_dot_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_leading_1.tga b/gfx/hud/old/num_leading_1.tga
deleted file mode 100644 (file)
index 0e5233c..0000000
Binary files a/gfx/hud/old/num_leading_1.tga and /dev/null differ
diff --git a/gfx/hud/old/num_leading_2.tga b/gfx/hud/old/num_leading_2.tga
deleted file mode 100644 (file)
index 0629e49..0000000
Binary files a/gfx/hud/old/num_leading_2.tga and /dev/null differ
diff --git a/gfx/hud/old/num_leading_3.tga b/gfx/hud/old/num_leading_3.tga
deleted file mode 100644 (file)
index a6fb924..0000000
Binary files a/gfx/hud/old/num_leading_3.tga and /dev/null differ
diff --git a/gfx/hud/old/num_minus.tga b/gfx/hud/old/num_minus.tga
deleted file mode 100644 (file)
index 10721f2..0000000
Binary files a/gfx/hud/old/num_minus.tga and /dev/null differ
diff --git a/gfx/hud/old/num_minus_stroke.tga b/gfx/hud/old/num_minus_stroke.tga
deleted file mode 100644 (file)
index 26455a0..0000000
Binary files a/gfx/hud/old/num_minus_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_plus.tga b/gfx/hud/old/num_plus.tga
deleted file mode 100644 (file)
index 3cb17b3..0000000
Binary files a/gfx/hud/old/num_plus.tga and /dev/null differ
diff --git a/gfx/hud/old/num_plus_stroke.tga b/gfx/hud/old/num_plus_stroke.tga
deleted file mode 100644 (file)
index 7df2faa..0000000
Binary files a/gfx/hud/old/num_plus_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/rifle_ring_1.tga b/gfx/hud/old/rifle_ring_1.tga
deleted file mode 100644 (file)
index a90927c..0000000
Binary files a/gfx/hud/old/rifle_ring_1.tga and /dev/null differ
diff --git a/gfx/hud/old/rifle_ring_2.tga b/gfx/hud/old/rifle_ring_2.tga
deleted file mode 100644 (file)
index 6f6ca4c..0000000
Binary files a/gfx/hud/old/rifle_ring_2.tga and /dev/null differ
diff --git a/gfx/hud/old/rifle_ring_3.tga b/gfx/hud/old/rifle_ring_3.tga
deleted file mode 100644 (file)
index 68f6df7..0000000
Binary files a/gfx/hud/old/rifle_ring_3.tga and /dev/null differ
diff --git a/gfx/hud/old/rifle_ring_4.tga b/gfx/hud/old/rifle_ring_4.tga
deleted file mode 100644 (file)
index 0a5db15..0000000
Binary files a/gfx/hud/old/rifle_ring_4.tga and /dev/null differ
diff --git a/gfx/hud/old/rifle_ring_5.tga b/gfx/hud/old/rifle_ring_5.tga
deleted file mode 100644 (file)
index d5cc95b..0000000
Binary files a/gfx/hud/old/rifle_ring_5.tga and /dev/null differ
diff --git a/gfx/hud/old/rifle_ring_6.tga b/gfx/hud/old/rifle_ring_6.tga
deleted file mode 100644 (file)
index 4a126e7..0000000
Binary files a/gfx/hud/old/rifle_ring_6.tga and /dev/null differ
diff --git a/gfx/hud/old/rifle_ring_7.tga b/gfx/hud/old/rifle_ring_7.tga
deleted file mode 100644 (file)
index 846212b..0000000
Binary files a/gfx/hud/old/rifle_ring_7.tga and /dev/null differ
diff --git a/gfx/hud/old/rifle_ring_8.tga b/gfx/hud/old/rifle_ring_8.tga
deleted file mode 100644 (file)
index 137e24d..0000000
Binary files a/gfx/hud/old/rifle_ring_8.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/ammo_bullets.tga b/gfx/hud/wickedhud/ammo_bullets.tga
deleted file mode 100644 (file)
index e7cd01a..0000000
Binary files a/gfx/hud/wickedhud/ammo_bullets.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/ammo_cells.tga b/gfx/hud/wickedhud/ammo_cells.tga
deleted file mode 100644 (file)
index 664eb23..0000000
Binary files a/gfx/hud/wickedhud/ammo_cells.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/ammo_current_bg.tga b/gfx/hud/wickedhud/ammo_current_bg.tga
deleted file mode 100644 (file)
index bd07205..0000000
Binary files a/gfx/hud/wickedhud/ammo_current_bg.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/ammo_fuel.tga b/gfx/hud/wickedhud/ammo_fuel.tga
deleted file mode 100644 (file)
index 8450a2f..0000000
Binary files a/gfx/hud/wickedhud/ammo_fuel.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/ammo_rockets.tga b/gfx/hud/wickedhud/ammo_rockets.tga
deleted file mode 100644 (file)
index c37f077..0000000
Binary files a/gfx/hud/wickedhud/ammo_rockets.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/ammo_shells.tga b/gfx/hud/wickedhud/ammo_shells.tga
deleted file mode 100644 (file)
index 59bea4b..0000000
Binary files a/gfx/hud/wickedhud/ammo_shells.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/armor.tga b/gfx/hud/wickedhud/armor.tga
deleted file mode 100644 (file)
index 92046b4..0000000
Binary files a/gfx/hud/wickedhud/armor.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border.tga b/gfx/hud/wickedhud/border.tga
deleted file mode 100644 (file)
index 8ceee44..0000000
Binary files a/gfx/hud/wickedhud/border.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border_chat.tga b/gfx/hud/wickedhud/border_chat.tga
deleted file mode 100644 (file)
index 1cd065e..0000000
Binary files a/gfx/hud/wickedhud/border_chat.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border_healtharmor.tga b/gfx/hud/wickedhud/border_healtharmor.tga
deleted file mode 100644 (file)
index 7109ab5..0000000
Binary files a/gfx/hud/wickedhud/border_healtharmor.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border_inventory.tga b/gfx/hud/wickedhud/border_inventory.tga
deleted file mode 100644 (file)
index 20ae8f6..0000000
Binary files a/gfx/hud/wickedhud/border_inventory.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border_modicons.tga b/gfx/hud/wickedhud/border_modicons.tga
deleted file mode 100644 (file)
index 5437b04..0000000
Binary files a/gfx/hud/wickedhud/border_modicons.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border_powerups.tga b/gfx/hud/wickedhud/border_powerups.tga
deleted file mode 100644 (file)
index f8fbf44..0000000
Binary files a/gfx/hud/wickedhud/border_powerups.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border_radar.tga b/gfx/hud/wickedhud/border_radar.tga
deleted file mode 100644 (file)
index a300f52..0000000
Binary files a/gfx/hud/wickedhud/border_radar.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border_score.tga b/gfx/hud/wickedhud/border_score.tga
deleted file mode 100644 (file)
index a4d8b6c..0000000
Binary files a/gfx/hud/wickedhud/border_score.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border_timer.tga b/gfx/hud/wickedhud/border_timer.tga
deleted file mode 100644 (file)
index c657136..0000000
Binary files a/gfx/hud/wickedhud/border_timer.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border_vote.tga b/gfx/hud/wickedhud/border_vote.tga
deleted file mode 100644 (file)
index 13b948e..0000000
Binary files a/gfx/hud/wickedhud/border_vote.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border_weaponicons.tga b/gfx/hud/wickedhud/border_weaponicons.tga
deleted file mode 100644 (file)
index 08e8dcd..0000000
Binary files a/gfx/hud/wickedhud/border_weaponicons.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/dock.tga b/gfx/hud/wickedhud/dock.tga
deleted file mode 100644 (file)
index 9dd4e2f..0000000
Binary files a/gfx/hud/wickedhud/dock.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/dock_small.tga b/gfx/hud/wickedhud/dock_small.tga
deleted file mode 100644 (file)
index 5135876..0000000
Binary files a/gfx/hud/wickedhud/dock_small.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/flag_blue_carrying.tga b/gfx/hud/wickedhud/flag_blue_carrying.tga
deleted file mode 100644 (file)
index 0700cd5..0000000
Binary files a/gfx/hud/wickedhud/flag_blue_carrying.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/flag_blue_lost.tga b/gfx/hud/wickedhud/flag_blue_lost.tga
deleted file mode 100644 (file)
index f0bb89d..0000000
Binary files a/gfx/hud/wickedhud/flag_blue_lost.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/flag_blue_shielded.tga b/gfx/hud/wickedhud/flag_blue_shielded.tga
deleted file mode 100644 (file)
index e385437..0000000
Binary files a/gfx/hud/wickedhud/flag_blue_shielded.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/flag_blue_taken.tga b/gfx/hud/wickedhud/flag_blue_taken.tga
deleted file mode 100644 (file)
index e51e297..0000000
Binary files a/gfx/hud/wickedhud/flag_blue_taken.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/flag_red_carrying.tga b/gfx/hud/wickedhud/flag_red_carrying.tga
deleted file mode 100644 (file)
index c28cea8..0000000
Binary files a/gfx/hud/wickedhud/flag_red_carrying.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/flag_red_lost.tga b/gfx/hud/wickedhud/flag_red_lost.tga
deleted file mode 100644 (file)
index 93d5579..0000000
Binary files a/gfx/hud/wickedhud/flag_red_lost.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/flag_red_shielded.tga b/gfx/hud/wickedhud/flag_red_shielded.tga
deleted file mode 100644 (file)
index ed9994a..0000000
Binary files a/gfx/hud/wickedhud/flag_red_shielded.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/flag_red_taken.tga b/gfx/hud/wickedhud/flag_red_taken.tga
deleted file mode 100644 (file)
index f999476..0000000
Binary files a/gfx/hud/wickedhud/flag_red_taken.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/health.tga b/gfx/hud/wickedhud/health.tga
deleted file mode 100644 (file)
index 0ed8a90..0000000
Binary files a/gfx/hud/wickedhud/health.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_backward.tga b/gfx/hud/wickedhud/key_backward.tga
deleted file mode 100644 (file)
index 4de0f33..0000000
Binary files a/gfx/hud/wickedhud/key_backward.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_backward_inv.tga b/gfx/hud/wickedhud/key_backward_inv.tga
deleted file mode 100644 (file)
index bef0d1c..0000000
Binary files a/gfx/hud/wickedhud/key_backward_inv.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_crouch.tga b/gfx/hud/wickedhud/key_crouch.tga
deleted file mode 100644 (file)
index 00b2dfe..0000000
Binary files a/gfx/hud/wickedhud/key_crouch.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_crouch_inv.tga b/gfx/hud/wickedhud/key_crouch_inv.tga
deleted file mode 100644 (file)
index 2cdbda8..0000000
Binary files a/gfx/hud/wickedhud/key_crouch_inv.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_forward.tga b/gfx/hud/wickedhud/key_forward.tga
deleted file mode 100644 (file)
index dfe2233..0000000
Binary files a/gfx/hud/wickedhud/key_forward.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_forward_inv.tga b/gfx/hud/wickedhud/key_forward_inv.tga
deleted file mode 100644 (file)
index 7bbea60..0000000
Binary files a/gfx/hud/wickedhud/key_forward_inv.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_jump.tga b/gfx/hud/wickedhud/key_jump.tga
deleted file mode 100644 (file)
index d02b2db..0000000
Binary files a/gfx/hud/wickedhud/key_jump.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_jump_inv.tga b/gfx/hud/wickedhud/key_jump_inv.tga
deleted file mode 100644 (file)
index c54bb37..0000000
Binary files a/gfx/hud/wickedhud/key_jump_inv.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_left.tga b/gfx/hud/wickedhud/key_left.tga
deleted file mode 100644 (file)
index 60fe71f..0000000
Binary files a/gfx/hud/wickedhud/key_left.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_left_inv.tga b/gfx/hud/wickedhud/key_left_inv.tga
deleted file mode 100644 (file)
index 92bc615..0000000
Binary files a/gfx/hud/wickedhud/key_left_inv.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_right.tga b/gfx/hud/wickedhud/key_right.tga
deleted file mode 100644 (file)
index 308c03b..0000000
Binary files a/gfx/hud/wickedhud/key_right.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_right_inv.tga b/gfx/hud/wickedhud/key_right_inv.tga
deleted file mode 100644 (file)
index 8f04be4..0000000
Binary files a/gfx/hud/wickedhud/key_right_inv.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/kh_blue.tga b/gfx/hud/wickedhud/kh_blue.tga
deleted file mode 100644 (file)
index 467b229..0000000
Binary files a/gfx/hud/wickedhud/kh_blue.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/kh_bluearrow.tga b/gfx/hud/wickedhud/kh_bluearrow.tga
deleted file mode 100644 (file)
index b686d1b..0000000
Binary files a/gfx/hud/wickedhud/kh_bluearrow.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/kh_pink.tga b/gfx/hud/wickedhud/kh_pink.tga
deleted file mode 100644 (file)
index b40967a..0000000
Binary files a/gfx/hud/wickedhud/kh_pink.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/kh_pinkarrow.tga b/gfx/hud/wickedhud/kh_pinkarrow.tga
deleted file mode 100644 (file)
index 17427e5..0000000
Binary files a/gfx/hud/wickedhud/kh_pinkarrow.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/kh_red.tga b/gfx/hud/wickedhud/kh_red.tga
deleted file mode 100644 (file)
index 3201f8a..0000000
Binary files a/gfx/hud/wickedhud/kh_red.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/kh_redarrow.tga b/gfx/hud/wickedhud/kh_redarrow.tga
deleted file mode 100644 (file)
index edd1fab..0000000
Binary files a/gfx/hud/wickedhud/kh_redarrow.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/kh_yellow.tga b/gfx/hud/wickedhud/kh_yellow.tga
deleted file mode 100644 (file)
index bb83475..0000000
Binary files a/gfx/hud/wickedhud/kh_yellow.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/kh_yellowarrow.tga b/gfx/hud/wickedhud/kh_yellowarrow.tga
deleted file mode 100644 (file)
index 8e754cc..0000000
Binary files a/gfx/hud/wickedhud/kh_yellowarrow.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/nexball_carrying.tga b/gfx/hud/wickedhud/nexball_carrying.tga
deleted file mode 100644 (file)
index 04ada8c..0000000
Binary files a/gfx/hud/wickedhud/nexball_carrying.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_camping.tga b/gfx/hud/wickedhud/notify_camping.tga
deleted file mode 100644 (file)
index 2766dd1..0000000
Binary files a/gfx/hud/wickedhud/notify_camping.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_death.tga b/gfx/hud/wickedhud/notify_death.tga
deleted file mode 100644 (file)
index d5e8045..0000000
Binary files a/gfx/hud/wickedhud/notify_death.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_fall.tga b/gfx/hud/wickedhud/notify_fall.tga
deleted file mode 100644 (file)
index febd1d0..0000000
Binary files a/gfx/hud/wickedhud/notify_fall.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_lava.tga b/gfx/hud/wickedhud/notify_lava.tga
deleted file mode 100644 (file)
index 3976e8b..0000000
Binary files a/gfx/hud/wickedhud/notify_lava.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_outofammo.tga b/gfx/hud/wickedhud/notify_outofammo.tga
deleted file mode 100644 (file)
index 82a11dd..0000000
Binary files a/gfx/hud/wickedhud/notify_outofammo.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_selfkill.tga b/gfx/hud/wickedhud/notify_selfkill.tga
deleted file mode 100644 (file)
index 646a1a2..0000000
Binary files a/gfx/hud/wickedhud/notify_selfkill.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_shootingstar.tga b/gfx/hud/wickedhud/notify_shootingstar.tga
deleted file mode 100644 (file)
index 048e015..0000000
Binary files a/gfx/hud/wickedhud/notify_shootingstar.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_slime.tga b/gfx/hud/wickedhud/notify_slime.tga
deleted file mode 100644 (file)
index c08a6a3..0000000
Binary files a/gfx/hud/wickedhud/notify_slime.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_teamkill.tga b/gfx/hud/wickedhud/notify_teamkill.tga
deleted file mode 100644 (file)
index 0f28ebb..0000000
Binary files a/gfx/hud/wickedhud/notify_teamkill.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_void.tga b/gfx/hud/wickedhud/notify_void.tga
deleted file mode 100644 (file)
index 1e2d280..0000000
Binary files a/gfx/hud/wickedhud/notify_void.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_water.tga b/gfx/hud/wickedhud/notify_water.tga
deleted file mode 100644 (file)
index 8315f12..0000000
Binary files a/gfx/hud/wickedhud/notify_water.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_0.tga b/gfx/hud/wickedhud/num_0.tga
deleted file mode 100644 (file)
index f0ab2f1..0000000
Binary files a/gfx/hud/wickedhud/num_0.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_0_stroke.tga b/gfx/hud/wickedhud/num_0_stroke.tga
deleted file mode 100644 (file)
index e9c6e5b..0000000
Binary files a/gfx/hud/wickedhud/num_0_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_1.tga b/gfx/hud/wickedhud/num_1.tga
deleted file mode 100644 (file)
index 78f1f45..0000000
Binary files a/gfx/hud/wickedhud/num_1.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_1_stroke.tga b/gfx/hud/wickedhud/num_1_stroke.tga
deleted file mode 100644 (file)
index 1ff552f..0000000
Binary files a/gfx/hud/wickedhud/num_1_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_2.tga b/gfx/hud/wickedhud/num_2.tga
deleted file mode 100644 (file)
index 205dd03..0000000
Binary files a/gfx/hud/wickedhud/num_2.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_2_stroke.tga b/gfx/hud/wickedhud/num_2_stroke.tga
deleted file mode 100644 (file)
index 08d26df..0000000
Binary files a/gfx/hud/wickedhud/num_2_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_3.tga b/gfx/hud/wickedhud/num_3.tga
deleted file mode 100644 (file)
index 335b5da..0000000
Binary files a/gfx/hud/wickedhud/num_3.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_3_stroke.tga b/gfx/hud/wickedhud/num_3_stroke.tga
deleted file mode 100644 (file)
index a5fddda..0000000
Binary files a/gfx/hud/wickedhud/num_3_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_4.tga b/gfx/hud/wickedhud/num_4.tga
deleted file mode 100644 (file)
index 2b9f46f..0000000
Binary files a/gfx/hud/wickedhud/num_4.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_4_stroke.tga b/gfx/hud/wickedhud/num_4_stroke.tga
deleted file mode 100644 (file)
index fe87933..0000000
Binary files a/gfx/hud/wickedhud/num_4_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_5.tga b/gfx/hud/wickedhud/num_5.tga
deleted file mode 100644 (file)
index 8bb7043..0000000
Binary files a/gfx/hud/wickedhud/num_5.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_5_stroke.tga b/gfx/hud/wickedhud/num_5_stroke.tga
deleted file mode 100644 (file)
index 3a6978a..0000000
Binary files a/gfx/hud/wickedhud/num_5_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_6.tga b/gfx/hud/wickedhud/num_6.tga
deleted file mode 100644 (file)
index 1db8c0e..0000000
Binary files a/gfx/hud/wickedhud/num_6.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_6_stroke.tga b/gfx/hud/wickedhud/num_6_stroke.tga
deleted file mode 100644 (file)
index f64e178..0000000
Binary files a/gfx/hud/wickedhud/num_6_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_7.tga b/gfx/hud/wickedhud/num_7.tga
deleted file mode 100644 (file)
index 0099d68..0000000
Binary files a/gfx/hud/wickedhud/num_7.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_7_stroke.tga b/gfx/hud/wickedhud/num_7_stroke.tga
deleted file mode 100644 (file)
index 252e796..0000000
Binary files a/gfx/hud/wickedhud/num_7_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_8.tga b/gfx/hud/wickedhud/num_8.tga
deleted file mode 100644 (file)
index aa20157..0000000
Binary files a/gfx/hud/wickedhud/num_8.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_8_stroke.tga b/gfx/hud/wickedhud/num_8_stroke.tga
deleted file mode 100644 (file)
index e2cd39d..0000000
Binary files a/gfx/hud/wickedhud/num_8_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_9.tga b/gfx/hud/wickedhud/num_9.tga
deleted file mode 100644 (file)
index 87b9c21..0000000
Binary files a/gfx/hud/wickedhud/num_9.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_9_stroke.tga b/gfx/hud/wickedhud/num_9_stroke.tga
deleted file mode 100644 (file)
index 5a8d610..0000000
Binary files a/gfx/hud/wickedhud/num_9_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_colon.tga b/gfx/hud/wickedhud/num_colon.tga
deleted file mode 100644 (file)
index e22c09a..0000000
Binary files a/gfx/hud/wickedhud/num_colon.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_colon_stroke.tga b/gfx/hud/wickedhud/num_colon_stroke.tga
deleted file mode 100644 (file)
index 68ad28a..0000000
Binary files a/gfx/hud/wickedhud/num_colon_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_dot.tga b/gfx/hud/wickedhud/num_dot.tga
deleted file mode 100644 (file)
index 7fbfdd0..0000000
Binary files a/gfx/hud/wickedhud/num_dot.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_dot_stroke.tga b/gfx/hud/wickedhud/num_dot_stroke.tga
deleted file mode 100644 (file)
index 29ad696..0000000
Binary files a/gfx/hud/wickedhud/num_dot_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_leading_1.tga b/gfx/hud/wickedhud/num_leading_1.tga
deleted file mode 100644 (file)
index f2f59d3..0000000
Binary files a/gfx/hud/wickedhud/num_leading_1.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_leading_2.tga b/gfx/hud/wickedhud/num_leading_2.tga
deleted file mode 100644 (file)
index a9be88c..0000000
Binary files a/gfx/hud/wickedhud/num_leading_2.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_leading_3.tga b/gfx/hud/wickedhud/num_leading_3.tga
deleted file mode 100644 (file)
index ebd35a4..0000000
Binary files a/gfx/hud/wickedhud/num_leading_3.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_minus.tga b/gfx/hud/wickedhud/num_minus.tga
deleted file mode 100644 (file)
index 10721f2..0000000
Binary files a/gfx/hud/wickedhud/num_minus.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_minus_stroke.tga b/gfx/hud/wickedhud/num_minus_stroke.tga
deleted file mode 100644 (file)
index 26455a0..0000000
Binary files a/gfx/hud/wickedhud/num_minus_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_plus.tga b/gfx/hud/wickedhud/num_plus.tga
deleted file mode 100644 (file)
index 3cb17b3..0000000
Binary files a/gfx/hud/wickedhud/num_plus.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_plus_stroke.tga b/gfx/hud/wickedhud/num_plus_stroke.tga
deleted file mode 100644 (file)
index 7df2faa..0000000
Binary files a/gfx/hud/wickedhud/num_plus_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/race_newfail.tga b/gfx/hud/wickedhud/race_newfail.tga
deleted file mode 100644 (file)
index cd1164b..0000000
Binary files a/gfx/hud/wickedhud/race_newfail.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/race_newrankgreen.tga b/gfx/hud/wickedhud/race_newrankgreen.tga
deleted file mode 100644 (file)
index c8fa157..0000000
Binary files a/gfx/hud/wickedhud/race_newrankgreen.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/race_newrankyellow.tga b/gfx/hud/wickedhud/race_newrankyellow.tga
deleted file mode 100644 (file)
index 0af3c59..0000000
Binary files a/gfx/hud/wickedhud/race_newrankyellow.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/race_newrecordserver.tga b/gfx/hud/wickedhud/race_newrecordserver.tga
deleted file mode 100644 (file)
index aa8bae1..0000000
Binary files a/gfx/hud/wickedhud/race_newrecordserver.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/race_newtime.tga b/gfx/hud/wickedhud/race_newtime.tga
deleted file mode 100644 (file)
index c9647b9..0000000
Binary files a/gfx/hud/wickedhud/race_newtime.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/rifle_ring_1.tga b/gfx/hud/wickedhud/rifle_ring_1.tga
deleted file mode 100644 (file)
index a90927c..0000000
Binary files a/gfx/hud/wickedhud/rifle_ring_1.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/rifle_ring_2.tga b/gfx/hud/wickedhud/rifle_ring_2.tga
deleted file mode 100644 (file)
index 6f6ca4c..0000000
Binary files a/gfx/hud/wickedhud/rifle_ring_2.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/rifle_ring_3.tga b/gfx/hud/wickedhud/rifle_ring_3.tga
deleted file mode 100644 (file)
index 68f6df7..0000000
Binary files a/gfx/hud/wickedhud/rifle_ring_3.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/rifle_ring_4.tga b/gfx/hud/wickedhud/rifle_ring_4.tga
deleted file mode 100644 (file)
index 0a5db15..0000000
Binary files a/gfx/hud/wickedhud/rifle_ring_4.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/rifle_ring_5.tga b/gfx/hud/wickedhud/rifle_ring_5.tga
deleted file mode 100644 (file)
index d5cc95b..0000000
Binary files a/gfx/hud/wickedhud/rifle_ring_5.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/rifle_ring_6.tga b/gfx/hud/wickedhud/rifle_ring_6.tga
deleted file mode 100644 (file)
index 4a126e7..0000000
Binary files a/gfx/hud/wickedhud/rifle_ring_6.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/rifle_ring_7.tga b/gfx/hud/wickedhud/rifle_ring_7.tga
deleted file mode 100644 (file)
index 846212b..0000000
Binary files a/gfx/hud/wickedhud/rifle_ring_7.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/rifle_ring_8.tga b/gfx/hud/wickedhud/rifle_ring_8.tga
deleted file mode 100644 (file)
index 137e24d..0000000
Binary files a/gfx/hud/wickedhud/rifle_ring_8.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/shield.tga b/gfx/hud/wickedhud/shield.tga
deleted file mode 100644 (file)
index f13f0b4..0000000
Binary files a/gfx/hud/wickedhud/shield.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/statusbar.tga b/gfx/hud/wickedhud/statusbar.tga
deleted file mode 100644 (file)
index 987c8f5..0000000
Binary files a/gfx/hud/wickedhud/statusbar.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/statusbar_vertical.tga b/gfx/hud/wickedhud/statusbar_vertical.tga
deleted file mode 100644 (file)
index e271438..0000000
Binary files a/gfx/hud/wickedhud/statusbar_vertical.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/strength.tga b/gfx/hud/wickedhud/strength.tga
deleted file mode 100644 (file)
index b19019d..0000000
Binary files a/gfx/hud/wickedhud/strength.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/voteprogress_back.tga b/gfx/hud/wickedhud/voteprogress_back.tga
deleted file mode 100644 (file)
index fc031ce..0000000
Binary files a/gfx/hud/wickedhud/voteprogress_back.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/voteprogress_prog.tga b/gfx/hud/wickedhud/voteprogress_prog.tga
deleted file mode 100644 (file)
index 9f3f614..0000000
Binary files a/gfx/hud/wickedhud/voteprogress_prog.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/voteprogress_voted.tga b/gfx/hud/wickedhud/voteprogress_voted.tga
deleted file mode 100644 (file)
index a21fe6a..0000000
Binary files a/gfx/hud/wickedhud/voteprogress_voted.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weapon_accuracy.tga b/gfx/hud/wickedhud/weapon_accuracy.tga
deleted file mode 100644 (file)
index 4a451b1..0000000
Binary files a/gfx/hud/wickedhud/weapon_accuracy.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weapon_current_bg.tga b/gfx/hud/wickedhud/weapon_current_bg.tga
deleted file mode 100644 (file)
index 5a8f936..0000000
Binary files a/gfx/hud/wickedhud/weapon_current_bg.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weapon_hlacmod_renameit.tga b/gfx/hud/wickedhud/weapon_hlacmod_renameit.tga
deleted file mode 100644 (file)
index f11c173..0000000
Binary files a/gfx/hud/wickedhud/weapon_hlacmod_renameit.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponcampingrifle.tga b/gfx/hud/wickedhud/weaponcampingrifle.tga
deleted file mode 100644 (file)
index fb6413b..0000000
Binary files a/gfx/hud/wickedhud/weaponcampingrifle.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponcrylink.tga b/gfx/hud/wickedhud/weaponcrylink.tga
deleted file mode 100644 (file)
index e48ad4d..0000000
Binary files a/gfx/hud/wickedhud/weaponcrylink.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponelectro.tga b/gfx/hud/wickedhud/weaponelectro.tga
deleted file mode 100644 (file)
index 73c791b..0000000
Binary files a/gfx/hud/wickedhud/weaponelectro.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponfireball.tga b/gfx/hud/wickedhud/weaponfireball.tga
deleted file mode 100644 (file)
index d7ea1fb..0000000
Binary files a/gfx/hud/wickedhud/weaponfireball.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weapongrenadelauncher.tga b/gfx/hud/wickedhud/weapongrenadelauncher.tga
deleted file mode 100644 (file)
index c09081b..0000000
Binary files a/gfx/hud/wickedhud/weapongrenadelauncher.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponhagar.tga b/gfx/hud/wickedhud/weaponhagar.tga
deleted file mode 100644 (file)
index 69a7b72..0000000
Binary files a/gfx/hud/wickedhud/weaponhagar.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponhlac.tga b/gfx/hud/wickedhud/weaponhlac.tga
deleted file mode 100644 (file)
index 2ba3853..0000000
Binary files a/gfx/hud/wickedhud/weaponhlac.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponhook.tga b/gfx/hud/wickedhud/weaponhook.tga
deleted file mode 100644 (file)
index 0c7fd40..0000000
Binary files a/gfx/hud/wickedhud/weaponhook.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponlaser.tga b/gfx/hud/wickedhud/weaponlaser.tga
deleted file mode 100644 (file)
index 1f016e1..0000000
Binary files a/gfx/hud/wickedhud/weaponlaser.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponminstanex.tga b/gfx/hud/wickedhud/weaponminstanex.tga
deleted file mode 100644 (file)
index 26877c2..0000000
Binary files a/gfx/hud/wickedhud/weaponminstanex.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponnex.tga b/gfx/hud/wickedhud/weaponnex.tga
deleted file mode 100644 (file)
index 4ed91bc..0000000
Binary files a/gfx/hud/wickedhud/weaponnex.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponporto.tga b/gfx/hud/wickedhud/weaponporto.tga
deleted file mode 100644 (file)
index 46dd107..0000000
Binary files a/gfx/hud/wickedhud/weaponporto.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponrocketlauncher.tga b/gfx/hud/wickedhud/weaponrocketlauncher.tga
deleted file mode 100644 (file)
index f5449b3..0000000
Binary files a/gfx/hud/wickedhud/weaponrocketlauncher.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponseeker.tga b/gfx/hud/wickedhud/weaponseeker.tga
deleted file mode 100644 (file)
index 566ee86..0000000
Binary files a/gfx/hud/wickedhud/weaponseeker.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponshotgun.tga b/gfx/hud/wickedhud/weaponshotgun.tga
deleted file mode 100644 (file)
index 055841c..0000000
Binary files a/gfx/hud/wickedhud/weaponshotgun.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weapontuba.tga b/gfx/hud/wickedhud/weapontuba.tga
deleted file mode 100644 (file)
index 8b80015..0000000
Binary files a/gfx/hud/wickedhud/weapontuba.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponuzi.tga b/gfx/hud/wickedhud/weaponuzi.tga
deleted file mode 100644 (file)
index c0e75d1..0000000
Binary files a/gfx/hud/wickedhud/weaponuzi.tga and /dev/null differ
diff --git a/gfx/menu/default/cursor_move.tga b/gfx/menu/default/cursor_move.tga
new file mode 100644 (file)
index 0000000..0264316
Binary files /dev/null and b/gfx/menu/default/cursor_move.tga differ
diff --git a/gfx/menu/default/cursor_resize.tga b/gfx/menu/default/cursor_resize.tga
new file mode 100644 (file)
index 0000000..475e224
Binary files /dev/null and b/gfx/menu/default/cursor_resize.tga differ
diff --git a/gfx/menu/default/cursor_resize2.tga b/gfx/menu/default/cursor_resize2.tga
new file mode 100644 (file)
index 0000000..6c97fb8
Binary files /dev/null and b/gfx/menu/default/cursor_resize2.tga differ
index 6775942eeca3197348cf8eb13f29523321223271..79b0e83b7d43330ca4c777f5a3e27c1706792a13 100755 (executable)
Binary files a/gfx/menu/wickedx/colorpicker_m.tga and b/gfx/menu/wickedx/colorpicker_m.tga differ
diff --git a/gfx/menu/wickedx/colorpicker_selected.tga b/gfx/menu/wickedx/colorpicker_selected.tga
new file mode 100644 (file)
index 0000000..605e932
Binary files /dev/null and b/gfx/menu/wickedx/colorpicker_selected.tga differ
diff --git a/gfx/menu/wickedx/cursor_move.tga b/gfx/menu/wickedx/cursor_move.tga
new file mode 100644 (file)
index 0000000..0264316
Binary files /dev/null and b/gfx/menu/wickedx/cursor_move.tga differ
diff --git a/gfx/menu/wickedx/cursor_resize.tga b/gfx/menu/wickedx/cursor_resize.tga
new file mode 100644 (file)
index 0000000..475e224
Binary files /dev/null and b/gfx/menu/wickedx/cursor_resize.tga differ
diff --git a/gfx/menu/wickedx/cursor_resize2.tga b/gfx/menu/wickedx/cursor_resize2.tga
new file mode 100644 (file)
index 0000000..6c97fb8
Binary files /dev/null and b/gfx/menu/wickedx/cursor_resize2.tga differ
diff --git a/gfx/rifle_ring_1.tga b/gfx/rifle_ring_1.tga
new file mode 100644 (file)
index 0000000..914de35
Binary files /dev/null and b/gfx/rifle_ring_1.tga differ
diff --git a/gfx/rifle_ring_2.tga b/gfx/rifle_ring_2.tga
new file mode 100644 (file)
index 0000000..db0a808
Binary files /dev/null and b/gfx/rifle_ring_2.tga differ
diff --git a/gfx/rifle_ring_3.tga b/gfx/rifle_ring_3.tga
new file mode 100644 (file)
index 0000000..20348c2
Binary files /dev/null and b/gfx/rifle_ring_3.tga differ
diff --git a/gfx/rifle_ring_4.tga b/gfx/rifle_ring_4.tga
new file mode 100644 (file)
index 0000000..07975e2
Binary files /dev/null and b/gfx/rifle_ring_4.tga differ
diff --git a/hud_default.cfg b/hud_default.cfg
new file mode 100644 (file)
index 0000000..34fed7a
--- /dev/null
@@ -0,0 +1,200 @@
+seta hud_skin "luminos"
+seta hud_panel_bg "border"
+seta hud_panel_bg_color "0.875 0.375 0"
+seta hud_panel_bg_color_team "1"
+seta hud_panel_bg_alpha "1"
+seta hud_panel_bg_border "6"
+seta hud_panel_bg_padding "2"
+seta hud_panel_fg_alpha "1"
+
+seta hud_dock "dock"
+seta hud_dock_color "0 0.1875 0.4375"
+seta hud_dock_color_team "0.600000"
+seta hud_dock_alpha "1"
+
+seta hud_progressbar_alpha "0.500000"
+seta hud_progressbar_strength_color "0 0 0.6"
+seta hud_progressbar_shield_color "0.6 0 0.6"
+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_panelorder "11 0 9 2 10 14 12 6 3 13 4 8 7 1 5 "
+
+seta hud_configure_grid "1"
+seta hud_configure_grid_xsize "0.005000"
+seta hud_configure_grid_ysize "0.005000"
+
+seta hud_panel_weapons 1
+seta hud_panel_weapons_pos "0.915000 0.085000"
+seta hud_panel_weapons_size "0.060000 0.635000"
+seta hud_panel_weapons_bg ""
+seta hud_panel_weapons_bg_color ""
+seta hud_panel_weapons_bg_color_team ""
+seta hud_panel_weapons_bg_alpha ""
+seta hud_panel_weapons_bg_border ""
+seta hud_panel_weapons_bg_padding ""
+seta hud_panel_weapons_complainbubble "1"
+seta hud_panel_weapons_complainbubble_padding "-10"
+seta hud_panel_weapons_complainbubble_color_outofammo "0.8 0 0"
+seta hud_panel_weapons_complainbubble_color_donthave "0.8 0.5 0"
+seta hud_panel_weapons_complainbubble_color_unavailable "0 0.3 0.8"
+seta hud_panel_weapons_ammo_color "0 1 0"
+seta hud_panel_weapons_ammo_alpha "1"
+seta hud_panel_weapons_aspect "2"
+
+seta hud_panel_ammo 1
+seta hud_panel_ammo_pos "0.190000 0.925000"
+seta hud_panel_ammo_size "0.095000 0.060000"
+seta hud_panel_ammo_bg ""
+seta hud_panel_ammo_bg_color ""
+seta hud_panel_ammo_bg_color_team ""
+seta hud_panel_ammo_bg_alpha ""
+seta hud_panel_ammo_bg_border ""
+seta hud_panel_ammo_bg_padding ""
+seta hud_panel_ammo_onlycurrent "1"
+seta hud_panel_ammo_iconalign "0"
+
+seta hud_panel_powerups 1
+seta hud_panel_powerups_pos "0.365000 0.015000"
+seta hud_panel_powerups_size "0.262500 0.048047"
+seta hud_panel_powerups_bg ""
+seta hud_panel_powerups_bg_color ""
+seta hud_panel_powerups_bg_color_team "1"
+seta hud_panel_powerups_bg_alpha ""
+seta hud_panel_powerups_bg_border ""
+seta hud_panel_powerups_bg_padding ""
+seta hud_panel_powerups_flip "1"
+seta hud_panel_powerups_iconalign "4"
+seta hud_panel_powerups_baralign "4"
+seta hud_panel_powerups_progressbar "1"
+
+seta hud_panel_healtharmor 1
+seta hud_panel_healtharmor_pos "0.305000 0.925000"
+seta hud_panel_healtharmor_size "0.315000 0.060000"
+seta hud_panel_healtharmor_bg ""
+seta hud_panel_healtharmor_bg_color ""
+seta hud_panel_healtharmor_bg_color_team "1"
+seta hud_panel_healtharmor_bg_alpha "1"
+seta hud_panel_healtharmor_bg_border ""
+seta hud_panel_healtharmor_bg_padding ""
+seta hud_panel_healtharmor_flip "0
+seta hud_panel_healtharmor_iconalign "4"
+seta hud_panel_healtharmor_baralign "4"
+seta hud_panel_healtharmor_progressbar "1"
+
+seta hud_panel_notify 1
+seta hud_panel_notify_pos "0.700000 0.740000"
+seta hud_panel_notify_size "0.280000 0.180000"
+seta hud_panel_notify_bg ""
+seta hud_panel_notify_bg_color ""
+seta hud_panel_notify_bg_color_team ""
+seta hud_panel_notify_bg_alpha "0"
+seta hud_panel_notify_bg_border ""
+seta hud_panel_notify_bg_padding ""
+seta hud_panel_notify_flip "0"
+seta hud_panel_notify_print "0"
+
+seta hud_panel_timer 1
+seta hud_panel_timer_pos "0.880000 0.012070"
+seta hud_panel_timer_size "0.100000 0.032520"
+seta hud_panel_timer_bg ""
+seta hud_panel_timer_bg_color ""
+seta hud_panel_timer_bg_color_team ""
+seta hud_panel_timer_bg_alpha ""
+seta hud_panel_timer_bg_border ""
+seta hud_panel_timer_bg_padding "0"
+
+seta hud_panel_radar 1
+seta hud_panel_radar_pos "0.025000 0.025000"
+seta hud_panel_radar_size "0.180000 0.220000"
+seta hud_panel_radar_bg ""
+seta hud_panel_radar_bg_color ""
+seta hud_panel_radar_bg_color_team ""
+seta hud_panel_radar_bg_alpha ""
+seta hud_panel_radar_bg_border ""
+seta hud_panel_radar_bg_padding "-3"
+seta hud_panel_radar_foreground_alpha "0.800000"
+
+seta hud_panel_score 1
+seta hud_panel_score_pos "0.025000 0.925000"
+seta hud_panel_score_size "0.145000 0.060000"
+seta hud_panel_score_bg ""
+seta hud_panel_score_bg_color ""
+seta hud_panel_score_bg_color_team ""
+seta hud_panel_score_bg_alpha ""
+seta hud_panel_score_bg_border ""
+seta hud_panel_score_bg_padding ""
+
+seta hud_panel_racetimer 1
+seta hud_panel_racetimer_pos "0.355000 0.205000"
+seta hud_panel_racetimer_size "0.280000 0.093333"
+seta hud_panel_racetimer_bg ""
+seta hud_panel_racetimer_bg_color ""
+seta hud_panel_racetimer_bg_color_team ""
+seta hud_panel_racetimer_bg_alpha "0"
+seta hud_panel_racetimer_bg_border ""
+seta hud_panel_racetimer_bg_padding ""
+
+seta hud_panel_vote 1
+seta hud_panel_vote_pos "0.025000 0.660000"
+seta hud_panel_vote_size "0.264218 0.102462"
+seta hud_panel_vote_bg ""
+seta hud_panel_vote_bg_color ""
+seta hud_panel_vote_bg_color_team ""
+seta hud_panel_vote_bg_alpha ""
+seta hud_panel_vote_bg_border ""
+seta hud_panel_vote_bg_padding ""
+seta hud_panel_vote_alreadyvoted_alpha "0.750000"
+
+seta hud_panel_modicons 1
+seta hud_panel_modicons_pos "0.040000 0.270000"
+seta hud_panel_modicons_size "0.084766 0.199903"
+seta hud_panel_modicons_bg ""
+seta hud_panel_modicons_bg_color ""
+seta hud_panel_modicons_bg_color_team ""
+seta hud_panel_modicons_bg_alpha ""
+seta hud_panel_modicons_bg_border ""
+seta hud_panel_modicons_bg_padding ""
+
+seta hud_panel_pressedkeys 1
+seta hud_panel_pressedkeys_pos "0.410000 0.545000"
+seta hud_panel_pressedkeys_size "0.177656 0.120531"
+seta hud_panel_pressedkeys_bg ""
+seta hud_panel_pressedkeys_bg_color ""
+seta hud_panel_pressedkeys_bg_color_team "1"
+seta hud_panel_pressedkeys_bg_alpha "0"
+seta hud_panel_pressedkeys_bg_border ""
+seta hud_panel_pressedkeys_bg_padding ""
+seta hud_panel_pressedkeys_aspect "1.600000"
+
+seta hud_panel_chat 1
+seta hud_panel_chat_pos "0.020000 0.775000"
+seta hud_panel_chat_size "0.627968 0.112696"
+seta hud_panel_chat_bg ""
+seta hud_panel_chat_bg_color ""
+seta hud_panel_chat_bg_color_team ""
+seta hud_panel_chat_bg_alpha "0"
+seta hud_panel_chat_bg_border ""
+seta hud_panel_chat_bg_padding ""
+
+seta hud_panel_engineinfo 1
+seta hud_panel_engineinfo_pos "0.860000 0.954667"
+seta hud_panel_engineinfo_size "0.125000 0.035000"
+seta hud_panel_engineinfo_bg ""
+seta hud_panel_engineinfo_bg_color ""
+seta hud_panel_engineinfo_bg_color_team ""
+seta hud_panel_engineinfo_bg_alpha "0"
+seta hud_panel_engineinfo_bg_border ""
+seta hud_panel_engineinfo_bg_padding ""
+
+seta hud_panel_infomessages 1
+seta hud_panel_infomessages_pos "0.340000 0.350000"
+seta hud_panel_infomessages_size "0.320000 0.085000"
+seta hud_panel_infomessages_bg ""
+seta hud_panel_infomessages_bg_color ""
+seta hud_panel_infomessages_bg_color_team ""
+seta hud_panel_infomessages_bg_alpha "0"
+seta hud_panel_infomessages_bg_border ""
+seta hud_panel_infomessages_bg_padding ""
diff --git a/hud_luminos_default.cfg b/hud_luminos_default.cfg
new file mode 100644 (file)
index 0000000..8d1436a
--- /dev/null
@@ -0,0 +1,202 @@
+seta hud_skin "luminos"
+seta hud_panel_bg "border"
+seta hud_panel_bg_color "0.875 0.375 0"
+seta hud_panel_bg_color_team "1"
+seta hud_panel_bg_alpha "1"
+seta hud_panel_bg_border "6"
+seta hud_panel_bg_padding "2"
+seta hud_panel_fg_alpha "1"
+
+seta hud_dock "dock"
+seta hud_dock_color "0 0.1875 0.4375"
+seta hud_dock_color_team "0.600000"
+seta hud_dock_alpha "1"
+
+seta hud_progressbar_alpha "0.500000"
+seta hud_progressbar_strength_color "0 0 0.6"
+seta hud_progressbar_shield_color "0.6 0 0.6"
+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_panelorder "11 0 9 2 10 14 12 6 3 13 4 8 7 1 5 "
+
+seta hud_configure_grid "1"
+seta hud_configure_grid_xsize "0.005000"
+seta hud_configure_grid_ysize "0.005000"
+
+seta hud_panel_weapons 1
+seta hud_panel_weapons_pos "0.915000 0.085000"
+seta hud_panel_weapons_size "0.060000 0.635000"
+seta hud_panel_weapons_bg ""
+seta hud_panel_weapons_bg_color ""
+seta hud_panel_weapons_bg_color_team ""
+seta hud_panel_weapons_bg_alpha ""
+seta hud_panel_weapons_bg_border ""
+seta hud_panel_weapons_bg_padding ""
+seta hud_panel_weapons_complainbubble "1"
+seta hud_panel_weapons_complainbubble_padding "-10"
+seta hud_panel_weapons_complainbubble_color_outofammo "0.8 0 0"
+seta hud_panel_weapons_complainbubble_color_donthave "0.8 0.5 0"
+seta hud_panel_weapons_complainbubble_color_unavailable "0 0.3 0.8"
+seta hud_panel_weapons_ammo_color "0 1 0"
+seta hud_panel_weapons_ammo_alpha "1"
+seta hud_panel_weapons_aspect "2"
+
+seta hud_panel_ammo 1
+seta hud_panel_ammo_pos "0.190000 0.925000"
+seta hud_panel_ammo_size "0.095000 0.060000"
+seta hud_panel_ammo_bg ""
+seta hud_panel_ammo_bg_color ""
+seta hud_panel_ammo_bg_color_team ""
+seta hud_panel_ammo_bg_alpha ""
+seta hud_panel_ammo_bg_border ""
+seta hud_panel_ammo_bg_padding ""
+seta hud_panel_ammo_onlycurrent "1"
+seta hud_panel_ammo_iconalign "0"
+
+seta hud_panel_powerups 1
+seta hud_panel_powerups_pos "0.365000 0.015000"
+seta hud_panel_powerups_size "0.262500 0.048047"
+seta hud_panel_powerups_bg ""
+seta hud_panel_powerups_bg_color ""
+seta hud_panel_powerups_bg_color_team "1"
+seta hud_panel_powerups_bg_alpha ""
+seta hud_panel_powerups_bg_border ""
+seta hud_panel_powerups_bg_padding ""
+seta hud_panel_powerups_flip "1"
+seta hud_panel_powerups_iconalign "4"
+seta hud_panel_powerups_baralign "4"
+seta hud_panel_powerups_progressbar "1"
+
+seta hud_panel_healtharmor 1
+seta hud_panel_healtharmor_pos "0.305000 0.925000"
+seta hud_panel_healtharmor_size "0.315000 0.060000"
+seta hud_panel_healtharmor_bg ""
+seta hud_panel_healtharmor_bg_color ""
+seta hud_panel_healtharmor_bg_color_team "1"
+seta hud_panel_healtharmor_bg_alpha "1"
+seta hud_panel_healtharmor_bg_border ""
+seta hud_panel_healtharmor_bg_padding ""
+seta hud_panel_healtharmor_flip "0
+seta hud_panel_healtharmor_iconalign "4"
+seta hud_panel_healtharmor_baralign "4"
+seta hud_panel_healtharmor_progressbar "1"
+
+seta hud_panel_notify 1
+seta hud_panel_notify_pos "0.700000 0.740000"
+seta hud_panel_notify_size "0.280000 0.180000"
+seta hud_panel_notify_bg ""
+seta hud_panel_notify_bg_color ""
+seta hud_panel_notify_bg_color_team ""
+seta hud_panel_notify_bg_alpha "0"
+seta hud_panel_notify_bg_border ""
+seta hud_panel_notify_bg_padding ""
+seta hud_panel_notify_flip "0"
+seta hud_panel_notify_print "0"
+
+seta hud_panel_timer 1
+seta hud_panel_timer_pos "0.880000 0.012070"
+seta hud_panel_timer_size "0.100000 0.032520"
+seta hud_panel_timer_bg ""
+seta hud_panel_timer_bg_color ""
+seta hud_panel_timer_bg_color_team ""
+seta hud_panel_timer_bg_alpha ""
+seta hud_panel_timer_bg_border ""
+seta hud_panel_timer_bg_padding "0"
+
+seta hud_panel_radar 1
+seta hud_panel_radar_pos "0.025000 0.025000"
+seta hud_panel_radar_size "0.180000 0.220000"
+seta hud_panel_radar_bg ""
+seta hud_panel_radar_bg_color ""
+seta hud_panel_radar_bg_color_team ""
+seta hud_panel_radar_bg_alpha ""
+seta hud_panel_radar_bg_border ""
+seta hud_panel_radar_bg_padding "-3"
+seta hud_panel_radar_foreground_alpha "0.800000"
+
+seta hud_panel_score 1
+seta hud_panel_score_pos "0.025000 0.925000"
+seta hud_panel_score_size "0.145000 0.060000"
+seta hud_panel_score_bg ""
+seta hud_panel_score_bg_color ""
+seta hud_panel_score_bg_color_team ""
+seta hud_panel_score_bg_alpha ""
+seta hud_panel_score_bg_border ""
+seta hud_panel_score_bg_padding ""
+
+seta hud_panel_racetimer 1
+seta hud_panel_racetimer_pos "0.355000 0.205000"
+seta hud_panel_racetimer_size "0.280000 0.093333"
+seta hud_panel_racetimer_bg ""
+seta hud_panel_racetimer_bg_color ""
+seta hud_panel_racetimer_bg_color_team ""
+seta hud_panel_racetimer_bg_alpha "0"
+seta hud_panel_racetimer_bg_border ""
+seta hud_panel_racetimer_bg_padding ""
+
+seta hud_panel_vote 1
+seta hud_panel_vote_pos "0.025000 0.660000"
+seta hud_panel_vote_size "0.264218 0.102462"
+seta hud_panel_vote_bg ""
+seta hud_panel_vote_bg_color ""
+seta hud_panel_vote_bg_color_team ""
+seta hud_panel_vote_bg_alpha ""
+seta hud_panel_vote_bg_border ""
+seta hud_panel_vote_bg_padding ""
+seta hud_panel_vote_alreadyvoted_alpha "0.750000"
+
+seta hud_panel_modicons 1
+seta hud_panel_modicons_pos "0.040000 0.270000"
+seta hud_panel_modicons_size "0.084766 0.199903"
+seta hud_panel_modicons_bg ""
+seta hud_panel_modicons_bg_color ""
+seta hud_panel_modicons_bg_color_team ""
+seta hud_panel_modicons_bg_alpha ""
+seta hud_panel_modicons_bg_border ""
+seta hud_panel_modicons_bg_padding ""
+
+seta hud_panel_pressedkeys 1
+seta hud_panel_pressedkeys_pos "0.410000 0.545000"
+seta hud_panel_pressedkeys_size "0.177656 0.120531"
+seta hud_panel_pressedkeys_bg ""
+seta hud_panel_pressedkeys_bg_color ""
+seta hud_panel_pressedkeys_bg_color_team "1"
+seta hud_panel_pressedkeys_bg_alpha "0"
+seta hud_panel_pressedkeys_bg_border ""
+seta hud_panel_pressedkeys_bg_padding ""
+seta hud_panel_pressedkeys_aspect "1.600000"
+
+seta hud_panel_chat 1
+seta hud_panel_chat_pos "0.020000 0.775000"
+seta hud_panel_chat_size "0.627968 0.112696"
+seta hud_panel_chat_bg ""
+seta hud_panel_chat_bg_color ""
+seta hud_panel_chat_bg_color_team ""
+seta hud_panel_chat_bg_alpha "0"
+seta hud_panel_chat_bg_border ""
+seta hud_panel_chat_bg_padding ""
+
+seta hud_panel_engineinfo 1
+seta hud_panel_engineinfo_pos "0.860000 0.954667"
+seta hud_panel_engineinfo_size "0.125000 0.035000"
+seta hud_panel_engineinfo_bg ""
+seta hud_panel_engineinfo_bg_color ""
+seta hud_panel_engineinfo_bg_color_team ""
+seta hud_panel_engineinfo_bg_alpha "0"
+seta hud_panel_engineinfo_bg_border ""
+seta hud_panel_engineinfo_bg_padding ""
+
+seta hud_panel_infomessages 1
+seta hud_panel_infomessages_pos "0.340000 0.350000"
+seta hud_panel_infomessages_size "0.320000 0.085000"
+seta hud_panel_infomessages_bg ""
+seta hud_panel_infomessages_bg_color ""
+seta hud_panel_infomessages_bg_color_team ""
+seta hud_panel_infomessages_bg_alpha "0"
+seta hud_panel_infomessages_bg_border ""
+seta hud_panel_infomessages_bg_padding ""
+
+menu_restart
index cc9baef5cffa06a6cc11f124798b15a3485705f5..e803ed9d3487ab7bdc0c02dff709b44083a887ac 100644 (file)
@@ -1,5 +1,5 @@
 seta hud_skin "old"
-seta hud_bg "0"
+seta hud_bg "border"
 seta hud_bg_color "1 1 1"
 seta hud_bg_color_team "0"
 seta hud_bg_alpha "0.500000"
@@ -12,7 +12,7 @@ seta hud_dock_color "0 0.5 0.35"
 seta hud_dock_color_team "0.700000"
 seta hud_dock_alpha "1"
 
-seta hud_progressbar_alpha 0
+seta hud_progressbar_alpha "0.5"
 seta hud_progressbar_strength_color "0 0 0.6"
 seta hud_progressbar_shield_color "0.6 0 0.6"
 seta hud_progressbar_health_color "0.6 0 0"
@@ -20,154 +20,183 @@ 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_weaponicons 1
-seta hud_weaponicons_pos "0.370000 0.870000"
-seta hud_weaponicons_size "0.330000 0.050000"
-seta hud_weaponicons_bg ""
-seta hud_weaponicons_bg_color ""
-seta hud_weaponicons_bg_color_team ""
-seta hud_weaponicons_bg_alpha ""
-seta hud_weaponicons_bg_border ""
-seta hud_weaponicons_bg_padding "-5"
-seta hud_weaponicons_accuracy_yellow 40
-
-seta hud_inventory 1
-seta hud_inventory_pos "0.160000 0.910000"
-seta hud_inventory_size "0.190000 0.090000"
-seta hud_inventory_bg ""
-seta hud_inventory_bg_color ""
-seta hud_inventory_bg_color_team ""
-seta hud_inventory_bg_alpha ""
-seta hud_inventory_bg_border ""
-seta hud_inventory_bg_padding ""
-seta hud_inventory_onlycurrent 0
-
-seta hud_powerups 1
-seta hud_powerups_pos "0.670000 0.910000"
-seta hud_powerups_size "0.100000 0.080000"
-seta hud_powerups_bg ""
-seta hud_powerups_bg_color ""
-seta hud_powerups_bg_color_team ""
-seta hud_powerups_bg_alpha ""
-seta hud_powerups_bg_border ""
-seta hud_powerups_bg_padding ""
-seta hud_powerups_flip 1
-seta hud_powerups_mirror 0
-
-seta hud_healtharmor 1
-seta hud_healtharmor_pos "0.370000 0.930000"
-seta hud_healtharmor_size "0.300000 0.070000"
-seta hud_healtharmor_bg ""
-seta hud_healtharmor_bg_color ""
-seta hud_healtharmor_bg_color_team ""
-seta hud_healtharmor_bg_alpha ""
-seta hud_healtharmor_bg_border ""
-seta hud_healtharmor_bg_padding ""
-seta hud_healtharmor_flip 0
-seta hud_healtharmor_mirror 0
-
-seta hud_notify 1
-seta hud_notify_pos "0.690000 0.660000"
-seta hud_notify_size "0.300000 0.070000"
-seta hud_notify_bg ""
-seta hud_notify_bg_color ""
-seta hud_notify_bg_color_team ""
-seta hud_notify_bg_alpha "0"
-seta hud_notify_bg_border ""
-seta hud_notify_bg_padding ""
-seta hud_notify_flip 0
-seta hud_notify_info_top 0
-
-seta hud_timer 1
-seta hud_timer_pos "0.860000 0"
-seta hud_timer_size "0.140000 0.045528"
-seta hud_timer_bg "border"
-seta hud_timer_bg_color "0 0.5 0.35"
-seta hud_timer_bg_color_team ""
-seta hud_timer_bg_alpha "0.800000"
-seta hud_timer_bg_border ""
-seta hud_timer_bg_padding "0"
-
-seta hud_radar 2
-seta hud_radar_pos "0.800000 0"
-seta hud_radar_size "0.200000 0.260000"
-seta hud_radar_bg "border_radar"
-seta hud_radar_bg_color ""
-seta hud_radar_bg_color_team ""
-seta hud_radar_bg_alpha ""
-seta hud_radar_bg_border ""
-seta hud_radar_bg_padding "-10"
-seta hud_radar_foreground_alpha 0.800000
-seta hud_radar_alreadyvoted_alpha 0
-
-seta hud_score 1
-seta hud_score_pos "0.760000 0.913333"
-seta hud_score_size "0.240000 0.080000"
-seta hud_score_bg ""
-seta hud_score_bg_color ""
-seta hud_score_bg_color_team ""
-seta hud_score_bg_alpha ""
-seta hud_score_bg_border ""
-seta hud_score_bg_padding ""
-
-seta hud_racetimer 1
-seta hud_racetimer_pos "0.360000 0.140000"
-seta hud_racetimer_size "0.280000 0.093333"
-seta hud_racetimer_bg ""
-seta hud_racetimer_bg_color ""
-seta hud_racetimer_bg_color_team ""
-seta hud_racetimer_bg_alpha "0"
-seta hud_racetimer_bg_border ""
-seta hud_racetimer_bg_padding ""
-
-seta hud_vote 1
-seta hud_vote_pos "0.690000 0.750000"
-seta hud_vote_size "0.300000 0.100000"
-seta hud_vote_bg ""
-seta hud_vote_bg_color "0 0.5 0.35"
-seta hud_vote_bg_color_team ""
-seta hud_vote_bg_alpha "0.800000"
-seta hud_vote_bg_border ""
-seta hud_vote_bg_padding "-3"
-seta hud_vote_alreadyvoted_alpha 0.750000
-
-seta hud_modicons 1
-seta hud_modicons_pos "0.010000 0.910000"
-seta hud_modicons_size "0.135000 0.090000"
-seta hud_modicons_bg ""
-seta hud_modicons_bg_color ""
-seta hud_modicons_bg_color_team ""
-seta hud_modicons_bg_alpha ""
-seta hud_modicons_bg_border ""
-seta hud_modicons_bg_padding ""
-
-seta hud_pressedkeys 1
-seta hud_pressedkeys_pos "0.440000 0.740000"
-seta hud_pressedkeys_size "0.120000 0.094368"
-seta hud_pressedkeys_bg ""
-seta hud_pressedkeys_bg_color ""
-seta hud_pressedkeys_bg_color_team ""
-seta hud_pressedkeys_bg_alpha "0"
-seta hud_pressedkeys_bg_border ""
-seta hud_pressedkeys_bg_padding ""
-
-seta hud_chat 1
-seta hud_chat_pos "0 0.760000"
-seta hud_chat_size "0.420000 0.130000"
-seta hud_chat_bg ""
-seta hud_chat_bg_color ""
-seta hud_chat_bg_color_team ""
-seta hud_chat_bg_alpha "0"
-seta hud_chat_bg_border ""
-seta hud_chat_bg_padding ""
-
-seta hud_engineinfo 1
-seta hud_engineinfo_pos "0.020000 0.820000"
-seta hud_engineinfo_size "0.112500 0.030000"
-seta hud_engineinfo_bg ""
-seta hud_engineinfo_bg_color ""
-seta hud_engineinfo_bg_color_team ""
-seta hud_engineinfo_bg_alpha "0"
-seta hud_engineinfo_bg_border ""
-seta hud_engineinfo_bg_padding ""
-
+seta _hud_panelorder "3 7 5 6 0 2 14 4 12 11 13 9 1 10 8 "
+
+seta hud_configure_grid "1"
+seta hud_configure_grid_xsize "0.01"
+seta hud_configure_grid_ysize "0.01"
+
+seta hud_panel_weapons 1
+seta hud_panel_weapons_pos "0.370000 0.870000"
+seta hud_panel_weapons_size "0.330000 0.060000"
+seta hud_panel_weapons_bg "0"
+seta hud_panel_weapons_bg_color ""
+seta hud_panel_weapons_bg_color_team ""
+seta hud_panel_weapons_bg_alpha ""
+seta hud_panel_weapons_bg_border ""
+seta hud_panel_weapons_bg_padding "-5"
+seta hud_panel_weapons_complainbubble "1"
+seta hud_panel_weapons_complainbubble_padding "-10"
+seta hud_panel_weapons_complainbubble_color_outofammo "0.8 0 0"
+seta hud_panel_weapons_complainbubble_color_donthave "0.8 0.5 0"
+seta hud_panel_weapons_complainbubble_color_unavailable "0 0.3 0.8"
+seta hud_panel_weapons_ammo_color "0 1 0"
+seta hud_panel_weapons_ammo_alpha "1"
+seta hud_panel_weapons_aspect "1"
+
+seta hud_panel_ammo 1
+seta hud_panel_ammo_pos "0.160000 0.910000"
+seta hud_panel_ammo_size "0.190000 0.090000"
+seta hud_panel_ammo_bg "0"
+seta hud_panel_ammo_bg_color ""
+seta hud_panel_ammo_bg_color_team ""
+seta hud_panel_ammo_bg_alpha ""
+seta hud_panel_ammo_bg_border ""
+seta hud_panel_ammo_bg_padding ""
+seta hud_panel_ammo_onlycurrent "0"
+seta hud_panel_ammo_iconalign "0"
+
+seta hud_panel_powerups 1
+seta hud_panel_powerups_pos "0.670000 0.910000"
+seta hud_panel_powerups_size "0.110000 0.080000"
+seta hud_panel_powerups_bg ""
+seta hud_panel_powerups_bg_color ""
+seta hud_panel_powerups_bg_color_team ""
+seta hud_panel_powerups_bg_alpha ""
+seta hud_panel_powerups_bg_border ""
+seta hud_panel_powerups_bg_padding ""
+seta hud_panel_powerups_flip "1"
+seta hud_panel_powerups_iconalign "0"
+seta hud_panel_powerups_baralign "0"
+seta hud_panel_powerups_progressbar "0"
+
+seta hud_panel_healtharmor 1
+seta hud_panel_healtharmor_pos "0.370000 0.930000"
+seta hud_panel_healtharmor_size "0.300000 0.070000"
+seta hud_panel_healtharmor_bg "0"
+seta hud_panel_healtharmor_bg_color ""
+seta hud_panel_healtharmor_bg_color_team ""
+seta hud_panel_healtharmor_bg_alpha ""
+seta hud_panel_healtharmor_bg_border ""
+seta hud_panel_healtharmor_bg_padding ""
+seta hud_panel_healtharmor_flip "0
+seta hud_panel_healtharmor_iconalign "0"
+seta hud_panel_healtharmor_baralign "0"
+seta hud_panel_healtharmor_progressbar "0"
+
+seta hud_panel_notify 0
+seta hud_panel_notify_pos "0 0.650000"
+seta hud_panel_notify_size "0.300000 0.070000"
+seta hud_panel_notify_bg ""
+seta hud_panel_notify_bg_color ""
+seta hud_panel_notify_bg_color_team ""
+seta hud_panel_notify_bg_alpha "0"
+seta hud_panel_notify_bg_border ""
+seta hud_panel_notify_bg_padding ""
+seta hud_panel_notify_flip "0"
+seta hud_panel_notify_print "0"
+
+seta hud_panel_timer 1
+seta hud_panel_timer_pos "0.860000 0"
+seta hud_panel_timer_size "0.140000 0.045528"
+seta hud_panel_timer_bg "border"
+seta hud_panel_timer_bg_color "0 0.5 0.35"
+seta hud_panel_timer_bg_color_team ""
+seta hud_panel_timer_bg_alpha "0.800000"
+seta hud_panel_timer_bg_border ""
+seta hud_panel_timer_bg_padding "0"
+
+seta hud_panel_radar 2
+seta hud_panel_radar_pos "0.800000 0"
+seta hud_panel_radar_size "0.200000 0.260000"
+seta hud_panel_radar_bg "border_radar"
+seta hud_panel_radar_bg_color ""
+seta hud_panel_radar_bg_color_team ""
+seta hud_panel_radar_bg_alpha "0.3"
+seta hud_panel_radar_bg_border ""
+seta hud_panel_radar_bg_padding "-10"
+seta hud_panel_radar_foreground_alpha "0.800000"
+
+seta hud_panel_score 1
+seta hud_panel_score_pos "0.760000 0.920000"
+seta hud_panel_score_size "0.240000 0.080000"
+seta hud_panel_score_bg "0"
+seta hud_panel_score_bg_color ""
+seta hud_panel_score_bg_color_team ""
+seta hud_panel_score_bg_alpha ""
+seta hud_panel_score_bg_border ""
+seta hud_panel_score_bg_padding ""
+
+seta hud_panel_racetimer 1
+seta hud_panel_racetimer_pos "0.360000 0.140000"
+seta hud_panel_racetimer_size "0.280000 0.093333"
+seta hud_panel_racetimer_bg ""
+seta hud_panel_racetimer_bg_color ""
+seta hud_panel_racetimer_bg_color_team ""
+seta hud_panel_racetimer_bg_alpha "0"
+seta hud_panel_racetimer_bg_border ""
+seta hud_panel_racetimer_bg_padding ""
+
+seta hud_panel_vote 1
+seta hud_panel_vote_pos "0.690000 0.750000"
+seta hud_panel_vote_size "0.300000 0.100000"
+seta hud_panel_vote_bg ""
+seta hud_panel_vote_bg_color "0 0.5 0.35"
+seta hud_panel_vote_bg_color_team ""
+seta hud_panel_vote_bg_alpha "0.800000"
+seta hud_panel_vote_bg_border ""
+seta hud_panel_vote_bg_padding "-3"
+seta hud_panel_vote_alreadyvoted_alpha "0.750000"
+
+seta hud_panel_modicons 1
+seta hud_panel_modicons_pos "0.010000 0.910000"
+seta hud_panel_modicons_size "0.135000 0.090000"
+seta hud_panel_modicons_bg ""
+seta hud_panel_modicons_bg_color ""
+seta hud_panel_modicons_bg_color_team ""
+seta hud_panel_modicons_bg_alpha ""
+seta hud_panel_modicons_bg_border ""
+seta hud_panel_modicons_bg_padding ""
+
+seta hud_panel_pressedkeys 1
+seta hud_panel_pressedkeys_pos "0.440000 0.740000"
+seta hud_panel_pressedkeys_size "0.120000 0.094368"
+seta hud_panel_pressedkeys_bg ""
+seta hud_panel_pressedkeys_bg_color ""
+seta hud_panel_pressedkeys_bg_color_team ""
+seta hud_panel_pressedkeys_bg_alpha "0"
+seta hud_panel_pressedkeys_bg_border ""
+seta hud_panel_pressedkeys_bg_padding ""
+seta hud_panel_pressedkeys_aspect "1.600000"
+
+seta hud_panel_chat 1
+seta hud_panel_chat_pos "0 0.760000"
+seta hud_panel_chat_size "0.420000 0.130000"
+seta hud_panel_chat_bg ""
+seta hud_panel_chat_bg_color ""
+seta hud_panel_chat_bg_color_team ""
+seta hud_panel_chat_bg_alpha "0"
+seta hud_panel_chat_bg_border ""
+seta hud_panel_chat_bg_padding ""
+
+seta hud_panel_engineinfo 1
+seta hud_panel_engineinfo_pos "0.887500 0.870000"
+seta hud_panel_engineinfo_size "0.112500 0.030000"
+seta hud_panel_engineinfo_bg ""
+seta hud_panel_engineinfo_bg_color ""
+seta hud_panel_engineinfo_bg_color_team ""
+seta hud_panel_engineinfo_bg_alpha "0"
+seta hud_panel_engineinfo_bg_border ""
+seta hud_panel_engineinfo_bg_padding ""
+
+seta hud_panel_infomessages 1
+seta hud_panel_infomessages_pos "0.700000 0.620000"
+seta hud_panel_infomessages_size "0.300000 0.090000"
+seta hud_panel_infomessages_bg ""
+seta hud_panel_infomessages_bg_color ""
+seta hud_panel_infomessages_bg_color_team ""
+seta hud_panel_infomessages_bg_alpha "0"
+seta hud_panel_infomessages_bg_border ""
+seta hud_panel_infomessages_bg_padding ""
+
+menu_restart
diff --git a/hud_wickedhud_big.cfg b/hud_wickedhud_big.cfg
deleted file mode 100644 (file)
index f41dcb5..0000000
+++ /dev/null
@@ -1,173 +0,0 @@
-seta hud_skin "wickedhud"
-seta hud_bg "border"
-seta hud_bg_color "0.875 0.375 0"
-seta hud_bg_color_team "0"
-seta hud_bg_alpha "1"
-seta hud_bg_border "6"
-seta hud_bg_padding "2"
-seta hud_fg_alpha) "1"
-
-seta hud_dock "dock"
-seta hud_dock_color "0 0.1875 0.4375"
-seta hud_dock_color_team "0.700000"
-seta hud_dock_alpha "1"
-
-seta hud_progressbar_alpha 0.500000
-seta hud_progressbar_strength_color "0 0 0.6"
-seta hud_progressbar_shield_color "0.6 0 0.6"
-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_weaponicons 1
-seta hud_weaponicons_pos "0.940000 0.110000"
-seta hud_weaponicons_size "0.040000 0.440000"
-seta hud_weaponicons_bg "border_weaponicons"
-seta hud_weaponicons_bg_color ""
-seta hud_weaponicons_bg_color_team ""
-seta hud_weaponicons_bg_alpha ""
-seta hud_weaponicons_bg_border ""
-seta hud_weaponicons_bg_padding ""
-seta hud_weaponicons_accuracy_yellow 40
-
-seta hud_inventory 1
-seta hud_inventory_pos "0.710000 0.900000"
-seta hud_inventory_size "0.150000 0.080000"
-seta hud_inventory_bg "border_inventory"
-seta hud_inventory_bg_color ""
-seta hud_inventory_bg_color_team ""
-seta hud_inventory_bg_alpha ""
-seta hud_inventory_bg_border ""
-seta hud_inventory_bg_padding ""
-seta hud_inventory_onlycurrent 0
-
-seta hud_powerups 1
-seta hud_powerups_pos "0.400000 0.130000"
-seta hud_powerups_size "0.200000 0.050000"
-seta hud_powerups_bg "border_powerups"
-seta hud_powerups_bg_color ""
-seta hud_powerups_bg_color_team ""
-seta hud_powerups_bg_alpha ""
-seta hud_powerups_bg_border ""
-seta hud_powerups_bg_padding ""
-seta hud_powerups_flip 1
-seta hud_powerups_mirror 0
-
-seta hud_healtharmor 1
-seta hud_healtharmor_pos "0.330000 0.850000"
-seta hud_healtharmor_size "0.340000 0.090000"
-seta hud_healtharmor_bg "border_healtharmor"
-seta hud_healtharmor_bg_color ""
-seta hud_healtharmor_bg_color_team ""
-seta hud_healtharmor_bg_alpha ""
-seta hud_healtharmor_bg_border ""
-seta hud_healtharmor_bg_padding ""
-seta hud_healtharmor_flip 0
-seta hud_healtharmor_mirror 0
-
-seta hud_notify 1
-seta hud_notify_pos "0.710000 0.570000"
-seta hud_notify_size "0.270000 0.280000"
-seta hud_notify_bg "border_modicons"
-seta hud_notify_bg_color ""
-seta hud_notify_bg_color_team ""
-seta hud_notify_bg_alpha "0"
-seta hud_notify_bg_border ""
-seta hud_notify_bg_padding ""
-seta hud_notify_flip 0
-seta hud_notify_info_top 1
-
-seta hud_timer 1
-seta hud_timer_pos "0.820000 0.017967"
-seta hud_timer_size "0.160000 0.052033"
-seta hud_timer_bg "border_timer"
-seta hud_timer_bg_color ""
-seta hud_timer_bg_color_team ""
-seta hud_timer_bg_alpha ""
-seta hud_timer_bg_border ""
-seta hud_timer_bg_padding "0"
-
-seta hud_radar 2
-seta hud_radar_pos "0.030000 0.080000"
-seta hud_radar_size "0.210000 0.250000"
-seta hud_radar_bg "border_radar"
-seta hud_radar_bg_color ""
-seta hud_radar_bg_color_team ""
-seta hud_radar_bg_alpha ""
-seta hud_radar_bg_border ""
-seta hud_radar_bg_padding "-3"
-seta hud_radar_foreground_alpha 0.800000
-seta hud_radar_alreadyvoted_alpha 0
-
-seta hud_score 1
-seta hud_score_pos "0.050000 0.900000"
-seta hud_score_size "0.240000 0.080000"
-seta hud_score_bg "border_score"
-seta hud_score_bg_color ""
-seta hud_score_bg_color_team ""
-seta hud_score_bg_alpha ""
-seta hud_score_bg_border ""
-seta hud_score_bg_padding ""
-
-seta hud_racetimer 1
-seta hud_racetimer_pos "0.360000 0.010000"
-seta hud_racetimer_size "0.280000 0.093333"
-seta hud_racetimer_bg "border_timer"
-seta hud_racetimer_bg_color ""
-seta hud_racetimer_bg_color_team ""
-seta hud_racetimer_bg_alpha 0
-seta hud_racetimer_bg_border ""
-seta hud_racetimer_bg_padding ""
-
-seta hud_vote 1
-seta hud_vote_pos "0.020000 0.600000"
-seta hud_vote_size "0.240000 0.080000"
-seta hud_vote_bg "border_vote"
-seta hud_vote_bg_color ""
-seta hud_vote_bg_color_team ""
-seta hud_vote_bg_alpha ""
-seta hud_vote_bg_border ""
-seta hud_vote_bg_padding ""
-seta hud_vote_alreadyvoted_alpha 0.750000
-
-seta hud_modicons 1
-seta hud_modicons_pos "0.880000 0.900000"
-seta hud_modicons_size "0.105000 0.070000"
-seta hud_modicons_bg "border_modicons"
-seta hud_modicons_bg_color ""
-seta hud_modicons_bg_color_team ""
-seta hud_modicons_bg_alpha ""
-seta hud_modicons_bg_border ""
-seta hud_modicons_bg_padding ""
-
-seta hud_pressedkeys 1
-seta hud_pressedkeys_pos "0.460000 0.740000"
-seta hud_pressedkeys_size "0.080000 0.062912"
-seta hud_pressedkeys_bg "border_modicons"
-seta hud_pressedkeys_bg_color ""
-seta hud_pressedkeys_bg_color_team ""
-seta hud_pressedkeys_bg_alpha "0"
-seta hud_pressedkeys_bg_border ""
-seta hud_pressedkeys_bg_padding ""
-
-seta hud_chat 1
-seta hud_chat_pos "0.020000 0.710000"
-seta hud_chat_size "0.360000 0.100000"
-seta hud_chat_bg "border_chat"
-seta hud_chat_bg_color ""
-seta hud_chat_bg_color_team ""
-seta hud_chat_bg_alpha "0"
-seta hud_chat_bg_border ""
-seta hud_chat_bg_padding ""
-
-seta hud_engineinfo 1
-seta hud_engineinfo_pos "0.020000 0.820000"
-seta hud_engineinfo_size "0.112500 0.030000"
-seta hud_engineinfo_bg "border_modicons"
-seta hud_engineinfo_bg_color ""
-seta hud_engineinfo_bg_color_team ""
-seta hud_engineinfo_bg_alpha "0"
-seta hud_engineinfo_bg_border ""
-seta hud_engineinfo_bg_padding ""
-
diff --git a/hud_wickedhud_default.cfg b/hud_wickedhud_default.cfg
deleted file mode 100644 (file)
index 62d9d11..0000000
+++ /dev/null
@@ -1,185 +0,0 @@
-seta hud_skin "wickedhud" "skin folder where to look for images"
-seta hud_bg "border" "default background for the panels, file must exist in gfx/hud/[skin name]/, 0 = disable background by default"
-seta hud_bg_color "0.875 0.375 0" "default background color for the panels, accepts \"shirt\" and \"pants\""
-seta hud_bg_color_team 0 "default setting for overriding panel color with team color in team games, 0.5 = less saturated"
-seta hud_bg_alpha 1 "default alpha of the background"
-seta hud_bg_border 6 "default border size for the panels"
-seta hud_bg_padding 2 "default padding of contents from the border"
-seta hud_fg_alpha 1 "alpha of the foreground"
-
-seta hud_dock "dock_small" "enable a fullscreen background for the hud, useful for creating artificial docks, \"\" = disable"
-seta hud_dock_color "0 0.1875 0.4375" "dock color, accepts \"shirt\" and \"pants\""
-seta hud_dock_color_team 0.7 "override dock color with team color in team games"
-seta hud_dock_alpha 1 "alpha of the dock"
-
-seta hud_progressbar_alpha "0.5" "alpha of progressbars"
-seta hud_progressbar_strength_color "0 0 0.6" "R G B vector of the progress bar background color"
-seta hud_progressbar_shield_color "0.6 0 0.6" "R G B vector of the progress bar background color"
-seta hud_progressbar_health_color "0.6 0 0" "R G B vector of the progress bar background color"
-seta hud_progressbar_armor_color "0 0.6 0" "R G B vector of the progress bar background color"
-seta hud_progressbar_fuel_color "0.6 0.6 0" "R G B vector of the progress bar background color"
-seta hud_progressbar_nexball_color "0.7 0.1 0" "R G B vector of the progress bar background color"
-
-seta hud_weaponicons 1 "enable/disable this panel"
-seta hud_weaponicons_pos "0.930000 0.090000" "position of this panel"
-seta hud_weaponicons_size "0.040000 0.490000" "size of this panel"
-seta hud_weaponicons_number 1 "show number of weapon"
-seta hud_weaponicons_accuracy_yellow 40 "percentage at which the accuracy color is yellow"
-seta hud_weaponicons_bg "border_weaponicons" "if set to something else than \"\" = override default background"
-seta hud_weaponicons_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_weaponicons_bg_color_team "" "override panel color with team color in team based games"
-seta hud_weaponicons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_weaponicons_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_weaponicons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_inventory 1 "enable/disable this panel"
-seta hud_inventory_pos "0.190000 0.930000" "position of this panel"
-seta hud_inventory_size "0.093750 0.050000" "size of this panel"
-seta hud_inventory_onlycurrent 1 "1 = show only current ammo type"
-seta hud_inventory_bg "border_inventory" "if set to something else than \"\" = override default background"
-seta hud_inventory_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_inventory_bg_color_team "" "override panel color with team color in team based games"
-seta hud_inventory_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_inventory_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_inventory_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_powerups 1 "enable/disable this panel"
-seta hud_powerups_pos "0.400000 0.130000" "position of this panel"
-seta hud_powerups_size "0.200000 0.050000" "size of this panel"
-seta hud_powerups_flip 1 "flip strength/shield positions"
-seta hud_powerups_mirror 0 "mirror alignment of panel items"
-seta hud_powerups_bg "border_powerups" "if set to something else than \"\" = override default background"
-seta hud_powerups_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_powerups_bg_color_team "" "override panel color with team color in team based games"
-seta hud_powerups_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_powerups_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_powerups_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_healtharmor 1 "enable/disable this panel, 2 = combined health/armor display"
-seta hud_healtharmor_pos "0.300000 0.930000" "position of this panel"
-seta hud_healtharmor_size "0.240000 0.050000" "size of this panel"
-seta hud_healtharmor_flip 0 "flip health/armor positions"
-seta hud_healtharmor_mirror 0 "mirror alignment of panel items"
-seta hud_healtharmor_bg "border_healtharmor" "if set to something else than \"\" = override default background"
-seta hud_healtharmor_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_healtharmor_bg_color_team "" "override panel color with team color in team based games"
-seta hud_healtharmor_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_healtharmor_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_healtharmor_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_notify 1 "enable/disable this panel"
-seta hud_notify_pos "0.660000 0.600000" "position of this base of the panel"
-seta hud_notify_size "0.320000 0.330000" "size of this panel with all notifications on"
-seta hud_notify_bg "border_modicons" "if set to something else than \"\" = override default background"
-seta hud_notify_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_notify_bg_color_team "" "override panel color with team color in team based games"
-seta hud_notify_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha"
-seta hud_notify_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_notify_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-seta hud_notify_flip 0 "order the list top to bottom instead of bottom to top"
-seta hud_notify_print 0 "also con_notify print the messages that are shown on the notify panel"
-seta hud_notify_time 10 "time that a new entry stays until it fades out"
-seta hud_notify_fadetime 3 "fade out time"
-seta hud_notify_info_top 1 "show info messages at top of panel"
-
-seta hud_timer 1 "enable/disable this panel"
-seta hud_timer_pos "0.880000 0.015000" "position of this base of the panel"
-seta hud_timer_size "0.100000 0.032520" "size of this panel"
-seta hud_timer_increment 0 "show elapsed time instead of remaining time"
-seta hud_timer_bg "border_timer" "if set to something else than \"\" = override default background"
-seta hud_timer_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_timer_bg_color_team "" "override panel color with team color in team based games"
-seta hud_timer_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_timer_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_timer_bg_padding "0" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_radar 2 "enable/disable this panel, 2 = also enable in non-teambased gamemodes"
-seta hud_radar_pos "0.030000 0.020000" "position of this base of the panel"
-seta hud_radar_size "0.190000 0.230000" "size of this panel"
-seta hud_radar_bg "border_radar" "if set to something else than \"\" = override default background"
-seta hud_radar_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_radar_bg_color_team "" "override panel color with team color in team based games"
-seta hud_radar_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_radar_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_radar_bg_padding "-3" "if set to something else than \"\" = override default padding of contents from border"
-seta hud_radar_foreground_alpha 0.8    "alpha of the map"
-seta hud_radar_scale 4096 "distance you can see on the team radar"
-seta hud_radar_rotation 0      "rotation mode: you set what points up. 0 = player, 1 = west, 2 = south, 3 = east, 4 = north"
-seta hud_radar_zoommode 0      "zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out"
-alias hud_radar_rotate "toggle hud_radar_rotation 0 1 2 3 4"
-
-seta hud_score 1 "enable/disable this panel"
-seta hud_score_pos "0.020000 0.930000" "position of this base of the panel"
-seta hud_score_size "0.150000 0.050000" "size of this panel"
-seta hud_score_bg "border_score" "if set to something else than \"\" = override default background"
-seta hud_score_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_score_bg_color_team "" "override panel color with team color in team based games"
-seta hud_score_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_score_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_score_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_racetimer 1 "enable/disable this panel"
-seta hud_racetimer_pos "0.360000 0.010000" "position of this base of the panel"
-seta hud_racetimer_size "0.280000 0.093333" "size of this panel"
-seta hud_racetimer_bg "border_timer" "if set to something else than \"\" = override default background"
-seta hud_racetimer_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_racetimer_bg_color_team "" "override panel color with team color in team based games"
-seta hud_racetimer_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha"
-seta hud_racetimer_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_racetimer_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_vote 1 "enable/disable this panel"
-seta hud_vote_pos "0.400000 0.800000" "position of this base of the panel"
-seta hud_vote_size "0.240000 0.080000" "size of this panel"
-seta hud_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted"
-seta hud_vote_bg "border_vote" "if set to something else than \"\" = override default background"
-seta hud_vote_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_vote_bg_color_team "" "override panel color with team color in team based games"
-seta hud_vote_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_vote_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_vote_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_modicons 1 "enable/disable this panel"
-seta hud_modicons_pos "0.560000 0.930000" "position of this base of the panel"
-seta hud_modicons_size "0.075000 0.050000" "size of this panel"
-seta hud_modicons_bg "border_modicons" "if set to something else than \"\" = override default background"
-seta hud_modicons_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_modicons_bg_color_team "" "override panel color with team color in team based games"
-seta hud_modicons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_modicons_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_modicons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_pressedkeys 1 "enable/disable this panel, 1 = show only when spectating other players, 2 = show always"
-seta hud_pressedkeys_pos "0.460000 0.730000" "position of this base of the panel"
-seta hud_pressedkeys_size "0.080000 0.062912" "size of this panel"
-seta hud_pressedkeys_bg "border_modicons" "if set to something else than \"\" = override default background"
-seta hud_pressedkeys_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_pressedkeys_bg_color_team "" "override panel color with team color in team based games"
-seta hud_pressedkeys_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha"
-seta hud_pressedkeys_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_pressedkeys_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_chat 1 "enable/disable this panel"
-seta hud_chat_pos "0.020000 0.790000" "position of this base of the panel"
-seta hud_chat_size "0.360000 0.100000" "size of this panel"
-seta hud_chat_bg "border_chat" "if set to something else than \"\" = override default background"
-seta hud_chat_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_chat_bg_color_team "" "override panel color with team color in team based games"
-seta hud_chat_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha"
-seta hud_chat_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_chat_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_engineinfo 1 "enable/disable this panel
-seta hud_engineinfo_pos "0.860000 0.950000" "position of this base of the panel"
-seta hud_engineinfo_size "0.130000 0.034667" "size of this panel"
-seta hud_engineinfo_bg "border_modicons" "if set to something else than \"\" = override default background"
-seta hud_engineinfo_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_engineinfo_bg_color_team "" "override panel color with team color in team based games"
-seta hud_engineinfo_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha"
-seta hud_engineinfo_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_engineinfo_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-seta hud_engineinfo_framecounter_time 1 "time between framerate display updates, smaller values yield less accuracy"
-seta hud_engineinfo_framecounter_decimals 0 "amount of decimals to show"
-seta hud_engineinfo_framecounter_exponentialmovingaverage 1 "use an averaging method for calculating fps instead of counting frametime like engine does"
-seta hud_engineinfo_framecounter_exponentialmovingaverage_new_weight 0.1 "weight of latest data point"
-seta hud_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold 0.5 "threshold for fps change when to update instantly, to make big fps changes update faster"
diff --git a/models/items/jetpack.blend b/models/items/jetpack.blend
deleted file mode 100644 (file)
index 5a08915..0000000
Binary files a/models/items/jetpack.blend and /dev/null differ
index c1858ef03f7d1f7905ba87c063f725b855731e62..d30980ad7090d01676022e58ecad853ebc3953fb 100644 (file)
Binary files a/models/misc/chatbubble.spr_0.tga and b/models/misc/chatbubble.spr_0.tga differ
index 332b2d7bfc1b67a4ab4b4636f99d524ed3570202..fe933e4e427835b1a15efe7231cc88a5e1982282 100644 (file)
Binary files a/models/vehicles/raptor_cockpit.dpm and b/models/vehicles/raptor_cockpit.dpm differ
diff --git a/models/vehicles/spinner.dpm b/models/vehicles/spinner.dpm
new file mode 100644 (file)
index 0000000..d3d83b4
Binary files /dev/null and b/models/vehicles/spinner.dpm differ
index 1fb76f81d1459fe1ce5eb5c09e5b30e60fb06a53..89b121b90d9fbd9a0e6500c57d1378bba31ffd40 100644 (file)
Binary files a/models/weapons/h_shotgun.iqm and b/models/weapons/h_shotgun.iqm differ
index 0a59625b6a6aa297525c008a66ba879537a5ac08..1c95207bde9f3573e3ba990ca1fe95651c68bfc3 100644 (file)
@@ -1,4 +1,6 @@
 1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
+9 23 20 0 // fire2
+32 200 20 1 // idle
+232 40 20 0 // reload
+// compile opts used in the iqm exporter (apparently needed to prevent insane ram usage):
+// fire:1:8, fire2:1:23, idle:1:200, reload:1:40
diff --git a/particles/gauntletbeam.tga b/particles/gauntletbeam.tga
new file mode 100644 (file)
index 0000000..20a6ee5
Binary files /dev/null and b/particles/gauntletbeam.tga differ
diff --git a/particles/lgbeam.tga b/particles/lgbeam.tga
new file mode 100644 (file)
index 0000000..15064ce
Binary files /dev/null and b/particles/lgbeam.tga differ
index 4631d5ea7b5f6d129267ab4858387545ea97fd76..6e112b9f67f3ccdcc7e26a0c7477a4fe85d16120 100644 (file)
@@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
index 8c8219af5fa0fd30a05e4f178a865a6e1a68690c..d4e1f54ababe70d5aadcbc7cdac254b344881e94 100644 (file)
@@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
index 9707f6f7ce6002d736d5c00b75256921d162f1eb..6cb19f1bde23333f0f2363419496b0dc72b3ce5c 100644 (file)
@@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
index 475875b1a2f316341c8c975580d58188292addc1..4796765cd3db3c906d7c0b436120d755d2f7c9b9 100644 (file)
@@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
index 68a8f198ef6e48d074efa4aa153b53f110b7b9de..c4d60c7f333b0a84d84315158ed8f82c77ff308e 100644 (file)
@@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
index b2e056ee5a9e092fd0dc011683ccdae0ac5e6449..d317514c00f0232528c7c97a3078c976bdbc3f07 100644 (file)
@@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
index 85e4841cd127b739ddfcfc2e757e020787557e53..af5f3863278bdab434c3217c22fbc00062607ef6 100644 (file)
@@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
index 0e4de396e70cdcb29b59e143a6e70ca021ec9edf..8fa5abc006df61b586cd358c6b4f55cab50feeca 100644 (file)
@@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
index d572e6d97f5606864aa6e57f4edb976c10596ef5..5660a33421e5d6d3f65b4651789af40e2dc33334 100644 (file)
@@ -18,6 +18,7 @@ sv_airstrafeaccelerate 70
 sv_maxairstrafespeed 30
 sv_airstrafeaccel_qw 0
 sv_aircontrol 150
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
index eb63775623b486ae5e77ed5a0cd8c64e6fd5face..f328f8967b67db1c46b4af61d66c5dd87951e2da 100644 (file)
@@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
index 4a959db3e94685a9b405861c8ef01f7d421d411e..b162e5f80096f1d8ea2d970afc348f5aa80976dc 100644 (file)
@@ -19,6 +19,7 @@ sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
index 2b437d3443a0dd62dfcad4602064d7de51c07dd2..064499002a2981fd266240bbb63bc2467eafc4dd 100644 (file)
@@ -19,6 +19,7 @@ sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
diff --git a/physicsNoQWBunny-nexbased.cfg b/physicsNoQWBunny-nexbased.cfg
new file mode 100644 (file)
index 0000000..d00ffe7
--- /dev/null
@@ -0,0 +1,38 @@
+// "NoQWBunny" physics based on Nexuiz 2.0-2.4.2
+sv_gravity 800
+sv_maxspeed 400
+sv_maxairspeed 400
+
+
+sv_stopspeed 100
+sv_accelerate 15
+sv_airaccelerate 2
+sv_friction 8
+edgefriction 1
+sv_stepheight 34
+
+// actually, what we want is 266.6666 for 180bpm
+// but 260 takes same amount of frames and is nicer to mappers
+sv_jumpvelocity 260
+sv_wateraccelerate -1
+sv_waterfriction -1
+sv_airaccel_sideways_friction 0
+sv_airaccel_qw -0.9475
+
+sv_airstopaccelerate 3
+sv_airstrafeaccelerate 24
+sv_maxairstrafespeed 100
+sv_airstrafeaccel_qw -0.9825
+sv_aircontrol 125
+sv_aircontrol_penalty 100
+sv_aircontrol_power 2.5
+sv_airspeedlimit_nonqw 0
+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
diff --git a/physicsNoQWBunny-xpmbased.cfg b/physicsNoQWBunny-xpmbased.cfg
new file mode 100644 (file)
index 0000000..3e1cc96
--- /dev/null
@@ -0,0 +1,36 @@
+// "NoQWBunny" physics based on XPM
+sv_gravity 800
+sv_maxspeed 320
+
+sv_maxairspeed 320
+
+sv_stopspeed 100
+sv_accelerate 15
+sv_airaccelerate 2
+sv_friction 8
+edgefriction 1
+sv_stepheight 34
+
+sv_jumpvelocity 250
+sv_wateraccelerate 4
+sv_waterfriction 1
+sv_airaccel_sideways_friction 0
+sv_airaccel_qw -0.937
+
+sv_airstopaccelerate 3
+sv_airstrafeaccelerate 20
+sv_maxairstrafespeed 96
+sv_airstrafeaccel_qw -0.979
+sv_aircontrol 125
+sv_aircontrol_penalty 100
+sv_aircontrol_power 2.5
+sv_airspeedlimit_nonqw 0
+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
diff --git a/physicsNoQWBunny.cfg b/physicsNoQWBunny.cfg
deleted file mode 100644 (file)
index d70bc1b..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-// 2.0-2.4.2 physics minus QW-bunnyhopping-bug, faster onground accel, CPMA air control
-sv_gravity 800
-sv_maxspeed 400
-sv_maxairspeed 400
-sv_stopspeed 100
-sv_accelerate 15
-sv_airaccelerate 2
-sv_friction 7
-edgefriction 1
-sv_stepheight 34
-sv_jumpvelocity 300
-sv_wateraccelerate -1
-sv_waterfriction -1
-sv_airaccel_sideways_friction -0.2
-sv_airaccel_qw -0.9475
-sv_airstopaccelerate 2.5
-sv_airstrafeaccelerate 24
-sv_maxairstrafespeed 100
-sv_airstrafeaccel_qw -0.9825
-sv_aircontrol 125
-sv_aircontrol_power 2.5
-sv_airspeedlimit_nonqw 0
-sv_warsowbunny_turnaccel 0
-sv_warsowbunny_accel 0.1593
-sv_warsowbunny_topspeed 925
-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
index ea8e1acf7bdd167e971f3a30dde9ca6fdeafb571..6fb02afe7880a41e02bb26f8242030acb6c9f5ef 100644 (file)
@@ -19,6 +19,7 @@ sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
index 1d08ae8c7400b13cac0c0b1ca23207e8d10ce3b3..927fef3c44edd49d4ddf7eced660035966311204 100644 (file)
@@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
index 7409ae4be2c327173ea97be61ab07de43d7863cd..7828cc608b2303368ab4bb3bfb32f2fc879a1ed8 100644 (file)
@@ -19,6 +19,7 @@ sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
index 1951becf20abd05d24685a6e51b813dabe592b23..37973aef68f90d59a53e9ec7aaa1793cb6bfb939 100644 (file)
@@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
index 4bbb9be2d4f91eab389b0653e9fcf12e83743edd..2f325586e363f133153ffcce967a796807d6c5e5 100644 (file)
@@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
index 6c17ad683b7905284ec5ff9d65e94c41e8c36453..03be62dd43d66b6c586750aef68e42a1fd7140bb 100644 (file)
@@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
index e03363a088ba30a3d59e1c9d8eccbefa1f5595d0..7492b415c56220840633b2aa256913b391931e2f 100644 (file)
@@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
index b1b0655cbc863b9a7394076401300b61cf3579fe..811084dd5f316c3e8e32120cf8f3a8279d5a1be6 100644 (file)
@@ -18,6 +18,7 @@ sv_airstrafeaccelerate 70
 sv_maxairstrafespeed 30
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 9 // activates warsow movement mode
index 06e7c1a575c61ffba43a5382974affbc32128ef6..467c4212a02626942b5557f0d86c5a740f1b9d5f 100644 (file)
@@ -18,6 +18,7 @@ sv_airstrafeaccelerate 70
 sv_maxairstrafespeed 30
 sv_airstrafeaccel_qw 0
 sv_aircontrol 150
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
index cb07a488180082f927575f3c39ee515f9aaf648b..8a62f3e053c355a24d1f14c519f0e0d6a009e849 100644 (file)
@@ -18,6 +18,7 @@ sv_airstrafeaccelerate 70
 sv_maxairstrafespeed 30
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 6 // activates warsow movement mode
index 2a60b65178257fbea2efabc866eb59866fb6d780..74a20a46840871ead0789d623d930b7e4d5fd740 100644 (file)
@@ -22,6 +22,7 @@ sv_airstrafeaccelerate 70
 sv_maxairstrafespeed 30
 sv_airstrafeaccel_qw 1
 sv_aircontrol 150
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
@@ -31,5 +32,5 @@ sv_warsowbunny_backtosideratio 0.8
 sv_friction_on_land 0
 sv_doublejump 1
 sv_jumpspeedcap_min 0
-sv_jumpspeedcap_max 1
+sv_jumpspeedcap_max 0.5
 sv_jumpspeedcap_max_disable_on_ramps 1
diff --git a/physicsXPMLight.cfg b/physicsXPMLight.cfg
new file mode 100644 (file)
index 0000000..db9c617
--- /dev/null
@@ -0,0 +1,36 @@
+// Nexrun tweaked to suit CPM
+sv_gravity 800
+sv_maxspeed 320
+// CPMA: 320
+sv_maxairspeed 320
+// CPMA: 320
+sv_stopspeed 100
+sv_accelerate 15
+sv_airaccelerate 1
+sv_friction 8
+edgefriction 1
+sv_stepheight 34
+// CPMA: 18
+sv_jumpvelocity 270
+sv_wateraccelerate 4
+sv_waterfriction 1
+sv_airaccel_sideways_friction 0
+sv_airaccel_qw -0.9146875
+// CPMA: 1
+sv_airstopaccelerate 6.5625 // matches strafe-stopping speed
+sv_airstrafeaccelerate 14
+sv_maxairstrafespeed 150
+sv_airstrafeaccel_qw -0.987
+sv_aircontrol 100
+sv_aircontrol_penalty 100
+sv_aircontrol_power 2.5
+sv_airspeedlimit_nonqw 0
+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
index 80bd84a0768432f114133f5f3e0aee01265059a4..fbed63fc40b671ffb09f0d43d11eb5a9eecf5bad 100644 (file)
@@ -232,7 +232,9 @@ float announcer_5min;
 // database for misc stuff
 float tempdb;
 float ClientProgsDB;
-vector hook_shotorigin;
+vector hook_shotorigin[4];
+vector electro_shotorigin[4];
+vector gauntlet_shotorigin[4];
 
 #ifdef BLURTEST
 float blurtest_time0, blurtest_time1, blurtest_radius, blurtest_power;
@@ -256,3 +258,5 @@ float w_deathtype, w_issilent, w_random;
 string w_deathtypestring;
 vector w_org, w_backoff;
 
+float campingrifle_scope;
+float nex_scope;
index 1a6996ce666bebecedf9b82fd052cca27b0856bd..d1a76320f429527c6f454d7709d470dab357d6e8 100644 (file)
@@ -136,6 +136,7 @@ void CSQC_Init(void)
 
        // precaches
        Projectile_Precache();
+       Hook_Precache();
        GibSplash_Precache();
        Casings_Precache();
        DamageInfo_Precache();
@@ -183,6 +184,7 @@ void CSQC_Init(void)
        minimapname = strzone(minimapname);
 
        WarpZone_Init();
+       hud_configure_prev = -1;
 }
 
 // CSQC_Shutdown : Called every time the CSQC code is shutdown (changing maps, quitting, etc)
@@ -922,6 +924,9 @@ void(float bIsNewEntity) CSQC_Ent_Update =
                case ENT_CLIENT_WARPZONE: WarpZone_Read(bIsNewEntity); break;
                case ENT_CLIENT_WARPZONE_CAMERA: WarpZone_Camera_Read(bIsNewEntity); break;
                case ENT_CLIENT_TRIGGER_MUSIC: Ent_ReadTriggerMusic(); break;
+               case ENT_CLIENT_HOOK: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_HOOK); break;
+               case ENT_CLIENT_LGBEAM: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_LGBEAM); break;
+               case ENT_CLIENT_GAUNTLET: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_GAUNTLET); break;
                default:
                        error(strcat("unknown entity type in CSQC_Ent_Update: ", ftos(self.enttype), "\n"));
                        break;
@@ -1021,9 +1026,18 @@ void Ent_Init()
 
        nb_pb_period = ReadByte() / 32; //Accuracy of 1/32th
 
-       hook_shotorigin_x = ReadCoord();
-       hook_shotorigin_y = ReadCoord();
-       hook_shotorigin_z = ReadCoord();
+       hook_shotorigin[0] = decompressShotOrigin(ReadInt24_t());
+       hook_shotorigin[1] = decompressShotOrigin(ReadInt24_t());
+       hook_shotorigin[2] = decompressShotOrigin(ReadInt24_t());
+       hook_shotorigin[3] = decompressShotOrigin(ReadInt24_t());
+       electro_shotorigin[0] = decompressShotOrigin(ReadInt24_t());
+       electro_shotorigin[1] = decompressShotOrigin(ReadInt24_t());
+       electro_shotorigin[2] = decompressShotOrigin(ReadInt24_t());
+       electro_shotorigin[3] = decompressShotOrigin(ReadInt24_t());
+       gauntlet_shotorigin[0] = decompressShotOrigin(ReadInt24_t());
+       gauntlet_shotorigin[1] = decompressShotOrigin(ReadInt24_t());
+       gauntlet_shotorigin[2] = decompressShotOrigin(ReadInt24_t());
+       gauntlet_shotorigin[3] = decompressShotOrigin(ReadInt24_t());
 
        if(forcefog)
                strunzone(forcefog);
@@ -1036,6 +1050,9 @@ void Ent_Init()
        g_balance_grenadelauncher_secondary_bouncefactor = ReadCoord();
        g_balance_grenadelauncher_secondary_bouncestop = ReadCoord();
 
+       nex_scope = !ReadByte();
+       campingrifle_scope = !ReadByte();
+
        if(!postinit)
                PostInit();
 }
@@ -1223,13 +1240,13 @@ void Net_ReadPingPLReport()
 
 void Net_VoteDialog(float highlight) {
        if(highlight) {
-               vote_highlighted = ReadShort();
+               vote_highlighted = ReadByte();
                return;
        }
 
-       vote_yescount = ReadShort();
-       vote_nocount = ReadShort();
-       vote_needed = ReadShort();
+       vote_yescount = ReadByte();
+       vote_nocount = ReadByte();
+       vote_needed = ReadByte();
        vote_active = 1;
 }
 
@@ -1251,6 +1268,18 @@ void Net_Notify() {
        }
 }
 
+void Net_WeaponComplain() {
+       complain_weapon = ReadByte();
+
+       if(complain_weapon_name)
+               strunzone(complain_weapon_name);
+       complain_weapon_name = strzone(ReadString());
+
+       complain_weapon_type = ReadByte();
+
+       complain_weapon_time = time;
+}
+
 // CSQC_Parse_TempEntity : Handles all temporary entity network data in the CSQC layer.
 // You must ALWAYS first acquire the temporary ID, which is sent as a byte.
 // Return value should be 1 if CSQC handled the temporary entity, otherwise return 0 to have the engine process the event.
@@ -1277,10 +1306,6 @@ float CSQC_Parse_TempEntity()
                        Net_ReadRace();
                        bHandled = true;
                        break;
-               case 13: // TE_BEAM
-                       Net_GrapplingHook();
-                       bHandled = true;
-                       break;
                case TE_CSQC_SPAWN:
                        Net_ReadSpawn();
                        bHandled = true;
@@ -1321,6 +1346,10 @@ float CSQC_Parse_TempEntity()
                        Net_Notify();
                        bHandled = true;
                        break;
+               case TE_CSQC_WEAPONCOMPLAIN:
+                       Net_WeaponComplain();
+                       bHandled = true;
+                       break;
                default:
                        // No special logic for this temporary entity; return 0 so the engine can handle it
                        bHandled = false;
index 0ec4277b6bf4e9f49ff50ff5a1d05a3a96fc41bd..d3a5ea6a2d87db4e3905d7a3090dcbfd75548471 100644 (file)
@@ -137,7 +137,7 @@ vector GetCurrentFov(float fov)
                        zoomspeed = 3.5;
 
        zoomdir = button_zoom;
-       if(getstati(STAT_ACTIVEWEAPON) == WEP_NEX) // do NOT use switchweapon here
+       if((getstati(STAT_ACTIVEWEAPON) == WEP_NEX && nex_scope) || (getstati(STAT_ACTIVEWEAPON) == WEP_CAMPINGRIFLE && campingrifle_scope)) // do NOT use switchweapon here
                zoomdir += button_attack2;
        if(spectatee_status > 0 || isdemo())
        {
@@ -375,7 +375,7 @@ void CSQC_UpdateView(float w, float h)
        input_angles = warpzone_fixview_cl_viewangles;
        view_angles = warpzone_fixview_angles;
 
-       if(cvar("cl_lockview") || hud_configure)
+       if(cvar("cl_lockview") || autocvar__hud_configure)
        {
                pmove_org = freeze_pmove_org;
                input_angles = view_angles = freeze_input_angles;
@@ -478,7 +478,6 @@ void CSQC_UpdateView(float w, float h)
                weapontime = time;
                last_weapon = activeweapon;
 
-               entity e;
                e = get_weaponinfo(activeweapon);
                if(e.netname != "")
                        localcmd(strcat("\ncl_hook_activeweapon ", e.netname), "\n");
@@ -565,9 +564,9 @@ void CSQC_UpdateView(float w, float h)
        // the view to go back to normal, so reticle_type would become 0 as we fade out)
        if(spectatee_status || getstati(STAT_HEALTH) <= 0)
                reticle_type = 0; // prevent reticle from showing during the respawn zoom effect or for spectators
-       else if(button_zoom)
+       else if(button_zoom || zoomscript_caught)
                reticle_type = 1; // normal zoom
-       else if(activeweapon == WEP_NEX && button_attack2)
+       else if(activeweapon == WEP_NEX && button_attack2 || activeweapon == WEP_CAMPINGRIFLE && button_attack2)
                reticle_type = 2; // nex zoom
 
        if(cvar("cl_reticle_stretch"))
@@ -585,17 +584,20 @@ void CSQC_UpdateView(float w, float h)
                reticle_pos_y = (vid_conheight - reticle_size_y) / 2;
        }
 
+       f = current_zoomfraction;
+       if(zoomscript_caught)
+               f = 1;
        if(cvar("cl_reticle_item_normal"))
        {
                precache_pic("gfx/reticle_normal");
-               if(reticle_type == 1 && current_zoomfraction)
-                       drawpic(reticle_pos, "gfx/reticle_normal", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_item_normal"), DRAWFLAG_NORMAL);
+               if(reticle_type == 1 && f)
+                       drawpic(reticle_pos, "gfx/reticle_normal", reticle_size, '1 1 1', f * cvar("cl_reticle_item_normal"), DRAWFLAG_NORMAL);
        }
        if(cvar("cl_reticle_item_nex"))
        {
                precache_pic("gfx/reticle_nex");
-               if(reticle_type == 2 && current_zoomfraction)
-                       drawpic(reticle_pos, "gfx/reticle_nex", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_item_nex"), DRAWFLAG_NORMAL);
+               if(reticle_type == 2 && f)
+                       drawpic(reticle_pos, "gfx/reticle_nex", reticle_size, '1 1 1', f * cvar("cl_reticle_item_nex"), DRAWFLAG_NORMAL);
        }
 
        // Draw the mouse cursor
@@ -773,13 +775,13 @@ void CSQC_UpdateView(float w, float h)
                                if (activeweapon == WEP_CAMPINGRIFLE)
                                {
                                        ring_scale = cvar("crosshair_campingrifle_ring_size");
-                                       bullets = bound(0, getstati(STAT_BULLETS_LOADED), 8);
+                                       bullets = bound(0, getstati(STAT_BULLETS_LOADED), 4);
                                }
                                else
                                        bullets = 0;
 
 #define CROSSHAIR_DRAW_RING(i,j,sz,wcross_name,wcross_alpha) \
-                               drawpic(wcross_origin - ('0.5 0 0' * (sz * wcross_size_x * ring_scale + i * wcross_blur) + '0 0.5 0' * (sz * wcross_size_y * ring_scale + j * wcross_blur)), strcat("gfx/hud/", cvar_string("hud_skin"), "/rifle_ring_", ftos(bullets)), sz * wcross_size * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL)
+                               drawpic(wcross_origin - ('0.5 0 0' * (sz * wcross_size_x * ring_scale + i * wcross_blur) + '0 0.5 0' * (sz * wcross_size_y * ring_scale + j * wcross_blur)), strcat("gfx/rifle_ring_", ftos(bullets)), sz * wcross_size * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL)
 
 #define CROSSHAIR_DO_BLUR(M,sz,wcross_name,wcross_alpha) \
                                do \
@@ -879,7 +881,7 @@ void CSQC_UpdateView(float w, float h)
                cvar_set("vid_conheight", h0);
        }
 
-       if(hud_configure)
+       if(autocvar__hud_configure)
                HUD_Panel_Mouse();
        // be safe against triggerbots until everyone has the fixed engine
        // this call is meant to overwrite the trace globals by something
@@ -1190,6 +1192,18 @@ void CSQC_common_hud(void)
        switch(hud)
        {
                case HUD_NORMAL:
+                       // do some accuracy var caching
+                       float i;
+                       if(!(gametype == GAME_RACE || gametype == GAME_CTS))
+                       {
+                               acc_levels = tokenize(cvar_string("hud_panel_weapons_accuracy_color_levels"));
+                               if (acc_levels > MAX_ACCURACY_LEVELS)
+                                       acc_levels = MAX_ACCURACY_LEVELS;
+
+                               for (i = 0; i < acc_levels; ++i)
+                                       acc_lev[i] = stof(argv(i));
+                       }
+
                        // hud first
                        HUD_Main();
 
index 83cdc12767f70d2abe9e13fee61c0b4adda3d43f..0c2df0e636257816fd717d9965883a9a323fd56a 100644 (file)
@@ -5,3 +5,232 @@ var float autocvar_cl_gibs_sloppy = 1;
 
 var float autocvar_cl_casings_ticrate = 0.1;
 var float autocvar_cl_casings_sloppy = 1;
+
+var float autocvar_cl_gentle;
+var float autocvar_cl_gentle_gibs;
+var float autocvar_cl_gentle_messages;
+
+var float autocvar_hud_color_bg_team;
+
+var float autocvar__menu_alpha;
+
+var float autocvar__hud_configure;
+var float autocvar_hud_configure_teamcolorforced;
+var float autocvar_hud_configure_checkcollisions;
+var float autocvar_hud_configure_bg_minalpha;
+var float autocvar_hud_configure_grid;
+var float autocvar_hud_configure_grid_xsize;
+var float autocvar_hud_configure_grid_ysize;
+var float autocvar_hud_configure_grid_alpha;
+
+var float autocvar__con_chat_maximized;
+var string autocvar__hud_panelorder;
+
+var string autocvar_hud_skin;
+var string autocvar_hud_dock;
+var string autocvar_hud_dock_color;
+var float autocvar_hud_dock_color_team;
+var float autocvar_hud_dock_alpha;
+
+var float autocvar_hud_progressbar_alpha;
+var vector autocvar_hud_progressbar_strength_color;
+var vector autocvar_hud_progressbar_shield_color;
+var vector autocvar_hud_progressbar_health_color;
+var vector autocvar_hud_progressbar_armor_color;
+var vector autocvar_hud_progressbar_fuel_color;
+var vector autocvar_hud_progressbar_nexball_color;
+
+var string autocvar_hud_panel_bg;
+var vector autocvar_hud_panel_bg_color;
+var float autocvar_hud_panel_bg_color_team;
+var float autocvar_hud_panel_bg_alpha;
+var float autocvar_hud_panel_bg_border;
+var float autocvar_hud_panel_bg_padding;
+var float autocvar_hud_panel_fg_alpha;
+
+var float autocvar_hud_panel_weapons;
+var vector autocvar_hud_panel_weapons_pos;
+var vector autocvar_hud_panel_weapons_size;
+var string autocvar_hud_panel_weapons_bg;
+var string autocvar_hud_panel_weapons_bg_color;
+var string autocvar_hud_panel_weapons_bg_color_team;
+var string autocvar_hud_panel_weapons_bg_alpha;
+var string autocvar_hud_panel_weapons_bg_border;
+var string autocvar_hud_panel_weapons_bg_padding;
+var float autocvar_hud_panel_weapons_aspect;
+var float autocvar_hud_panel_weapons_accuracy;
+var float autocvar_hud_panel_weapons_accuracy_yellow;
+var float autocvar_hud_panel_weapons_ammo;
+var vector autocvar_hud_panel_weapons_ammo_color;
+var float autocvar_hud_panel_weapons_ammo_alpha;
+var float autocvar_hud_panel_weapons_ammo_full_shells;
+var float autocvar_hud_panel_weapons_ammo_full_nails;
+var float autocvar_hud_panel_weapons_ammo_full_rockets;
+var float autocvar_hud_panel_weapons_ammo_full_cells;
+var float autocvar_hud_panel_weapons_ammo_full_fuel;
+var float autocvar_hud_panel_weapons_label;
+var float autocvar_hud_panel_weapons_complainbubble;
+var float autocvar_hud_panel_weapons_complainbubble_padding;
+var float autocvar_hud_panel_weapons_complainbubble_time;
+var float autocvar_hud_panel_weapons_complainbubble_fadetime;
+var vector autocvar_hud_panel_weapons_complainbubble_color_outofammo;
+var vector autocvar_hud_panel_weapons_complainbubble_color_donthave;
+var vector autocvar_hud_panel_weapons_complainbubble_color_unavailable;
+
+var float autocvar_hud_panel_ammo;
+var vector autocvar_hud_panel_ammo_pos;
+var vector autocvar_hud_panel_ammo_size;
+var string autocvar_hud_panel_ammo_bg;
+var string autocvar_hud_panel_ammo_bg_color;
+var string autocvar_hud_panel_ammo_bg_color_team;
+var string autocvar_hud_panel_ammo_bg_alpha;
+var string autocvar_hud_panel_ammo_bg_border;
+var string autocvar_hud_panel_ammo_bg_padding;
+var float autocvar_hud_panel_ammo_onlycurrent;
+var float autocvar_hud_panel_ammo_iconalign;
+
+var float autocvar_hud_panel_powerups;
+var vector autocvar_hud_panel_powerups_pos;
+var vector autocvar_hud_panel_powerups_size;
+var string autocvar_hud_panel_powerups_bg;
+var string autocvar_hud_panel_powerups_bg_color;
+var string autocvar_hud_panel_powerups_bg_color_team;
+var string autocvar_hud_panel_powerups_bg_alpha;
+var string autocvar_hud_panel_powerups_bg_border;
+var string autocvar_hud_panel_powerups_bg_padding;
+var float autocvar_hud_panel_powerups_flip;
+var float autocvar_hud_panel_powerups_iconalign;
+var float autocvar_hud_panel_powerups_baralign;
+var float autocvar_hud_panel_powerups_progressbar;
+
+var float autocvar_hud_panel_healtharmor;
+var vector autocvar_hud_panel_healtharmor_pos;
+var vector autocvar_hud_panel_healtharmor_size;
+var string autocvar_hud_panel_healtharmor_bg;
+var string autocvar_hud_panel_healtharmor_bg_color;
+var string autocvar_hud_panel_healtharmor_bg_color_team;
+var string autocvar_hud_panel_healtharmor_bg_alpha;
+var string autocvar_hud_panel_healtharmor_bg_border;
+var string autocvar_hud_panel_healtharmor_bg_padding;
+var float autocvar_hud_panel_healtharmor_flip;
+var float autocvar_hud_panel_healtharmor_iconalign;
+var float autocvar_hud_panel_healtharmor_baralign;
+var float autocvar_hud_panel_healtharmor_progressbar;
+
+var float autocvar_hud_panel_notify;
+var vector autocvar_hud_panel_notify_pos;
+var vector autocvar_hud_panel_notify_size;
+var string autocvar_hud_panel_notify_bg;
+var string autocvar_hud_panel_notify_bg_color;
+var string autocvar_hud_panel_notify_bg_color_team;
+var string autocvar_hud_panel_notify_bg_alpha;
+var string autocvar_hud_panel_notify_bg_border;
+var string autocvar_hud_panel_notify_bg_padding;
+var float autocvar_hud_panel_notify_print;
+var float autocvar_hud_panel_notify_time;
+var float autocvar_hud_panel_notify_fadetime;
+var float autocvar_hud_panel_notify_flip;
+
+var float autocvar_hud_panel_timer;
+var vector autocvar_hud_panel_timer_pos;
+var vector autocvar_hud_panel_timer_size;
+var string autocvar_hud_panel_timer_bg;
+var string autocvar_hud_panel_timer_bg_color;
+var string autocvar_hud_panel_timer_bg_color_team;
+var string autocvar_hud_panel_timer_bg_alpha;
+var string autocvar_hud_panel_timer_bg_border;
+var string autocvar_hud_panel_timer_bg_padding;
+var float autocvar_hud_panel_timer_increment;
+
+var float autocvar_hud_panel_radar;
+var vector autocvar_hud_panel_radar_pos;
+var vector autocvar_hud_panel_radar_size;
+var string autocvar_hud_panel_radar_bg;
+var string autocvar_hud_panel_radar_bg_color;
+var string autocvar_hud_panel_radar_bg_color_team;
+var string autocvar_hud_panel_radar_bg_alpha;
+var string autocvar_hud_panel_radar_bg_border;
+var string autocvar_hud_panel_radar_bg_padding;
+
+var float autocvar_hud_panel_score;
+var vector autocvar_hud_panel_score_pos;
+var vector autocvar_hud_panel_score_size;
+var string autocvar_hud_panel_score_bg;
+var string autocvar_hud_panel_score_bg_color;
+var string autocvar_hud_panel_score_bg_color_team;
+var string autocvar_hud_panel_score_bg_alpha;
+var string autocvar_hud_panel_score_bg_border;
+var string autocvar_hud_panel_score_bg_padding;
+
+var float autocvar_hud_panel_racetimer;
+var vector autocvar_hud_panel_racetimer_pos;
+var vector autocvar_hud_panel_racetimer_size;
+var string autocvar_hud_panel_racetimer_bg;
+var string autocvar_hud_panel_racetimer_bg_color;
+var string autocvar_hud_panel_racetimer_bg_color_team;
+var string autocvar_hud_panel_racetimer_bg_alpha;
+var string autocvar_hud_panel_racetimer_bg_border;
+var string autocvar_hud_panel_racetimer_bg_padding;
+
+var float autocvar_hud_panel_vote;
+var vector autocvar_hud_panel_vote_pos;
+var vector autocvar_hud_panel_vote_size;
+var string autocvar_hud_panel_vote_bg;
+var string autocvar_hud_panel_vote_bg_color;
+var string autocvar_hud_panel_vote_bg_color_team;
+var string autocvar_hud_panel_vote_bg_alpha;
+var string autocvar_hud_panel_vote_bg_border;
+var string autocvar_hud_panel_vote_bg_padding;
+var float autocvar_hud_panel_vote_alreadyvoted_alpha;
+
+var float autocvar_hud_panel_modicons;
+var vector autocvar_hud_panel_modicons_pos;
+var vector autocvar_hud_panel_modicons_size;
+var string autocvar_hud_panel_modicons_bg;
+var string autocvar_hud_panel_modicons_bg_color;
+var string autocvar_hud_panel_modicons_bg_color_team;
+var string autocvar_hud_panel_modicons_bg_alpha;
+var string autocvar_hud_panel_modicons_bg_border;
+var string autocvar_hud_panel_modicons_bg_padding;
+
+var float autocvar_hud_panel_pressedkeys;
+var vector autocvar_hud_panel_pressedkeys_pos;
+var vector autocvar_hud_panel_pressedkeys_size;
+var string autocvar_hud_panel_pressedkeys_bg;
+var string autocvar_hud_panel_pressedkeys_bg_color;
+var string autocvar_hud_panel_pressedkeys_bg_color_team;
+var string autocvar_hud_panel_pressedkeys_bg_alpha;
+var string autocvar_hud_panel_pressedkeys_bg_border;
+var string autocvar_hud_panel_pressedkeys_bg_padding;
+var float autocvar_hud_panel_pressedkeys_aspect;
+
+var float autocvar_hud_panel_chat;
+var vector autocvar_hud_panel_chat_pos;
+var vector autocvar_hud_panel_chat_size;
+var string autocvar_hud_panel_chat_bg;
+var string autocvar_hud_panel_chat_bg_color;
+var string autocvar_hud_panel_chat_bg_color_team;
+var string autocvar_hud_panel_chat_bg_alpha;
+var string autocvar_hud_panel_chat_bg_border;
+var string autocvar_hud_panel_chat_bg_padding;
+
+var float autocvar_hud_panel_engineinfo;
+var vector autocvar_hud_panel_engineinfo_pos;
+var vector autocvar_hud_panel_engineinfo_size;
+var string autocvar_hud_panel_engineinfo_bg;
+var string autocvar_hud_panel_engineinfo_bg_color;
+var string autocvar_hud_panel_engineinfo_bg_color_team;
+var string autocvar_hud_panel_engineinfo_bg_alpha;
+var string autocvar_hud_panel_engineinfo_bg_border;
+var string autocvar_hud_panel_engineinfo_bg_padding;
+
+var float autocvar_hud_panel_infomessages;
+var vector autocvar_hud_panel_infomessages_pos;
+var vector autocvar_hud_panel_infomessages_size;
+var string autocvar_hud_panel_infomessages_bg;
+var string autocvar_hud_panel_infomessages_bg_color;
+var string autocvar_hud_panel_infomessages_bg_color_team;
+var string autocvar_hud_panel_infomessages_bg_alpha;
+var string autocvar_hud_panel_infomessages_bg_border;
+var string autocvar_hud_panel_infomessages_bg_padding;
+var float autocvar_hud_panel_infomessages_flip;
index a92567e61928f90ff8f4c74916430234f4768f3d..f395fb6a7ba99cc8f07df85034c4a0126bfb366a 100644 (file)
@@ -151,16 +151,16 @@ void Ent_GibSplash(float isNew)
        org_z = ReadShort() * 4 + 2;
        vel = decompressShortVector(ReadShort());
 
-       if(cvar("cl_gentle"))
+       if(cvar("cl_gentle_gibs") || cvar("cl_gentle"))
                type |= 0x80; // set gentle bit
 
        if(type & 0x80)
        {
-               if(cvar("cl_gentle") == 2)
+               if(cvar("cl_gentle_gibs") == 2)
                        gentle_prefix = "";
-               else if(cvar("cl_gentle") == 3) 
+               else if(cvar("cl_gentle_gibs") == 3) 
                        gentle_prefix = "happy_";
-               else if(cvar("cl_gentle"))
+               else
                        gentle_prefix = "morphed_";
        }
        else if(cvar("cl_particlegibs"))
@@ -169,7 +169,7 @@ void Ent_GibSplash(float isNew)
                gentle_prefix = "particlegibs_";
        }
 
-       if not(cvar("cl_gentle"))
+       if not(cvar("cl_gentle_gibs") || cvar("cl_gentle"))
                amount *= 1 - cvar("cl_nogibs");
 
        if(cvar("ekg"))
index dbd8ab2ad89fd7429a8b8349ccd54634e8aacd16..412d4a44e02890c3e46e830f8430c9c2671563a9 100644 (file)
@@ -1,6 +1,9 @@
-.vector HookStart;
-.vector HookEnd;
-.float HookKillTime;
+.float HookType; // ENT_CLIENT_*
+.vector origin;
+.vector velocity;
+.float HookSound;
+.float HookSilent;
+.float HookRange;
 
 void Draw_CylindricLine(vector from, vector to, float thickness, string texture, float aspect, float shift, vector rgb, float alpha, float drawflag)
 {
@@ -38,85 +41,244 @@ void Draw_CylindricLine(vector from, vector to, float thickness, string texture,
 
 string Draw_GrapplingHook_trace_callback_tex;
 float Draw_GrapplingHook_trace_callback_rnd;
+vector Draw_GrapplingHook_trace_callback_rgb;
+float Draw_GrapplingHook_trace_callback_a;
 void Draw_GrapplingHook_trace_callback(vector start, vector hit, vector end)
 {
-       Draw_CylindricLine(hit, start, 8, Draw_GrapplingHook_trace_callback_tex, 0.25, Draw_GrapplingHook_trace_callback_rnd, '1 1 1', 1, DRAWFLAG_NORMAL);
+       float i;
+       for(i = 0; i < Draw_GrapplingHook_trace_callback_a; ++i)
+               Draw_CylindricLine(hit, start, 8, Draw_GrapplingHook_trace_callback_tex, 0.25, Draw_GrapplingHook_trace_callback_rnd, Draw_GrapplingHook_trace_callback_rgb, min(1, Draw_GrapplingHook_trace_callback_a - i), DRAWFLAG_NORMAL);
        Draw_GrapplingHook_trace_callback_rnd += 0.25 * vlen(hit - start) / 8;
 }
 
 void Draw_GrapplingHook()
 {
-       vector a, b;
-       string tex;
+       vector a, b, atrans;
+       string tex, snd;
        vector rgb;
        float t;
+       float s;
+       vector vs;
+       float intensity, offset;
+
+       InterpolateOrigin_Do();
+
+       s = cvar("cl_gunalign");
+       if(s != 1 && s != 2 && s != 4)
+               s = 3; // default value
+       --s;
+       switch(self.HookType)
+       {
+               default:
+               case ENT_CLIENT_HOOK:
+                       vs = hook_shotorigin[s];
+                       break;
+               case ENT_CLIENT_LGBEAM:
+                       vs = electro_shotorigin[s];
+                       break;
+               case ENT_CLIENT_GAUNTLET:
+                       vs = gauntlet_shotorigin[s];
+                       break;
+       }
 
-       if(time >= self.HookKillTime)
-               return;
-       if(self.sv_entnum == player_localentnum - 1)
-               a = view_origin + view_forward * hook_shotorigin_x + view_right * hook_shotorigin_y + view_up * hook_shotorigin_z;
+       if((self.owner.sv_entnum == player_localentnum - 1))
+       {
+               switch(self.HookType)
+               {
+                       default:
+                       case ENT_CLIENT_HOOK:
+                               a = view_origin + view_forward * vs_x + view_right * -vs_y + view_up * vs_z;
+                               b = self.origin;
+                               break;
+                       case ENT_CLIENT_LGBEAM:
+                       case ENT_CLIENT_GAUNTLET:
+                               if(self.HookRange)
+                                       b = view_origin + view_forward * self.HookRange;
+                               else
+                                       b = view_origin + view_forward * vlen(self.velocity - self.origin); // honor original length of beam!
+                               WarpZone_TraceLine(view_origin, b, MOVE_NORMAL, world);
+                               b = WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos);
+                               a = view_origin + view_forward * vs_x + view_right * -vs_y + view_up * vs_z;
+                               break;
+               }
+       }
        else
-               a = self.HookStart;
-       b = self.HookEnd;
+       {
+               switch(self.HookType)
+               {
+                       default:
+                       case ENT_CLIENT_HOOK:
+                               a = self.velocity;
+                               b = self.origin;
+                               break;
+                       case ENT_CLIENT_LGBEAM:
+                       case ENT_CLIENT_GAUNTLET:
+                               a = self.origin;
+                               b = self.velocity;
+                               break;
+               }
+       }
 
-       t = GetPlayerColorForce(self.sv_entnum);
+       t = GetPlayerColorForce(self.owner.sv_entnum);
 
-       if(t == COLOR_TEAM1)
+       switch(self.HookType)
        {
-               tex = "particles/hook_red";
-               rgb = '1 .3 .3';
+               default:
+               case ENT_CLIENT_HOOK:
+                       intensity = 1;
+                       offset = Noise_White(self, frametime);
+                       if(t == COLOR_TEAM1)
+                       {
+                               tex = "particles/hook_red";
+                               rgb = '1 .3 .3';
+                       }
+                       else if(t == COLOR_TEAM2)
+                       {
+                               tex = "particles/hook_blue";
+                               rgb = '.3 .3 1';
+                       }
+                       else if(t == COLOR_TEAM3)
+                       {
+                               tex = "particles/hook_yellow";
+                               rgb = '1 1 .3';
+                       }
+                       else if(t == COLOR_TEAM4)
+                       {
+                               tex = "particles/hook_pink";
+                               rgb = '1 .3 1';
+                       }
+                       else
+                       {
+                               tex = "particles/hook_green";
+                               rgb = '.3 1 .3';
+                       }
+                       break;
+               case ENT_CLIENT_LGBEAM:
+                       intensity = bound(0.2, 1 + Noise_Pink(self, frametime) * 1 + Noise_Burst(self, frametime, 0.03) * 0.3, 2);
+                       offset = Noise_Brown(self, frametime) * 10;
+                       tex = "particles/lgbeam";
+                       rgb = '1 1 1';
+                       break;
+               case ENT_CLIENT_GAUNTLET:
+                       intensity = 1;
+                       offset = Noise_White(self, frametime);
+                       tex = "particles/gauntletbeam";
+                       rgb = '1 1 1';
+                       break;
        }
-       else if(t == COLOR_TEAM2)
+
+       Draw_GrapplingHook_trace_callback_tex = tex;
+       Draw_GrapplingHook_trace_callback_rnd = offset;
+       Draw_GrapplingHook_trace_callback_rgb = rgb;
+       Draw_GrapplingHook_trace_callback_a = intensity;
+       WarpZone_TraceBox_ThroughZone(a, '0 0 0', '0 0 0', b, ((self.HookType == ENT_CLIENT_HOOK) ? MOVE_NOTHING : MOVE_NORMAL), world, world, Draw_GrapplingHook_trace_callback);
+       Draw_GrapplingHook_trace_callback_tex = string_null;
+
+       atrans = WarpZone_TransformOrigin(WarpZone_trace_transform, a);
+
+       switch(self.HookType)
        {
-               tex = "particles/hook_blue";
-               rgb = '.3 .3 1';
+               default:
+               case ENT_CLIENT_HOOK:
+                       setorigin(self, trace_endpos); // hook endpoint!
+                       self.angles = vectoangles(trace_endpos - atrans);
+                       break;
+               case ENT_CLIENT_LGBEAM:
+               case ENT_CLIENT_GAUNTLET:
+                       setorigin(self, a); // beam origin!
+                       break;
        }
-       else if(t == COLOR_TEAM3)
+
+       switch(self.HookType)
+       {
+               default:
+               case ENT_CLIENT_HOOK:
+                       break;
+               case ENT_CLIENT_LGBEAM:
+                       pointparticles(particleeffectnum("electro_lightning"), trace_endpos, normalize(atrans - trace_endpos), frametime * intensity);
+                       break;
+               case ENT_CLIENT_GAUNTLET:
+                       pointparticles(particleeffectnum("gauntlet_lightning"), b, normalize(a - b), frametime * intensity);
+                       break;
+       }
+}
+
+void Remove_GrapplingHook()
+{
+       sound (self, CHAN_PROJECTILE, "misc/null.wav", VOL_BASE, ATTN_NORM);
+}
+
+void Ent_ReadHook(float bIsNew, float type)
+{
+       self.HookType = type;
+
+       float sf;
+       sf = ReadByte();
+
+       self.HookSilent = (sf & 0x80);
+       self.iflags = IFLAG_VELOCITY;
+
+       InterpolateOrigin_Undo();
+
+       if(sf & 1)
        {
-               tex = "particles/hook_yellow";
-               rgb = '1 1 .3';
+               self.owner = playerslots[ReadByte() - 1];
+               switch(self.HookType)
+               {
+                       default:
+                       case ENT_CLIENT_HOOK:
+                       case ENT_CLIENT_GAUNTLET:
+                               self.HookRange = 0;
+                               break;
+                       case ENT_CLIENT_LGBEAM:
+                               self.HookRange = ReadCoord();
+                               break;
+               }
        }
-       else if(t == COLOR_TEAM4)
+       if(sf & 2)
        {
-               tex = "particles/hook_pink";
-               rgb = '1 .3 1';
+               self.origin_x = ReadCoord();
+               self.origin_y = ReadCoord();
+               self.origin_z = ReadCoord();
+               setorigin(self, self.origin);
        }
-       else
+       if(sf & 4)
        {
-               tex = "particles/hook_green";
-               rgb = '.3 1 .3';
+               self.velocity_x = ReadCoord();
+               self.velocity_y = ReadCoord();
+               self.velocity_z = ReadCoord();
        }
 
-       Draw_GrapplingHook_trace_callback_tex = tex;
-       Draw_GrapplingHook_trace_callback_rnd = random();
-       WarpZone_TraceBox_ThroughZone(a, '0 0 0', '0 0 0', b, MOVE_NOMONSTERS, world, world, Draw_GrapplingHook_trace_callback);
-       Draw_GrapplingHook_trace_callback_tex = string_null;
+       InterpolateOrigin_Note();
+
+       if(bIsNew)
+       {
+               self.draw = Draw_GrapplingHook;
+               self.entremove = Remove_GrapplingHook;
+
+               switch(self.HookType)
+               {
+                       default:
+                       case ENT_CLIENT_HOOK:
+                               // for the model
+                               setmodel(self, "models/hook.md3");
+                               self.drawmask = MASK_NORMAL;
+                               break;
+                       case ENT_CLIENT_LGBEAM:
+                               sound (self, CHAN_PROJECTILE, "weapons/lgbeam_fly.wav", VOL_BASE, ATTN_NORM);
+                               break;
+                       case ENT_CLIENT_GAUNTLET:
+                               sound (self, CHAN_PROJECTILE, "weapons/gauntletbeam_fly.wav", VOL_BASE, ATTN_NORM);
+                               break;
+               }
+       }
 }
 
-void Net_GrapplingHook()
+void Hook_Precache()
 {
-       float i;
-       vector start, end;
-       entity p;
-
-       i = ReadShort();
-       end_x = ReadCoord();
-       end_y = ReadCoord();
-       end_z = ReadCoord();
-       start_x = ReadCoord();
-       start_y = ReadCoord();
-       start_z = ReadCoord();
-
-       if(i <= 0 || i >= 256) // not owned by a client
-               return;
-       --i;
-
-       p = playerslots[i];
-       if(!p)
-               return;
-
-       p.HookKillTime = time + 0.1;
-       p.HookStart = start;
-       p.HookEnd = end;
-       p.draw = Draw_GrapplingHook;
+       precache_sound("weapons/lgbeam_fly.wav");
+       precache_sound("weapons/gauntletbeam_fly.wav");
+       precache_model("models/hook.md3");
 }
+
+// TODO: hook: temporarily transform self.origin for drawing the model along warpzones!
index 1b8b2366e0122f52b1b7d9e814970fff075acba7..f2b900fa978bc7370b8e84c6da6ceed64243f4d8 100644 (file)
@@ -14,6 +14,13 @@ Misc HUD functions
 //   1/4 height: bottom part
 void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector theColor, float theAlpha, vector theBorderSize)
 {
+       if (theBorderSize_x <= 0 && theBorderSize_y <= 0) // no border
+       {
+               // draw only the central part
+               drawsubpic(theOrigin, theSize, pic, '0.25 0.25 0', '0.5 0.5 0', theColor, theAlpha, 0);
+               return;
+       }
+
        vector dX, dY;
        vector width, height;
        vector bW, bH;
@@ -75,170 +82,6 @@ void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector the
        }
 }
 
-// drawpic wrapper to draw an image as large as possible with preserved aspect ratio into a box
-void drawpic_aspect(vector pos, string pic, vector sz, vector color, float alpha, float drawflag) {
-       vector imgsize;
-       imgsize = drawgetimagesize(pic);
-       float imgaspect;
-       imgaspect = imgsize_x/imgsize_y;
-
-       vector oldsz;
-       oldsz = sz;
-       float aspect;
-       aspect = sz_x/sz_y;
-
-       if(aspect > imgaspect) {
-               sz_x = sz_y * imgaspect;
-               drawpic(pos + eX * (oldsz_x - sz_x) * 0.5, pic, sz, color, alpha, drawflag);
-       } else {
-               sz_y = sz_x / imgaspect; 
-               drawpic(pos + eY * (oldsz_y - sz_y) * 0.5, pic, sz, color, alpha, drawflag);
-       }
-}
-
-// draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga
-void drawpic_skin(vector pos, string pic, vector sz, vector color, float alpha, float drawflag) {
-       drawpic_aspect(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, color, alpha, drawflag);
-}
-
-// TODO: aspect!
-void drawpic_skin_expanding(vector pos, string pic, vector sz, vector rgb, float alpha, float flag, float fadelerp) {
-       drawpic_expanding(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, rgb, alpha, flag, fadelerp);
-}
-
-void drawpic_skin_expanding_two(vector pos, string pic, vector sz, vector rgb, float alpha, float flag, float fadelerp) {
-       drawpic_expanding_two(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, rgb, alpha, flag, fadelerp);
-}
-
-// return HUD background color
-vector HUD_GetBgColor()
-{
-       vector color;
-       if (teamplay)
-               GetTeamRGB(myteam) * hud_color_bg_team;
-       else {
-               // allow custom HUD colors in non-teamgames
-               color_x = cvar("hud_color_bg_r");
-               color_y = cvar("hud_color_bg_g");
-               color_z = cvar("hud_color_bg_b");
-       }
-       return color;
-}
-
-// return accuracy text color
-vector HUD_AccuracyColor(float accuracy)
-{
-       vector rgb;
-       float yellow_accuracy = cvar("hud_weaponicons_accuracy_yellow"); // value at which this function returns yellow
-       if(accuracy >= 100) {
-               rgb_x = 0;
-               rgb_y = 1;
-       }
-       else if(accuracy > yellow_accuracy) {
-               rgb_x = 1 - (accuracy-yellow_accuracy)/(100-yellow_accuracy); // red value between 1 -> 0
-               rgb_y = 1;
-       }
-       else {
-               rgb_x = 1;
-               rgb_y = accuracy/yellow_accuracy; // green value between 0 -> 1
-       }
-       rgb_z = 0;
-       return rgb;
-}
-
-// draw number in the XSCALE font
-void HUD_DrawXNum (vector pos, float num, float digits, float showsign, float lettersize, vector rgb, float highlighted, float stroke, float alpha, float dflags)
-{
-       float l, i;
-       string str, tmp, l_length;
-       float minus, plus;
-       vector vsize, num_color;
-
-       vsize_x = vsize_y = lettersize;
-       vsize_z = 0;
-
-       // showsign 1: always prefix with minus sign (useful in race distribution display)
-       // showsign 2: always prefix with plus sign (useful in race distribution display)
-       // showsign 3: prefix with minus sign if negative, plus sign if positive (useful in score distribution display)
-
-       if((showsign == 2 && num >= 0) || (num > 0 && showsign == 3))
-       {
-               plus = true;
-               pos_x -= lettersize;
-       } else
-               plus = false;
-
-       if(num < 0 || (num < 0 && showsign == 3) || (showsign == 1 && num <= 0))
-       {
-               minus = true;
-               num = -num;
-               pos_x -= lettersize;
-       } else
-               minus = false;
-
-       if(digits < 0)
-       {
-               tmp = ftos(num);
-               digits = -digits;
-               str = strcat(substring("0000000000", 0, digits - strlen(tmp)), tmp);
-       } else
-               str = ftos(num);
-
-       l = strlen(str);
-       l_length = ftos(l);
-
-       if(l > digits)
-       {
-               str = substring(str, l-digits, 999);
-               l = strlen(str);
-       } else if(l < digits)
-               pos_x += (digits-l) * lettersize;
-
-       if (highlighted == 1) {
-               vector hl_size;
-               hl_size_x = vsize_x * l + vsize_x * 0.2;
-               hl_size_y = vsize_y * 1.1;
-               hl_size_z = 0;
-               if(minus)
-                       hl_size_x = hl_size_x + vsize_x;
-
-               vector hl_pos;
-               hl_pos_x = pos_x - lettersize/10;
-               hl_pos_y = pos_y - lettersize/20;
-               hl_pos_z = 0;
-
-               drawpic_skin(hl_pos, strcat("num_leading_", l_length), hl_size, '1 1 1', alpha, dflags);
-       }
-
-       if (stroke == 1)
-               num_color = '1 1 1';
-       else
-               num_color = rgb;
-
-       if(minus)
-       {
-               if (stroke == 1)
-                       drawpic_skin(pos, "num_minus_stroke", vsize, rgb, alpha, dflags);
-               drawpic_skin(pos, "num_minus", vsize, num_color, alpha, dflags);
-               pos_x += lettersize;
-       } else if(plus)
-       {
-               if (stroke == 1)
-                       drawpic_skin(pos, "num_plus_stroke", vsize, rgb, alpha, dflags);
-               drawpic_skin(pos, "num_plus", vsize, num_color, alpha, dflags);
-               pos_x += lettersize;
-       }
-
-       for(i = 0; i < l; ++i)
-       {
-               tmp = substring(str, i, 1);
-               if (stroke == 1)
-                       drawpic_skin(pos, strcat("num_", tmp, "_stroke"), vsize, rgb, alpha, dflags);
-               drawpic_skin(pos, strcat("num_", tmp), vsize, num_color, alpha, dflags);
-               pos_x += lettersize;
-       }
-}
-
 vector HUD_Get_Num_Color (float x, float maxvalue)
 {
        vector color;
@@ -274,13 +117,6 @@ vector HUD_Get_Num_Color (float x, float maxvalue)
        }
        return color;
 }
-// color the number differently based on how big it is (used in the health/armor panel)
-void HUD_DrawXNum_Colored (vector pos, float x, float digits, float lettersize, float alpha)
-{
-       vector color;
-       color = HUD_Get_Num_Color (x, 200);
-       HUD_DrawXNum(pos, x, digits, 0, lettersize, color, 0, 0, alpha, DRAWFLAG_NORMAL);
-}
 
 float stringwidth_colors(string s, vector theSize)
 {
@@ -462,7 +298,6 @@ void HUD_DrawCenterPrint (void)
                ts = centerprint_messages[i];
                if (ts != "")
                {
-                       dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
                        drawcolorcodedstring(pos, ts, centerprint_fontsize, a, DRAWFLAG_NORMAL);
                        //  - '0 0.5 0' * (sz - 1) * centerprint_fontsize_x - '0.5 0 0' * (sz - 1) * centerprint_width[i] * centerprint_fontsize_y, centerprint_fontsize * sz
                        pos_y = pos_y + centerprint_fontsize_y;
@@ -582,26 +417,26 @@ HUD panels
 void HUD_Panel_ExportCfg(string cfgname)
 {
        float fh;
-       fh = fopen(strcat("hud_", cvar_string("hud_skin"), "_", cfgname, ".cfg"), FILE_WRITE);
+       fh = fopen(strcat("hud_", autocvar_hud_skin, "_", cfgname, ".cfg"), FILE_WRITE);
        if(fh >= 0)
        {
                fputs(fh, strcat("seta hud_skin \"", cvar_string("hud_skin"), "\"", "\n"));
-               fputs(fh, strcat("seta hud_bg \"", cvar_string("hud_bg"), "\"", "\n"));
-               fputs(fh, strcat("seta hud_bg_color \"", cvar_string("hud_bg_color"), "\"", "\n"));
-               fputs(fh, strcat("seta hud_bg_color_team \"", cvar_string("hud_bg_color_team"), "\"", "\n"));
-               fputs(fh, strcat("seta hud_bg_alpha \"", cvar_string("hud_bg_alpha"), "\"", "\n"));
-               fputs(fh, strcat("seta hud_bg_border \"", cvar_string("hud_bg_border"), "\"", "\n"));
-               fputs(fh, strcat("seta hud_bg_padding \"", cvar_string("hud_bg_padding"), "\"", "\n"));
-               fputs(fh, strcat("seta hud_fg_alpha \"", cvar_string("hud_fg_alpha"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_panel_bg \"", cvar_string("hud_panel_bg"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_panel_bg_color \"", cvar_string("hud_panel_bg_color"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_panel_bg_color_team \"", cvar_string("hud_panel_bg_color_team"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_panel_bg_alpha \"", cvar_string("hud_panel_bg_alpha"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_panel_bg_border \"", cvar_string("hud_panel_bg_border"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_panel_bg_padding \"", cvar_string("hud_panel_bg_padding"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_panel_fg_alpha \"", cvar_string("hud_panel_fg_alpha"), "\"", "\n"));
                fputs(fh, "\n");
 
                fputs(fh, strcat("seta hud_dock \"", cvar_string("hud_dock"), "\"", "\n"));
                fputs(fh, strcat("seta hud_dock_color \"", cvar_string("hud_dock_color"), "\"", "\n"));
                fputs(fh, strcat("seta hud_dock_color_team \"", cvar_string("hud_dock_color_team"), "\"", "\n"));
-               fputs(fh, strcat("seta hud_dock_alpha \"", ftos(cvar("hud_dock_alpha")), "\"", "\n"));
+               fputs(fh, strcat("seta hud_dock_alpha \"", cvar_string("hud_dock_alpha"), "\"", "\n"));
                fputs(fh, "\n");
 
-               fputs(fh, strcat("seta hud_progressbar_alpha ", ftos(cvar("hud_progressbar_alpha")), "\n"));
+               fputs(fh, strcat("seta hud_progressbar_alpha \"", cvar_string("hud_progressbar_alpha"), "\"", "\n"));
                fputs(fh, strcat("seta hud_progressbar_strength_color \"", cvar_string("hud_progressbar_strength_color"), "\"", "\n"));
                fputs(fh, strcat("seta hud_progressbar_shield_color \"", cvar_string("hud_progressbar_shield_color"), "\"", "\n"));
                fputs(fh, strcat("seta hud_progressbar_health_color \"", cvar_string("hud_progressbar_health_color"), "\"", "\n"));
@@ -610,296 +445,144 @@ void HUD_Panel_ExportCfg(string cfgname)
                fputs(fh, strcat("seta hud_progressbar_nexball_color \"", cvar_string("hud_progressbar_nexball_color"), "\"", "\n"));
                fputs(fh, "\n");
 
+               fputs(fh, strcat("seta _hud_panelorder \"", cvar_string("_hud_panelorder"), "\"", "\n"));
+               fputs(fh, "\n");
+
+               fputs(fh, strcat("seta hud_configure_grid \"", cvar_string("hud_configure_grid"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_configure_grid_xsize \"", cvar_string("hud_configure_grid_xsize"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_configure_grid_ysize \"", cvar_string("hud_configure_grid_ysize"), "\"", "\n"));
+               fputs(fh, "\n");
+
                // common cvars for all panels
                float i;
                for (i = 0; i < HUD_PANEL_NUM; ++i)
                {
-                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), " ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i)))), "\n"));
-                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_pos \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_pos")), "\"", "\n"));
-                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_size \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_size")), "\"", "\n"));
-                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg")), "\"", "\n"));
-                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_color \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_color")), "\"", "\n"));
-                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_color_team \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_color_team")), "\"", "\n"));
-                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_alpha \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_alpha")), "\"", "\n"));
-                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_border \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_border")), "\"", "\n"));
-                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_padding \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_padding")), "\"", "\n"));
+                       HUD_Panel_GetName(i)
+
+                       fputs(fh, strcat("seta hud_panel_", panel_name, " ", cvar_string(strcat("hud_panel_", panel_name)), "\n"));
+                       fputs(fh, strcat("seta hud_panel_", panel_name, "_pos \"", cvar_string(strcat("hud_panel_", panel_name, "_pos")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_panel_", panel_name, "_size \"", cvar_string(strcat("hud_panel_", panel_name, "_size")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_panel_", panel_name, "_bg \"", cvar_string(strcat("hud_panel_", panel_name, "_bg")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_panel_", panel_name, "_bg_color \"", cvar_string(strcat("hud_panel_", panel_name, "_bg_color")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_panel_", panel_name, "_bg_color_team \"", cvar_string(strcat("hud_panel_", panel_name, "_bg_color_team")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_panel_", panel_name, "_bg_alpha \"", cvar_string(strcat("hud_panel_", panel_name, "_bg_alpha")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_panel_", panel_name, "_bg_border \"", cvar_string(strcat("hud_panel_", panel_name, "_bg_border")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_panel_", panel_name, "_bg_padding \"", cvar_string(strcat("hud_panel_", panel_name, "_bg_padding")), "\"", "\n"));
                        switch(i) {
-                               case 0:
-                                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_accuracy_yellow ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_accuracy_yellow"))), "\n"));
+                               case HUD_PANEL_WEAPONS:
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_complainbubble \"", cvar_string(strcat("hud_panel_", panel_name, "_complainbubble")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_complainbubble_padding \"", cvar_string(strcat("hud_panel_", panel_name, "_complainbubble_padding")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_complainbubble_color_outofammo \"", cvar_string(strcat("hud_panel_", panel_name, "_complainbubble_color_outofammo")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_complainbubble_color_donthave \"", cvar_string(strcat("hud_panel_", panel_name, "_complainbubble_color_donthave")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_complainbubble_color_unavailable \"", cvar_string(strcat("hud_panel_", panel_name, "_complainbubble_color_unavailable")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_ammo_color \"", cvar_string(strcat("hud_panel_", panel_name, "_ammo_color")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_ammo_alpha \"", cvar_string(strcat("hud_panel_", panel_name, "_ammo_alpha")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_aspect \"", cvar_string(strcat("hud_panel_", panel_name, "_aspect")), "\"", "\n"));
                                        break;
-                               case 1:
-                                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_onlycurrent ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_onlycurrent"))), "\n"));
+                               case HUD_PANEL_AMMO:
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_onlycurrent \"", cvar_string(strcat("hud_panel_", panel_name, "_onlycurrent")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_iconalign \"", cvar_string(strcat("hud_panel_", panel_name, "_iconalign")), "\"", "\n"));
                                        break;
-                               case 2:
-                                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_flip ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_flip"))), "\n"));
-                                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_mirror ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_mirror"))), "\n"));
+                               case HUD_PANEL_POWERUPS:
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_flip \"", cvar_string(strcat("hud_panel_", panel_name, "_flip")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_iconalign \"", cvar_string(strcat("hud_panel_", panel_name, "_iconalign")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_baralign \"", cvar_string(strcat("hud_panel_", panel_name, "_baralign")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_progressbar \"", cvar_string(strcat("hud_panel_", panel_name, "_progressbar")), "\"", "\n"));
                                        break;
-                               case 3:
-                                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_flip ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_flip"))), "\n"));
-                                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_mirror ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_mirror"))), "\n"));
+                               case HUD_PANEL_HEALTHARMOR:
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_flip \"", cvar_string(strcat("hud_panel_", panel_name, "_flip")), "\n"));
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_iconalign \"", cvar_string(strcat("hud_panel_", panel_name, "_iconalign")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_baralign \"", cvar_string(strcat("hud_panel_", panel_name, "_baralign")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_progressbar \"", cvar_string(strcat("hud_panel_", panel_name, "_progressbar")), "\"", "\n"));
                                        break;
-                               case 4:
-                                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_flip ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_flip"))), "\n"));
-                                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_info_top ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_info_top"))), "\n"));
+                               case HUD_PANEL_NOTIFY:
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_flip \"", cvar_string(strcat("hud_panel_", panel_name, "_flip")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_print \"", cvar_string(strcat("hud_panel_", panel_name, "_print")), "\"", "\n"));
                                        break;
-                               case 6:
-                                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_foreground_alpha ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_foreground_alpha"))), "\n"));
-                               case 9:
-                                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_alreadyvoted_alpha ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_alreadyvoted_alpha"))), "\n"));
+                               case HUD_PANEL_RADAR:
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_foreground_alpha \"", cvar_string(strcat("hud_panel_", panel_name, "_foreground_alpha")), "\"", "\n"));
+                                       break;
+                               case HUD_PANEL_VOTE:
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_alreadyvoted_alpha \"", cvar_string(strcat("hud_panel_", panel_name, "_alreadyvoted_alpha")), "\"", "\n"));
+                                       break;
+                               case HUD_PANEL_PRESSEDKEYS:
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_aspect \"", cvar_string(strcat("hud_panel_", panel_name, "_aspect")), "\"", "\n"));
                                        break;
                        }
                        fputs(fh, "\n");
                }
+               fputs(fh, strcat("menu_restart", "\n")); // force a menu update when execing config, so that the dialogs are updated
 
-               print("^2Successfully exported to hud_", cvar_string("hud_skin"), "_", cfgname, ".cfg! (Note: It's saved in data/data/)\n");
+               print("^2Successfully exported to hud_", autocvar_hud_skin, "_", cfgname, ".cfg! (Note: It's saved in data/data/)\n");
        }
        fclose(fh);
 }
 
-// return active status of panel
-float HUD_Panel_CheckActive(float id)
+const float hlBorderSize = 4;
+const string hlBorder = "gfx/hud/default/border_highlighted";
+const string hlBorder2 = "gfx/hud/default/border_highlighted2";
+void HUD_Panel_HlBorder(float myBorder, vector color, float alpha)
 {
-       if (cvar_or(strcat("hud_", HUD_Panel_GetName(id)), 1))
-               return 1;
-       return 0;
+       drawfill(panel_pos - '1 1 0' * myBorder, panel_size + '2 2 0' * myBorder, '0 0.5 1', .5 * alpha, DRAWFLAG_NORMAL);
+       drawpic_tiled(panel_pos - '1 1 0' * myBorder, hlBorder, '8 1 0' * hlBorderSize, eX * (panel_size_x + 2 * myBorder) + eY * hlBorderSize, color, alpha, DRAWFLAG_NORMAL);
+       drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * (panel_size_y + 2 * myBorder - hlBorderSize), hlBorder, '8 1 0' * hlBorderSize, eX * (panel_size_x + 2 * myBorder) + eY * hlBorderSize, color, alpha, DRAWFLAG_NORMAL);
+       drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * hlBorderSize, hlBorder2, '1 8 0' * hlBorderSize, eY * (panel_size_y + 2 * myBorder - 2 * hlBorderSize) + eX * hlBorderSize, color, alpha, DRAWFLAG_NORMAL);
+       drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * hlBorderSize + eX * (panel_size_x + 2 * myBorder - hlBorderSize), hlBorder2, '1 8 0' * hlBorderSize, eY * (panel_size_y + 2 * myBorder - 2 * hlBorderSize) + eX * hlBorderSize, color, alpha, DRAWFLAG_NORMAL);
 }
 
-// return size of given panel
-vector HUD_Panel_GetSize(float id)
-{
-       vector mySize;
-       mySize = stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_size")));
-
-       mySize = eX * mySize_x * vid_conwidth + eY * mySize_y * vid_conheight;
-
-       if(disable_menu_alphacheck == 2 && id == highlightedPanel)
-       {
-               vector menu_enable_maxsize, menu_enable_size;
-               menu_enable_maxsize = '0 0 0'; // shut up FTEQCC
-               menu_enable_maxsize_x = 0.3 * vid_conwidth;
-               menu_enable_maxsize_y = 0.18 * vid_conheight;
-               if(mySize_x > mySize_y)
-               {
-                       if(mySize_y > menu_enable_maxsize_y)
-                       {
-                               menu_enable_size_y = menu_enable_maxsize_y;
-                               menu_enable_size_x = mySize_x * (menu_enable_maxsize_y/mySize_y);
-                               mySize = (1 - cvar("_menu_alpha")) * mySize + (cvar("_menu_alpha")) * menu_enable_size;
-                       }
-               }
-               else
-               {
-                       if(mySize_x > menu_enable_maxsize_x)
-                       {
-                               menu_enable_size_x = menu_enable_maxsize_x;
-                               menu_enable_size_y = mySize_y * (menu_enable_maxsize_x/mySize_x);
-                               mySize = (1 - cvar("_menu_alpha")) * mySize + (cvar("_menu_alpha")) * menu_enable_size;
-                       }
-               }
-       }
-       return mySize;
-}
-
-// return pos of given panel
-vector HUD_Panel_GetPos(float id)
-{
-       vector pos;
-       pos = stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_pos")));
-
-       pos = eX * pos_x * vid_conwidth + eY * pos_y * vid_conheight;
-
-       if(disable_menu_alphacheck == 2 && id == highlightedPanel)
-       {
-               vector mySize, menu_enable_panelpos;
-               mySize = HUD_Panel_GetSize(id);
-               if(mySize_x > mySize_y)
-                       menu_enable_panelpos = eX * 0.5 * vid_conwidth - eX * 0.5 * mySize_x + eY * 0.82 * vid_conheight;
-               else
-                       menu_enable_panelpos = eY * 0.5 * vid_conheight - eY * 0.5 * mySize_y + eX * 0.7 * vid_conwidth;
-               pos = (1 - cvar("_menu_alpha")) * pos + (cvar("_menu_alpha")) * menu_enable_panelpos;
-       }
-       return pos;
-}
-
-float HUD_Panel_GetBorder(float id)
-{
-       string border;
-       border = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_border"));
-       if(border == "")
-               border = cvar_string("hud_bg_border");
-       return stof(border);
-}
+// draw the background/borders
+#define HUD_Panel_DrawBg(alpha)\
+if(panel_bg != "0")\
+       draw_BorderPicture(panel_pos - '1 1 0' * panel_bg_border, panel_bg, panel_size + '1 1 0' * 2 * panel_bg_border, panel_bg_color, panel_bg_alpha * alpha, '1 1 0' * (panel_bg_border/BORDER_MULTIPLIER));\
+if(highlightedPanel_prev == active_panel && autocvar__hud_configure)\
+       HUD_Panel_HlBorder(panel_bg_border + 1.5 * hlBorderSize, '0 0.5 1', 0.25 * (1 - autocvar__menu_alpha) * alpha);
 
-vector HUD_Panel_GetColor(float id)
+void HUD_Panel_DrawProgressBar(vector pos, float vertical, vector mySize, vector color, float alpha, float drawflag)
 {
-       float f;
-       vector color_vec;
-       string color;
+       if(!alpha)
+               return;
 
-       // fetch per-panel color
-       if(teamplay && cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_color_team")) != "") {
-               f = stof(getplayerkey(self.sv_entnum, "colors"));
-               color = vtos(colormapPaletteColor(mod(f, 16), 1) * cvar(strcat("hud_", HUD_Panel_GetName(id), "_bg_color_team")));
-       }
-       else
-               color = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_color"));
-       color_vec = stov(color);
-
-       if(color == "") { // fetch default color
-               color = cvar_string("hud_bg_color");
-               color_vec = stov(color);
-               if(teamplay && cvar(strcat("hud_bg_color_team"))) {
-                       f = stof(getplayerkey(self.sv_entnum, "colors"));
-                       color_vec = colormapPaletteColor(mod(f, 16), 1) * cvar("hud_bg_color_team");
-               }
-               else if(color == "shirt") {
-                       f = stof(getplayerkey(self.sv_entnum, "colors"));
-                       color_vec = colormapPaletteColor(floor(f / 16), 0);
+       string pic;
+       if(vertical) {
+               pic = strcat(hud_skin_path, "/statusbar_vertical");
+               if(precache_pic(pic) == "") {
+                       pic = "gfx/hud/default/statusbar_vertical";
                }
-               else if(color == "pants") {
-                       f = stof(getplayerkey(self.sv_entnum, "colors"));
-                       color_vec = colormapPaletteColor(mod(f, 16), 1);
+               drawsubpic(pos, eY * min(mySize_y * 0.5, mySize_x) + eX * mySize_x, pic, '0 0 0', '1 0.25 0', color, alpha, drawflag);
+               if(mySize_y/mySize_x > 2)
+                       drawsubpic(pos + eY * mySize_x, eY * (mySize_y - 2 * mySize_x) + eX * mySize_x, pic, '0 0.25 0', '1 0.5 0', color, alpha, drawflag);
+               drawsubpic(pos + eY * mySize_y - eY * min(mySize_y * 0.5, mySize_x), eY * min(mySize_y * 0.5, mySize_x) + eX * mySize_x, pic, '0 0.75 0', '1 0.25 0', color, alpha, drawflag);
+       } else {
+               pic = strcat(hud_skin_path, "/statusbar");
+               if(precache_pic(pic) == "") {
+                       pic = "gfx/hud/default/statusbar";
                }
+               drawsubpic(pos, eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, pic, '0 0 0', '0.25 1 0', color, alpha, drawflag);
+               if(mySize_x/mySize_y > 2)
+                       drawsubpic(pos + eX * mySize_y, eX * (mySize_x - 2 * mySize_y) + eY * mySize_y, pic, '0.25 0 0', '0.5 1 0', color, alpha, drawflag);
+               drawsubpic(pos + eX * mySize_x - eX * min(mySize_x * 0.5, mySize_y), eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, pic, '0.75 0 0', '0.25 1 0', color, alpha, drawflag);
        }
-       else if(color == "shirt") {
-               f = stof(getplayerkey(self.sv_entnum, "colors"));
-               color_vec = colormapPaletteColor(floor(f / 16), 0);
-       }
-       else if(color == "pants") {
-               f = stof(getplayerkey(self.sv_entnum, "colors"));
-               color_vec = colormapPaletteColor(mod(f, 16), 1);
-       }
-       return color_vec;
-}
-
-vector HUD_Panel_Dock_GetColor(void)
-{
-       float f;
-       vector color_vec;
-       string color;
-       color = cvar_string("hud_dock_color");
-       color_vec = stov(color);
-       if(teamplay && cvar(strcat("hud_dock_color_team"))) {
-               f = stof(getplayerkey(self.sv_entnum, "colors"));
-               color_vec = colormapPaletteColor(mod(f, 16), 1) * cvar("hud_dock_color_team");
-       }
-       else if(color == "shirt") {
-               f = stof(getplayerkey(self.sv_entnum, "colors"));
-               color_vec = colormapPaletteColor(floor(f / 16), 0);
-       }
-       else if(color == "pants") {
-               f = stof(getplayerkey(self.sv_entnum, "colors"));
-               color_vec = colormapPaletteColor(mod(f, 16), 1);
-       }
-       return color_vec;
 }
 
-float HUD_Panel_GetBgAlpha(float id)
+void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float alpha, float drawflag)
 {
-       string alpha;
-       alpha = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_alpha"));
-       if(alpha == "")
-               alpha = cvar_string("hud_bg_alpha");
-
-       if(hud_configure && disable_menu_alphacheck == 2 && highlightedPanel == id) // do not set a minalpha cap when showing the config dialog for this panel
-               alpha = ftos((1 - cvar("_menu_alpha")) * max(cvar("hud_configure_bg_minalpha"), stof(alpha)) + (cvar("_menu_alpha")) * stof(alpha));
-       else if(hud_configure)
-               alpha = ftos(max(cvar("hud_configure_bg_minalpha"), stof(alpha)));
-
-       if(hud_configure && !cvar(strcat("hud_", HUD_Panel_GetName(id)))) // ALWAYS show disabled panels at 0.25 alpha when in config mode
-               return 0.25;
-
-       if(disable_menu_alphacheck == 2 && highlightedPanel == id) // don't fade this panel when showing the panel-specific menu dialog
-               return stof(alpha);
-       else
-               return stof(alpha) * menu_fade_alpha;
-}
-
-float HUD_Panel_GetFgAlpha(float id)
-{
-       float alpha;
-       alpha = hud_fg_alpha;
-
-       if(hud_configure && !cvar(strcat("hud_", HUD_Panel_GetName(id)))) // ALWAYS show disabled panels at 0.25 alpha when in config mode
-               return 0.25;
-
-       if(disable_menu_alphacheck == 2 && highlightedPanel == id) // don't fade this panel when showing the panel-specific menu dialog
-               return alpha;
-       else
-               return alpha * menu_fade_alpha;
-}
-
-float HUD_Panel_GetPadding(float id)
-{
-       string padding;
-       padding = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_padding"));
-       if(padding == "")
-               padding = cvar_string("hud_bg_padding");
-
-       vector mySize;
-       mySize = HUD_Panel_GetSize(id);
-       float smallestsize;
-       smallestsize = min(mySize_x, mySize_y);
-       return min(smallestsize/2 - 5, stof(padding));
-}
-
-// draw the background/borders
-void HUD_Panel_DrawBg(float id, vector pos, vector mySize, float alpha)
-{
-       if(!hud_configure && cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg")) == "0")
+       if(!alpha)
                return;
 
-       string bg;
-       bg = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg"));
-       if(bg == "")
-               bg = cvar_string("hud_bg");
-
-       if(bg == "0" && hud_configure) {
-               bg = "border"; // we probably want to see a background in config mode at all times...
-       }
-
-       if(bg != "0")
-       {
-               float border;
-               border = max(0.0000001, HUD_Panel_GetBorder(id)); // draw_BorderPicture does not like border = 0
-
-               vector color;
-               color = HUD_Panel_GetColor(id);
-
-               if(alpha)
-                       alpha = HUD_Panel_GetBgAlpha(id) * alpha; // allow panels to fade in/out by passing an alpha value
-               else
-                       alpha = HUD_Panel_GetBgAlpha(id);
-
-               draw_BorderPicture(pos - '1 1 0' * border, strcat("gfx/hud/", cvar_string("hud_skin"), "/", bg), mySize + '1 1 0' * 2 * border, color, alpha, '1 1 0' * (border/BORDER_MULTIPLIER));
-       }
-}
-
-void HUD_Panel_DrawProgressBar(vector pos, float vertical, vector mySize, vector color, float alpha, float drawflag)
-{
-//float        drawsubpic(vector position, vector size, string pic, vector srcPosition, vector srcSize, vector rgb, float alpha, float flag) = #328;
        string pic;
-       pic = strcat("gfx/hud/", cvar_string("hud_skin"), "/");
-       if(vertical) {
-               drawsubpic(pos, eY * min(mySize_y * 0.5, mySize_x) + eX * mySize_x, strcat(pic, "statusbar_vertical"), '0 0 0', '1 0.25 0', color, alpha, drawflag);
-               if(mySize_y/mySize_x > 2)
-                       drawsubpic(pos + eY * mySize_x, eY * (mySize_y - 2 * mySize_x) + eX * mySize_x, strcat(pic, "statusbar_vertical"), '0 0.25 0', '1 0.5 0', color, alpha, drawflag);
-               drawsubpic(pos + eY * mySize_y - eY * min(mySize_y * 0.5, mySize_x), eY * min(mySize_y * 0.5, mySize_x) + eX * mySize_x, strcat(pic, "statusbar_vertical"), '0 0.75 0', '1 0.25 0', color, alpha, drawflag);
-       } else {
-               drawsubpic(pos, eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, strcat(pic, "statusbar"), '0 0 0', '0.25 1 0', color, alpha, drawflag);
-               if(mySize_x/mySize_y > 2)
-                       drawsubpic(pos + eX * mySize_y, eX * (mySize_x - 2 * mySize_y) + eY * mySize_y, strcat(pic, "statusbar"), '0.25 0 0', '0.5 1 0', color, alpha, drawflag);
-               drawsubpic(pos + eX * mySize_x - eX * min(mySize_x * 0.5, mySize_y), eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, strcat(pic, "statusbar"), '0.75 0 0', '0.25 1 0', color, alpha, drawflag);
+       pic = strcat(hud_skin_path, "/num_leading");
+       if(precache_pic(pic) == "") {
+               pic = "gfx/hud/default/num_leading";
        }
-}
 
-vector HUD_Panel_GetProgressBarColor(string item)
-{
-       return stov(cvar_string(strcat("hud_progressbar_", item, "_color")));
+       drawsubpic(pos, eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, pic, '0 0 0', '0.25 1 0', color, alpha, drawflag);
+       if(mySize_x/mySize_y > 2)
+               drawsubpic(pos + eX * mySize_y, eX * (mySize_x - 2 * mySize_y) + eY * mySize_y, pic, '0.25 0 0', '0.5 1 0', color, alpha, drawflag);
+       drawsubpic(pos + eX * mySize_x - eX * min(mySize_x * 0.5, mySize_y), eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, pic, '0.75 0 0', '0.25 1 0', color, alpha, drawflag);
 }
 
 // check if move will result in panel being moved into another panel. If so, return snapped vector, otherwise return the given vector
-vector HUD_Panel_CheckMove(float id, vector myPos, vector mySize)
+vector HUD_Panel_CheckMove(vector myPos, vector mySize)
 {
        float i;
 
@@ -914,20 +597,22 @@ vector HUD_Panel_CheckMove(float id, vector myPos, vector mySize)
        targCenter = '0 0 0'; // shut up fteqcc, there IS a reference
 
        for (i = 0; i < HUD_PANEL_NUM; ++i) {
-               if(i == id || !HUD_Panel_CheckActive(i))
+               if(i == highlightedPanel || !panel_enabled)
                        continue;
 
-               targPos = HUD_Panel_GetPos(i) - '1 1 0' * HUD_Panel_GetBorder(id);
-               targSize = HUD_Panel_GetSize(i) + '2 2 0' * HUD_Panel_GetBorder(id);
+               HUD_Panel_UpdatePosSizeForId(i)
+
+               panel_pos -= '1 1 0' * panel_bg_border;
+               panel_size += '2 2 0' * panel_bg_border;
 
-               if(myPos_y + mySize_y < targPos_y)
+               if(myPos_y + mySize_y < panel_pos_y)
                        continue;
-               if(myPos_y > targPos_y + targSize_y)
+               if(myPos_y > panel_pos_y + panel_size_y)
                        continue;
 
-               if(myPos_x + mySize_x < targPos_x)
+               if(myPos_x + mySize_x < panel_pos_x)
                        continue;
-               if(myPos_x > targPos_x + targSize_x)
+               if(myPos_x > panel_pos_x + panel_size_x)
                        continue;
 
                // OK, there IS a collision.
@@ -935,97 +620,106 @@ vector HUD_Panel_CheckMove(float id, vector myPos, vector mySize)
                myCenter_x = myPos_x + 0.5 * mySize_x;
                myCenter_y = myPos_y + 0.5 * mySize_y;
 
-               targCenter_x = targPos_x + 0.5 * targSize_x;
-               targCenter_y = targPos_y + 0.5 * targSize_y;
+               targCenter_x = panel_pos_x + 0.5 * panel_size_x;
+               targCenter_y = panel_pos_y + 0.5 * panel_size_y;
 
                if(myCenter_x < targCenter_x && myCenter_y < targCenter_y) // top left (of the target panel)
                {
-                       if(myPos_x + mySize_x - targPos_x < myPos_y + mySize_y - targPos_y) // push it to the side
-                               myTarget_x = targPos_x - mySize_x;
+                       if(myPos_x + mySize_x - panel_pos_x < myPos_y + mySize_y - panel_pos_y) // push it to the side
+                               myTarget_x = panel_pos_x - mySize_x;
                        else // push it upwards
-                               myTarget_y = targPos_y - mySize_y;
+                               myTarget_y = panel_pos_y - mySize_y;
                }
                else if(myCenter_x > targCenter_x && myCenter_y < targCenter_y) // top right
                {
-                       if(targPos_x + targSize_x - myPos_x < myPos_y + mySize_y - targPos_y) // push it to the side
-                               myTarget_x = targPos_x + targSize_x;
+                       if(panel_pos_x + panel_size_x - myPos_x < myPos_y + mySize_y - panel_pos_y) // push it to the side
+                               myTarget_x = panel_pos_x + panel_size_x;
                        else // push it upwards
-                               myTarget_y = targPos_y - mySize_y;
+                               myTarget_y = panel_pos_y - mySize_y;
                }
                else if(myCenter_x < targCenter_x && myCenter_y > targCenter_y) // bottom left
                {
-                       if(myPos_x + mySize_x - targPos_x < targPos_y + targSize_y - myPos_y) // push it to the side
-                               myTarget_x = targPos_x - mySize_x;
+                       if(myPos_x + mySize_x - panel_pos_x < panel_pos_y + panel_size_y - myPos_y) // push it to the side
+                               myTarget_x = panel_pos_x - mySize_x;
                        else // push it downwards
-                               myTarget_y = targPos_y + targSize_y;
+                               myTarget_y = panel_pos_y + panel_size_y;
                }
                else if(myCenter_x > targCenter_x && myCenter_y > targCenter_y) // bottom right
                {
-                       if(targPos_x + targSize_x - myPos_x < targPos_y + targSize_y - myPos_y) // push it to the side
-                               myTarget_x = targPos_x + targSize_x;
+                       if(panel_pos_x + panel_size_x - myPos_x < panel_pos_y + panel_size_y - myPos_y) // push it to the side
+                               myTarget_x = panel_pos_x + panel_size_x;
                        else // push it downwards
-                               myTarget_y = targPos_y + targSize_y;
+                               myTarget_y = panel_pos_y + panel_size_y;
                }
+               if(cvar("hud_configure_checkcollisions_debug"))
+                       drawfill(panel_pos, panel_size, '1 1 0', .3, DRAWFLAG_NORMAL);
        }
 
        return myTarget;
 }
 
-void HUD_Panel_SetPos(float id, vector pos)
+void HUD_Panel_SetPos(vector pos)
 {
-       vector oldPos;
-       oldPos = HUD_Panel_GetPos(id);
-
+       HUD_Panel_UpdatePosSizeForId(highlightedPanel)
        vector mySize;
-       mySize = HUD_Panel_GetSize(id);
-
-       if(cvar("hud_configure_checkcollisions"))
-               pos = HUD_Panel_CheckMove(id, pos, mySize);
+       mySize = panel_size;
 
-       pos_x = bound(0, pos_x, vid_conwidth - mySize_x);
-       pos_y = bound(0, pos_y, vid_conheight - mySize_y);
+       if(cvar("hud_configure_checkcollisions_debug"))
+               drawfill(pos, mySize, '1 1 1', .2, DRAWFLAG_NORMAL);
 
-       if(cvar("hud_configure_grid"))
+       if(autocvar_hud_configure_grid)
        {
-               pos_x = floor((pos_x/vid_conwidth)/bound(0.005, cvar("hud_configure_grid_x"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_x"), 0.2) * vid_conwidth;
-               pos_y = floor((pos_y/vid_conheight)/bound(0.005, cvar("hud_configure_grid_y"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_y"), 0.2) * vid_conheight;
+               pos_x = floor((pos_x/vid_conwidth)/bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) * vid_conwidth;
+               pos_y = floor((pos_y/vid_conheight)/bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) * vid_conheight;
        }
 
+       if(hud_configure_checkcollisions)
+               pos = HUD_Panel_CheckMove(pos, mySize);
+
+       pos_x = bound(0, pos_x, vid_conwidth - mySize_x);
+       pos_y = bound(0, pos_y, vid_conheight - mySize_y);
+
        string s;
        s = strcat(ftos(pos_x/vid_conwidth), " ", ftos(pos_y/vid_conheight));
 
-       cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_pos"), s);
+       HUD_Panel_GetName(highlightedPanel);
+       cvar_set(strcat("hud_panel_", panel_name, "_pos"), s);
 }
 
 // check if resize will result in panel being moved into another panel. If so, return snapped vector, otherwise return the given vector
-vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin) {
+vector HUD_Panel_CheckResize(vector mySize, vector resizeorigin) {
        float i;
 
        float targBorder;
        vector targPos;
        vector targSize;
        vector targEndPos;
+
        vector dist;
+       float ratio;
+       ratio = mySize_x/mySize_y;
 
        for (i = 0; i < HUD_PANEL_NUM; ++i) {
-               if(i == id || !HUD_Panel_CheckActive(i))
+               if(i == highlightedPanel || !panel_enabled)
                        continue;
 
-               targBorder = HUD_Panel_GetBorder(i);
-               targPos = HUD_Panel_GetPos(i) - '1 1 0' * targBorder;
-               targSize = HUD_Panel_GetSize(i) + '2 2 0' * targBorder;
-               targEndPos = targPos + targSize;
+               HUD_Panel_UpdatePosSizeForId(i)
+
+               panel_pos -= '1 1 0' * panel_bg_border;
+               panel_size += '2 2 0' * panel_bg_border;
+
+               targEndPos = panel_pos + panel_size;
 
                // resizeorigin is WITHIN target panel, just abort any collision testing against that particular panel to produce expected behaviour!
-               if(resizeorigin_x > targPos_x && resizeorigin_x < targPos_x + targSize_x && resizeorigin_y > targPos_y && resizeorigin_y < targPos_y + targSize_y)
+               if(resizeorigin_x > panel_pos_x && resizeorigin_x < targEndPos_x && resizeorigin_y > panel_pos_y && resizeorigin_y < targEndPos_y)
                        continue;
 
                if (resizeCorner == 1)
                {
                        // check if this panel is on our way
-                       if (resizeorigin_x <= targPos_x)
+                       if (resizeorigin_x <= panel_pos_x)
                                continue;
-                       if (resizeorigin_y <= targPos_y)
+                       if (resizeorigin_y <= panel_pos_y)
                                continue;
                        if (targEndPos_x <= resizeorigin_x - mySize_x)
                                continue;
@@ -1040,7 +734,7 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin) {
                        // in this case resizeorigin (bottom-right point) and the bottom-right point of the panel
                        dist_x = resizeorigin_x - targEndPos_x;
                        dist_y = resizeorigin_y - targEndPos_y;
-                       if (dist_y < 0)
+                       if (dist_y <= 0 || dist_x / dist_y > ratio)
                                mySize_x = min(mySize_x, dist_x);
                        else
                                mySize_y = min(mySize_y, dist_y);
@@ -1049,34 +743,34 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin) {
                {
                        if (resizeorigin_x >= targEndPos_x)
                                continue;
-                       if (resizeorigin_y <= targPos_y)
+                       if (resizeorigin_y <= panel_pos_y)
                                continue;
-                       if (targPos_x >= resizeorigin_x + mySize_x)
+                       if (panel_pos_x >= resizeorigin_x + mySize_x)
                                continue;
                        if (targEndPos_y <= resizeorigin_y - mySize_y)
                                continue;
 
-                       dist_x = targPos_x - resizeorigin_x;
+                       dist_x = panel_pos_x - resizeorigin_x;
                        dist_y = resizeorigin_y - targEndPos_y;
-                       if (dist_y < 0)
+                       if (dist_y <= 0 || dist_x / dist_y > ratio)
                                mySize_x = min(mySize_x, dist_x);
                        else
                                mySize_y = min(mySize_y, dist_y);
                }
                else if (resizeCorner == 3)
                {
-                       if (resizeorigin_x <= targPos_x)
+                       if (resizeorigin_x <= panel_pos_x)
                                continue;
                        if (resizeorigin_y >= targEndPos_y)
                                continue;
                        if (targEndPos_x <= resizeorigin_x - mySize_x)
                                continue;
-                       if (targPos_y >= resizeorigin_y + mySize_y)
+                       if (panel_pos_y >= resizeorigin_y + mySize_y)
                                continue;
 
                        dist_x = resizeorigin_x - targEndPos_x;
-                       dist_y = targPos_y - resizeorigin_y;
-                       if (dist_y < 0)
+                       dist_y = panel_pos_y - resizeorigin_y;
+                       if (dist_y <= 0 || dist_x / dist_y > ratio)
                                mySize_x = min(mySize_x, dist_x);
                        else
                                mySize_y = min(mySize_y, dist_y);
@@ -1087,53 +781,40 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin) {
                                continue;
                        if (resizeorigin_y >= targEndPos_y)
                                continue;
-                       if (targPos_x >= resizeorigin_x + mySize_x)
+                       if (panel_pos_x >= resizeorigin_x + mySize_x)
                                continue;
-                       if (targPos_y >= resizeorigin_y + mySize_y)
+                       if (panel_pos_y >= resizeorigin_y + mySize_y)
                                continue;
 
-                       dist_x = targPos_x - resizeorigin_x;
-                       dist_y = targPos_y - resizeorigin_y;
-                       if (dist_y < 0)
+                       dist_x = panel_pos_x - resizeorigin_x;
+                       dist_y = panel_pos_y - resizeorigin_y;
+                       if (dist_y <= 0 || dist_x / dist_y > ratio)
                                mySize_x = min(mySize_x, dist_x);
                        else
                                mySize_y = min(mySize_y, dist_y);
                }
                if(cvar("hud_configure_checkcollisions_debug"))
-                       drawfill(targPos + '1 1 0' * targBorder, targSize - '2 2 0' * targBorder, '1 1 0', .3, DRAWFLAG_NORMAL);
+                       drawfill(panel_pos, panel_size, '1 1 0', .3, DRAWFLAG_NORMAL);
        }
 
        return mySize;
 }
 
-void HUD_Panel_SetPosSize(float id)
+void HUD_Panel_SetPosSize(vector mySize)
 {
+       HUD_Panel_UpdatePosSizeForId(highlightedPanel)
        vector resizeorigin;
        resizeorigin = panel_click_resizeorigin;
-       vector mySize, myPos;
-
-       if(resizeCorner == 1) {
-               mySize_x = resizeorigin_x - (mousepos_x - panel_click_distance_x);
-               mySize_y = resizeorigin_y - (mousepos_y - panel_click_distance_y);
-       } else if(resizeCorner == 2) {          
-               mySize_x = mousepos_x + panel_click_distance_x - resizeorigin_x;
-               mySize_y = panel_click_distance_y + resizeorigin_y - mousepos_y;
-       } else if(resizeCorner == 3) {
-               mySize_x = resizeorigin_x + panel_click_distance_x - mousepos_x;
-               mySize_y = mousepos_y + panel_click_distance_y - resizeorigin_y;
-       } else { // resizeCorner == 4
-               mySize_x = mousepos_x - (resizeorigin_x - panel_click_distance_x);
-               mySize_y = mousepos_y - (resizeorigin_y - panel_click_distance_y);
-       }
+       vector myPos;
 
        // minimum panel size cap
        mySize_x = max(0.025 * vid_conwidth, mySize_x);
        mySize_y = max(0.025 * vid_conheight, mySize_y);
 
-       if(id == 12) // some panels have their own restrictions, like the chat panel (which actually only moves the engine chat print around). Looks bad if it's too small.
+       if(highlightedPanel == HUD_PANEL_CHAT) // some panels have their own restrictions, like the chat panel (which actually only moves the engine chat print around). Looks bad if it's too small.
        {
                mySize_x = max(17 * cvar("con_chatsize"), mySize_x);
-               mySize_y = max(2 * cvar("con_chatsize") + 2 * HUD_Panel_GetPadding(id), mySize_y);
+               mySize_y = max(2 * cvar("con_chatsize") + 2 * panel_bg_padding, mySize_y);
        }
 
        // collision testing|
@@ -1170,16 +851,14 @@ void HUD_Panel_SetPosSize(float id)
                drawfill(myPos, mySize, '1 1 1', .2, DRAWFLAG_NORMAL);
 
        // before checkresize, otherwise panel can be snapped partially inside another panel or panel aspect ratio can be broken
-       if(cvar("hud_configure_grid"))
+       if(autocvar_hud_configure_grid)
        {
-               mySize_x = floor((mySize_x/vid_conwidth)/bound(0.005, cvar("hud_configure_grid_x"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_x"), 0.2) * vid_conwidth;
-               mySize_y = floor((mySize_y/vid_conheight)/bound(0.005, cvar("hud_configure_grid_y"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_y"), 0.2) * vid_conheight;
+               mySize_x = floor((mySize_x/vid_conwidth)/bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) * vid_conwidth;
+               mySize_y = floor((mySize_y/vid_conheight)/bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) * vid_conheight;
        }
 
-       if(cvar("hud_configure_checkcollisions"))
-       {
-               mySize = HUD_Panel_CheckResize(id, mySize, resizeorigin);
-       }
+       if(hud_configure_checkcollisions)
+               mySize = HUD_Panel_CheckResize(mySize, resizeorigin);
 
        // minimum panel size cap, do this once more so we NEVER EVER EVER have a panel smaller than this, JUST IN CASE above code still makes the panel eg negative (impossible to resize back without changing cvars manually then)
        mySize_x = max(0.025 * vid_conwidth, mySize_x);
@@ -1201,15 +880,15 @@ void HUD_Panel_SetPosSize(float id)
        }
 
        if(cvar("hud_configure_checkcollisions_debug"))
-       if(cvar("hud_configure_checkcollisions"))
                drawfill(myPos, mySize, '0 1 0', .3, DRAWFLAG_NORMAL);
 
+       HUD_Panel_GetName(highlightedPanel);
        string s;
        s = strcat(ftos(mySize_x/vid_conwidth), " ", ftos(mySize_y/vid_conheight));
-       cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_size"), s);
+       cvar_set(strcat("hud_panel_", panel_name, "_size"), s);
 
        s = strcat(ftos(myPos_x/vid_conwidth), " ", ftos(myPos_y/vid_conheight));
-       cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_pos"), s);
+       cvar_set(strcat("hud_panel_", panel_name, "_pos"), s);
 }
 
 float mouseClicked;
@@ -1219,9 +898,106 @@ vector prevMouseClickedPos; // pos during previous mouse click, to check for dou
 
 float menu_enabled;
 float menu_enabled_time;
+float pressed_key_time;
+void HUD_Panel_Arrow_Action(float nPrimary)
+{
+       if (highlightedPanel_prev == -1 || mouseClicked)
+               return;
+
+       hud_configure_checkcollisions = (!(hudShiftState & S_CTRL) && cvar("hud_configure_checkcollisions"));
+
+       float step;
+       if(autocvar_hud_configure_grid)
+       {
+               if (nPrimary == K_UPARROW || nPrimary == K_DOWNARROW)
+               {
+                       if (hudShiftState & S_SHIFT)
+                               step = bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) * vid_conheight;
+                       else
+                               step = 2 * bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) * vid_conheight;
+               }
+               else
+               {
+                       if (hudShiftState & S_SHIFT)
+                               step = bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) * vid_conwidth;
+                       else
+                               step = 2 * bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) * vid_conwidth;
+               }
+       }
+       else
+       {
+               if (nPrimary == K_UPARROW || nPrimary == K_DOWNARROW)
+                       step = vid_conheight;
+               else
+                       step = vid_conwidth;
+               if (hudShiftState & S_SHIFT)
+                       step = (step / 256); // more precision
+               else
+                       step = (step / 64) * (1 + 2 * (time - pressed_key_time));
+       }
+
+       highlightedPanel = highlightedPanel_prev;
+
+       HUD_Panel_UpdatePosSizeForId(highlightedPanel)
+
+       if (hudShiftState & S_ALT) // resize
+       {
+               highlightedAction = 1;
+               if(nPrimary == K_UPARROW)
+                       resizeCorner = 1;
+               else if(nPrimary == K_RIGHTARROW)
+                       resizeCorner = 2;
+               else if(nPrimary == K_LEFTARROW)
+                       resizeCorner = 3;
+               else // if(nPrimary == K_DOWNARROW)
+                       resizeCorner = 4;
+
+               // ctrl+arrow reduces the size, instead of increasing it
+               // Note that ctrl disables collisions check too, but it's fine
+               // since we don't collide with anything reducing the size
+               if (hudShiftState & S_CTRL) {
+                       step = -step;
+                       resizeCorner = 5 - resizeCorner;
+               }
+
+               vector mySize;
+               mySize = panel_size;
+               panel_click_resizeorigin = panel_pos;
+               if(resizeCorner == 1) {
+                       panel_click_resizeorigin += mySize;
+                       mySize_y += step;
+               } else if(resizeCorner == 2) {
+                       panel_click_resizeorigin_y += mySize_y;
+                       mySize_x += step;
+               } else if(resizeCorner == 3) {
+                       panel_click_resizeorigin_x += mySize_x;
+                       mySize_x += step;
+               } else { // resizeCorner == 4
+                       mySize_y += step;
+               }
+               HUD_Panel_SetPosSize(mySize);
+       }
+       else // move
+       {
+               highlightedAction = 2;
+               vector pos;
+               pos = panel_pos;
+               if(nPrimary == K_UPARROW)
+                       pos_y -= step;
+               else if(nPrimary == K_DOWNARROW)
+                       pos_y += step;
+               else if(nPrimary == K_LEFTARROW)
+                       pos_x -= step;
+               else // if(nPrimary == K_RIGHTARROW)
+                       pos_x += step;
+
+               HUD_Panel_SetPos(pos);
+       }
+}
+
 float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)
 {
-       if(!hud_configure)
+       if(!autocvar__hud_configure)
                return false;
 
        // allow console bind to work
@@ -1237,6 +1013,17 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)
                        hit_con_bind = 1;
        }
 
+       if(bInputType == 0) {
+               if(nPrimary == K_ALT) hudShiftState |= S_ALT;
+               if(nPrimary == K_CTRL) hudShiftState |= S_CTRL;
+               if(nPrimary == K_SHIFT) hudShiftState |= S_SHIFT;
+       }
+       else if(bInputType == 1) {
+               if(nPrimary == K_ALT) hudShiftState -= (hudShiftState & S_ALT);
+               if(nPrimary == K_CTRL) hudShiftState -= (hudShiftState & S_CTRL);
+               if(nPrimary == K_SHIFT) hudShiftState -= (hudShiftState & S_SHIFT);
+       }
+
        if(nPrimary == K_MOUSE1)
        {
                if(bInputType == 0) { // key pressed
@@ -1250,24 +1037,201 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)
        }
        else if(nPrimary == K_ESCAPE)
        {
+               if (bInputType == 1)
+                       return true;
                disable_menu_alphacheck = 1;
                menu_enabled = 1;
                menu_enabled_time = time;
                localcmd("menu_showhudexit\n");
        }
+       else if(nPrimary == K_UPARROW || nPrimary == K_DOWNARROW || nPrimary == K_LEFTARROW || nPrimary == K_RIGHTARROW)
+       {
+               if (bInputType == 1)
+               {
+                       pressed_key_time = 0;
+                       return true;
+               }
+               else if (pressed_key_time == 0)
+                       pressed_key_time = time;
 
+               HUD_Panel_Arrow_Action(nPrimary); //move or resize panel
+       }
        else if(hit_con_bind)
                return false;
 
        return true; // Suppress ALL other input
 }
 
+float HUD_Panel_HighlightCheck()
+{
+       float i, j, border;
+       vector panelPos;
+       vector panelSize;
+
+       while(j <= HUD_PANEL_NUM)
+       {
+               i = panel_order[j];
+               j += 1;
+
+               HUD_Panel_UpdatePosSizeForId(i)
+
+               panelPos = panel_pos;
+               panelSize = panel_size;
+               border = max(8, panel_bg_border); // FORCED border so a small border size doesn't mean you can't resize
+
+               // move
+               if(mousepos_x >= panelPos_x && mousepos_y >= panelPos_y && mousepos_x <= panelPos_x + panelSize_x && mousepos_y <= panelPos_y + panelSize_y)
+               {
+                       return 1;
+               }
+               // resize from topleft border
+               else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
+               {
+                       return 2;
+               }
+               // resize from topright border
+               else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
+               {
+                       return 3;
+               }
+               // resize from bottomleft border
+               else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + panelSize_y + border)
+               {
+                       return 3;
+               }
+               // resize from bottomright border
+               else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + panelSize_y + border)
+               {
+                       return 2;
+               }
+       }
+       return 0;
+}
+
+// move a panel to the beginning of the panel order array (which means it gets drawn last, on top of everything else)
+void HUD_Panel_FirstInDrawQ(float id)
+{
+       float i;
+       var float place = -1;
+       // find out where in the array our current id is, save into place
+       for(i = 0; i < HUD_PANEL_NUM; ++i)
+       {
+               if(panel_order[i] == id)
+               {
+                       place = i;
+                       break;
+               }
+       }
+       // place last if we didn't find a place for it yet (probably new panel, or screwed up cvar)
+       if(place == -1)
+               place = HUD_PANEL_NUM - 1;
+
+       // move all ids up by one step in the array until "place"
+       for(i = place; i > 0; --i)
+       {
+               panel_order[i] = panel_order[i-1];
+       }
+       // now save the new top id
+       panel_order[0] = id;
+       
+       // let's save them into the cvar by some strcat trickery
+       string s;
+       for(i = 0; i < HUD_PANEL_NUM; ++i)
+       {
+               s = strcat(s, ftos(panel_order[i]), " ");
+       }
+       cvar_set("_hud_panelorder", s);
+       if(hud_panelorder_prev)
+               strunzone(hud_panelorder_prev);
+       hud_panelorder_prev = strzone(autocvar__hud_panelorder); // prevent HUD_Main from doing useless update, we already updated here
+}
+
+void HUD_Panel_Highlight()
+{
+       float i, j, border;
+       vector panelPos;
+       vector panelSize;
+
+       while(j <= HUD_PANEL_NUM)
+       {
+               i = panel_order[j];
+               j += 1;
+
+               HUD_Panel_UpdatePosSizeForId(i)
+
+               panelPos = panel_pos;
+               panelSize = panel_size;
+               border = max(8, panel_bg_border); // FORCED border so a small border size doesn't mean you can't resize
+
+               // move
+               if(mousepos_x >= panelPos_x && mousepos_y >= panelPos_y && mousepos_x <= panelPos_x + panelSize_x && mousepos_y <= panelPos_y + panelSize_y)
+               {
+                       highlightedPanel = i;
+                       HUD_Panel_FirstInDrawQ(i);
+                       highlightedAction = 1;
+                       panel_click_distance = mousepos - panelPos;
+                       return;
+               }
+               // resize from topleft border
+               else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
+               {
+                       highlightedPanel = i;
+                       HUD_Panel_FirstInDrawQ(i);
+                       highlightedAction = 2;
+                       resizeCorner = 1;
+                       panel_click_distance = mousepos - panelPos;
+                       panel_click_resizeorigin = panelPos + panelSize;
+                       return;
+               }
+               // resize from topright border
+               else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
+               {
+                       highlightedPanel = i;
+                       HUD_Panel_FirstInDrawQ(i);
+                       highlightedAction = 2;
+                       resizeCorner = 2;
+                       panel_click_distance_x = panelSize_x - mousepos_x + panelPos_x;
+                       panel_click_distance_y = mousepos_y - panelPos_y;
+                       panel_click_resizeorigin = panelPos + eY * panelSize_y;
+                       return;
+               }
+               // resize from bottomleft border
+               else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + panelSize_y + border)
+               {
+                       highlightedPanel = i;
+                       HUD_Panel_FirstInDrawQ(i);
+                       highlightedAction = 2;
+                       resizeCorner = 3;
+                       panel_click_distance_x = mousepos_x - panelPos_x;
+                       panel_click_distance_y = panelSize_y - mousepos_y + panelPos_y;
+                       panel_click_resizeorigin = panelPos + eX * panelSize_x;
+                       return;
+               }
+               // resize from bottomright border
+               else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + panelSize_y + border)
+               {
+                       highlightedPanel = i;
+                       HUD_Panel_FirstInDrawQ(i);
+                       highlightedAction = 2;
+                       resizeCorner = 4;
+                       panel_click_distance = panelSize - mousepos + panelPos;
+                       panel_click_resizeorigin = panelPos;
+                       return;
+               }
+               else
+               {
+                       highlightedPanel_prev = -1;
+               }
+       }
+}
+
+float highlightcheck;
 void HUD_Panel_Mouse()
 {
        // TODO: needs better check... is there any float that contains the current state of the menu? _menu_alpha isn't apparently updated the frame the menu gets enabled
        if (menu_enabled == 0) // menu dialog closed, enable normal alpha stuff again
                disable_menu_alphacheck = 0;
-       if (cvar("_menu_alpha") == 0 && time - menu_enabled_time > 0.5)
+       if (autocvar__menu_alpha == 0 && time - menu_enabled_time > 0.5)
                menu_enabled = 0;
 
        /*
@@ -1276,100 +1240,44 @@ void HUD_Panel_Mouse()
        print("Menu alpha: ", cvar_string("_menu_alpha"), "\n");
        */
 
-       if(mouseClicked == 0 && disable_menu_alphacheck != 2) { // don't reset these variables in disable_menu_alphacheck mode 2!
+       if(mouseClicked == 0 && disable_menu_alphacheck != 2 && highlightedPanel >= 0) { // don't reset these variables in disable_menu_alphacheck mode 2!
                highlightedPanel = -1;
                highlightedAction = 0;
        }
+       if(highlightedPanel != -1)
+               highlightedPanel_prev = highlightedPanel;
 
-       mousepos = mousepos + getmousepos();
+       mousepos = mousepos + getmousepos() * cvar("menu_mouse_speed");
 
        mousepos_x = bound(0, mousepos_x, vid_conwidth);
        mousepos_y = bound(0, mousepos_y, vid_conheight);
 
-       drawpic(mousepos, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor.tga"), '32 32 0', '1 1 1', 1, DRAWFLAG_NORMAL);
-
        if(mouseClicked)
        {
-               float i, border;
-               vector panelPos;
-               vector panelSize;
-
-               for(i = 0; i < HUD_PANEL_NUM; ++i)
-               {
-                       panelPos = HUD_Panel_GetPos(i);
-                       panelSize = HUD_Panel_GetSize(i);
-                       border = HUD_Panel_GetBorder(i);
-                       if(prevMouseClicked == 0) {
-                               // move
-                               if(mousepos_x >= panelPos_x && mousepos_y >= panelPos_y && mousepos_x <= panelPos_x + panelSize_x && mousepos_y <= panelPos_y + panelSize_y)
-                               {
-                                       highlightedPanel = i;
-                                       highlightedAction = 1;
-                               }
-                               // resize from topleft border
-                               else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
-                               {
-                                       highlightedPanel = i;
-                                       highlightedAction = 2;
-                                       resizeCorner = 1;
-                               }
-                               // resize from topright border
-                               else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
-                               {
-                                       highlightedPanel = i;
-                                       highlightedAction = 2;
-                                       resizeCorner = 2;
-                               }
-                               // resize from bottomleft border
-                               else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + panelSize_y + border)
-                               {
-                                       highlightedPanel = i;
-                                       highlightedAction = 2;
-                                       resizeCorner = 3;
-                               }
-                               // resize from bottomright border
-                               else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + panelSize_y + border)
-                               {
-                                       highlightedPanel = i;
-                                       highlightedAction = 2;
-                                       resizeCorner = 4;
-                               }
-                       }
-
-                       if(highlightedPanel == i)
-                       {
-                               if(prevMouseClicked == 0)
-                               {
-                                       if(highlightedAction == 1)
-                                               panel_click_distance = mousepos - panelPos;
-                                       else if(highlightedAction == 2)
-                                       {
-                                               if(resizeCorner == 1) {
-                                                       panel_click_distance = mousepos - panelPos;
-                                                       panel_click_resizeorigin = panelPos + panelSize;
-                                               } else if(resizeCorner == 2) {
-                                                       panel_click_distance_x = panelSize_x - mousepos_x + panelPos_x;
-                                                       panel_click_distance_y = mousepos_y - panelPos_y;
-                                                       panel_click_resizeorigin = panelPos + eY * panelSize_y;
-                                               } else if(resizeCorner == 3) {
-                                                       panel_click_distance_x = mousepos_x - panelPos_x;
-                                                       panel_click_distance_y = panelSize_y - mousepos_y + panelPos_y;
-                                                       panel_click_resizeorigin = panelPos + eX * panelSize_x;
-                                               } else if(resizeCorner == 4) {
-                                                       panel_click_distance = panelSize - mousepos + panelPos;
-                                                       panel_click_resizeorigin = panelPos;
-                                               }
-                                       }       
-                               }
+               if(prevMouseClicked == 0)
+                       HUD_Panel_Highlight(); // sets highlightedPanel, highlightedAction, panel_click_distance, panel_click_resizeorigin
 
-                               if(cvar("hud_configure_checkcollisions_debug"))
-                                       drawfill(panelPos, panelSize, '1 0 0', .3, DRAWFLAG_NORMAL);
+               hud_configure_checkcollisions = (!(hudShiftState & S_CTRL) && autocvar_hud_configure_checkcollisions);
 
-                               if(highlightedAction == 1)
-                                       HUD_Panel_SetPos(i, mousepos - panel_click_distance);
-                               else if(highlightedAction == 2)
-                                       HUD_Panel_SetPosSize(i);
+               if(highlightedAction == 1)
+                       HUD_Panel_SetPos(mousepos - panel_click_distance);
+               else if(highlightedAction == 2)
+               {
+                       vector mySize;
+                       if(resizeCorner == 1) {
+                               mySize_x = panel_click_resizeorigin_x - (mousepos_x - panel_click_distance_x);
+                               mySize_y = panel_click_resizeorigin_y - (mousepos_y - panel_click_distance_y);
+                       } else if(resizeCorner == 2) {
+                               mySize_x = mousepos_x + panel_click_distance_x - panel_click_resizeorigin_x;
+                               mySize_y = panel_click_distance_y + panel_click_resizeorigin_y - mousepos_y;
+                       } else if(resizeCorner == 3) {
+                               mySize_x = panel_click_resizeorigin_x + panel_click_distance_x - mousepos_x;
+                               mySize_y = mousepos_y + panel_click_distance_y - panel_click_resizeorigin_y;
+                       } else { // resizeCorner == 4
+                               mySize_x = mousepos_x - (panel_click_resizeorigin_x - panel_click_distance_x);
+                               mySize_y = mousepos_y - (panel_click_resizeorigin_y - panel_click_distance_y);
                        }
+                       HUD_Panel_SetPosSize(mySize);
                }
 
                // doubleclick check
@@ -1379,7 +1287,8 @@ void HUD_Panel_Mouse()
                        disable_menu_alphacheck = 2;
                        menu_enabled = 1;
                        menu_enabled_time = time;
-                       localcmd("menu_showhudoptions ", ftos(highlightedPanel), "\n");
+                       HUD_Panel_GetName(highlightedPanel)
+                       localcmd("menu_showhudoptions ", panel_name, "\n");
                        return;
                }
                if(prevMouseClicked == 0)
@@ -1388,18 +1297,34 @@ void HUD_Panel_Mouse()
                        prevMouseClickedPos = mousepos;
                }
        }
+       else
+       {
+               highlightcheck = HUD_Panel_HighlightCheck();
+       }
+       // draw cursor after performing move/resize to have the panel pos/size updated before highlightcheck
+       string cursor;
+       vector cursorsize;
+       cursorsize = '32 32 0';
+
+       if(highlightcheck == 0)
+               drawpic(mousepos, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor.tga"), '32 32 0', '1 1 1', 1, DRAWFLAG_NORMAL);
+       else if(highlightcheck == 1)
+               drawpic(mousepos - cursorsize * 0.5, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor_move.tga"), '32 32 0', '1 1 1', 1, DRAWFLAG_NORMAL);
+       else if(highlightcheck == 2)
+               drawpic(mousepos - cursorsize * 0.5, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor_resize.tga"), '32 32 0', '1 1 1', 1, DRAWFLAG_NORMAL);
+       else
+               drawpic(mousepos - cursorsize * 0.5, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor_resize2.tga"), '32 32 0', '1 1 1', 1, DRAWFLAG_NORMAL);
+
        prevMouseClicked = mouseClicked;
 }
 
 // Weapon icons (#0)
 //
 float weaponspace[10];
-void HUD_WeaponIcons_Clear()
-{
-       float idx;
-       for(idx = 0; idx < 10; ++idx)
+#define HUD_Weapons_Clear()\
+       float idx;\
+       for(idx = 0; idx < 10; ++idx)\
                weaponspace[idx] = 0;
-}
 
 entity weaponorder[WEP_MAXCOUNT];
 void weaponorder_swap(float i, float j, entity pass)
@@ -1420,17 +1345,54 @@ float weaponorder_cmp(float i, float j, entity pass)
        return aj - ai; // the string is in REVERSE order (higher prio at the right is what we want, but higher prio first is the string)
 }
 
-void HUD_WeaponIcons(void)
+float GetAmmoStat(float i)
 {
-       float id = HUD_PANEL_WEAPONICONS;
-       float alpha, stat_weapons; // "constants"
-       vector pos, mySize, accuracy_color;
-       float i, weapid, fade, weapon_stats, weapon_hit, weapon_damage, weapon_cnt; // variables
+       switch(i)
+       {
+               case 0: return STAT_SHELLS;
+               case 1: return STAT_NAILS;
+               case 2: return STAT_ROCKETS;
+               case 3: return STAT_CELLS;
+               case 4: return STAT_FUEL;
+               default: return -1;
+       }
+}
 
-       pos = HUD_Panel_GetPos(id);
-       mySize = HUD_Panel_GetSize(id);
+float GetAmmoTypeForWep(float i)
+{
+       switch(i)
+       {
+               case WEP_SHOTGUN: return 0;
+               case WEP_UZI: return 1;
+               case WEP_CAMPINGRIFLE: return 1;
+               case WEP_GRENADE_LAUNCHER: return 2;
+               case WEP_ELECTRO: return 3;
+               case WEP_CRYLINK: return 3;
+               case WEP_HLAC: return 3;
+               case WEP_MINSTANEX: return 3;
+               case WEP_NEX: return 3;
+               case WEP_HAGAR: return 2;
+               case WEP_ROCKET_LAUNCHER: return 2;
+               case WEP_SEEKER: return 2;
+               case WEP_FIREBALL: return 4;
+               case WEP_HOOK: return 3;
+               default: return -1;
+       }
+}
+
+void HUD_Weapons(void)
+{
+       if(!autocvar_hud_panel_weapons && !autocvar__hud_configure)
+               return;
+
+       active_panel = HUD_PANEL_WEAPONS;
+       HUD_Panel_UpdateCvars(weapons);
+       vector pos, mySize;
+       float i, weapid, fade, weapon_stats, weapon_number, weapon_cnt;
+
+       pos = panel_pos;
+       mySize = panel_size;
 
-       stat_weapons = getstati(STAT_WEAPONS);
        weapon_cnt = 0;
        for(i = WEP_FIRST; i <= WEP_LAST; ++i)
        {
@@ -1460,13 +1422,11 @@ void HUD_WeaponIcons(void)
                heapsort(weapon_cnt, weaponorder_swap, weaponorder_cmp, world);
        }
 
-       HUD_Panel_DrawBg(id, pos, mySize, 0);
-       float padding;
-       padding = HUD_Panel_GetPadding(id);
-       if(padding)
+       HUD_Panel_DrawBg(1);
+       if(panel_bg_padding)
        {
-               pos += '1 1 0' * padding;
-               mySize -= '2 2 0' * padding;
+               pos += '1 1 0' * panel_bg_padding;
+               mySize -= '2 2 0' * panel_bg_padding;
        }
 
        // hits
@@ -1478,7 +1438,7 @@ void HUD_WeaponIcons(void)
        weapon_number = weapon_stats & 63;
        weapon_fired[weapon_number-WEP_FIRST] = floor(weapon_stats / 64);
 
-       if(cvar_or("hud_weaponicons_fade", 1))
+       if(cvar_or("hud_panel_weapons_fade", 1))
        {
                fade = 3.2 - 2 * (time - weapontime);
                fade = bound(0.7, fade, 1);
@@ -1486,78 +1446,177 @@ void HUD_WeaponIcons(void)
        else
                fade = 1;
 
-       HUD_WeaponIcons_Clear();
+       HUD_Weapons_Clear();
 
        float rows, columns;
        rows = mySize_y/mySize_x;
-       rows = bound(1, floor((sqrt(4 * (2/1) * rows * WEP_COUNT + rows * rows) + rows + 0.5) / 2), WEP_COUNT);
-       //                               ^^^ weapon icon aspect goes here
+       rows = bound(1, floor((sqrt(4 * autocvar_hud_panel_weapons_aspect * rows * WEP_COUNT + rows * rows) + rows + 0.5) / 2), WEP_COUNT);
 
        columns = ceil(WEP_COUNT/rows);
        float row, column;
+
+       float a, type, fullammo;
+       float when;
+       when = autocvar_hud_panel_weapons_complainbubble_time;
+       float fadetime;
+       fadetime = autocvar_hud_panel_weapons_complainbubble_fadetime;
+
+       vector color;
+       vector wpnpos;
+       vector wpnsize;
+
        for(i = 0; i < weapon_cnt; ++i)
        {
+               wpnpos = pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows);
+               wpnsize = eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows);
+
                self = weaponorder[i];
                weapid = self.impulse;
 
-               alpha = (self.weapon == activeweapon) ? 1 : 0.6;
-
-               weapon_hit = weapon_hits[self.weapon-WEP_FIRST];
-               weapon_damage = weapon_fired[self.weapon-WEP_FIRST];
-
                // draw background behind currently selected weapon
                if(self.weapon == activeweapon)
-                       drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_current_bg", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                       drawpic_aspect_skin(wpnpos, "weapon_current_bg", wpnsize, '1 1 1', fade * panel_fg_alpha, DRAWFLAG_NORMAL);
 
-               // draw the weapon accuracy on the HUD
-               if(hud_accuracy_hud && !(gametype == GAME_RACE || gametype == GAME_CTS))
+               // draw the weapon accuracy
+               if(acc_levels)
                {
+                       float weapon_hit, weapon_damage;
+                       weapon_damage = weapon_fired[self.weapon-WEP_FIRST];
                        if(weapon_damage)
+                       {
+                               weapon_hit = weapon_hits[self.weapon-WEP_FIRST];
                                weapon_stats = floor(100 * weapon_hit / weapon_damage);
+                       }
+
+                       // find the max level lower than weapon_stats
+                       float j;
+                       j = acc_levels-1;
+                       while ( j && weapon_stats < acc_lev[j] )
+                               --j;
+
+                       // inject color j+1 in color j, how much depending on how much weapon_stats is higher than level j
+                       float factor;
+                       factor = (weapon_stats - acc_lev[j]) / (acc_lev[j+1] - acc_lev[j]);
+                       color = acc_color(j);
+                       color = color + factor * (acc_color(j+1) - color);
 
-                       accuracy_color = HUD_AccuracyColor(weapon_stats);
                        if(weapon_damage)
-                               drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_accuracy", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), accuracy_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                               drawpic_aspect_skin(wpnpos, "weapon_accuracy", wpnsize, color, panel_fg_alpha, DRAWFLAG_NORMAL);
                }
 
                // draw the weapon icon
-               if((self.impulse >= 0) && (stat_weapons & self.weapons))
+               if((self.impulse >= 0) && (getstati(STAT_WEAPONS) & self.weapons))
                {
-                       drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                       drawpic_aspect_skin(wpnpos, strcat("weapon", self.netname), wpnsize, '1 1 1', fade * panel_fg_alpha, DRAWFLAG_NORMAL);
+
+                       if(autocvar_hud_panel_weapons_label == 1) // weapon number
+                               drawstring(wpnpos, ftos(weapid), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+                       else if(autocvar_hud_panel_weapons_label == 2) // bind
+                               drawstring(wpnpos, getcommandkey(ftos(weapid), strcat("impulse ", ftos(weapid))), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
 
-                       if(cvar_or("hud_weaponicons_number", 1))
-                               drawstring(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), ftos(weapid), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                       // draw ammo status bar
+                       if(autocvar_hud_panel_weapons_ammo && weapid != WEP_TUBA && weapid != WEP_LASER && weapid != WEP_PORTO)
+                       {
+                               a = 0;
+                               type = GetAmmoTypeForWep(weapid);
+                               if(type != -1)
+                                       a = getstati(GetAmmoStat(type)); // how much ammo do we have?
+
+                               if(a > 0)
+                               {
+                                       switch(type) {
+                                               case 0: fullammo = autocvar_hud_panel_weapons_ammo_full_shells; break;
+                                               case 1: fullammo = autocvar_hud_panel_weapons_ammo_full_nails; break;
+                                               case 2: fullammo = autocvar_hud_panel_weapons_ammo_full_rockets; break;
+                                               case 3: fullammo = autocvar_hud_panel_weapons_ammo_full_cells; break;
+                                               case 4: fullammo = autocvar_hud_panel_weapons_ammo_full_fuel; break;
+                                               default: fullammo = 60;
+                                       }
+
+                                       vector barsize;
+                                       vector barpos;
+                                       if(wpnsize_x/wpnsize_y > autocvar_hud_panel_weapons_aspect)
+                                       {
+                                               barsize_x = autocvar_hud_panel_weapons_aspect * wpnsize_y;
+                                               barsize_y = wpnsize_y;
+
+                                               barpos_x = wpnpos_x + (wpnsize_x - barsize_x) / 2;
+                                               barpos_y = wpnpos_y;
+                                       }
+                                       else
+                                       {
+                                               barsize_y = 1/autocvar_hud_panel_weapons_aspect * wpnsize_x;
+                                               barsize_x = wpnsize_x;
+
+                                               barpos_y = wpnpos_y + (wpnsize_y - barsize_y) / 2;
+                                               barpos_x = wpnpos_x;
+                                       }
+
+                                       drawsetcliparea(
+                                               barpos_x,
+                                               barpos_y,
+                                               barsize_x * bound(0, a/fullammo, 1),
+                                               barsize_y);
+                                       drawpic_aspect_skin(wpnpos, "weapon_ammo", wpnsize, autocvar_hud_panel_weapons_ammo_color, panel_fg_alpha * autocvar_hud_panel_weapons_ammo_alpha, DRAWFLAG_NORMAL);
+                                       drawresetcliparea();
+                               }
+                       }
                }
+
+               // draw a "ghost weapon icon" if you don't have the weapon
                else
                {
-                       drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '0 0 0', HUD_Panel_GetFgAlpha(id) * 0.5, DRAWFLAG_NORMAL);
+                       drawpic_aspect_skin(wpnpos, strcat("weapon", self.netname), wpnsize, '0 0 0', panel_fg_alpha * 0.5, DRAWFLAG_NORMAL);
                }
 
-               ++row;
-               if(row >= rows)
+               // draw the complain message
+               if(time - complain_weapon_time < when + fadetime && self.weapon == complain_weapon && autocvar_hud_panel_weapons_complainbubble)
                {
-                       row = 0;
-                       ++column;
-               }
-       }
+                       if(fadetime)
+                       {
+                               if(complain_weapon_time + when > time)
+                                       a = 1;
+                               else
+                                       a = bound(0, (complain_weapon_time + when + fadetime - time) / fadetime, 1);
+                       }
+                       else
+                       {
+                               if(complain_weapon_time + when > time)
+                                       a = 1;
+                               else
+                                       a = 0;
+                       }
 
-}
+                       string s;
+                       if(complain_weapon_type == 0) {
+                               s = "Out of ammo";
+                               color = autocvar_hud_panel_weapons_complainbubble_color_outofammo;
+                       }
+                       else if(complain_weapon_type == 1) {
+                               s = "Don't have";
+                               color = autocvar_hud_panel_weapons_complainbubble_color_donthave;
+                       }
+                       else {
+                               s = "Unavailable";
+                               color = autocvar_hud_panel_weapons_complainbubble_color_unavailable;
+                       }
+                       drawpic_aspect_skin(wpnpos + '1 1 0' * autocvar_hud_panel_weapons_complainbubble_padding, "weapon_complainbubble", wpnsize - '2 2 0' * autocvar_hud_panel_weapons_complainbubble_padding, color, a * panel_fg_alpha, DRAWFLAG_NORMAL);
+                       drawstring_aspect(wpnpos + '1 1 0' * autocvar_hud_panel_weapons_complainbubble_padding, s, wpnsize - '2 2 0' * autocvar_hud_panel_weapons_complainbubble_padding, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
+               }
 
-// Inventory (#1)
-//
-float GetAmmoStat(float i)
-{
-       switch(i)
-       {
-               case 0: return STAT_SHELLS;
-               case 1: return STAT_NAILS;
-               case 2: return STAT_ROCKETS;
-               case 3: return STAT_CELLS;
-               case 4: return STAT_FUEL;
-               default: return -1;
+               ++row;
+               if(row >= rows)
+               {
+                       row = 0;
+                       ++column;
+               }
        }
+
 }
 
+// Ammo (#1)
+//
+// TODO: macro
 float GetAmmoItemCode(float i)
 {
        switch(i)
@@ -1584,104 +1643,195 @@ string GetAmmoPicture(float i)
        }
 }
 
-void HUD_Inventory(void)
+void DrawAmmoItem(vector myPos, vector mySize, float itemcode, float currently_selected)
 {
-       float id = HUD_PANEL_INVENTORY;
-       float i;
-       float stat_items;
+       float a;
+       a = getstati(GetAmmoStat(itemcode)); // how much ammo do we have of type itemcode?
+       if(autocvar__hud_configure)
+               a = 100;
+
+       vector color;
+       if(a < 10)
+               color = '0.7 0 0';
+       else
+               color = '1 1 1';
+
+       float alpha;
+       if(currently_selected)
+               alpha = 1;
+       else
+               alpha = 0.7;
+
+       vector newSize, newPos;
+       if(mySize_x/mySize_y > 3)
+       {
+               newSize_x = 3 * mySize_y;
+               newSize_y = mySize_y;
+
+               newPos_x = myPos_x + (mySize_x - newSize_x) / 2;
+               newPos_y = myPos_y;
+       }
+       else
+       {
+               newSize_y = 1/3 * mySize_x;
+               newSize_x = mySize_x;
+
+               newPos_y = myPos_y + (mySize_y - newSize_y) / 2;
+               newPos_x = myPos_x;
+       }
+
+       vector picpos, numpos;
+       if(autocvar_hud_panel_ammo_iconalign)
+       {
+               numpos = newPos;
+               picpos = newPos + eX * 2 * newSize_y;
+       }
+       else
+       {
+               numpos = newPos + eX * newSize_y;
+               picpos = newPos;
+       }
+
+       if (currently_selected)
+               drawpic_aspect_skin(newPos, "ammo_current_bg", newSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+
+       drawfont = hud_bigfont;
+       if(a > 0)
+               drawstring_aspect(numpos, ftos(a), eX * (2/3) * newSize_x + eY * newSize_y, color, panel_fg_alpha * alpha, DRAWFLAG_NORMAL);
+       else // "ghost" ammo count
+               drawstring_aspect(numpos, ftos(a), eX * (2/3) * newSize_x + eY * newSize_y, '0 0 0', panel_fg_alpha * alpha * 0.5, DRAWFLAG_NORMAL);
+       drawfont = hud_font;
+       if(a > 0)
+               drawpic_aspect_skin(picpos, GetAmmoPicture(itemcode), '1 1 0' * newSize_y, '1 1 1', panel_fg_alpha * alpha, DRAWFLAG_NORMAL);
+       else // "ghost" ammo icon
+               drawpic_aspect_skin(picpos, GetAmmoPicture(itemcode), '1 1 0' * newSize_y, '0 0 0', panel_fg_alpha * alpha * 0.5, DRAWFLAG_NORMAL);
+}
+
+void HUD_Ammo(void)
+{
+       if(!autocvar_hud_panel_ammo && !autocvar__hud_configure)
+               return;
+
+       active_panel = HUD_PANEL_AMMO;
+       HUD_Panel_UpdateCvars(ammo);
+       float i, currently_selected;
 
-       vector pos, mySize, mysize, mypos;
-       pos = HUD_Panel_GetPos(id);
-       mySize = HUD_Panel_GetSize(id);
+       vector pos, mySize;
+       pos = panel_pos;
+       mySize = panel_size;
 
-       HUD_Panel_DrawBg(id, pos, mySize, 0);
-       float padding;
-       padding = HUD_Panel_GetPadding(id);
-       if(padding)
+       HUD_Panel_DrawBg(1);
+       if(panel_bg_padding)
        {
-               pos += '1 1 0' * padding;
-               mySize -= '2 2 0' * padding;
+               pos += '1 1 0' * panel_bg_padding;
+               mySize -= '2 2 0' * panel_bg_padding;
        }
 
+       float rows, columns;
+       rows = mySize_y/mySize_x;
+       rows = bound(1, floor((sqrt(4 * (3/1) * rows * AMMO_COUNT + rows * rows) + rows + 0.5) / 2), AMMO_COUNT);
+       //                               ^^^ ammo item aspect goes here
+
+       columns = ceil(AMMO_COUNT/rows);
+
+       float row, column;
        // ammo
-       stat_items = getstati(STAT_ITEMS);
-       for (i = 0; i < 4; ++i) {
-               float a;
-               a = getstati(GetAmmoStat(i)); // how much ammo do we have of type i?
-               if(hud_configure)
-                       a = 100;
-
-               if(cvar("hud_inventory_onlycurrent")) {
-                       if(hud_configure)
+       for (i = 0; i < AMMO_COUNT; ++i) {
+               currently_selected = getstati(STAT_ITEMS) & GetAmmoItemCode(i);
+               if(autocvar_hud_panel_ammo_onlycurrent) {
+                       if(autocvar__hud_configure)
                                i = 2;
-                       if (stat_items & GetAmmoItemCode(i) || hud_configure) {
-                               drawpic_skin(pos, GetAmmoPicture(i), '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                               if(a < 10)
-                                       HUD_DrawXNum(pos + eX * mySize_y + eY * 0.25 * mySize_y, a, strlen(ftos(a)), 0, 0.5 * mySize_y, '0.7 0 0', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                               else
-                                       HUD_DrawXNum(pos + eX * mySize_y + eY * 0.25 * mySize_y, a, strlen(ftos(a)), 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                       }
-                       if(hud_configure)
+                       if (currently_selected || autocvar__hud_configure)
+                       {
+                               DrawAmmoItem(pos, mySize, i, currently_selected);
                                break;
+                       }
                } else {
-                       if (a > 0) {
-                               if(mySize_x/mySize_y >= 10) { // arrange horizontally
-                                       switch (i) {
-                                               case 0: mypos_x = pos_x;                        mypos_y = pos_y;                        break; // shells
-                                               case 1: mypos_x = pos_x + 0.25 * mySize_x;      mypos_y = pos_y;                        break; // bullets
-                                               case 2: mypos_x = pos_x + 0.5  * mySize_x;      mypos_y = pos_y;                        break; // rockets
-                                               case 3: mypos_x = pos_x + 0.75 * mySize_x;      mypos_y = pos_y;                        break; // cells
-                                       }
-                                       mysize_x = 0.25 * mySize_x;
-                                       mysize_y = mySize_y;
-                               } else if(mySize_x/mySize_y >= 2.5) { // arrange in a 2x2 grid
-                                       switch (i) {
-                                               case 0: mypos_x = pos_x + 0.5 * mySize_x;       mypos_y = pos_y + 0.5 * mySize_y;       break; // shells
-                                               case 1: mypos_x = pos_x + 0.5 * mySize_x;       mypos_y = pos_y;                        break; // bullets
-                                               case 2: mypos_x = pos_x;                        mypos_y = pos_y + 0.5 * mySize_y;       break; // rockets
-                                               case 3: mypos_x = pos_x;                        mypos_y = pos_y;                        break; // cells
-                                       }
-                                       mysize_x = 0.5 * mySize_x;
-                                       mysize_y = 0.5 * mySize_y;
-                               } else { // arrange vertically
-                                       switch (i) {
-                                               case 0: mypos_x = pos_x;                        mypos_y = pos_y;                        break; // shells
-                                               case 1: mypos_x = pos_x;                        mypos_y = pos_y + 0.25 * mySize_y;      break; // bullets
-                                               case 2: mypos_x = pos_x;                        mypos_y = pos_y + 0.5  * mySize_y;      break; // rockets
-                                               case 3: mypos_x = pos_x;                        mypos_y = pos_y + 0.75 * mySize_y;      break; // cells
-                                       }
-                                       mysize_x = mySize_x;
-                                       mysize_y = 0.25 * mySize_y;
-                               }
-
-                               if (stat_items & GetAmmoItemCode(i))
-                                       drawpic_skin(mypos, "ammo_current_bg", mysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                               drawpic_skin(mypos + eY * 0.05 * mysize_y, GetAmmoPicture(i), '1 1 0' * 0.8 * mysize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                               if (a < 10) {
-                                       if(stat_items & GetAmmoItemCode(i))
-                                               HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0 0', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                                       else
-                                               HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0 0', 0, 0, HUD_Panel_GetFgAlpha(id) * 0.7, DRAWFLAG_NORMAL);
-                               } else {
-                                       if(stat_items & GetAmmoItemCode(i))
-                                               HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                                       else
-                                               HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0.7 0.7', 0, 0, HUD_Panel_GetFgAlpha(id) * 0.7, DRAWFLAG_NORMAL);
-                               }
+                       DrawAmmoItem(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), i, currently_selected);
+                       ++row;
+                       if(row >= rows)
+                       {
+                               row = 0;
+                               column = column + 1;
                        }
                }
        }
 }
 
+void DrawNumIcon(float iconalign, vector myPos, vector mySize, float x, string icon, float left, vector color, float alpha)
+{
+       vector newSize, newPos;
+       if(mySize_x/mySize_y > 3)
+       {
+               newSize_x = 3 * mySize_y;
+               newSize_y = mySize_y;
+
+               newPos_x = myPos_x + (mySize_x - newSize_x) / 2;
+               newPos_y = myPos_y;
+       }
+       else
+       {
+               newSize_y = 1/3 * mySize_x;
+               newSize_x = mySize_x;
+
+               newPos_y = myPos_y + (mySize_y - newSize_y) / 2;
+               newPos_x = myPos_x;
+       }
+
+       vector picpos, numpos;
+       if(left)
+       {
+               if(iconalign == 1 || iconalign == 3) // right align
+               {
+                       numpos = newPos;
+                       picpos = newPos + eX * 2 * newSize_y;
+               }
+               else // left align
+               {
+                       numpos = newPos + eX * newSize_y;
+                       picpos = newPos;
+               }
+       }
+       else
+       {
+               if(iconalign == 0 || iconalign == 3) // left align
+               {
+                       numpos = newPos + eX * newSize_y;
+                       picpos = newPos;
+               } 
+               else // right align
+               {
+                       numpos = newPos;
+                       picpos = newPos + eX * 2 * newSize_y;
+               }
+       }
+
+       drawfont = hud_bigfont;
+       drawstring_aspect(numpos, ftos(x), eX * (2/3) * newSize_x + eY * newSize_y, color, panel_fg_alpha * alpha, DRAWFLAG_NORMAL);
+       drawfont = hud_font;
+       drawpic_aspect_skin(picpos, icon, '1 1 0' * newSize_y, '1 1 1', panel_fg_alpha * alpha, DRAWFLAG_NORMAL);
+}
+
+void DrawNumIcon_expanding(float iconalign, vector myPos, vector mySize, float x, string icon, float left, vector color, float fadelerp)
+{
+       float sz;
+       sz = expandingbox_sizefactor_from_fadelerp(fadelerp);
+
+       DrawNumIcon(iconalign, myPos + expandingbox_resize_centered_box_offset(sz, mySize, 1), mySize * sz, x, icon, left, color, (1 - fadelerp));
+}
 
 // Powerups (#2)
 //
 void HUD_Powerups(void) {
-       float id = HUD_PANEL_POWERUPS;
+       if(!autocvar_hud_panel_powerups && !autocvar__hud_configure)
+               return;
+
+       active_panel = HUD_PANEL_POWERUPS;
+       HUD_Panel_UpdateCvars(powerups);
        float stat_items;
        stat_items = getstati(STAT_ITEMS);
 
-       if(!hud_configure)
+       if(!autocvar__hud_configure)
        {
                if not(stat_items & IT_STRENGTH)
                        if not(stat_items & IT_INVINCIBLE)
@@ -1692,31 +1842,27 @@ void HUD_Powerups(void) {
        }
 
        vector pos, mySize;
-       pos = HUD_Panel_GetPos(id);
-       mySize = HUD_Panel_GetSize(id);
-
-       HUD_Panel_DrawBg(id, pos, mySize, 0);
-       float padding;
-       padding = HUD_Panel_GetPadding(id);
-       if(padding)
-       {
-               pos += '1 1 0' * padding;
-               mySize -= '2 2 0' * padding;
-       }
+       pos = panel_pos;
+       mySize = panel_size;
 
        float strength_time, shield_time;
 
        strength_time = bound(0, getstatf(STAT_STRENGTH_FINISHED) - time, 99);
        shield_time = bound(0, getstatf(STAT_INVINCIBLE_FINISHED) - time, 99);
 
-       if(hud_configure)
+       HUD_Panel_DrawBg(bound(0, max(strength_time, shield_time), 1));
+       if(panel_bg_padding)
+       {
+               pos += '1 1 0' * panel_bg_padding;
+               mySize -= '2 2 0' * panel_bg_padding;
+       }
+
+       if(autocvar__hud_configure)
        {
                strength_time = 15;
                shield_time = 27;
        }
 
-       float len;
-
        vector barpos, barsize;
        vector picpos;
        vector numpos;
@@ -1724,8 +1870,7 @@ void HUD_Powerups(void) {
        string leftname, rightname;
        float leftcnt, rightcnt;
        float leftexact, rightexact;
-       float leftalpha, rightalpha;
-       if (cvar(strcat("hud_", HUD_Panel_GetName(id), "_flip"))) {
+       if (autocvar_hud_panel_powerups_flip) {
                leftname = "strength";
                leftcnt = ceil(strength_time);
                leftexact = strength_time;
@@ -1742,177 +1887,179 @@ void HUD_Powerups(void) {
                rightcnt = ceil(strength_time);
                rightexact = strength_time;
        }
-       leftalpha = bound(0, leftexact, 1);
-       rightalpha = bound(0, rightexact, 1);
 
+       drawfont = hud_bigfont;
        if (mySize_x/mySize_y > 4)
        {
                if(leftcnt)
                {
-                       len = strlen(ftos(leftcnt));
-
-                       if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+                       if(autocvar_hud_panel_powerups_baralign == 1 || autocvar_hud_panel_powerups_baralign == 3) { // right align
                                barpos = pos + eX * 0.5 * mySize_x - eX * 0.5 * mySize_x * min(1, leftcnt/30);
                                barsize = eX * 0.5 * mySize_x * min(1, leftcnt/30) + eY * mySize_y;
-                               picpos = pos + eX * 0.5 * mySize_x - eX * mySize_y;
-                               numpos = picpos - eX * 2 * 0.5 * mySize_y + eX * (2-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y;
-                       } else {
+                       } else { // left align
                                barpos = pos;
                                barsize = eX * 0.5 * mySize_x * min(1, leftcnt/30) + eY * mySize_y;
-                               picpos = pos;
-                               numpos = picpos + eX * mySize_y - eX * (2-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y;
                        }
 
-                       HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                       if(autocvar_hud_panel_powerups_progressbar)
+                       {
+                               HUD_Panel_GetProgressBarColor(leftname)
+                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL);
+                       }
+                       if(leftcnt > 1)
+                               DrawNumIcon(autocvar_hud_panel_powerups_iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, '1 1 1', 1);
                        if(leftcnt <= 5)
-                               drawpic_skin_expanding_two(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1));
-                       else
-                               drawpic_skin(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                       HUD_DrawXNum(numpos, leftcnt, 2, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                               DrawNumIcon_expanding(autocvar_hud_panel_powerups_iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, '1 1 1', bound(0, (leftcnt - leftexact) / 0.5, 1));
                }
 
                if(rightcnt)
                {
-                       len = strlen(ftos(rightcnt));
-
-                       if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+                       if(autocvar_hud_panel_powerups_baralign == 0 || autocvar_hud_panel_powerups_baralign == 3) { // left align
                                barpos = pos + eX * 0.5 * mySize_x;
                                barsize = eX * 0.5 * mySize_x * min(1, rightcnt/30) + eY * mySize_y;
-                               picpos = pos + eX * 0.5 * mySize_x;
-                               numpos = picpos + eX * mySize_y - eX * (2-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y;
-                       } else {
+                       } else { // right align
                                barpos = pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, rightcnt/30);
                                barsize = eX * 0.5 * mySize_x * min(1, rightcnt/30) + eY * mySize_y;
-                               picpos = pos + eX * mySize_x - eX * mySize_y;
-                               numpos = picpos - eX * mySize_y + eY * 0.25 * mySize_y;
                        }
 
-                       HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                       if(autocvar_hud_panel_powerups_progressbar)
+                       {
+                               HUD_Panel_GetProgressBarColor(rightname)
+                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL);
+                       }
+                       if(rightcnt > 1)
+                               DrawNumIcon(autocvar_hud_panel_powerups_iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, '1 1 1', 1);
                        if(rightcnt <= 5)
-                               drawpic_skin_expanding_two(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1));
-                       else
-                               drawpic_skin(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                       HUD_DrawXNum(numpos, rightcnt, 2, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                               DrawNumIcon_expanding(autocvar_hud_panel_powerups_iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, '1 1 1', bound(0, (rightcnt - rightexact) / 0.5, 1));
                }
        }
        else if (mySize_x/mySize_y > 1.5)
        {
                if(leftcnt)
                {
-                       len = strlen(ftos(leftcnt));
-
-                       if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+                       if(autocvar_hud_panel_powerups_baralign == 1 || autocvar_hud_panel_powerups_baralign == 3) { // right align
                                barpos = pos + eX * mySize_x - eX * mySize_x * min(1, leftcnt/30);
                                barsize = eX * mySize_x * min(1, leftcnt/30) + eY * 0.5 * mySize_y;
-                               picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y;
-                               numpos = picpos - eX * len * 0.5 * mySize_y;
-                       } else {
+                       } else { // left align
                                barpos = pos;
                                barsize = eX * mySize_x * min(1, leftcnt/30) + eY * 0.5 * mySize_y;
-                               picpos = pos;
-                               numpos = picpos + eX * 0.5 * mySize_y;
                        }
 
-                       HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                       if(autocvar_hud_panel_powerups_progressbar)
+                       {
+                               HUD_Panel_GetProgressBarColor(leftname)
+                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL);
+                       }
+                       if(leftcnt > 1)
+                               DrawNumIcon(autocvar_hud_panel_powerups_iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, '1 1 1', 1);
                        if(leftcnt <= 5)
-                               drawpic_skin_expanding_two(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1));
-                       else
-                               drawpic_skin(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                       HUD_DrawXNum(numpos, leftcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                               DrawNumIcon_expanding(autocvar_hud_panel_powerups_iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, '1 1 1', bound(0, (leftcnt - leftexact) / 0.5, 1));
                }
 
                if(rightcnt)
                {
-                       len = strlen(ftos(rightcnt));
-
-                       if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
-                               barpos = pos + eX * mySize_x - eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y;
-                               barsize = eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y;
-                               picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y + eY * 0.5 * mySize_y;
-                               numpos = picpos - eX * len * 0.5 * mySize_y;
-                       } else {
+                       if(autocvar_hud_panel_powerups_baralign == 0 || autocvar_hud_panel_powerups_baralign == 3) { // left align
                                barpos = pos + eY * 0.5 * mySize_y;
                                barsize = eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y;
-                               picpos = pos + eY * 0.5 * mySize_y;
-                               numpos = picpos + eX * 0.5 * mySize_y;
+                       } else { // right align
+                               barpos = pos + eX * mySize_x - eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y;
+                               barsize = eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y;
                        }
 
-                       HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                       if(autocvar_hud_panel_powerups_progressbar)
+                       {
+                               HUD_Panel_GetProgressBarColor(rightname)
+                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL);
+                       }
+                       if(rightcnt > 1)
+                               DrawNumIcon(autocvar_hud_panel_powerups_iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, '1 1 1', 1);
                        if(rightcnt <= 5)
-                               drawpic_skin_expanding_two(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1));
-                       else
-                               drawpic_skin(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                       HUD_DrawXNum(numpos, rightcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                               DrawNumIcon_expanding(autocvar_hud_panel_powerups_iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, '1 1 1', bound(0, (rightcnt - rightexact) / 0.5, 1));
                }
        }
        else
        {
                if(leftcnt)
                {
-                       len = strlen(ftos(leftcnt));
-
-                       if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+                       if(autocvar_hud_panel_powerups_baralign == 1 || autocvar_hud_panel_powerups_baralign == 3) { // down align
+                               barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/30);
+                               barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30);
+                       } else { // up align
                                barpos = pos;
                                barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30);
+                       }
+
+                       if(autocvar_hud_panel_powerups_iconalign == 1 || autocvar_hud_panel_powerups_iconalign == 3) { // down align
+                               picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x);
+                               numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x;
+                       } else { // up align
                                picpos = pos + eX * 0.05 * mySize_x;
-                               numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x;
-                       } else {
-                               barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/30);
-                               barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30);
-                               picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.65 * mySize_x;
-                               numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.25 * mySize_x;
+                               numpos = pos + eY * 0.4 * mySize_x;
                        }
 
-                       HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                       if(autocvar_hud_panel_powerups_progressbar)
+                       {
+                               HUD_Panel_GetProgressBarColor(leftname)
+                               HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL);
+                       }
                        if(leftcnt <= 5)
-                               drawpic_skin_expanding_two(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1));
-                       else
-                               drawpic_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                       HUD_DrawXNum(numpos, leftcnt, len, 0, 0.25 * mySize_x, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                               drawpic_aspect_skin_expanding(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, bound(0, (leftcnt - leftexact) / 0.5, 1));
+                       if(leftcnt > 1)
+                               drawpic_aspect_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+                       drawstring_aspect(numpos, ftos(leftcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
                }
 
                if(rightcnt)
                {
-                       len = strlen(ftos(rightcnt));
-
-                       if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+                       if(autocvar_hud_panel_powerups_baralign == 0 || autocvar_hud_panel_powerups_baralign == 3) { // up align
                                barpos = pos + eX * 0.5 * mySize_x;
                                barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/30);
-                               picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x;
-                               numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x;
-                       } else {
+                       } else { // down align
                                barpos = pos + eY * mySize_y - eY * mySize_y * min(1, rightcnt/30) + eX * 0.5 * mySize_x;
                                barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/30);
-                               picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.65 * mySize_x + eX * 0.5 * mySize_x;
-                               numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.25 * mySize_x + eX * 0.5 * mySize_x;
                        }
 
-                       HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                       if(autocvar_hud_panel_powerups_iconalign == 0 || autocvar_hud_panel_powerups_iconalign == 3) { // up align
+                               picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x;
+                               numpos = pos + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x;
+                       } else { // down align
+                               picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x) + eX * 0.5 * mySize_x;
+                               numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x + eX * 0.5 * mySize_x;
+                       }
+
+                       if(autocvar_hud_panel_powerups_progressbar)
+                       {
+                               HUD_Panel_GetProgressBarColor(rightname)
+                               HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL);
+                       }
                        if(rightcnt <= 5)
-                               drawpic_skin_expanding_two(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1));
-                       else
-                               drawpic_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                       HUD_DrawXNum(numpos, rightcnt, len, 0, 0.25 * mySize_x, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                               drawpic_aspect_skin_expanding(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, bound(0, (rightcnt - rightexact) / 0.5, 1));
+                       if(rightcnt > 1)
+                               drawpic_aspect_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+                       drawstring_aspect(numpos, ftos(rightcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
                }
        }
+       drawfont = hud_font;
 }
 
 // Health/armor (#3)
 //
 void HUD_HealthArmor(void)
 {
-       float id = HUD_PANEL_HEALTHARMOR;
+       if(!autocvar_hud_panel_healtharmor && !autocvar__hud_configure)
+               return;
+
+       active_panel = HUD_PANEL_HEALTHARMOR;
+       HUD_Panel_UpdateCvars(healtharmor);
        vector pos, mySize;
-       pos = HUD_Panel_GetPos(id);
-       mySize = HUD_Panel_GetSize(id);
+       pos = panel_pos;
+       mySize = panel_size;
 
-       HUD_Panel_DrawBg(id, pos, mySize, 0);
-       float padding;
-       padding = HUD_Panel_GetPadding(id);
-       if(padding)
+       HUD_Panel_DrawBg(1);
+       if(panel_bg_padding)
        {
-               pos += '1 1 0' * padding;
-               mySize -= '2 2 0' * padding;
+               pos += '1 1 0' * panel_bg_padding;
+               mySize -= '2 2 0' * panel_bg_padding;
        }
 
        float armor, health;
@@ -1922,7 +2069,7 @@ void HUD_HealthArmor(void)
        float fuel;
        fuel = getstati(GetAmmoStat(4)); // how much fuel do we have?
 
-       if(hud_configure)
+       if(autocvar__hud_configure)
        {
                armor = 150;
                health = 100;
@@ -1932,12 +2079,12 @@ void HUD_HealthArmor(void)
        if(health <= 0)
                return;
 
-       float len;
        vector barpos, barsize;
        vector picpos;
        vector numpos;
 
-       if(cvar("hud_healtharmor") == 2) // combined health and armor display
+       drawfont = hud_bigfont;
+       if(autocvar_hud_panel_healtharmor == 2) // combined health and armor display
        {
                vector v;
                v = healtharmor_maxdamage(health, armor, armorblockpercent);
@@ -1945,53 +2092,60 @@ void HUD_HealthArmor(void)
                float x;
                x = floor(v_x + 1);
 
-               if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+               if(autocvar_hud_panel_healtharmor_baralign == 1 || autocvar_hud_panel_healtharmor_baralign == 3) { // right align
                        barpos = pos + eX * mySize_x - eX * mySize_x * min(1, x/400);
                        barsize = eX * mySize_x * min(1, x/400) + eY * mySize_y;
-                       picpos = pos;
-                       numpos = picpos + eX * 1.5 * mySize_y;
-               } else {
+               } else { // left align
                        barpos = pos;
                        barsize = eX * mySize_x * min(1, x/400) + eY * mySize_y;
-                       picpos = pos + eX * 3 * mySize_y;
-                       numpos = pos;
                }
 
+               string biggercount;
                if(v_z) // NOT fully armored
                {
-                       HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("health"), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                       drawpic_skin(picpos, "health", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                       biggercount = "health";
+                       if(autocvar_hud_panel_healtharmor_progressbar)
+                       {
+                               HUD_Panel_GetProgressBarColor("health")
+                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+                       }
                        if(armor)
-                               drawpic_skin(picpos + eX * mySize_y, "armor", '0.5 0.5 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id) * armor / health, DRAWFLAG_NORMAL);
+                               drawpic_aspect_skin(pos + eX * mySize_x - eX * 0.5 * mySize_y, "armor", '0.5 0.5 0' * mySize_y, '1 1 1', panel_fg_alpha * armor / health, DRAWFLAG_NORMAL);
                }
                else
                {
-                       HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("armor"), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                       drawpic_skin(picpos + eX * mySize_y, "health", '0.5 0.5 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id) * health / armor, DRAWFLAG_NORMAL);
-                       if(armor)
-                               drawpic_skin(picpos, "armor", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                       biggercount = "armor";
+                       if(autocvar_hud_panel_healtharmor_progressbar)
+                       {
+                               HUD_Panel_GetProgressBarColor("armor")
+                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+                       }
+                       if(health)
+                               drawpic_aspect_skin(pos + eX * mySize_x - eX * 0.5 * mySize_y, "health", '0.5 0.5 0' * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
                }
-               HUD_DrawXNum_Colored(numpos, x, 3, mySize_y, HUD_Panel_GetFgAlpha(id)); // draw the combined health and armor
+               DrawNumIcon(autocvar_hud_panel_healtharmor_iconalign, pos, mySize, x, biggercount, 1, HUD_Get_Num_Color(x, 2 * 200), 1);
 
                // fuel
-               if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
-                       barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100);
-                       barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y;
-               } else {
-                       barpos = pos;
-                       barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y;
-               }
                if(fuel)
-                       HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL);
+               {
+                       if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align
+                               barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100);
+                               barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y;
+                       } else {
+                               barpos = pos;
+                               barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y;
+                       }
+                       HUD_Panel_GetProgressBarColor("fuel")
+                       HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL);
+               }
        }
-
        else
        {
                string leftname, rightname;
                float leftcnt, rightcnt;
                float leftactive, rightactive;
                float leftalpha, rightalpha;
-               if (cvar(strcat("hud_", HUD_Panel_GetName(id), "_flip"))) { // old style layout with armor left/top of health
+               if (autocvar_hud_panel_healtharmor_flip) { // old style layout with armor left/top of health
                        leftname = "armor";
                        leftcnt = armor;
                        if(leftcnt)
@@ -2015,172 +2169,181 @@ void HUD_HealthArmor(void)
                        rightalpha = min((armor+10)/55, 1);
                }
 
-               if (mySize_x/mySize_y > 5)
+               if (mySize_x/mySize_y > 4)
                {
                        if(leftactive)
                        {
-                               len = strlen(ftos(leftcnt));
-
-                               if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+                               if(autocvar_hud_panel_healtharmor_baralign == 1 || autocvar_hud_panel_healtharmor_baralign == 3) { // right align
                                        barpos = pos + eX * 0.5 * mySize_x - eX * 0.5 * mySize_x * min(1, leftcnt/200);
                                        barsize = eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y;
-                                       picpos = pos + eX * 0.5 * mySize_x - eX * mySize_y;
-                                       numpos = picpos - eX * 3 * 0.5 * mySize_y + eX * (3-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y;
-                               } else {
+                               } else { // left align
                                        barpos = pos;
                                        barsize = eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y;
-                                       picpos = pos;
-                                       numpos = picpos + eX * mySize_y + eY * 0.25 * mySize_y;
                                }
 
-                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                               drawpic_skin(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                               HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id));
+                               if(autocvar_hud_panel_healtharmor_progressbar)
+                               {
+                                       HUD_Panel_GetProgressBarColor(leftname)
+                                       HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+                               }
+                               DrawNumIcon(autocvar_hud_panel_healtharmor_iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, 200), 1);
                        }
 
                        if(rightactive)
                        {
-                               len = strlen(ftos(rightcnt));
-
-                               if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+                               if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align
                                        barpos = pos + eX * 0.5 * mySize_x;
                                        barsize = eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y;
-                                       picpos = pos + eX * 0.5 * mySize_x;
-                                       numpos = picpos + eX * mySize_y - eX * (3-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y;
-                               } else {
+                               } else { // right align
                                        barpos = pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, rightcnt/200);
                                        barsize = eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y;
-                                       picpos = pos + eX * mySize_x - eX * mySize_y;
-                                       numpos = picpos - eX * 1.5 * mySize_y + eY * 0.25 * mySize_y;
                                }
 
-                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                               drawpic_skin(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                               HUD_DrawXNum_Colored(numpos, rightcnt, 3, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id));
+                               if(autocvar_hud_panel_healtharmor_progressbar)
+                               {
+                                       HUD_Panel_GetProgressBarColor(rightname)
+                                       HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+                               }
+                               DrawNumIcon(autocvar_hud_panel_healtharmor_iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(rightcnt, 200), 1);
                        }
 
-                       if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
-                               barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100);
-                               barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y;
-                       } else {
-                               barpos = pos;
-                               barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y;
-                       }
                        if(fuel)
-                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL);
+                       {
+                               if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align
+                                       barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100);
+                                       barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y;
+                               } else {
+                                       barpos = pos;
+                                       barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y;
+                               }
+                               HUD_Panel_GetProgressBarColor("fuel")
+                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL);
+                       }
                }
-               else if (mySize_x/mySize_y > 2)
+               else if (mySize_x/mySize_y > 1.5)
                {
                        if(leftactive)
                        {
-                               len = strlen(ftos(leftcnt));
-
-                               if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+                               if(autocvar_hud_panel_healtharmor_baralign == 1 || autocvar_hud_panel_healtharmor_baralign == 3) { // right align
                                        barpos = pos + eX * mySize_x - eX * mySize_x * min(1, leftcnt/200);
                                        barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y;
-                                       picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y;
-                                       numpos = picpos - eX * len * 0.5 * mySize_y;
-                               } else {
+                               } else { // left align
                                        barpos = pos;
                                        barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y;
-                                       picpos = pos;
-                                       numpos = picpos + eX * 0.5 * mySize_y;
                                }
 
-                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                               drawpic_skin(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                               HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id));
+                               if(autocvar_hud_panel_healtharmor_progressbar)
+                               {
+                                       HUD_Panel_GetProgressBarColor(leftname)
+                                       HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+                               }
+                               DrawNumIcon(autocvar_hud_panel_healtharmor_iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, 200), 1);
                        }
 
                        if(rightactive)
                        {
-                               len = strlen(ftos(rightcnt));
-
-                               if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
-                                       barpos = pos + eX * mySize_x - eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
-                                       barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
-                                       picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y + eY * 0.5 * mySize_y;
-                                       numpos = picpos - eX * len * 0.5 * mySize_y;
-                               } else {
+                               if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align
                                        barpos = pos + eY * 0.5 * mySize_y;
                                        barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
-                                       picpos = pos + eY * 0.5 * mySize_y;
-                                       numpos = picpos + eX * 0.5 * mySize_y;
+                               } else { // right align
+                                       barpos = pos + eX * mySize_x - eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
+                                       barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
                                }
 
-                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                               drawpic_skin(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                               HUD_DrawXNum_Colored(numpos, rightcnt, len, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id));
+                               if(autocvar_hud_panel_healtharmor_progressbar)
+                               {
+                                       HUD_Panel_GetProgressBarColor(rightname)
+                                       HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+                               }
+                               DrawNumIcon(autocvar_hud_panel_healtharmor_iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(rightcnt, 200), 1);
                        }
 
-                       if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
-                               barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100);
-                               barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y;
-                       } else {
-                               barpos = pos;
-                               barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y;
-                       }
                        if(fuel)
-                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL);
+                       {
+                               if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align
+                                       barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100);
+                                       barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y;
+                               } else {
+                                       barpos = pos;
+                                       barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y;
+                               }
+                               HUD_Panel_GetProgressBarColor("fuel")
+                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL);
+                       }
                }
                else
                {
                        if(leftactive)
                        {
-                               len = strlen(ftos(leftcnt));
-
-                               if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+                               if(autocvar_hud_panel_healtharmor_baralign == 1 || autocvar_hud_panel_healtharmor_baralign == 3) { // down align
+                                       barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/200);
+                                       barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200);
+                               } else { // up align
                                        barpos = pos;
                                        barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200);
+                               }
+
+                               if(autocvar_hud_panel_healtharmor_iconalign == 1 || autocvar_hud_panel_healtharmor_iconalign == 3) { // down align
+                                       picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x);
+                                       numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x;
+                               } else { // up align
                                        picpos = pos + eX * 0.05 * mySize_x;
-                                       numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x;
-                               } else {
-                                       barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/200);
-                                       barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200);
-                                       picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.566 * mySize_x;
-                                       numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.166 * mySize_x;
+                                       numpos = pos + eY * 0.4 * mySize_x;
                                }
 
-                               HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                               drawpic_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                               HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.166 * mySize_x, HUD_Panel_GetFgAlpha(id));
+                               if(autocvar_hud_panel_healtharmor_progressbar)
+                               {
+                                       HUD_Panel_GetProgressBarColor(leftname)
+                                       HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+                               }
+                               drawpic_aspect_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+                               drawstring_aspect(numpos, ftos(leftcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, HUD_Get_Num_Color(leftcnt, 200), panel_fg_alpha, DRAWFLAG_NORMAL);
                        }
 
                        if(rightactive)
                        {
-                               len = strlen(ftos(rightcnt));
-
-                               if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+                               if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // up align
                                        barpos = pos + eX * 0.5 * mySize_x;
                                        barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/200);
-                                       picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x;
-                                       numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x;
-                               } else {
+                               } else { // down align
                                        barpos = pos + eY * mySize_y - eY * mySize_y * min(1, rightcnt/200) + eX * 0.5 * mySize_x;
                                        barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/200);
-                                       picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.566 * mySize_x + eX * 0.5 * mySize_x;
-                                       numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.166 * mySize_x + eX * 0.5 * mySize_x;
                                }
 
-                               HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                               drawpic_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                               HUD_DrawXNum_Colored(numpos, rightcnt, len, 0.166 * mySize_x, HUD_Panel_GetFgAlpha(id));
-                       }
+                               if(autocvar_hud_panel_healtharmor_iconalign == 0 || autocvar_hud_panel_healtharmor_iconalign == 3) { // up align
+                                       picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x;
+                                       numpos = pos + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x;
+                               } else { // down align
+                                       picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x) + eX * 0.5 * mySize_x;
+                                       numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x + eX * 0.5 * mySize_x;
+                               }
 
-                       if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
-                               barpos = pos;
-                               barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100);
-                       } else {
-                               barpos = pos + eY * mySize_y - eY * mySize_y * min(1, fuel/100);
-                               barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100);
+                               if(autocvar_hud_panel_healtharmor_progressbar)
+                               {
+                                       HUD_Panel_GetProgressBarColor(rightname)
+                                       HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+                               }
+                               drawpic_aspect_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+                               drawstring_aspect(numpos, ftos(rightcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, HUD_Get_Num_Color(rightcnt, 200), panel_fg_alpha, DRAWFLAG_NORMAL);
                        }
+
                        if(fuel)
-                               HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL);
+                       {
+                               if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align
+                                       barpos = pos;
+                                       barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100);
+                               } else {
+                                       barpos = pos + eY * mySize_y - eY * mySize_y * min(1, fuel/100);
+                                       barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100);
+                               }
+                               HUD_Panel_GetProgressBarColor("fuel")
+                               HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL);
+                       }
                }
        }
+       drawfont = hud_font;
 }
 
-// ___TODO___ !!!
 // Notification area (#4)
 //
 
@@ -2231,16 +2394,16 @@ void HUD_KillNotify_Push(string attacker, string victim, float actiontype, float
 void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
 {
        float w;
-       float alsoprint;
-       alsoprint = (cvar("hud_notify_print") || !HUD_Panel_CheckActive(4)); // print message to console if: notify panel disabled, or cvar to do so enabled
+       float alsoprint, gentle;
+       alsoprint = (autocvar_hud_panel_notify_print || !panel_enabled); // print message to console if: notify panel disabled, or cvar to do so enabled
+       gentle = (autocvar_cl_gentle || autocvar_cl_gentle_messages);
        
        if(msg == MSG_SUICIDE) {
-               // TODO: cl_gentle
                w = DEATH_WEAPONOF(type);
                if(WEP_VALID(w)) {
                        HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
                        if (alsoprint)
-                               print("^1", s1, "^1 ", Weapon_SuicideMessage(type), "\n");
+                               print("^1", sprintf(Weapon_SuicideMessage(type), strcat(s1, "^1")), "\n");
                } else if (type == DEATH_KILL) {
                        HUD_KillNotify_Push(s1, "", 0, DEATH_KILL);
                        if (alsoprint)
@@ -2280,28 +2443,28 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
        } else if(msg == MSG_KILL) {
                w = DEATH_WEAPONOF(type);
                if(WEP_VALID(w)) {
-                       HUD_KillNotify_Push(s2, s1, 1, w);
+                       HUD_KillNotify_Push(s1, s2, 1, type);
                        if (alsoprint)
-                               print("^1", s1, "^1 ", Weapon_KillMessage(type), "\n");
+                               print("^1", sprintf(Weapon_KillMessage(type), strcat(s2, "^1"), strcat(s1, "^1")), "\n"); // default order: victim, killer
                }
                else if(type == KILL_TEAM_RED || type == KILL_TEAM_BLUE || type == KILL_TEAM_SPREE) {
                        HUD_KillNotify_Push(s1, s2, 1, type);
                        if(alsoprint)
                        {
-                               if(cvar("cl_gentle")) {
+                               if(gentle) {
                                        print ("^1", s1, "^1 took action against a team mate\n");
                                } else {
                                        print ("^1", s1, "^1 mows down a team mate\n");
                                }
                        }
                        if (stof(s2) > 2 && type == KILL_TEAM_SPREE) {
-                               if(cvar("cl_gentle"))
+                               if(gentle)
                                        print ("^1",s1,"^1 ended a ",s3," scoring spree by going against a team mate\n");
                                else
                                        print ("^1",s1,"^1 ended a ",s3," kill spree by killing a team mate\n");
                        }
                        else if (stof(s2) > 2) {
-                               if(cvar("cl_gentle"))
+                               if(gentle)
                                        print ("^1",s1,"'s ^1",s3," scoring spree was ended by a team mate!\n");
                                else
                                        print ("^1",s1,"'s ^1",s3," kill spree was ended by a team mate!\n");
@@ -2402,47 +2565,47 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
                }
        } else if(msg == MSG_SPREE) {
                if(type == KILL_END_SPREE) {
-                       if(cvar("cl_gentle"))
+                       if(gentle)
                                print ("^1",s1,"'s ^1", s2, " scoring spree was ended by ", s3, "\n");
                        else
                                print ("^1",s1,"'s ^1", s2, " kill spree was ended by ", s3, "\n");
                } else if(type == KILL_SPREE) {
-                       if(cvar("cl_gentle"))
+                       if(gentle)
                                print ("^1",s1,"^1 made ",s2," scores in a row\n");
                        else
                                print ("^1",s1,"^1 has ",s2," frags in a row\n");
                } else if(type == KILL_SPREE_3) {
-                       if(cvar("cl_gentle"))
+                       if(gentle)
                                print (s1,"^7 made a ^1TRIPLE SCORE\n");
                        else
                                print (s1,"^7 made a ^1TRIPLE FRAG\n");
                } else if(type == KILL_SPREE_5) {
-                       if(cvar("cl_gentle"))
+                       if(gentle)
                                print (s1,"^7 unleashes ^1SCORING RAGE\n");
                        else
                                print (s1,"^7 unleashes ^1RAGE\n");
                } else if(type == KILL_SPREE_10) {
-                       if(cvar("cl_gentle"))
+                       if(gentle)
                                print (s1,"^7 made ^1TEN SCORES IN A ROW!\n");
                        else
                                print (s1,"^7 starts the ^1MASSACRE!\n");
                } else if(type == KILL_SPREE_15) {
-                       if(cvar("cl_gentle"))
+                       if(gentle)
                                print (s1,"^7 made ^1FIFTEEN SCORES IN A ROW!\n");
                        else
                                print (s1,"^7 executes ^1MAYHEM!\n");
                } else if(type == KILL_SPREE_20) {
-                       if(cvar("cl_gentle"))
+                       if(gentle)
                                print (s1,"^7 made ^1TWENTY SCORES IN A ROW!\n");
                        else
                                print (s1,"^7 is a ^1BERSERKER!\n");
                } else if(type == KILL_SPREE_25) {
-                       if(cvar("cl_gentle"))
+                       if(gentle)
                                print (s1,"^7 made ^1TWENTY FIFE SCORES IN A ROW!\n");
                        else
                                print (s1,"^7 inflicts ^1CARNAGE!\n");
                } else if(type == KILL_SPREE_30) {
-                       if(cvar("cl_gentle"))
+                       if(gentle)
                                print (s1,"^7 made ^1THIRTY SCORES IN A ROW!\n");
                        else
                                print (s1,"^7 unleashes ^1ARMAGEDDON!\n");
@@ -2452,7 +2615,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
                        HUD_KillNotify_Push(s1, "", 0, DEATH_DROWN);
                        if(alsoprint)
                        {
-                               if(cvar("cl_gentle"))
+                               if(gentle)
                                        print ("^1",s1, "^1 was in the water for too long\n");
                                else
                                        print ("^1",s1, "^1 drowned\n");
@@ -2465,7 +2628,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
                        HUD_KillNotify_Push(s1, "", 0, DEATH_LAVA);
                        if(alsoprint)
                        {
-                               if(cvar("cl_gentle"))
+                               if(gentle)
                                        print ("^1",s1, "^1 found a hot place\n");
                                else
                                        print ("^1",s1, "^1 turned into hot slag\n");
@@ -2474,7 +2637,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
                        HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
                        if(alsoprint)
                        {
-                               if(cvar("cl_gentle"))
+                               if(gentle)
                                        print ("^1",s1, "^1 tested gravity (and it worked)\n");
                                else
                                        print ("^1",s1, "^1 hit the ground with a crunch\n");
@@ -2487,7 +2650,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
                        HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
                        if(alsoprint)
                        {
-                               if(cvar("cl_gentle"))
+                               if(gentle)
                                        print ("^1",s1, "^1 discovered a swamp\n");
                                else
                                        print ("^1",s1, "^1 is now conserved for centuries to come\n");
@@ -2516,7 +2679,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
                        HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
                        if(alsoprint)
                        {
-                               if(cvar("cl_gentle"))
+                               if(gentle)
                                        print ("^1",s1, "^1 felt a little hot\n");
                                else
                                        print ("^1",s1, "^1 burnt to death\n");
@@ -2525,14 +2688,14 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
                        HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
                        if(alsoprint)
                        {
-                               if(cvar("cl_gentle"))
+                               if(gentle)
                                        print ("^1",s1, "^1 needs a restart\n");
                                else
                                        print ("^1",s1, "^1 died\n");
                        }
                }
        } else if(msg == MSG_KILL_ACTION_SPREE) {
-               if(cvar("cl_gentle"))
+               if(gentle)
                        print ("^1",s1,"^1 needs a restart after a ",s2," scoring spree\n");
                else
                        print ("^1",s1,"^1 died with a ",s2," kill spree\n");
@@ -2549,6 +2712,9 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
                } else if(type == INFO_RETURNFLAG) {
                        HUD_KillNotify_Push(s1, s2, 0, INFO_RETURNFLAG);
                        print(s1, "^7 returned the ", s2, "\n");
+               } else if(type == INFO_CAPTUREFLAG) {
+                       HUD_KillNotify_Push(s1, s2, 0, INFO_CAPTUREFLAG);
+                       print(s1, "^7 captured the ", s2, s3, "\n");
                }
        }
 }
@@ -2557,78 +2723,80 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
 
 void HUD_Centerprint(string s1, string s2, float type, float msg)
 {
+       float gentle;
+       gentle = (autocvar_cl_gentle || autocvar_cl_gentle_messages);
        if(msg == MSG_SUICIDE) {
                if (type == DEATH_TEAMCHANGE) {
                        centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "You are now on: ", s1));
                } else if (type == DEATH_AUTOTEAMCHANGE) {
                        centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "You have been moved into a different team to improve team balance\nYou are now on: ", s1));
                } else if (type == DEATH_CAMP) {
-                       if(cvar("cl_gentle"))
+                       if(gentle)
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Reconsider your tactics, camper!"));
                        else
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Die camper!"));
                } else if (type == DEATH_NOAMMO) {
-                       if(cvar("cl_gentle"))
+                       if(gentle)
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You are reinserted into the game for running out of ammo..."));
                        else
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were killed for running out of ammo..."));
                } else if (type == DEATH_ROT) {
-                       if(cvar("cl_gentle"))
+                       if(gentle)
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You need to preserve your health"));
                        else
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You grew too old without taking your medicine"));
                } else if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) {
-                       if(cvar("cl_gentle"))
+                       if(gentle)
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Don't go against team mates!"));
                        else
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Don't shoot your team mates!"));
                } else if (type == DEATH_QUIET) {
                        // do nothing
                } else if (type == DEATH_KILL) {
-                       if(cvar("cl_gentle"))
+                       if(gentle)
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You need to be more careful!"));
                        else
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You killed your own dumb self!"));
                }
        } else if(msg == MSG_KILL) {
                if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) {
-                       if(cvar("cl_gentle")) {
+                       if(gentle) {
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You went against", s1, ",a team mate!"));
                        } else {
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You fragged ", s1, ", a team mate!"));
                        }
                } else if (type == KILL_FIRST_BLOOD) {
-                       if(cvar("cl_gentle")) {
+                       if(gentle) {
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1First score"));
                        } else {
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1First blood"));
                        }
                } else if (type == KILL_FIRST_VICTIM) {
-                       if(cvar("cl_gentle")) {
+                       if(gentle) {
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1First casualty"));
                        } else {
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1First victim"));
                        }
                } else if (type == KILL_TYPEFRAG) { // s2 contains "advanced kill messages" such as ping, handicap...
-                       if(cvar("cl_gentle")) {
+                       if(gentle) {
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You scored against ^7", s1, "^1 who was typing!", s2));
                        } else {
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You typefragged ^7", s1, s2));
                        }
                } else if (type == KILL_TYPEFRAGGED) {
-                       if(cvar("cl_gentle")) {
+                       if(gentle) {
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were scored against by ^7", s1, "^1 while you were typing!", s2));
                        } else {
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were typefragged by ^7", s1, s2));
                        }
                } else if (type == KILL_FRAG) {
-                       if(cvar("cl_gentle")) {
+                       if(gentle) {
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You scored against ^7", s1, s2));
                        } else {
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You fragged ^7", s1, s2));
                        }
                } else if (type == KILL_FRAGGED) {
-                       if(cvar("cl_gentle")) {
+                       if(gentle) {
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were scored against by ^7", s1, s2));
                        } else {
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were fragged by ^7", s1, s2));
@@ -2642,50 +2810,50 @@ void HUD_Centerprint(string s1, string s2, float type, float msg)
 
 void HUD_Notify (void)
 {
-       float id = HUD_PANEL_NOTIFY;
+       if(!autocvar_hud_panel_notify && !autocvar__hud_configure)
+               return;
+
+       active_panel = HUD_PANEL_NOTIFY;
+       HUD_Panel_UpdateCvars(notify);
        vector pos, mySize;
-       pos = HUD_Panel_GetPos(id);
-       mySize = HUD_Panel_GetSize(id);
+       pos = panel_pos;
+       mySize = panel_size;
 
-       HUD_Panel_DrawBg(id, pos, mySize, 0);
-       float padding;
-       padding = HUD_Panel_GetPadding(id);
-       if(padding)
+       HUD_Panel_DrawBg(1);
+       if(panel_bg_padding)
        {
-               pos += '1 1 0' * padding;
-               mySize -= '2 2 0' * padding;
+               pos += '1 1 0' * panel_bg_padding;
+               mySize -= '2 2 0' * panel_bg_padding;
        }
 
        float entries, height;
-       entries = bound(1, floor(14 * mySize_y/mySize_x), 12);
+       entries = bound(1, floor(10 * mySize_y/mySize_x), 10);
        height = mySize_y/entries;
-       entries -= 2; // top/bottom two lines reserved for info messaged, such as spec instructions
        
        vector fontsize;
        fontsize = '0.5 0.5 0' * height;
 
        float a;
        float when;
-       when = cvar("hud_notify_time");
+       when = autocvar_hud_panel_notify_time;
        float fadetime;
-       fadetime = cvar("hud_notify_fadetime");
+       fadetime = autocvar_hud_panel_notify_fadetime;
 
        string s;
 
        vector pos_attacker, pos_victim;
        vector weap_pos;
-       float width_attacker, width_victim;
+       float width_attacker;
        string attacker, victim;
 
        float i, j;
        for(j = 0; j < entries; ++j)
        {
-               if(cvar("hud_notify_flip"))
+               s = "";
+               if(autocvar_hud_panel_notify_flip)
                        i = j;
                else // rather nasty hack for ordering items from the bottom up
                        i = entries - j - 1;
-               if(cvar("hud_notify_info_top"))
-                       i += 2; // top/bottom two lines reserved for info messaged, such as spec instructions
 
                if(fadetime)
                {
@@ -2702,342 +2870,197 @@ void HUD_Notify (void)
                                a = 0;
                }
 
+               float w;
+               w = DEATH_WEAPONOF(killnotify_deathtype[j]);
+
                // TODO: maybe print in team colors?
-               // TODO: maybe this could be cleaned up somehow...
-               // TODO: less copypaste code below
                //
                // Y [used by] X
-               if(killnotify_actiontype[j] == 0 && !hud_configure) 
+               if(killnotify_actiontype[j] == 0 && !autocvar__hud_configure) 
                {
-                       attacker = textShortenToWidth(killnotify_attackers[j], mySize_x - 2 * height, fontsize, stringwidth_colors);
-
-                       width_attacker = stringwidth(attacker, TRUE, fontsize);
-                       pos_attacker = pos + eX * 0.5 * (mySize_x - width_attacker + 2 * height) + eY * 0.5 * fontsize_y + eY * i * height;
+                       attacker = textShortenToWidth(killnotify_attackers[j], 0.48 * mySize_x - height, fontsize, stringwidth_colors);
+                       pos_attacker = pos + eX * (0.52 * mySize_x + height) + eY * (0.5 * fontsize_y + i * height);
+                       weap_pos = pos + eX * 0.5 * mySize_x - eX * height + eY * i * height;
 
-                       weap_pos = pos + eX * 0.5 * (mySize_x - width_attacker) - eX * height + eY * i * height;
                        if(killnotify_deathtype[j] == DEATH_GENERIC)
                        {
-                               drawpic_skin(weap_pos, "notify_death", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               s = "notify_death";
                        }
                        else if(killnotify_deathtype[j] == DEATH_NOAMMO)
                        {
-                               drawpic_skin(weap_pos, "notify_outofammo", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               s = "notify_outofammo";
                        }
                        else if(killnotify_deathtype[j] == DEATH_KILL)
                        {
-                               drawpic_skin(weap_pos, "notify_selfkill", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               s = "notify_selfkill";
                        }
                        else if(killnotify_deathtype[j] == DEATH_CAMP)
                        {
-                               drawpic_skin(weap_pos, "notify_camping", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               s = "notify_camping";
                        }
                        else if(killnotify_deathtype[j] == KILL_TEAM_RED)
                        {
-                               drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '1 0 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               s = "notify_teamkill_red";
                        }
                        else if(killnotify_deathtype[j] == KILL_TEAM_BLUE)
                        {
-                               drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '0 0 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               s = "notify_teamkill_blue";
                        }
                        else if(killnotify_deathtype[j] == DEATH_DROWN)
                        {
-                               drawpic_skin(weap_pos, "notify_water", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               s = "notify_water";
                        }
                        else if(killnotify_deathtype[j] == DEATH_SLIME)
                        {
-                               drawpic_skin(weap_pos, "notify_slime", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               s = "notify_slime";
                        }
                        else if(killnotify_deathtype[j] == DEATH_LAVA)
                        {
-                               drawpic_skin(weap_pos, "notify_lava", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               s = "notify_lava";
                        }
                        else if(killnotify_deathtype[j] == DEATH_FALL)
                        {
-                               drawpic_skin(weap_pos, "notify_fall", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               s = "notify_fall";
                        }
                        else if(killnotify_deathtype[j] == DEATH_SHOOTING_STAR)
                        {
-                               drawpic_skin(weap_pos, "notify_shootingstar", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               s = "notify_shootingstar";
                        }
                        else if(killnotify_deathtype[j] == DEATH_HURTTRIGGER || killnotify_deathtype[j] == DEATH_CUSTOM)
                        {
-                               drawpic_skin(weap_pos, "notify_void", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               s = "notify_death";
                        }
                        else if(killnotify_deathtype[j] == INFO_GOTFLAG)
                        {
                                if(killnotify_victims[j] == "^1RED^7 flag")
-                                       s = "red";
+                               {
+                                       s = "notify_red_taken";
+                               }
                                else
-                                       s = "blue";
-                               drawpic_skin(weap_pos, strcat("flag_", s, "_carrying"), '1 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               {
+                                       s = "notify_blue_taken";
+                               }
                        }
                        else if(killnotify_deathtype[j] == INFO_RETURNFLAG)
                        {
                                if(killnotify_victims[j] == "^1RED^7 flag")
-                                       s = "red";
+                               {
+                                       s = "notify_red_returned";
+                               }
                                else
-                                       s = "blue";
-                               drawpic_skin(weap_pos, strcat("flag_", s, "_taken"), '1 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               {
+                                       s = "notify_blue_returned";
+                               }
                        }
                        else if(killnotify_deathtype[j] == INFO_LOSTFLAG)
                        {
                                if(killnotify_victims[j] == "^1RED^7 flag")
-                                       s = "red";
+                               {
+                                       s = "notify_red_lost";
+                               }
+                               else
+                               {
+                                       s = "notify_blue_lost";
+                               }
+                       }
+                       else if(killnotify_deathtype[j] == INFO_CAPTUREFLAG)
+                       {
+                               if(killnotify_victims[j] == "^1RED^7 flag")
+                               {
+                                       s = "notify_red_captured";
+                               }
                                else
-                                       s = "blue";
-                               drawpic_skin(weap_pos, strcat("flag_", s, "_lost"), '1 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               {
+                                       s = "notify_blue_captured";
+                               }
+                       }
+                       if(s != "" && a)
+                       {
+                               drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
+                               drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL);
                        }
                }
                // X [did action to] Y
                else
                {
-                       if(hud_configure)
+                       if(autocvar__hud_configure)
                        {
-                               attacker = textShortenToWidth("Player1", 0.5 * mySize_x - height, fontsize, stringwidth_colors);
-                               victim = textShortenToWidth("Player2", 0.5 * mySize_x - height, fontsize, stringwidth_colors);
+                               attacker = textShortenToWidth("Player1", 0.48 * mySize_x - height, fontsize, stringwidth_colors);
+                               victim = textShortenToWidth("Player2", 0.48 * mySize_x - height, fontsize, stringwidth_colors);
                                a = bound(0, (when - j) / 4, 1);
                        }
                        else
                        {
-                               attacker = textShortenToWidth(killnotify_attackers[j], 0.5 * mySize_x - height, fontsize, stringwidth_colors);
-                               victim = textShortenToWidth(killnotify_victims[j], 0.5 * mySize_x - height, fontsize, stringwidth_colors);
+                               attacker = textShortenToWidth(killnotify_attackers[j], 0.48 * mySize_x - height, fontsize, stringwidth_colors);
+                               victim = textShortenToWidth(killnotify_victims[j], 0.48 * mySize_x - height, fontsize, stringwidth_colors);
                        }
                        width_attacker = stringwidth(attacker, TRUE, fontsize);
-                       width_victim = stringwidth(victim, TRUE, fontsize);
-                       pos_attacker = pos + eX * 0.5 * ((0.5 * mySize_x - height) - width_attacker) + eY * 0.5 * fontsize_y + eY * i * height;
-                       pos_victim = pos + eX * 0.5 * ((0.5 * mySize_x - height) - width_victim) + eY * 0.5 * fontsize_y + eX * 0.5 * mySize_x + eX * height + eY * i * height;
+                       pos_attacker = pos + eX * (0.48 * mySize_x - height - width_attacker) + eY * (0.5 * fontsize_y + i * height);
+                       pos_victim = pos + eX * (0.52 * mySize_x + height) + eY * (0.5 * fontsize_y + i * height);
                        weap_pos = pos + eX * 0.5 * mySize_x - eX * height + eY * i * height;
 
-                       if(hud_configure) // example actions for config mode
+                       if(autocvar__hud_configure) // example actions for config mode
+                       {
+                               s = "weaponelectro";
+                       }
+                       else if(killnotify_deathtype[j] & HITTYPE_SECONDARY && w == WEP_LASER)
                        {
-                               drawpic_skin(weap_pos, strcat("weapon", "electro"), '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               s = "notify_melee_laser";
                        }
-                       else if(WEP_VALID(killnotify_deathtype[j]))
+                       else if(killnotify_deathtype[j] & HITTYPE_SECONDARY && w == WEP_SHOTGUN)
                        {
-                               self = get_weaponinfo(killnotify_deathtype[j]);
-                               drawpic_skin(weap_pos, strcat("weapon", self.netname), '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               s = "notify_melee_shotgun";
+                       }
+                       else if(WEP_VALID(w))
+                       {
+                               self = get_weaponinfo(w);
+                               s = strcat("weapon", self.netname);
                        }
                        else if(killnotify_deathtype[j] == KILL_TEAM_RED)
                        {
-                               drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '1 0 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               s = "notify_teamkill_red";
                        }
                        else if(killnotify_deathtype[j] == KILL_TEAM_BLUE)
                        {
-                               drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '0 0 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               s = "notify_teamkill_red";
                        }
                        else if(killnotify_deathtype[j] == DEATH_DROWN)
                        {
-                               drawpic_skin(weap_pos, "notify_water", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               s = "notify_water";
                        }
                        else if(killnotify_deathtype[j] == DEATH_SLIME)
                        {
-                               drawpic_skin(weap_pos, "notify_slime", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               s = "notify_slime";
                        }
                        else if(killnotify_deathtype[j] == DEATH_LAVA)
                        {
-                               drawpic_skin(weap_pos, "notify_lava", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               s = "notify_lava";
                        }
                        else if(killnotify_deathtype[j] == DEATH_FALL)
                        {
-                               drawpic_skin(weap_pos, "notify_fall", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               s = "notify_fall";
                        }
                        else if(killnotify_deathtype[j] == DEATH_SHOOTING_STAR)
                        {
-                               drawpic_skin(weap_pos, "notify_shootingstar", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               s = "notify_shootingstar";
                        }
                        else if(killnotify_deathtype[j] == DEATH_HURTTRIGGER || killnotify_deathtype[j] == DEATH_CUSTOM) // DEATH_CUSTOM is also void, right?
                        {
-                               drawpic_skin(weap_pos, "notify_void", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                       }
-               }
-
-       }
-
-       // Info messages
-       //
-       entity tm;
-       vector o;
-       o = pos;
-       if(cvar("hud_notify_info_top"))
-               o = pos + eY;
-       else
-               o = pos + eY * mySize_y - eY * 2 * height;
-       
-       if(spectatee_status && !intermission)
-       {
-               //drawfont = hud_bigfont;
-               if(spectatee_status == -1)
-                       s = "^1Observing";
-               else
-                       s = GetPlayerName(spectatee_status - 1);
-
-               //s = textShortenToWidth(s, mySize_y, 0.5 * height, stringwidth_colors);
-               //drawcolorcodedstring(pos + eY * 0.25 * height, s, 0.5 * height, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-               //drawfont = hud_font;
-
-               // spectator text in the upper right corner
-               if(spectatee_status == -1)
-                       s = strcat("^1Press ^3", getcommandkey("primary fire", "+attack"), "^1 to spectate");
-               else
-                       s = strcat("^1Press ^3", getcommandkey("primary fire", "+attack"), "^1 for another player");
-               drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-               o += eY * fontsize_y;
-
-               if(spectatee_status == -1)
-                       s = strcat("^1Use ^3", getcommandkey("next weapon", "weapnext"), "^1 or ^3", getcommandkey("previous weapon", "weapprev"), "^1 to change the speed");
-               else
-                       s = strcat("^1Press ^3", getcommandkey("secondary fire", "+attack2"), "^1 to observe");
-               drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-               o += eY * fontsize_y;
-
-               s = strcat("^1Press ^3", getcommandkey("server info", "+show_info"), "^1 for gamemode info");
-               drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-               o += eY * fontsize_y;
-
-               if(gametype == GAME_ARENA)
-                       s = "^1Wait for your turn to join";
-               else if(gametype == GAME_LMS)
-               {
-                       entity sk;
-                       sk = playerslots[player_localentnum - 1];
-                       if(sk.(scores[ps_primary]) >= 666)
-                               s = "^1Match has already begun";
-                       else if(sk.(scores[ps_primary]) > 0)
-                               s = "^1You have no more lives left";
-                       else
-                               s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join");
-               }
-               else
-                       s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join");
-               drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-               o += eY * fontsize_y;
-
-               //show restart countdown:
-               if (time < getstatf(STAT_GAMESTARTTIME)) {
-                       float countdown;
-                       //we need to ceil, otherwise the countdown would be off by .5 when using round()
-                       countdown = ceil(getstatf(STAT_GAMESTARTTIME) - time);
-                       s = strcat("^1Game starts in ^3", ftos(countdown), "^1 seconds");
-                       drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                       o += eY * fontsize_y;
-               }
-       }
-       if(warmup_stage && !intermission)
-       {
-               s = "^2Currently in ^1warmup^2 stage!";
-               drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-               o += eY * fontsize_y;
-       }
-
-       string blinkcolor;
-       if(mod(time, 1) >= 0.5)
-               blinkcolor = "^1";
-       else
-               blinkcolor = "^3";
-
-       if(ready_waiting && !intermission && !spectatee_status)
-       {
-               if(ready_waiting_for_me)
-               {
-                       if(warmup_stage)
-                               s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " to end warmup");
-                       else
-                               s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " once you are ready");
-               }
-               else
-               {
-                       if(warmup_stage)
-                               s = strcat("^2Waiting for others to ready up to end warmup...");
-                       else
-                               s = strcat("^2Waiting for others to ready up...");
-               }
-               drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-               o += eY * fontsize_y;
-       }
-       else if(warmup_stage && !intermission && !spectatee_status)
-       {
-               s = strcat("^2Press ^3", getcommandkey("ready", "ready"), "^2 to end warmup");
-               drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-               o += eY * fontsize_y;
-       }
-
-       if(teamplay && !intermission && !spectatee_status && gametype != GAME_CA && teamnagger)
-       {
-               float ts_min, ts_max;
-               tm = teams.sort_next;
-               if (tm)
-               {
-                       for(; tm.sort_next; tm = tm.sort_next)
-                       {
-                               if(!tm.team_size || tm.team == COLOR_SPECTATOR)
-                                       continue;
-                               if(!ts_min) ts_min = tm.team_size;
-                               else ts_min = min(ts_min, tm.team_size);
-                               if(!ts_max) ts_max = tm.team_size;
-                               else ts_max = max(ts_max, tm.team_size);
+                               s = "notify_void";
                        }
-                       if ((ts_max - ts_min) > 1)
+                       if(s != "" && a)
                        {
-                               s = strcat(blinkcolor, "Teamnumbers are unbalanced!");
-                               tm = GetTeam(myteam, false);
-                               if (tm)
-                               if (tm.team != COLOR_SPECTATOR)
-                               if (tm.team_size == ts_max)
-                                       s = strcat(s, " Press ^3", getcommandkey("team menu", "menu_showteamselect"), blinkcolor, " to adjust");
-
-                               drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                               o += eY * fontsize_y;
+                               drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
+                               drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL);
+                               drawcolorcodedstring(pos_victim, victim, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL);
                        }
                }
        }
-       if(hud_configure)
-       {
-               s = "^7Press ^3ESC ^7to show HUD options.";
-               drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-               o += eY * fontsize_y;
-               s = "^3Doubleclick a panel for panel-specific options.";
-               drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-               o += eY * fontsize_y;
-       }
 }
 
 // Timer (#5)
 //
+// TODO: macro
 string seconds_tostring(float sec)
 {
        float minutes;
@@ -3053,18 +3076,20 @@ string seconds_tostring(float sec)
 
 void HUD_Timer(void)
 {
-       float id = HUD_PANEL_TIMER;
+       if(!autocvar_hud_panel_timer && !autocvar__hud_configure)
+               return;
+
+       active_panel = HUD_PANEL_TIMER;
+       HUD_Panel_UpdateCvars(timer);
        vector pos, mySize;
-       pos = HUD_Panel_GetPos(id);
-       mySize = HUD_Panel_GetSize(id);
+       pos = panel_pos;
+       mySize = panel_size;
 
-       HUD_Panel_DrawBg(id, pos, mySize, 0);
-       float padding;
-       padding = HUD_Panel_GetPadding(id);
-       if(padding)
+       HUD_Panel_DrawBg(1);
+       if(panel_bg_padding)
        {
-               pos += '1 1 0' * padding;
-               mySize -= '2 2 0' * padding;
+               pos += '1 1 0' * panel_bg_padding;
+               mySize -= '2 2 0' * panel_bg_padding;
        }
 
        string timer;
@@ -3085,7 +3110,7 @@ void HUD_Timer(void)
        else
                timer_color = '1 0 0'; //red
 
-       if (cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) {
+       if (autocvar_hud_panel_timer_increment || timelimit == 0 || warmup_stage) {
                if (time < getstatf(STAT_GAMESTARTTIME)) {
                        //while restart is still active, show 00:00
                        timer = seconds_tostring(0);
@@ -3097,25 +3122,29 @@ void HUD_Timer(void)
                timer = seconds_tostring(timeleft);
        }
 
-       drawstring_aspect(pos, timer, mySize, mySize_y, timer_color, HUD_Panel_GetFgAlpha(HUD_PANEL_TIMER), DRAWFLAG_NORMAL);
+       drawfont = hud_bigfont;
+       drawstring_aspect(pos, timer, mySize, timer_color, panel_fg_alpha, DRAWFLAG_NORMAL);
+       drawfont = hud_font;
 }
 
 // Radar (#6)
 //
 void HUD_Radar(void)
 {
-       float id = HUD_PANEL_RADAR;
+       if ((autocvar_hud_panel_radar == 0 || (autocvar_hud_panel_radar != 2 && !teamplay)) && !autocvar__hud_configure)
+               return;
+
+       active_panel = HUD_PANEL_RADAR;
+       HUD_Panel_UpdateCvars(radar);
        vector pos, mySize;
-       pos = HUD_Panel_GetPos(id);
-       mySize = HUD_Panel_GetSize(id);
+       pos = panel_pos;
+       mySize = panel_size;
 
-       HUD_Panel_DrawBg(id, pos, mySize, 0);
-       float padding;
-       padding = HUD_Panel_GetPadding(id);
-       if(padding)
+       HUD_Panel_DrawBg(1);
+       if(panel_bg_padding)
        {
-               pos += '1 1 0' * padding;
-               mySize -= '2 2 0' * padding;
+               pos += '1 1 0' * panel_bg_padding;
+               mySize -= '2 2 0' * panel_bg_padding;
        }
 
        local float color1, color2; // color already declared as a global in hud.qc
@@ -3132,7 +3161,7 @@ void HUD_Radar(void)
 
        teamradar_loadcvars();
 
-       switch(hud_radar_zoommode)
+       switch(hud_panel_radar_zoommode)
        {
                default:
                case 0:
@@ -3149,13 +3178,13 @@ void HUD_Radar(void)
                        break;
        }
 
-       switch(hud_radar_rotation)
+       switch(hud_panel_radar_rotation)
        {
                case 0:
                        teamradar_angle = view_angles_y - 90;
                        break;
                default:
-                       teamradar_angle = 90 * hud_radar_rotation;
+                       teamradar_angle = 90 * hud_panel_radar_rotation;
                        break;
        }
 
@@ -3165,7 +3194,7 @@ void HUD_Radar(void)
        teamradar_extraclip_mins = teamradar_extraclip_maxs = '0 0 0'; // we always center
 
        // pixels per world qu to match the teamradar_size2d_x range in the longest dimension
-       if(hud_radar_rotation == 0)
+       if(hud_panel_radar_rotation == 0)
        {
                // max-min distance must fit the radar in any rotation
                bigsize = vlen_minnorm2d(teamradar_size2d) * scale2d / (1.05 * vlen2d(mi_max - mi_min));
@@ -3188,7 +3217,7 @@ void HUD_Radar(void)
                );
        }
 
-       normalsize = vlen_maxnorm2d(teamradar_size2d) * scale2d / hud_radar_scale;
+       normalsize = vlen_maxnorm2d(teamradar_size2d) * scale2d / hud_panel_radar_scale;
        if(bigsize > normalsize)
                normalsize = bigsize;
 
@@ -3209,12 +3238,12 @@ void HUD_Radar(void)
                mySize_y
        );
 
-       draw_teamradar_background(hud_radar_background_alpha, hud_radar_foreground_alpha);
+       draw_teamradar_background(hud_panel_radar_foreground_alpha);
 
        for(tm = world; (tm = find(tm, classname, "radarlink")); )
                draw_teamradar_link(tm.origin, tm.velocity, tm.team);
        for(tm = world; (tm = findflags(tm, teamradar_icon, 0xFFFFFF)); )
-               draw_teamradar_icon(tm.origin, tm.teamradar_icon, tm, tm.teamradar_color, HUD_Panel_GetFgAlpha(id));
+               draw_teamradar_icon(tm.origin, tm.teamradar_icon, tm, tm.teamradar_color, panel_fg_alpha);
        for(tm = world; (tm = find(tm, classname, "entcs_receiver")); )
        {
                color2 = GetPlayerColor(tm.sv_entnum);
@@ -3230,29 +3259,31 @@ void HUD_Radar(void)
 //
 void HUD_Score(void)
 {
-       float id = HUD_PANEL_SCORE;
+       if(!autocvar_hud_panel_score && !autocvar__hud_configure)
+               return;
+
+       active_panel = HUD_PANEL_SCORE;
+       HUD_Panel_UpdateCvars(score);
        vector pos, mySize;
-       pos = HUD_Panel_GetPos(id);
-       mySize = HUD_Panel_GetSize(id);
+       pos = panel_pos;
+       mySize = panel_size;
 
-       HUD_Panel_DrawBg(id, pos, mySize, 0);
-       float padding;
-       padding = HUD_Panel_GetPadding(id);
-       if(padding)
+       HUD_Panel_DrawBg(1);
+       if(panel_bg_padding)
        {
-               pos += '1 1 0' * padding;
-               mySize -= '2 2 0' * padding;
+               pos += '1 1 0' * panel_bg_padding;
+               mySize -= '2 2 0' * panel_bg_padding;
        }
 
        float score, distribution, leader;
-       float score_len, distr_len;
        vector distribution_color;
        entity tm, pl, me;
        me = (spectatee_status > 0) ? playerslots[spectatee_status - 1] : playerslots[player_localentnum - 1];
 
-       // TODO... this (race part) still uses constant coordinates :/
        if((scores_flags[ps_primary] & SFL_TIME) && !teamplay) { // race/cts record display on HUD
-               /*pl = players.sort_next;
+               string timer, distrtimer;
+
+               pl = players.sort_next;
                if(pl == me)
                        pl = pl.sort_next;
                if(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)
@@ -3260,57 +3291,35 @@ void HUD_Score(void)
                                pl = world;
 
                score = me.(scores[ps_primary]);
-
-               float racemin, racesec, racemsec;
-               float distsec, distmsec, minusplus;
-
-               racemin = floor(score/(60 * TIME_FACTOR));
-               racesec = floor((score - racemin*(60 * TIME_FACTOR))/TIME_FACTOR);
-               racemsec = score - racemin*60*TIME_FACTOR - racesec*TIME_FACTOR;
+               timer = TIME_ENCODED_TOSTRING(score);
 
                if (pl && ((!(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)) || score)) {
                        // distribution display
                        distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]);
 
-                       if (distribution < TIME_FACTOR && distribution > -TIME_FACTOR)
-                               distmsec = fabs(distribution);
-                       else {
-                               distsec = floor(fabs(distribution)/TIME_FACTOR);
-                               distmsec = fabs(distribution) - distsec*TIME_FACTOR;
-                               if (distribution < 0)
-                                       distsec = -distsec;
-                       }
+                       distrtimer = ftos(distribution/pow(10, TIME_DECIMALS));
 
                        if (distribution <= 0) {
-                               distribution_color = eY;
-                               minusplus = 1; // minusplus 1: always prefix with minus sign
+                               distribution_color = '0 1 0';
                        }
                        else {
-                               distribution_color = eX;
-                               minusplus = 2; // minusplus 1: always prefix with plus sign
+                               distribution_color = '1 0 0';
                        }
-                       HUD_DrawXNum(bottomright - '0 48 0' - '16 0 0' * TIME_DECIMALS, distmsec, -TIME_DECIMALS, 0, 16, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                       HUD_DrawXNum(bottomright - '68 48 0' - '16 0 0' * TIME_DECIMALS, distsec, 4, minusplus, 16, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                       drawpic_skin(bottomright - '10 48 0' - '16 0 0' * TIME_DECIMALS, "num_dot", '16 16 0', distribution_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE);
+                       drawstring_aspect(pos + eX * 0.75 * mySize_x, distrtimer, eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL);
                }
                // race record display
-               if (distribution <= 0 || distribution == score) // draw the highlight background behind the timer if we have the lead
-                       drawpic_skin(bottomright - '0 32 0' - '32 0 0' * (4 + TIME_DECIMALS), "num_leading_4", '0 28 0' + '32 0 0' * (4 + TIME_DECIMALS), '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-
-               HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0', racemsec, -TIME_DECIMALS, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-               HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0'  - '66 0 0', racesec, -2, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-               drawpic_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '18 0 0', "num_dot", '30 30 0', '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE);
-
-               HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '132 0 0', racemin, -2, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-               drawpic_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '84 0 0', "num_colon", '30 30 0', '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE);
-               */
+               if (distribution <= 0)
+                       HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+               drawfont = hud_bigfont;
+               drawstring_aspect(pos, timer, eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+               drawfont = hud_font;
        } else if (!teamplay) { // non-teamgames
                // me vector := [team/connected frags id]
                pl = players.sort_next;
                if(pl == me)
                        pl = pl.sort_next;
 
-               if(hud_configure)
+               if(autocvar__hud_configure)
                        distribution = 42;
                else if(pl)
                        distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]);
@@ -3318,7 +3327,7 @@ void HUD_Score(void)
                        distribution = 0;
 
                score = me.(scores[ps_primary]);
-               if(hud_configure)
+               if(autocvar__hud_configure)
                        score = 123;
 
                if(distribution >= 5) {
@@ -3332,28 +3341,25 @@ void HUD_Score(void)
                else
                        distribution_color = eX;
 
-               score_len = strlen(ftos(score));
-               distr_len = strlen(ftos(distribution));
-
-               HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * 0.33 * mySize_y, distribution, 3, 3, 0.33 * mySize_y, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+               drawstring_aspect(pos + eX * 0.75 * mySize_x, ftos(distribution), eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL);
                if (leader)
-                       drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("num_leading_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-               HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * mySize_y - eX * 3 * 0.33 * mySize_y, score, 3, 0, mySize_y, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                       HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+               drawfont = hud_bigfont;
+               drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL);
+               drawfont = hud_font;
        } else { // teamgames
                float max_fragcount;
                max_fragcount = -99;
 
                float teamnum;
                for(tm = teams.sort_next; tm; tm = tm.sort_next) {
-                       if(tm.team == COLOR_SPECTATOR || (!tm.team_size && !hud_configure)) // no players? don't display
+                       if(tm.team == COLOR_SPECTATOR || (!tm.team_size && !autocvar__hud_configure)) // no players? don't display
                                continue;
                        score = tm.(teamscores[ts_primary]);
-                       if(hud_configure)
+                       if(autocvar__hud_configure)
                                score = 123;
                        leader = 0;
                        
-                       score_len = strlen(ftos(score));
-
                        if (score > max_fragcount)
                                max_fragcount = score;
 
@@ -3361,14 +3367,16 @@ void HUD_Score(void)
                                if (max_fragcount == score)
                                        leader = 1;
                                if (leader)
-                                       drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("num_leading_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                               HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * mySize_y - eX * 3 * 0.33 * mySize_y, score, 3, 0, mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                                       HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+                               drawfont = hud_bigfont;
+                               drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, GetTeamRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
+                               drawfont = hud_font;
                        } else {
                                if (max_fragcount == score)
                                        leader = 1;
                                if (leader)
-                                       drawpic_skin(pos + eX * mySize_x - eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y * teamnum, strcat("num_leading_", ftos(score_len)), eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-                               HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * 0.33 * mySize_y + eY * 0.33 * mySize_y * teamnum, score, 3, 0, 0.33 * mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                                       HUD_Panel_DrawHighlight(pos + eX * 0.75 * mySize_x + eY * (1/3) * teamnum * mySize_y, eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+                               drawstring_aspect(pos + eX * 0.75 * mySize_x + eY * (1/3) * teamnum * mySize_y, ftos(score), eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, GetTeamRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
                                teamnum += 1;
                        }
                }
@@ -3378,32 +3386,52 @@ void HUD_Score(void)
 // Race timer (#8)
 //
 void HUD_RaceTimer (void) {
-       float id = HUD_PANEL_RACETIMER;
+       if(!autocvar_hud_panel_racetimer && !(gametype == GAME_RACE || gametype == GAME_CTS) && !autocvar__hud_configure)
+               return;
+
+       active_panel = HUD_PANEL_RACETIMER;
+       HUD_Panel_UpdateCvars(racetimer);
        vector pos, mySize;
-       pos = HUD_Panel_GetPos(id);
-       mySize = HUD_Panel_GetSize(id);
+       pos = panel_pos;
+       mySize = panel_size;
+
+       HUD_Panel_DrawBg(1);
+       if(panel_bg_padding)
+       {
+               pos += '1 1 0' * panel_bg_padding;
+               mySize -= '2 2 0' * panel_bg_padding;
+       }
+
+       // always force 4:1 aspect
+       vector newSize;
+       if(mySize_x/mySize_y > 4)
+       {
+               newSize_x = 4 * mySize_y;
+               newSize_y = mySize_y;
 
-       HUD_Panel_DrawBg(id, pos, mySize, 0);
-       float padding;
-       padding = HUD_Panel_GetPadding(id);
-       if(padding)
+               pos_x = pos_x + (mySize_x - newSize_x) / 2;
+       }
+       else
        {
-               pos += '1 1 0' * padding;
-               mySize -= '2 2 0' * padding;
+               newSize_y = 1/4 * mySize_x;
+               newSize_x = mySize_x;
+
+               pos_y = pos_y + (mySize_y - newSize_y) / 2;
        }
+       mySize = newSize;
 
        drawfont = hud_bigfont;
        float a, t;
        string s, forcetime;
 
-       if(hud_configure)
+       if(autocvar__hud_configure)
        {
                s = "0:13:37";
-               drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.60 0.60 0' * mySize_y), s, '0.60 0.60 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+               drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.60 0.60 0' * mySize_y), s, '0.60 0.60 0' * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
                s = "^1Intermediate 1 (+15.42)";
-               drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.20 * mySize_y) + eY * 0.60 * mySize_y, s, '1 1 0' * 0.20 * mySize_y, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+               drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.20 * mySize_y) + eY * 0.60 * mySize_y, s, '1 1 0' * 0.20 * mySize_y, panel_fg_alpha, DRAWFLAG_NORMAL);
                s = strcat("^1PENALTY: ", ftos_decimals(20 * 0.1, 1), " (missing a checkpoint)");
-               drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.20 * mySize_y) + eY * 0.80 * mySize_y, s, '1 1 0' * 0.20 * mySize_y, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+               drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.20 * mySize_y) + eY * 0.80 * mySize_y, s, '1 1 0' * 0.20 * mySize_y, panel_fg_alpha, DRAWFLAG_NORMAL);
        }
        else if(race_checkpointtime)
        {
@@ -3436,9 +3464,7 @@ void HUD_RaceTimer (void) {
 
                if(s != "" && a > 0)
                {
-                       dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
-                       //drawcolorcodedstring(m - '0 16 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                       drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                       drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
                }
 
                if(race_penaltytime)
@@ -3447,17 +3473,14 @@ void HUD_RaceTimer (void) {
                        if(a > 0)
                        {
                                s = strcat("^1PENALTY: ", ftos_decimals(race_penaltytime * 0.1, 1), " (", race_penaltyreason, ")");
-                               dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
-                               //drawcolorcodedstring(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.8 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.8 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
                        }
                }
 
                if(forcetime != "")
                {
                        a = bound(0, (time - race_checkpointtime) / 0.5, 1);
-                       //drawstring_expanding(m - '16 0 0' * stringwidth(forcetime, FALSE), forcetime, '32 32 0', '1 1 1', HUD_Panel_GetFgAlpha(id), 0, a);
-                       drawstring_expanding(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(forcetime, FALSE, '1 1 0' * 0.6 * mySize_y), forcetime, '1 1 0' * 0.6 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), 0, a);
+                       drawstring_expanding(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(forcetime, FALSE, '1 1 0' * 0.6 * mySize_y), forcetime, '1 1 0' * 0.6 * mySize_y, '1 1 1', panel_fg_alpha, 0, a);
                }
                else
                        a = 1;
@@ -3465,8 +3488,7 @@ void HUD_RaceTimer (void) {
                if(race_laptime && race_checkpoint != 255)
                {
                        s = TIME_ENCODED_TOSTRING(TIME_ENCODE(time + TIME_DECODE(race_penaltyaccumulator) - race_laptime));
-                       //drawstring(m - '16 0 0' * stringwidth(s, FALSE), s, '32 32 0', '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                       drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.6 0.6 0' * mySize_y), s, '0.6 0.6 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                       drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.6 0.6 0' * mySize_y), s, '0.6 0.6 0' * mySize_y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
                }
        }
        else
@@ -3475,17 +3497,13 @@ void HUD_RaceTimer (void) {
                {
                        a = bound(0, 2 - (time - race_mycheckpointtime), 1);
                        s = MakeRaceString(race_mycheckpoint, TIME_DECODE(race_mycheckpointdelta), -!race_mycheckpointenemy, race_mycheckpointlapsdelta, race_mycheckpointenemy);
-                       dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
-                       //drawcolorcodedstring(m - '0 16 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                       drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                       drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
                }
                if(race_othercheckpointtime && race_othercheckpointenemy != "")
                {
                        a = bound(0, 2 - (time - race_othercheckpointtime), 1);
                        s = MakeRaceString(race_othercheckpoint, -TIME_DECODE(race_othercheckpointdelta), -!race_othercheckpointenemy, race_othercheckpointlapsdelta, race_othercheckpointenemy);
-                       dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
-                       //drawcolorcodedstring(m - '0 0 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                       drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                       drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
                }
 
                if(race_penaltytime && !race_penaltyaccumulator)
@@ -3498,9 +3516,7 @@ void HUD_RaceTimer (void) {
                                        s = strcat("^1PENALTY: ", ftos_decimals(t - time, 1), " (", race_penaltyreason, ")");
                                else
                                        s = strcat("^2PENALTY: 0.0 (", race_penaltyreason, ")");
-                               dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
-                               //drawcolorcodedstring(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
                        }
                }
        }
@@ -3522,10 +3538,14 @@ float vote_change; // "time" when vote_active changed
 
 void HUD_VoteWindow(void) 
 {
-       float id = HUD_PANEL_VOTE;
+       if(!autocvar_hud_panel_vote && !autocvar__hud_configure)
+               return;
+
+       active_panel = HUD_PANEL_VOTE;
+       HUD_Panel_UpdateCvars(vote);
        vector pos, mySize;
-       pos = HUD_Panel_GetPos(id);
-       mySize = HUD_Panel_GetSize(id);
+       pos = panel_pos;
+       mySize = panel_size;
 
        string s;
        float a;
@@ -3534,12 +3554,12 @@ void HUD_VoteWindow(void)
                vote_prev = vote_active;
        }
 
-       if(vote_active || hud_configure)
+       if(vote_active || autocvar__hud_configure)
                vote_alpha = bound(0, (time - vote_change) * 2, 1);
        else
                vote_alpha = bound(0, 1 - (time - vote_change) * 2, 1);
 
-       if(hud_configure)
+       if(autocvar__hud_configure)
        {
                vote_yescount = 3;
                vote_nocount = 2;
@@ -3549,49 +3569,66 @@ void HUD_VoteWindow(void)
        if(!vote_alpha)
                return;
 
-       a = vote_alpha * bound(cvar_or("hud_vote_alreadyvoted_alpha", 0.75), 1 - vote_highlighted, 1);
+       a = vote_alpha * bound(autocvar_hud_panel_vote_alreadyvoted_alpha, 1 - vote_highlighted, 1);
 
-       HUD_Panel_DrawBg(id, pos, mySize, a);
-       float padding;
-       padding = HUD_Panel_GetPadding(id);
-       if(padding)
+       HUD_Panel_DrawBg(a);
+       if(panel_bg_padding)
        {
-               pos += '1 1 0' * padding;
-               mySize -= '2 2 0' * padding;
+               pos += '1 1 0' * panel_bg_padding;
+               mySize -= '2 2 0' * panel_bg_padding;
        }
 
-       drawpic_skin(pos, "voteprogress_back", mySize, '1 1 1', a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+       // always force 3:1 aspect
+       vector newSize;
+       if(mySize_x/mySize_y > 3)
+       {
+               newSize_x = 3 * mySize_y;
+               newSize_y = mySize_y;
 
-       s = "A vote has been called for: ";
-       drawstring(pos + '0.5 0 0' * mySize_x + '0 0.1 0' * mySize_y - eX * stringwidth(s, FALSE, '1 1 0' * 0.5 * mySize_y*(1/5)), s, '1 1 0' * mySize_y*(1/5), '1 1 1', a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-       s = textShortenToWidth(vote_called_vote, mySize_x * 0.96, '1 1 0' * mySize_y*(1/5), stringwidth_colors); // TODO: broken?
-       if(hud_configure)
-               s = "Configure the HUD";
-       drawcolorcodedstring(pos + '0.52 0 0' * mySize_x + '0 0.3 0' * mySize_y - eX * stringwidth(s, FALSE, '1 1 0' * 0.5 * mySize_y*(1/6)), s, '1 1 0' * mySize_y*(1/6), a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+               pos_x = pos_x + (mySize_x - newSize_x) / 2;
+       }
+       else
+       {
+               newSize_y = 1/3 * mySize_x;
+               newSize_x = mySize_x;
 
-       // print the yes/no counts
-       s = strcat("Yes: ", ftos(vote_yescount));
-       drawstring(pos + '0 0.6 0' * mySize_y + '0.02 0 0' * mySize_x, s, '1 1 0' * mySize_y*(1/6) , eY, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-       s = strcat("No: ", ftos(vote_nocount));
-       drawstring(pos + '0 0.6 0' * mySize_y + '0.98 0 0' * mySize_x - eX * stringwidth(s, FALSE, '1 1 0' * mySize_y*(1/6)), s, '1 1 0' * mySize_y*(1/6), eX, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+               pos_y = pos_y + (mySize_y - newSize_y) / 2;
+       }
+       mySize = newSize;
 
-       // draw the progress bars
-       drawsetcliparea(pos_x, pos_y, mySize_x * 0.5 * (vote_yescount/vote_needed), mySize_y);
-       drawpic_skin(pos, "voteprogress_prog", mySize, eY, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+       s = "A vote has been called for:";
+       drawstring_aspect(pos, s, eX * mySize_x + eY * (2/8) * mySize_y, '1 1 1', a * panel_fg_alpha, DRAWFLAG_NORMAL);
+       s = textShortenToWidth(vote_called_vote, mySize_x, '1 1 0' * mySize_y * (1.75/8), stringwidth_colors);
+       if(autocvar__hud_configure)
+               s = "^1Configure the HUD";
+       drawcolorcodedstring_aspect(pos + eY * (2/8) * mySize_y, s, eX * mySize_x + eY * (1.75/8) * mySize_y, a * panel_fg_alpha, DRAWFLAG_NORMAL);
 
-       drawsetcliparea(pos_x + mySize_x - mySize_x * 0.5 * (vote_nocount/vote_needed), pos_y, mySize_x * 0.5, mySize_y);
-       drawpic_skin(pos, "voteprogress_prog", mySize, eX, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+       // print the yes/no counts
+       s = strcat("Yes (", getcommandkey("not bound", "vyes"), "): ", ftos(vote_yescount));
+       drawstring_aspect(pos + eY * (4/8) * mySize_y, s, eX * 0.5 * mySize_x + eY * (1.5/8) * mySize_y, '0 1 0', a * panel_fg_alpha, DRAWFLAG_NORMAL);
+       s = strcat("No (", getcommandkey("not bound", "vno"), "): ", ftos(vote_nocount));
+       drawstring_aspect(pos + eX * 0.5 * mySize_x + eY * (4/8) * mySize_y, s, eX * 0.5 * mySize_x + eY * (1.5/8) * mySize_y, '1 0 0', a * panel_fg_alpha, DRAWFLAG_NORMAL);
+
+       // draw the progress bar backgrounds
+       drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_back", eX * mySize_x + eY * (3/8) * mySize_y, '1 1 1', a * panel_fg_alpha, DRAWFLAG_NORMAL);
 
        // draw the highlights
        if(vote_highlighted == 1) {
                drawsetcliparea(pos_x, pos_y, mySize_x * 0.5, mySize_y);
-               drawpic_skin(pos, "voteprogress_voted", mySize, eY, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+               drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_voted", eX * mySize_x + eY * (3/8) * mySize_y, '0 1 0', a * panel_fg_alpha, DRAWFLAG_NORMAL);
        }
        else if(vote_highlighted == 2) {
                drawsetcliparea(pos_x + 0.5 * mySize_x, pos_y, mySize_x * 0.5, mySize_y);
-               drawpic_skin(pos, "voteprogress_voted", mySize, eX, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+               drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_voted", eX * mySize_x + eY * (3/8) * mySize_y, '0 1 0', a * panel_fg_alpha, DRAWFLAG_NORMAL);
        }
 
+       // draw the progress bars
+       drawsetcliparea(pos_x, pos_y, mySize_x * 0.5 * (vote_yescount/vote_needed), mySize_y);
+       drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_prog", eX * mySize_x + eY * (3/8) * mySize_y, '0 1 0', a * panel_fg_alpha, DRAWFLAG_NORMAL);
+
+       drawsetcliparea(pos_x + mySize_x - mySize_x * 0.5 * (vote_nocount/vote_needed), pos_y, mySize_x * 0.5, mySize_y);
+       drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_prog", eX * mySize_x + eY * (3/8) * mySize_y, '1 0 0', a * panel_fg_alpha, DRAWFLAG_NORMAL);
+
        drawresetcliparea();
 
        if(!vote_active) {
@@ -3633,7 +3670,7 @@ void HUD_Mod_CTF(vector pos, vector mySize)
        else
                mod_active = 0;
 
-       if(hud_configure)
+       if(autocvar__hud_configure)
        {
                redflag = 1;
                blueflag = 2;
@@ -3744,15 +3781,15 @@ void HUD_Mod_CTF(vector pos, vector mySize)
 
        f = bound(0, redflag_statuschange_elapsedtime*2, 1);
        if(red_icon_prevstatus && f < 1)
-               drawpic_skin_expanding(redflag_pos, red_icon_prevstatus, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha_prevstatus, DRAWFLAG_NORMAL, f);
+               drawpic_aspect_skin_expanding(redflag_pos, red_icon_prevstatus, flag_size, '1 1 1', panel_fg_alpha * red_alpha_prevstatus, DRAWFLAG_NORMAL, f);
        if(red_icon)
-               drawpic_skin(redflag_pos, red_icon, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha * f, DRAWFLAG_NORMAL);
+               drawpic_aspect_skin(redflag_pos, red_icon, flag_size, '1 1 1', panel_fg_alpha * red_alpha * f, DRAWFLAG_NORMAL);
 
        f = bound(0, blueflag_statuschange_elapsedtime*2, 1);
        if(blue_icon_prevstatus && f < 1)
-               drawpic_skin_expanding(blueflag_pos, blue_icon_prevstatus, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha_prevstatus, DRAWFLAG_NORMAL, f);
+               drawpic_aspect_skin_expanding(blueflag_pos, blue_icon_prevstatus, flag_size, '1 1 1', panel_fg_alpha * blue_alpha_prevstatus, DRAWFLAG_NORMAL, f);
        if(blue_icon)
-               drawpic_skin(blueflag_pos, blue_icon, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha * f, DRAWFLAG_NORMAL);
+               drawpic_aspect_skin(blueflag_pos, blue_icon, flag_size, '1 1 1', panel_fg_alpha * blue_alpha * f, DRAWFLAG_NORMAL);
 }
 
 // Keyhunt HUD modicon section
@@ -3840,23 +3877,23 @@ void HUD_Mod_KH(vector pos, vector mySize)
                                aa = 0.5;
                                break;
                }
-               a = a * HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS);
-               aa = aa * HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS);
+               a = a * panel_fg_alpha;
+               aa = aa * panel_fg_alpha;
                if(a > 0)
                {
                        switch(keyteam)
                        {
                                case COLOR_TEAM1:
-                                       drawpic_skin(pa, "kh_redarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
+                                       drawpic_aspect_skin(pa, "kh_redarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
                                        break;
                                case COLOR_TEAM2:
-                                       drawpic_skin(pa, "kh_bluearrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
+                                       drawpic_aspect_skin(pa, "kh_bluearrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
                                        break;
                                case COLOR_TEAM3:
-                                       drawpic_skin(pa, "kh_yellowarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
+                                       drawpic_aspect_skin(pa, "kh_yellowarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
                                        break;
                                case COLOR_TEAM4:
-                                       drawpic_skin(pa, "kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
+                                       drawpic_aspect_skin(pa, "kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
                                        break;
                                default:
                                        break;
@@ -3864,16 +3901,16 @@ void HUD_Mod_KH(vector pos, vector mySize)
                        switch(i) // YAY! switch(i) inside a for loop for i. DailyWTF, here we come!
                        {
                                case 0:
-                                       drawpic_skin(p, "kh_red", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
+                                       drawpic_aspect_skin(p, "kh_red", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
                                        break;
                                case 1:
-                                       drawpic_skin(p, "kh_blue", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
+                                       drawpic_aspect_skin(p, "kh_blue", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
                                        break;
                                case 2:
-                                       drawpic_skin(p, "kh_yellow", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
+                                       drawpic_aspect_skin(p, "kh_yellow", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
                                        break;
                                case 3:
-                                       drawpic_skin(p, "kh_pink", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
+                                       drawpic_aspect_skin(p, "kh_pink", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
                                        break;
                        }
                }
@@ -3935,11 +3972,12 @@ void HUD_Mod_NexBall(vector pos, vector mySize)
                        barsize = eX * mySize_x + eY * p * mySize_y;
                        vertical = 1;
                }
-               HUD_Panel_DrawProgressBar(pos, vertical, barsize, HUD_Panel_GetProgressBarColor("nexball"), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL);
+               HUD_Panel_GetProgressBarColor("nexball")
+               HUD_Panel_DrawProgressBar(pos, vertical, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
        }
 
        if (stat_items & IT_KEY1)
-               drawpic_skin(pos, "nexball_carrying", eX * mySize_x + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL);
+               drawpic_aspect_skin(pos, "nexball_carrying", eX * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
 }
 
 // Race/CTS HUD mod icons
@@ -3990,13 +4028,13 @@ void HUD_Mod_Race(vector pos, vector mySize)
        f = time - crecordtime_change_time;
 
        if (f > 1) {
-               drawstring_aspect(pos, "Personal best ", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL);
-               drawstring(pos + eY * 0.2 * mySize_y, TIME_ENCODED_TOSTRING(t), '1 1 0' * 0.2 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL);
+               drawstring_aspect(pos, "Personal best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+               drawstring_aspect(pos + eY * 0.25 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
        } else {
-               drawstring(pos, "Personal best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL);
-               drawstring(pos + eY * 0.2 * mySize_y, TIME_ENCODED_TOSTRING(t), '1 1 0' * 0.2 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL);
-               drawstring_expanding(pos, "Personal best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL, f);
-               drawstring_expanding(pos + eY * 0.2 * mySize_y, TIME_ENCODED_TOSTRING(t), '1 1 0' * 0.2 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL, f);
+               drawstring_aspect(pos, "Personal best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+               drawstring_aspect(pos + eY * 0.25 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+               drawstring_aspect_expanding(pos, "Personal best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f);
+               drawstring_aspect_expanding(pos + eY * 0.25 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f);
        }
 
        // server record
@@ -4008,13 +4046,13 @@ void HUD_Mod_Race(vector pos, vector mySize)
        f = time - srecordtime_change_time;
 
        if (f > 1) {
-               drawstring(pos + eY * 0.5 * mySize_y, "Server best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL);
-               drawstring(pos + eY * 0.5 * mySize_y + eY * 0.2 * mySize_y, TIME_ENCODED_TOSTRING(t),'1 1 0' * 0.2 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL);
+               drawstring_aspect(pos + eY * 0.5 * mySize_y, "Server best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+               drawstring_aspect(pos + eY * 0.75 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
        } else {
-               drawstring(pos + eY * 0.5 * mySize_y, "Server best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL);
-               drawstring(pos + eY * 0.5 * mySize_y + eY * 0.2 * mySize_y, TIME_ENCODED_TOSTRING(t),'1 1 0' * 0.2 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL);
-               drawstring_expanding(pos + eY * 0.5 * mySize_y, "Server best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL, f);
-               drawstring_expanding(pos + eY * 0.5 * mySize_y + eY * 0.2 * mySize_y, TIME_ENCODED_TOSTRING(t),'1 1 0' * 0.2 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL, f);
+               drawstring_aspect(pos + eY * 0.5 * mySize_y, "Server best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+               drawstring_aspect(pos + eY * 0.75 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+               drawstring_aspect_expanding(pos + eY * 0.5 * mySize_y, "Server best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f);
+               drawstring_aspect_expanding(pos + eY * 0.75 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f);
        }
 
        if (race_status != race_status_prev || race_status_name != race_status_name_prev) {
@@ -4045,22 +4083,22 @@ void HUD_Mod_Race(vector pos, vector mySize)
        rankpos = pos + '0.5 0.25 0' * mySize_y - eX * stringwidth(rankname, TRUE, '1 1 0' * 0.15 * mySize_y);
 
        if(race_status == 0)
-               drawpic_skin(pos, "race_newfail", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
+               drawpic_aspect_skin(pos, "race_newfail", '1 1 0' * mySize_y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
        else if(race_status == 1) {
-               drawpic_skin(pos, "race_newtime", '1 1 0' * 0.9 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
-               drawcolorcodedstring(namepos, s, '1 1 0' * 0.1 * mySize_y, HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
-               drawstring(rankpos, rankname, '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
+               drawpic_aspect_skin(pos, "race_newtime", '1 1 0' * 0.9 * mySize_y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
+               drawcolorcodedstring(namepos, s, '1 1 0' * 0.1 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
+               drawstring(rankpos, rankname, '1 1 0' * 0.15 * mySize_y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
        } else if(race_status == 2) {
                if(race_status_name == GetPlayerName(player_localentnum -1) || !race_myrank || race_myrank < rank)
-                       drawpic_skin(pos, "race_newrankgreen", '1 1 0' * 0.9 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
+                       drawpic_aspect_skin(pos, "race_newrankgreen", '1 1 0' * 0.9 * mySize_y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
                else
-                       drawpic_skin(pos, "race_newrankyellow", '1 1 0' * 0.9 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
-               drawcolorcodedstring(namepos, s, '1 1 0' * 0.1 * mySize_y, HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
-               drawstring(rankpos, rankname, '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
+                       drawpic_aspect_skin(pos, "race_newrankyellow", '1 1 0' * 0.9 * mySize_y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
+               drawcolorcodedstring(namepos, s, '1 1 0' * 0.1 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
+               drawstring(rankpos, rankname, '1 1 0' * 0.15 * mySize_y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
        } else if(race_status == 3) {
-               drawpic_skin(pos, "race_newrecordserver", '1 1 0' * 0.9 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
-               drawcolorcodedstring(namepos, s, '1 1 0' * 0.1 * mySize_y, HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
-               drawstring(rankpos, rankname, '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
+               drawpic_aspect_skin(pos, "race_newrecordserver", '1 1 0' * 0.9 * mySize_y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
+               drawcolorcodedstring(namepos, s, '1 1 0' * 0.1 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
+               drawstring(rankpos, rankname, '1 1 0' * 0.15 * mySize_y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
        }
 
        if (race_status_time - time <= 0) {
@@ -4082,39 +4120,41 @@ float mod_change; // "time" when mod_active changed
 
 void HUD_ModIcons(void)
 {
-       if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && !hud_configure)
+       if(!autocvar_hud_panel_modicons && !autocvar__hud_configure)
+               return;
+
+       if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && !autocvar__hud_configure)
                return;
 
-       float id = HUD_PANEL_MODICONS;
+       active_panel = HUD_PANEL_MODICONS;
+       HUD_Panel_UpdateCvars(modicons);
        vector pos, mySize;
-       pos = HUD_Panel_GetPos(id);
-       mySize = HUD_Panel_GetSize(id);
+       pos = panel_pos;
+       mySize = panel_size;
 
        if(mod_active != mod_prev) {
                mod_change = time;
                mod_prev = mod_active;
        }
 
-       if(mod_active || hud_configure)
+       if(mod_active || autocvar__hud_configure)
                mod_alpha = bound(0, (time - mod_change) * 2, 1);
        else
                mod_alpha = bound(0, 1 - (time - mod_change) * 2, 1);
 
        if(mod_alpha)
-               HUD_Panel_DrawBg(id, pos, mySize, mod_alpha);
+               HUD_Panel_DrawBg(mod_alpha);
 
-       float padding;
-       padding = HUD_Panel_GetPadding(id);
-       if(padding)
+       if(panel_bg_padding)
        {
-               pos += '1 1 0' * padding;
-               mySize -= '2 2 0' * padding;
+               pos += '1 1 0' * panel_bg_padding;
+               mySize -= '2 2 0' * panel_bg_padding;
        }
 
        // these MUST be ran in order to update mod_active
        if(gametype == GAME_KEYHUNT)
                HUD_Mod_KH(pos, mySize);
-       else if(gametype == GAME_CTF || hud_configure)
+       else if(gametype == GAME_CTF || autocvar__hud_configure)
                HUD_Mod_CTF(pos, mySize); // forcealpha only needed for ctf icons, as only they are shown in config mode
        else if(gametype == GAME_NEXBALL)
                HUD_Mod_NexBall(pos, mySize);
@@ -4126,18 +4166,44 @@ void HUD_ModIcons(void)
 //
 void HUD_DrawPressedKeys(void)
 {
-       float id = HUD_PANEL_PRESSEDKEYS;
+       if(!autocvar_hud_panel_pressedkeys && !autocvar__hud_configure)
+               return;
+
+       if(!(spectatee_status > 0 || autocvar_hud_panel_pressedkeys >= 2 || autocvar__hud_configure))
+               return;
+
+       active_panel = HUD_PANEL_PRESSEDKEYS;
+       HUD_Panel_UpdateCvars(pressedkeys);
        vector pos, mySize;
-       pos = HUD_Panel_GetPos(id);
-       mySize = HUD_Panel_GetSize(id);
+       pos = panel_pos;
+       mySize = panel_size;
 
-       HUD_Panel_DrawBg(id, pos, mySize, 0);
-       float padding;
-       padding = HUD_Panel_GetPadding(id);
-       if(padding)
+       HUD_Panel_DrawBg(1);
+       if(panel_bg_padding)
        {
-               pos += '1 1 0' * padding;
-               mySize -= '2 2 0' * padding;
+               pos += '1 1 0' * panel_bg_padding;
+               mySize -= '2 2 0' * panel_bg_padding;
+       }
+
+       // force custom aspect
+       if(autocvar_hud_panel_pressedkeys_aspect)
+       {
+               vector newSize;
+               if(mySize_x/mySize_y > autocvar_hud_panel_pressedkeys_aspect)
+               {
+                       newSize_x = autocvar_hud_panel_pressedkeys_aspect * mySize_y;
+                       newSize_y = mySize_y;
+
+                       pos_x = pos_x + (mySize_x - newSize_x) / 2;
+               }
+               else
+               {
+                       newSize_y = 1/autocvar_hud_panel_pressedkeys_aspect * mySize_x;
+                       newSize_x = mySize_x;
+
+                       pos_y = pos_y + (mySize_y - newSize_y) / 2;
+               }
+               mySize = newSize;
        }
 
        vector keysize;
@@ -4145,30 +4211,46 @@ void HUD_DrawPressedKeys(void)
        float pressedkeys;
 
        pressedkeys = getstatf(STAT_PRESSED_KEYS);
-       drawpic_skin(pos, ((pressedkeys & KEY_CROUCH) ? "key_crouch_inv.tga" : "key_crouch.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-       drawpic_skin(pos + eX * mySize_x * (1/3), ((pressedkeys & KEY_FORWARD) ? "key_forward_inv.tga" : "key_forward.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-       drawpic_skin(pos + eX * mySize_x * (2/3), ((pressedkeys & KEY_JUMP) ? "key_jump_inv.tga" : "key_jump.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-       drawpic_skin(pos + eY * 0.5 * mySize_y, ((pressedkeys & KEY_LEFT) ? "key_left_inv.tga" : "key_left.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-       drawpic_skin(pos + eY * 0.5 * mySize_y + eX * mySize_x * (1/3), ((pressedkeys & KEY_BACKWARD) ? "key_backward_inv.tga" : "key_backward.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-       drawpic_skin(pos + eY * 0.5 * mySize_y + eX * mySize_x * (2/3), ((pressedkeys & KEY_RIGHT) ? "key_right_inv.tga" : "key_right.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+       drawpic_aspect_skin(pos, ((pressedkeys & KEY_CROUCH) ? "key_crouch_inv.tga" : "key_crouch.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+       drawpic_aspect_skin(pos + eX * mySize_x * (1/3), ((pressedkeys & KEY_FORWARD) ? "key_forward_inv.tga" : "key_forward.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+       drawpic_aspect_skin(pos + eX * mySize_x * (2/3), ((pressedkeys & KEY_JUMP) ? "key_jump_inv.tga" : "key_jump.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+       drawpic_aspect_skin(pos + eY * 0.5 * mySize_y, ((pressedkeys & KEY_LEFT) ? "key_left_inv.tga" : "key_left.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+       drawpic_aspect_skin(pos + eY * 0.5 * mySize_y + eX * mySize_x * (1/3), ((pressedkeys & KEY_BACKWARD) ? "key_backward_inv.tga" : "key_backward.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+       drawpic_aspect_skin(pos + eY * 0.5 * mySize_y + eX * mySize_x * (2/3), ((pressedkeys & KEY_RIGHT) ? "key_right_inv.tga" : "key_right.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
 }
 
 // Handle chat as a panel (#12)
 //
 void HUD_Chat(void)
 {
-       float id = HUD_PANEL_CHAT;
+       if(!autocvar_hud_panel_chat && !autocvar__hud_configure)
+       {
+               cvar_set("con_chatrect", "0");
+               return;
+       }
+
+       active_panel = HUD_PANEL_CHAT;
+       HUD_Panel_UpdateCvars(chat);
+
+       if(autocvar__con_chat_maximized && !autocvar__hud_configure) // draw at full screen height if maximized
+       {
+               panel_pos_y = panel_bg_border;
+               panel_size_y = vid_conheight - panel_bg_border * 2;
+               if(panel_bg == "0")
+                       panel_bg = "border"; // force a border when maximized
+               panel_bg_alpha = max(0.75, panel_bg_alpha); // force an alpha of at least 0.75
+       }
+
        vector pos, mySize;
-       pos = HUD_Panel_GetPos(id);
-       mySize = HUD_Panel_GetSize(id);
+       pos = panel_pos;
+       mySize = panel_size;
+
+       HUD_Panel_DrawBg(1);
 
-       HUD_Panel_DrawBg(id, pos, mySize, 0);
-       float padding;
-       padding = HUD_Panel_GetPadding(id);
-       if(padding)
+       if(panel_bg_padding)
        {
-               pos += '1 1 0' * padding;
-               mySize -= '2 2 0' * padding;
+               pos += '1 1 0' * panel_bg_padding;
+               mySize -= '2 2 0' * panel_bg_padding;
        }
 
        cvar_set("con_chatrect", "1");
@@ -4179,7 +4261,7 @@ void HUD_Chat(void)
        cvar_set("con_chatwidth", ftos(mySize_x/vid_conwidth));
        cvar_set("con_chat", ftos(floor(mySize_y/cvar("con_chatsize") - 0.5)));
 
-       if(hud_configure)
+       if(autocvar__hud_configure)
        {
                float chatsize;
                chatsize = cvar("con_chatsize");
@@ -4188,9 +4270,9 @@ void HUD_Chat(void)
                for(i = 0; i < cvar("con_chat"); ++i)
                {
                        if(i == cvar("con_chat") - 1)
-                               a = HUD_Panel_GetFgAlpha(id);
+                               a = panel_fg_alpha;
                        else
-                               a = HUD_Panel_GetFgAlpha(id) * floor(((i + 1) * 7 + cvar("con_chattime"))/45);
+                               a = panel_fg_alpha * floor(((i + 1) * 7 + cvar("con_chattime"))/45);
                        drawcolorcodedstring(pos + eY * i * chatsize, textShortenToWidth("^3Player^7: This is the chat area.", mySize_x, '1 1 0' * chatsize, stringwidth_colors), '1 1 0' * chatsize, a, DRAWFLAG_NORMAL);
                }
        }
@@ -4207,31 +4289,33 @@ float frametimeavg1; // 1 frame ago
 float frametimeavg2; // 2 frames ago
 void HUD_EngineInfo(void)
 {
-       float id = HUD_PANEL_ENGINEINFO;
+       if(!autocvar_hud_panel_engineinfo && !autocvar__hud_configure)
+               return;
+
+       active_panel = HUD_PANEL_ENGINEINFO;
+       HUD_Panel_UpdateCvars(engineinfo);
        vector pos, mySize;
-       pos = HUD_Panel_GetPos(id);
-       mySize = HUD_Panel_GetSize(id);
+       pos = panel_pos;
+       mySize = panel_size;
 
-       HUD_Panel_DrawBg(id, pos, mySize, 0);
-       float padding;
-       padding = HUD_Panel_GetPadding(id);
-       if(padding)
+       HUD_Panel_DrawBg(1);
+       if(panel_bg_padding)
        {
-               pos += '1 1 0' * padding;
-               mySize -= '2 2 0' * padding;
+               pos += '1 1 0' * panel_bg_padding;
+               mySize -= '2 2 0' * panel_bg_padding;
        }
 
-       if(cvar("hud_engineinfo_framecounter_exponentialmovingaverage"))
+       if(cvar("hud_panel_engineinfo_framecounter_exponentialmovingaverage"))
        {
                frametimeavg = (frametimeavg + frametimeavg1 + frametimeavg2 + frametime)/4; // average three frametimes into framecounter for slightly more stable fps readings :P
                frametimeavg2 = frametimeavg1;
                frametimeavg1 = frametimeavg;
                
                float weight;
-               weight = cvar("hud_engineinfo_framecounter_exponentialmovingaverage_new_weight");
+               weight = cvar("hud_panel_engineinfo_framecounter_exponentialmovingaverage_new_weight");
                if(frametime > 0.0001) // filter out insane values which sometimes seem to occur and throw off the average? If you are getting 10,000 fps or more, then you don't need a framerate counter.
                {
-                       if(fabs(prevfps - (1/frametimeavg)) > prevfps * cvar("hud_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold")) // if there was a big jump in fps, just force prevfps at current (1/frametime) to make big updates instant
+                       if(fabs(prevfps - (1/frametimeavg)) > prevfps * cvar("hud_panel_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold")) // if there was a big jump in fps, just force prevfps at current (1/frametime) to make big updates instant
                                prevfps = (1/frametime);
                        prevfps = (1 - weight) * prevfps + weight * (1/frametimeavg); // framecounter just used so there's no need for a new variable, think of it as "frametime average"
                }
@@ -4239,9 +4323,9 @@ void HUD_EngineInfo(void)
        else
        {
                framecounter += 1;
-               if(time - prevfps_time > cvar("hud_engineinfo_framecounter_time"))
+               if(time - prevfps_time > cvar("hud_panel_engineinfo_framecounter_time"))
                {
-                       prevfps = framecounter/cvar("hud_engineinfo_framecounter_time");
+                       prevfps = framecounter/cvar("hud_panel_engineinfo_framecounter_time");
                        framecounter = 0;
                        prevfps_time = time;
                }
@@ -4249,8 +4333,227 @@ void HUD_EngineInfo(void)
 
        vector color;
        color = HUD_Get_Num_Color (prevfps, 100);
-       drawstring_aspect(pos, strcat("FPS: ", ftos_decimals(prevfps, cvar("hud_engineinfo_framecounter_decimals"))), mySize, mySize_y, color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+       drawfont = hud_bigfont;
+       drawstring_aspect(pos, strcat("FPS: ", ftos_decimals(prevfps, cvar("hud_panel_engineinfo_framecounter_decimals"))), mySize, color, panel_fg_alpha, DRAWFLAG_NORMAL);
+       drawfont = hud_font;
+}
+
+// Info messages panel (#14)
+//
+void HUD_InfoMessages(void)
+{
+       if(!autocvar_hud_panel_infomessages && !autocvar__hud_configure)
+               return;
+
+       active_panel = HUD_PANEL_INFOMESSAGES;
+       HUD_Panel_UpdateCvars(infomessages);
+       vector pos, mySize;
+       pos = panel_pos;
+       mySize = panel_size;
+
+       HUD_Panel_DrawBg(1);
+       if(panel_bg_padding)
+       {
+               pos += '1 1 0' * panel_bg_padding;
+               mySize -= '2 2 0' * panel_bg_padding;
+       }
+
+       // always force 5:1 aspect
+       vector newSize;
+       if(mySize_x/mySize_y > 5)
+       {
+               newSize_x = 5 * mySize_y;
+               newSize_y = mySize_y;
+
+               pos_x = pos_x + (mySize_x - newSize_x) / 2;
+       }
+       else
+       {
+               newSize_y = 1/5 * mySize_x;
+               newSize_x = mySize_x;
+
+               pos_y = pos_y + (mySize_y - newSize_y) / 2;
+       }
+
+       mySize = newSize;
+       entity tm;
+       vector o;
+       o = pos;
+
+       vector fontsize;
+       fontsize = '0.20 0.20 0' * mySize_y;
+       
+       string s;
+       if(!autocvar__hud_configure)
+       {
+               if(spectatee_status && !intermission)
+               {
+                       if(spectatee_status == -1)
+                               s = "^1Observing";
+                       else
+                               s = strcat("^1Spectating: ^7", GetPlayerName(spectatee_status - 1));
+
+                       if(autocvar_hud_panel_infomessages_flip)
+                               o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); 
+                       drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+                       o += eY * fontsize_y;
+
+                       if(spectatee_status == -1)
+                               s = strcat("^1Press ^3", getcommandkey("primary fire", "+attack"), "^1 to spectate");
+                       else
+                               s = strcat("^1Press ^3", getcommandkey("primary fire", "+attack"), "^1 for another player");
+                       if(autocvar_hud_panel_infomessages_flip)
+                               o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); 
+                       drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+                       o += eY * fontsize_y;
+
+                       if(spectatee_status == -1)
+                               s = strcat("^1Use ^3", getcommandkey("next weapon", "weapnext"), "^1 or ^3", getcommandkey("previous weapon", "weapprev"), "^1 to change the speed");
+                       else
+                               s = strcat("^1Press ^3", getcommandkey("secondary fire", "+attack2"), "^1 to observe");
+                       if(autocvar_hud_panel_infomessages_flip)
+                               o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); 
+                       drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+                       o += eY * fontsize_y;
+
+                       s = strcat("^1Press ^3", getcommandkey("server info", "+show_info"), "^1 for gamemode info");
+                       if(autocvar_hud_panel_infomessages_flip)
+                               o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); 
+                       drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+                       o += eY * fontsize_y;
+
+                       if(gametype == GAME_ARENA)
+                               s = "^1Wait for your turn to join";
+                       else if(gametype == GAME_LMS)
+                       {
+                               entity sk;
+                               sk = playerslots[player_localentnum - 1];
+                               if(sk.(scores[ps_primary]) >= 666)
+                                       s = "^1Match has already begun";
+                               else if(sk.(scores[ps_primary]) > 0)
+                                       s = "^1You have no more lives left";
+                               else
+                                       s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join");
+                       }
+                       else
+                               s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join");
+                       if(autocvar_hud_panel_infomessages_flip)
+                               o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); 
+                       drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+                       o += eY * fontsize_y;
+
+                       //show restart countdown:
+                       if (time < getstatf(STAT_GAMESTARTTIME)) {
+                               float countdown;
+                               //we need to ceil, otherwise the countdown would be off by .5 when using round()
+                               countdown = ceil(getstatf(STAT_GAMESTARTTIME) - time);
+                               s = strcat("^1Game starts in ^3", ftos(countdown), "^1 seconds");
+                               drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+                               o += eY * fontsize_y;
+                       }
+               }
+               if(warmup_stage && !intermission)
+               {
+                       s = "^2Currently in ^1warmup^2 stage!";
+                       if(autocvar_hud_panel_infomessages_flip)
+                               o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); 
+                       drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+                       o += eY * fontsize_y;
+               }
+
+               string blinkcolor;
+               if(mod(time, 1) >= 0.5)
+                       blinkcolor = "^1";
+               else
+                       blinkcolor = "^3";
+
+               if(ready_waiting && !intermission && !spectatee_status)
+               {
+                       if(ready_waiting_for_me)
+                       {
+                               if(warmup_stage)
+                                       s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " to end warmup");
+                               else
+                                       s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " once you are ready");
+                       }
+                       else
+                       {
+                               if(warmup_stage)
+                                       s = strcat("^2Waiting for others to ready up to end warmup...");
+                               else
+                                       s = strcat("^2Waiting for others to ready up...");
+                       }
+                       if(autocvar_hud_panel_infomessages_flip)
+                               o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); 
+                       drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+                       o += eY * fontsize_y;
+               }
+               else if(warmup_stage && !intermission && !spectatee_status)
+               {
+                       s = strcat("^2Press ^3", getcommandkey("ready", "ready"), "^2 to end warmup");
+                       if(autocvar_hud_panel_infomessages_flip)
+                               o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); 
+                       drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+                       o += eY * fontsize_y;
+               }
+
+               if(teamplay && !intermission && !spectatee_status && gametype != GAME_CA && teamnagger)
+               {
+                       float ts_min, ts_max;
+                       tm = teams.sort_next;
+                       if (tm)
+                       {
+                               for(; tm.sort_next; tm = tm.sort_next)
+                               {
+                                       if(!tm.team_size || tm.team == COLOR_SPECTATOR)
+                                               continue;
+                                       if(!ts_min) ts_min = tm.team_size;
+                                       else ts_min = min(ts_min, tm.team_size);
+                                       if(!ts_max) ts_max = tm.team_size;
+                                       else ts_max = max(ts_max, tm.team_size);
+                               }
+                               if ((ts_max - ts_min) > 1)
+                               {
+                                       s = strcat(blinkcolor, "Teamnumbers are unbalanced!");
+                                       tm = GetTeam(myteam, false);
+                                       if (tm)
+                                       if (tm.team != COLOR_SPECTATOR)
+                                       if (tm.team_size == ts_max)
+                                               s = strcat(s, " Press ^3", getcommandkey("team menu", "menu_showteamselect"), blinkcolor, " to adjust");
+
+                                       if(autocvar_hud_panel_infomessages_flip)
+                                               o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); 
+                                       drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+                                       o += eY * fontsize_y;
+                               }
+                       }
+               }
+       }
+       else 
+       {
+               s = "^7Press ^3ESC ^7to show HUD options.";
+               if(autocvar_hud_panel_infomessages_flip)
+                       o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); 
+               drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+               o += eY * fontsize_y;
+               s = "^3Doubleclick ^7a panel for panel-specific options.";
+               if(autocvar_hud_panel_infomessages_flip)
+                       o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); 
+               drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+               o += eY * fontsize_y;
+               s = "^3CTRL ^7to disable collision testing, ^3SHIFT ^7and";
+               if(autocvar_hud_panel_infomessages_flip)
+                       o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); 
+               drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+               o += eY * fontsize_y;
+               s = "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments.";
+               if(autocvar_hud_panel_infomessages_flip)
+                       o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); 
+               drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+               o += eY * fontsize_y;
+       }
 }
+
 /*
 ==================
 Main HUD system
@@ -4298,11 +4601,11 @@ void HUD_ShowSpeed(void)
        pos = (vid_conheight - numsize_y) * cvar("cl_showspeed_position");
 
        drawfont = hud_bigfont;
-       drawstringcenter(eX + pos * eY, speed, numsize, '1 1 1', hud_fg_alpha, DRAWFLAG_NORMAL);
+       drawstringcenter(eX + pos * eY, speed, numsize, '1 1 1', autocvar_hud_panel_fg_alpha, DRAWFLAG_NORMAL);
 
        if (cvar("cl_showspeed_z") == 1) {
                zspeed = strcat(ftos(fabs(floor( pmove_vel_z * conversion_factor + 0.5 ))), unit);
-               drawstringcenter(eX + pos * eY + numsize_y * eY, zspeed, numsize * 0.5, '1 1 1', hud_fg_alpha, DRAWFLAG_NORMAL);
+               drawstringcenter(eX + pos * eY + numsize_y * eY, zspeed, numsize * 0.5, '1 1 1', autocvar_hud_panel_fg_alpha, DRAWFLAG_NORMAL);
        }
 
        drawfont = hud_font;
@@ -4348,9 +4651,9 @@ void HUD_ShowAcceleration(void)
        }
 
        if (acceleration > 0)
-               HUD_Panel_DrawProgressBar(pos, 0, acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_fg_alpha, DRAWFLAG_NORMAL);
+               HUD_Panel_DrawProgressBar(pos, 0, acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * autocvar_hud_panel_fg_alpha, DRAWFLAG_NORMAL);
        else if (acceleration < 0)
-               HUD_Panel_DrawProgressBar(pos + acceleration * scale * '40 0 0', 0, -acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_fg_alpha, DRAWFLAG_NORMAL);
+               HUD_Panel_DrawProgressBar(pos + acceleration * scale * '40 0 0', 0, -acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * autocvar_hud_panel_fg_alpha, DRAWFLAG_NORMAL);
 }
 
 void HUD_Reset (void)
@@ -4362,78 +4665,123 @@ void HUD_Reset (void)
                HUD_Mod_CTF_Reset();
 }
 
+#define HUD_DrawPanel(id)\
+switch (id) {\
+       case (HUD_PANEL_RADAR):\
+               HUD_Radar(); break;\
+       case (HUD_PANEL_WEAPONS):\
+               HUD_Weapons(); break;\
+       case (HUD_PANEL_AMMO):\
+               HUD_Ammo(); break;\
+       case (HUD_PANEL_POWERUPS):\
+               HUD_Powerups(); break;\
+       case (HUD_PANEL_HEALTHARMOR):\
+               HUD_HealthArmor(); break;\
+       case (HUD_PANEL_NOTIFY):\
+               HUD_Notify(); break;\
+       case (HUD_PANEL_TIMER):\
+               HUD_Timer(); break;\
+       case (HUD_PANEL_SCORE):\
+               HUD_Score(); break;\
+       case (HUD_PANEL_RACETIMER):\
+               HUD_RaceTimer(); break;\
+       case (HUD_PANEL_VOTE):\
+               HUD_VoteWindow(); break;\
+       case (HUD_PANEL_MODICONS):\
+               HUD_ModIcons(); break;\
+       case (HUD_PANEL_PRESSEDKEYS):\
+               HUD_DrawPressedKeys(); break;\
+       case (HUD_PANEL_CHAT):\
+               HUD_Chat(); break;\
+       case (HUD_PANEL_ENGINEINFO):\
+               HUD_EngineInfo(); break;\
+       case (HUD_PANEL_INFOMESSAGES):\
+                HUD_InfoMessages(); break;\
+}
+
 void HUD_Main (void)
 {
+       hud_skin_path = strcat("gfx/hud/", autocvar_hud_skin);
+
        if(disable_menu_alphacheck == 1)
                menu_fade_alpha = 1;
        else
-               menu_fade_alpha = (1 - cvar("_menu_alpha"));
-       hud_fg_alpha = cvar("hud_fg_alpha");
+               menu_fade_alpha = (1 - autocvar__menu_alpha);
 
        hud_border_thickness = bound(0, cvar("hud_border_thickness"), 5);
        hud_accuracy_border_thickness = bound(0, cvar_or("hud_accuracy_border_thickness", 1), 5);
-       hud_color_bg_team = cvar("hud_color_bg_team");
 
        hud_fontsize = HUD_GetFontsize("hud_fontsize");
        hud_fontsize_spec = HUD_GetFontsize("hud_fontsize_spec");
 
-       hud_configure = cvar("_hud_configure");
-
        // Drawing stuff
 
        // HUD configure visible grid
-       if(hud_configure && cvar("hud_configure_grid") && cvar("hud_configure_grid_alpha"))
+       if(autocvar__hud_configure && autocvar_hud_configure_grid && autocvar_hud_configure_grid_alpha)
        {
                float i;
                // x-axis
-               for(i = 0; i < 1/bound(0.005, cvar("hud_configure_grid_x"), 0.2); ++i)
+               for(i = 0; i < 1/bound(0.005, autocvar_hud_configure_grid_xsize, 0.2); ++i)
                {
-                       drawfill(eX * i * vid_conwidth * bound(0.005, cvar("hud_configure_grid_x"), 0.2), eX + eY * vid_conheight, '0.5 0.5 0.5', cvar("hud_configure_grid_alpha"), DRAWFLAG_NORMAL);
+                       drawfill(eX * i * vid_conwidth * bound(0.005, autocvar_hud_configure_grid_xsize, 0.2), eX + eY * vid_conheight, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL);
                }
                // y-axis
-               for(i = 0; i < 1/bound(0.005, cvar("hud_configure_grid_y"), 0.2); ++i)
+               for(i = 0; i < 1/bound(0.005, autocvar_hud_configure_grid_ysize, 0.2); ++i)
                {
-                       drawfill(eY * i * vid_conheight * bound(0.005, cvar("hud_configure_grid_y"), 0.2), eY + eX * vid_conwidth, '0.5 0.5 0.5', cvar("hud_configure_grid_alpha"), DRAWFLAG_NORMAL);
+                       drawfill(eY * i * vid_conheight * bound(0.005, autocvar_hud_configure_grid_ysize, 0.2), eY + eX * vid_conwidth, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL);
                }
        }
 
-       if(cvar_string("hud_dock") != "")
-               drawpic('0 0 0', strcat("gfx/hud/", cvar_string("hud_skin"), "/", cvar_string("hud_dock")), eX * vid_conwidth + eY * vid_conheight, HUD_Panel_Dock_GetColor(), cvar("hud_dock_alpha") * menu_fade_alpha, DRAWFLAG_NORMAL); // no aspect ratio forcing on dock...
-
-       if(HUD_Panel_CheckActive(HUD_PANEL_RADAR) || hud_configure)
-               if(cvar_string("hud_radar") != "0" && (cvar("hud_radar") == 2 || teamplay))
-                       HUD_Radar();
-       if(HUD_Panel_CheckActive(HUD_PANEL_WEAPONICONS) || hud_configure)
-               HUD_WeaponIcons();
-       if(HUD_Panel_CheckActive(HUD_PANEL_INVENTORY) || hud_configure)
-               HUD_Inventory();
-       if(HUD_Panel_CheckActive(HUD_PANEL_POWERUPS) || hud_configure)
-               HUD_Powerups();
-       if(HUD_Panel_CheckActive(HUD_PANEL_HEALTHARMOR) || hud_configure)
-               HUD_HealthArmor();
-       if(HUD_Panel_CheckActive(HUD_PANEL_NOTIFY) || hud_configure)
-               HUD_Notify();
-       if(HUD_Panel_CheckActive(HUD_PANEL_TIMER) || hud_configure)
-               HUD_Timer();
-       if(HUD_Panel_CheckActive(HUD_PANEL_SCORE) || hud_configure)
-               HUD_Score();
-       if(HUD_Panel_CheckActive(HUD_PANEL_RACETIMER) || hud_configure)
-               if(gametype == GAME_RACE || gametype == GAME_CTS || hud_configure)
-                       HUD_RaceTimer();
-       if(HUD_Panel_CheckActive(HUD_PANEL_VOTE) || hud_configure)
-               HUD_VoteWindow();
-       if(HUD_Panel_CheckActive(HUD_PANEL_MODICONS) || hud_configure)
-               HUD_ModIcons();
-       // TODO hud'ify
-       if(HUD_Panel_CheckActive(HUD_PANEL_PRESSEDKEYS) || hud_configure)
-               if(spectatee_status > 0 || cvar("hud_pressedkeys") >= 2 || hud_configure)
-                       HUD_DrawPressedKeys();
-       if(HUD_Panel_CheckActive(HUD_PANEL_CHAT) || hud_configure)
-               HUD_Chat();
+       float f;
+       vector color;
+       if((teamplay) && autocvar_hud_dock_color_team) {
+               f = stof(getplayerkey(player_localentnum - 1, "colors"));
+               color = colormapPaletteColor(mod(f, 16), 1) * autocvar_hud_dock_color_team;
+       }
+       else if(autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && autocvar_hud_dock_color_team) {
+               color = '1 0 0' * autocvar_hud_dock_color_team;
+       }
+       else if(autocvar_hud_dock_color == "shirt") {
+               f = stof(getplayerkey(player_localentnum - 1, "colors"));
+               color = colormapPaletteColor(floor(f / 16), 0);
+       }
+       else if(autocvar_hud_dock_color == "pants") {
+               f = stof(getplayerkey(player_localentnum - 1, "colors"));
+               color = colormapPaletteColor(mod(f, 16), 1);
+       }
        else
-               cvar_set("con_chatrect", "0");
-       if(HUD_Panel_CheckActive(HUD_PANEL_ENGINEINFO) || hud_configure)
-               HUD_EngineInfo();
+               color = stov(autocvar_hud_dock_color);
+
+       // draw the dock
+       if(autocvar_hud_dock != "" && autocvar_hud_dock != "0")
+       {
+               string pic;
+               pic = strcat(hud_skin_path, "/", autocvar_hud_dock);
+               if(precache_pic(pic) == "") {
+                       pic = "gfx/hud/default/dock";
+               }
+               drawpic('0 0 0', pic, eX * vid_conwidth + eY * vid_conheight, color, autocvar_hud_dock_alpha * menu_fade_alpha, DRAWFLAG_NORMAL); // no aspect ratio forcing on dock...
+       }
+
+       // cache the panel order into the panel_order array
+       if(autocvar__hud_panelorder != hud_panelorder_prev) {
+               if(hud_panelorder_prev)
+                       strunzone(hud_panelorder_prev);
+               hud_panelorder_prev = strzone(autocvar__hud_panelorder);
+               tokenize_console(autocvar__hud_panelorder);
+               for(i = 0; i < HUD_PANEL_NUM; ++i) {
+                       panel_order[i] = stof(argv(i));
+               }
+       }
+       // draw panels in order specified by panel_order array
+       for(i = HUD_PANEL_NUM - 1; i >= 0; --i) {
+               if(i != HUD_PANEL_CHAT || !autocvar__con_chat_maximized) // don't draw maximized chat panel twice!
+                       HUD_DrawPanel(panel_order[i]);
+       }
+
+       // draw chat panel on top if it is maximized
+       if(autocvar__con_chat_maximized)
+               HUD_DrawPanel(HUD_PANEL_CHAT);
 
        // TODO hud_'ify these
        if (cvar("cl_showspeed"))
@@ -4441,9 +4789,11 @@ void HUD_Main (void)
        if (cvar("cl_showacceleration"))
                HUD_ShowAcceleration();
 
-       if (hud_configure && spectatee_status) // try to join if we are in hud_configure mode, but still spectating (in order to get rid of motd and such)
+       if (autocvar__hud_configure && spectatee_status && hud_configure_prev == -1) // try to join if we are in hud_configure mode, but still spectating, and in the first frame (in order to get rid of motd when launching a server via the menu "HUD Setup" button)
                localcmd("cmd selectteam auto; cmd join\n");
 
-       if (!hud_configure) // hud config mode disabled, enable normal alpha stuff again
+       hud_configure_prev = autocvar__hud_configure;
+
+       if (!autocvar__hud_configure) // hud config mode disabled, enable normal alpha stuff again
                disable_menu_alphacheck = 0;
 }
index 6768221a3a89b6e0033599d8a25c75c01fba0707..bdc533edbd7e818a56c7b473cf7c63980a124e1c 100644 (file)
@@ -1,16 +1,30 @@
+float log(float f);
+
+float panel_order[HUD_PANEL_NUM];
+string hud_panelorder_prev;
+
 vector mousepos;
 vector panel_click_distance; // mouse cursor distance from the top left corner of the panel (saved only upon a click)
 vector panel_click_resizeorigin; // coordinates for opposite point when resizing
 float resizeCorner; // 1 = topleft, 2 = topright, 3 = bottomleft, 4 = bottomright
-float highlightedPanel;
+var float highlightedPanel = -1;
+var float highlightedPanel_prev = -1;
 float highlightedAction; // 0 = nothing, 1 = move, 2 = resize
 
 const float BORDER_MULTIPLIER = 0.25;
-float hud_color_bg_team;
 float scoreboard_bottom;
 float weapon_hits[WEP_MAXCOUNT];
 float weapon_fired[WEP_MAXCOUNT];
-float weapon_number;
+
+#define acc_color(i) stov(cvar_string(strcat("hud_panel_weapons_accuracy_color", ftos(i))))
+#define MAX_ACCURACY_LEVELS 10
+float acc_lev[MAX_ACCURACY_LEVELS];
+float acc_levels;
+
+float complain_weapon;
+string complain_weapon_name;
+float complain_weapon_type;
+float complain_weapon_time;
 
 float ps_primary, ps_secondary;
 float ts_primary, ts_secondary;
@@ -19,12 +33,282 @@ float last_weapon;
 float weapontime;
 
 float teamnagger;
-float hud_fg_alpha;
 float hud_accuracy_hud;
 float hud_border_thickness;
 float hud_accuracy_border_thickness;
 
-float hud_configure;
+float hud_configure_checkcollisions;
+float hud_configure_prev;
+
+float hudShiftState;
+const float S_SHIFT = 1;
+const float S_CTRL = 2;
+const float S_ALT = 4;
 
 float disable_menu_alphacheck; // 0 = enable alpha check, 1 = disable for entire hud, 2 = disable for one panel
 float menu_fade_alpha;
+
+string hud_skin_path;
+
+var vector progressbar_color;
+
+var float active_panel; // this panel has recently referred the UpdateCvars macro
+var string panel_name;
+var float panel_enabled;
+var vector panel_pos;
+var vector panel_size;
+var string panel_bg;
+var string panel_bg_str; // "_str" vars contain the raw value of the cvar, non-"_str" contains what hud.qc code should use
+var vector panel_bg_color;
+var string panel_bg_color_str;
+var float panel_bg_color_team;
+var string panel_bg_color_team_str;
+var float panel_fg_alpha;
+var float panel_bg_alpha;
+var string panel_bg_alpha_str;
+var float panel_bg_border;
+var string panel_bg_border_str;
+var float panel_bg_padding;
+var string panel_bg_padding_str;
+var float panel_accuracy_yellow;
+var float panel_accuracy_onlycurrent;
+var float panel_accuracy_flip;
+var float panel_accuracy_iconalign;
+var float panel_accuracy_baralign;
+var float panel_accuracy_info_top;
+var float panel_accuracy_foreground_alpha;
+var float panel_accuracy_alreadyvoted_alpha;
+
+var string picpath;
+
+// Because calling lots of functions in QC apparently cuts fps in half on many machines:
+// ----------------------
+// MACRO HELL STARTS HERE
+// ----------------------
+// Little help for the poor people who have to make sense of this: Start from the bottom
+
+#define HUD_Panel_GetProgressBarColor(item) \
+switch(item) {\
+       case "strength": progressbar_color = autocvar_hud_progressbar_strength_color; break;\
+       case "shield": progressbar_color = autocvar_hud_progressbar_shield_color; break;\
+       case "health": progressbar_color = autocvar_hud_progressbar_health_color; break;\
+       case "armor": progressbar_color = autocvar_hud_progressbar_armor_color; break;\
+       case "fuel": progressbar_color = autocvar_hud_progressbar_fuel_color; break;\
+       case "nexball": progressbar_color = autocvar_hud_progressbar_nexball_color; break;\
+}
+
+// Get value for panel_bg: if "" fetch default, else use panel_bg_str
+// comment on last line of macro: // we probably want to see a background in config mode at all times...
+#define HUD_Panel_GetBg()\
+if(!autocvar__hud_configure && panel_bg_str == "0") {\
+       panel_bg = "0";\
+} else {\
+       if(panel_bg_str == "") {\
+               panel_bg = autocvar_hud_panel_bg;\
+       } else if(panel_bg_str == "0" && autocvar__hud_configure) {\
+               panel_bg = autocvar_hud_panel_bg;\
+               panel_bg_alpha_str = "0";\
+       } else {\
+               panel_bg = panel_bg_str;\
+       }\
+       panel_bg = strcat(hud_skin_path, "/", panel_bg);\
+       if(precache_pic(panel_bg) == "") {\
+               panel_bg = strcat(hud_skin_path, "/", "border");\
+               if(precache_pic(panel_bg) == "") {\
+                       panel_bg = strcat("gfx/hud/default/", "border");\
+               }\
+       }\
+}
+
+// Get value for panel_bg_color: if "" fetch default, else use panel_bg_color. Convert pants, shirt or teamcolor into a vector.
+#define HUD_Panel_GetColor()\
+if((teamplay) && panel_bg_color_team) {\
+       panel_bg_color = colormapPaletteColor(mod(stof(getplayerkey(player_localentnum - 1, "colors")), 16), 1) * panel_bg_color_team;\
+} else if (autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && panel_bg_color_team) {\
+       panel_bg_color = '1 0 0' * panel_bg_color_team;\
+} else {\
+       if(panel_bg_color_str == "") {\
+               panel_bg_color = autocvar_hud_panel_bg_color;\
+       } else {\
+               if(panel_bg_color_str == "shirt") {\
+                       panel_bg_color = colormapPaletteColor(floor(stof(getplayerkey(player_localentnum - 1, "colors")) / 16), 0);\
+               } else if(panel_bg_color_str == "pants") {\
+                       panel_bg_color = colormapPaletteColor(mod(stof(getplayerkey(player_localentnum - 1, "colors")), 16), 1);\
+               } else {\
+                       panel_bg_color = stov(panel_bg_color_str);\
+               }\
+       }\
+}
+
+// Get value for panel_bg_color_team: if "" fetch default, else use panel_bg_color_team_str
+#define HUD_Panel_GetColorTeam()\
+if(panel_bg_color_team_str == "") {\
+       panel_bg_color_team = autocvar_hud_panel_bg_color_team;\
+} else {\
+       panel_bg_color_team = stof(panel_bg_color_team_str);\
+}
+
+// Get value for panel_bg_alpha: if "" fetch default, else use panel_bg_alpha. Also do various menu dialog fadeout/in checks, and minalpha checks
+// comment on line 3 of macro: // do not set a minalpha cap when showing the config dialog for this panel
+#define HUD_Panel_GetBgAlpha()\
+if(panel_bg_alpha_str == "") {\
+       panel_bg_alpha_str = ftos(autocvar_hud_panel_bg_alpha);\
+}\
+panel_bg_alpha = stof(panel_bg_alpha_str);\
+if(autocvar__hud_configure && disable_menu_alphacheck == 2 && highlightedPanel == active_panel) {\
+       panel_bg_alpha = (1 - autocvar__menu_alpha) * max(autocvar_hud_configure_bg_minalpha, panel_bg_alpha) + autocvar__menu_alpha * panel_bg_alpha;\
+} else if(autocvar__hud_configure) {\
+       panel_bg_alpha = max(autocvar_hud_configure_bg_minalpha, panel_bg_alpha);\
+} if(autocvar__hud_configure && !panel_enabled) {\
+       panel_bg_alpha = 0.25;\
+} if(!(disable_menu_alphacheck == 2 && highlightedPanel == active_panel)) {\
+       panel_bg_alpha *= menu_fade_alpha;\
+}
+
+// Get value for panel_fg_alpha. Also do various minalpha checks
+// comment on line 2 of macro: // ALWAYS show disabled panels at 0.25 alpha when in config mode
+// comment on line 4 of macro: // don't fade this panel when showing the panel-specific menu dialog
+#define HUD_Panel_GetFgAlpha()\
+panel_fg_alpha = autocvar_hud_panel_fg_alpha;\
+if(autocvar__hud_configure && !panel_enabled)\
+       panel_fg_alpha = 0.25;\
+if(!(disable_menu_alphacheck == 2 && highlightedPanel == active_panel))\
+       panel_fg_alpha *= menu_fade_alpha;
+
+// Get border. See comments above, it's similar.
+#define HUD_Panel_GetBorder()\
+if(panel_bg_border_str == "") {\
+       panel_bg_border = autocvar_hud_panel_bg_border;\
+} else {\
+       panel_bg_border = stof(panel_bg_border_str);\
+}
+
+// Scale the pos and size vectors to absolute coordinates
+#define HUD_Panel_GetScaledVectors()\
+panel_pos_x *= vid_conwidth;\
+panel_pos_y *= vid_conheight;\
+panel_size_x *= vid_conwidth;\
+panel_size_y *= vid_conheight;
+
+// Get padding. See comments above, it's similar.
+// last line is a port of the old function, basically always make sure the panel contents are at least 5 pixels tall/wide, to disallow extreme padding values
+#define HUD_Panel_GetPadding()\
+if(panel_bg_padding_str == "") {\
+       panel_bg_padding = autocvar_hud_panel_bg_padding;\
+} else {\
+       panel_bg_padding = stof(panel_bg_padding_str);\
+}\
+panel_bg_padding = min(min(panel_size_x, panel_size_y)/2 - 5, panel_bg_padding);
+
+// Point to the macros above (stupid max macro length)
+#define HUD_Panel_StringVars()\
+HUD_Panel_GetBg()\
+HUD_Panel_GetColorTeam()\
+HUD_Panel_GetColor()\
+HUD_Panel_GetBgAlpha()\
+HUD_Panel_GetFgAlpha()\
+HUD_Panel_GetBorder()\
+HUD_Panel_GetScaledVectors()\
+HUD_Panel_GetPadding()
+
+// return smoothly faded pos of given panel when a dialog is active
+var vector menu_enable_panelpos;
+#define HUD_Panel_GetMenuPos() \
+if(panel_size_x > panel_size_y)\
+       menu_enable_panelpos = eX * 0.5 * vid_conwidth - eX * 0.5 * panel_size_x + eY * 0.82 * vid_conheight;\
+else\
+       menu_enable_panelpos = eY * 0.5 * vid_conheight - eY * 0.5 * panel_size_y + eX * 0.7 * vid_conwidth;\
+panel_pos = (1 - autocvar__menu_alpha) * panel_pos + (autocvar__menu_alpha) * menu_enable_panelpos;
+
+// return smoothly faded size of given panel when a dialog is active
+var vector menu_enable_maxsize;
+var vector menu_enable_size;
+#define HUD_Panel_GetMenuSize()\
+menu_enable_maxsize_x = 0.3 * vid_conwidth;\
+menu_enable_maxsize_y = 0.18 * vid_conheight;\
+if(panel_size_x > panel_size_y)\
+{\
+       if(panel_size_y > menu_enable_maxsize_y)\
+       {\
+               menu_enable_size_y = menu_enable_maxsize_y;\
+               menu_enable_size_x = panel_size_x * (menu_enable_maxsize_y/panel_size_y);\
+               panel_size = (1 - autocvar__menu_alpha) * panel_size + (autocvar__menu_alpha) * menu_enable_size;\
+       }\
+}\
+else\
+{\
+       if(panel_size_x > menu_enable_maxsize_x)\
+       {\
+               menu_enable_size_x = menu_enable_maxsize_x;\
+               menu_enable_size_y = panel_size_y * (menu_enable_maxsize_x/panel_size_x);\
+               panel_size = (1 - autocvar__menu_alpha) * panel_size + (autocvar__menu_alpha) * menu_enable_size;\
+       }\
+}
+
+// Update all common cvars of given panel name
+#define HUD_Panel_UpdateCvars(name) \
+panel_enabled = autocvar_hud_panel_##name; \
+panel_pos = autocvar_hud_panel_##name##_pos; \
+panel_size = autocvar_hud_panel_##name##_size; \
+panel_bg_str = autocvar_hud_panel_##name##_bg; \
+panel_bg_color_str = autocvar_hud_panel_##name##_bg_color; \
+panel_bg_color_team_str = autocvar_hud_panel_##name##_bg_color_team; \
+panel_bg_alpha_str = autocvar_hud_panel_##name##_bg_alpha; \
+panel_bg_border_str = autocvar_hud_panel_##name##_bg_border; \
+panel_bg_padding_str = autocvar_hud_panel_##name##_bg_padding; \
+HUD_Panel_StringVars()\
+if(disable_menu_alphacheck == 2 && active_panel == highlightedPanel) {\
+       HUD_Panel_GetMenuSize()\
+       HUD_Panel_GetMenuPos()\
+}
+
+// Update all common cvars of given panel id
+#define HUD_Panel_UpdateCvarsForId(id) \
+switch(id) { \
+       case HUD_PANEL_WEAPONS: HUD_Panel_UpdateCvars(weapons) break; \
+       case HUD_PANEL_AMMO: HUD_Panel_UpdateCvars(ammo) break; \
+       case HUD_PANEL_POWERUPS: HUD_Panel_UpdateCvars(powerups) break; \
+       case HUD_PANEL_HEALTHARMOR: HUD_Panel_UpdateCvars(healtharmor) break; \
+       case HUD_PANEL_NOTIFY: HUD_Panel_UpdateCvars(notify) break; \
+       case HUD_PANEL_TIMER: HUD_Panel_UpdateCvars(timer) break; \
+       case HUD_PANEL_RADAR: HUD_Panel_UpdateCvars(radar) break; \
+       case HUD_PANEL_SCORE: HUD_Panel_UpdateCvars(score) break; \
+       case HUD_PANEL_RACETIMER: HUD_Panel_UpdateCvars(racetimer) break; \
+       case HUD_PANEL_VOTE: HUD_Panel_UpdateCvars(vote) break; \
+       case HUD_PANEL_MODICONS: HUD_Panel_UpdateCvars(modicons) break; \
+       case HUD_PANEL_PRESSEDKEYS: HUD_Panel_UpdateCvars(pressedkeys) break; \
+       case HUD_PANEL_CHAT: HUD_Panel_UpdateCvars(chat) break; \
+       case HUD_PANEL_ENGINEINFO: HUD_Panel_UpdateCvars(engineinfo) break; \
+       case HUD_PANEL_INFOMESSAGES: HUD_Panel_UpdateCvars(infomessages) break; \
+}
+
+#define HUD_Panel_UpdatePosSize(name) \
+panel_pos = autocvar_hud_panel_##name##_pos; \
+panel_size = autocvar_hud_panel_##name##_size; \
+HUD_Panel_GetScaledVectors()\
+if(disable_menu_alphacheck == 2 && active_panel == highlightedPanel) {\
+       HUD_Panel_GetMenuSize()\
+       HUD_Panel_GetMenuPos()\
+}\
+panel_bg_border_str = autocvar_hud_panel_##name##_bg_border; \
+HUD_Panel_GetBorder()
+
+// Update pos and size of given panel id
+#define HUD_Panel_UpdatePosSizeForId(id) \
+switch(id) { \
+       case HUD_PANEL_WEAPONS: HUD_Panel_UpdatePosSize(weapons) break;\
+       case HUD_PANEL_AMMO: HUD_Panel_UpdatePosSize(ammo) break;\
+       case HUD_PANEL_POWERUPS: HUD_Panel_UpdatePosSize(powerups) break;\
+       case HUD_PANEL_HEALTHARMOR: HUD_Panel_UpdatePosSize(healtharmor) break;\
+       case HUD_PANEL_NOTIFY: HUD_Panel_UpdatePosSize(notify) break;\
+       case HUD_PANEL_TIMER: HUD_Panel_UpdatePosSize(timer) break;\
+       case HUD_PANEL_RADAR: HUD_Panel_UpdatePosSize(radar) break;\
+       case HUD_PANEL_SCORE: HUD_Panel_UpdatePosSize(score) break;\
+       case HUD_PANEL_RACETIMER: HUD_Panel_UpdatePosSize(racetimer) break;\
+       case HUD_PANEL_VOTE: HUD_Panel_UpdatePosSize(vote) break;\
+       case HUD_PANEL_MODICONS: HUD_Panel_UpdatePosSize(modicons) break;\
+       case HUD_PANEL_PRESSEDKEYS: HUD_Panel_UpdatePosSize(pressedkeys) break;\
+       case HUD_PANEL_CHAT: HUD_Panel_UpdatePosSize(chat) break;\
+       case HUD_PANEL_ENGINEINFO: HUD_Panel_UpdatePosSize(engineinfo) break;\
+       case HUD_PANEL_INFOMESSAGES: HUD_Panel_UpdatePosSize(infomessages)\
+}
index c352cacaea05af16daa4feb922bcc4b8d81bc472..7c3bcecc50d22be197f696b15a60b05036dd466f 100644 (file)
@@ -249,7 +249,7 @@ void MapVote_Draw()
                MapVote_DrawAbstain(pos, isize, xmax - xmin, tmp, i);
        }
 
-       drawpic(mv_mousepos, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor.tga"), '32 32 0', '1 1 1', hud_fg_alpha, DRAWFLAG_NORMAL);
+       drawpic(mv_mousepos, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor.tga"), '32 32 0', '1 1 1', autocvar_hud_panel_fg_alpha, DRAWFLAG_NORMAL);
 }
 
 void Cmd_MapVote_MapDownload(float argc)
index 74830223d9306f31cead7823a6f3ff590b593e7f..c573fe30518ee2c02591327918d0a1e43cf58375 100644 (file)
@@ -468,24 +468,64 @@ void drawpic_tiled(vector pos, string pic, vector sz, vector area, vector color,
        }
 }
 
-void drawpic_expanding(vector position, string pic, vector scale, vector rgb, float alpha, float flag, float fadelerp)
+// drawpic wrapper to draw an image as large as possible with preserved aspect ratio into a box
+var float imgaspect;
+var float aspect;
+#define drawpic_aspect(pos,pic,mySize,color,alpha,drawflag)\
+do {\
+       vector imgsize;\
+       imgsize = drawgetimagesize(pic);\
+       imgaspect = imgsize_x/imgsize_y;\
+       vector oldsz, sz;\
+       oldsz = sz = mySize;\
+       aspect = sz_x/sz_y;\
+       if(aspect > imgaspect) {\
+               sz_x = sz_y * imgaspect;\
+               drawpic(pos + eX * (oldsz_x - sz_x) * 0.5, pic, sz, color, alpha, drawflag);\
+       } else {\
+               sz_y = sz_x / imgaspect;\
+               drawpic(pos + eY * (oldsz_y - sz_y) * 0.5, pic, sz, color, alpha, drawflag);\
+       }\
+} while(0)
+
+// draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga
+#define drawpic_aspect_skin(pos,pic,sz,color,alpha,drawflag)\
+do{\
+       picpath = strcat(hud_skin_path, "/", pic);\
+       if(precache_pic(picpath) == "") {\
+               picpath = strcat("gfx/hud/default/", pic);\
+       }\
+       drawpic_aspect(pos, picpath, sz, color, alpha, drawflag);\
+} while(0)
+
+// draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga
+#define drawpic_skin(pos,pic,sz,color,alpha,drawflag)\
+do{\
+       picpath = strcat(hud_skin_path, "/", pic);\
+       if(precache_pic(picpath) == "") {\
+               picpath = strcat("gfx/hud/default/", pic);\
+       }\
+       drawpic(pos, picpath, sz, color, alpha, drawflag);\
+} while(0)
+
+void drawpic_aspect_skin_expanding(vector position, string pic, vector scale, vector rgb, float alpha, float flag, float fadelerp)
 {
        float sz;
        sz = expandingbox_sizefactor_from_fadelerp(fadelerp);
 
-       drawpic(position + expandingbox_resize_centered_box_offset(sz, scale, 1), pic, scale * sz, rgb, alpha * (1 - fadelerp), flag);
+       drawpic_skin(position + expandingbox_resize_centered_box_offset(sz, scale, 1), pic, scale * sz, rgb, alpha * (1 - fadelerp), flag);
 }
 
-void drawpic_expanding_two(vector position, string pic, vector scale, vector rgb, float alpha, float flag, float fadelerp)
+void drawpic_aspect_skin_expanding_two(vector position, string pic, vector scale, vector rgb, float alpha, float flag, float fadelerp)
 {
-       drawpic_expanding(position, pic, scale, rgb, alpha, flag, fadelerp);
-       drawpic(position, pic, scale, rgb, alpha * fadelerp, flag);
+       drawpic_aspect_skin_expanding(position, pic, scale, rgb, alpha, flag, fadelerp);
+       drawpic_skin(position, pic, scale, rgb, alpha * fadelerp, flag);
 }
 
 // drawstring wrapper to draw a string as large as possible with preserved aspect ratio into a box
-void drawstring_aspect(vector pos, string text, vector sz, float fontsize, vector color, float alpha, float drawflag) {
+void drawstring_aspect(vector pos, string text, vector sz, vector color, float alpha, float drawflag) {
        vector textsize;
-       textsize = eX * stringwidth(text, FALSE, '1 1 0' * fontsize) + eY * fontsize;
+       textsize = eX * stringwidth(text, FALSE, '1 1 1' * sz_y) + eY * sz_y;
        
        float textaspect;
        textaspect = textsize_x/textsize_y;
@@ -504,6 +544,28 @@ void drawstring_aspect(vector pos, string text, vector sz, float fontsize, vecto
        }
 }
 
+// drawstring wrapper to draw a colorcodedstring as large as possible with preserved aspect ratio into a box
+void drawcolorcodedstring_aspect(vector pos, string text, vector sz, float alpha, float drawflag) {
+       vector textsize;
+       textsize = eX * stringwidth(text, TRUE, '1 1 1' * sz_y) + eY * sz_y;
+       
+       float textaspect;
+       textaspect = textsize_x/textsize_y;
+
+       vector oldsz;
+       oldsz = sz;
+       float aspect;
+       aspect = sz_x/sz_y;
+
+       if(aspect > textaspect) {
+               sz_x = sz_y * textaspect;
+               drawcolorcodedstring(pos + eX * (oldsz_x - sz_x) * 0.5, text, '1 1 0' * sz_y, alpha, drawflag);
+       } else {
+               sz_y = sz_x / textaspect; 
+               drawcolorcodedstring(pos + eY * (oldsz_y - sz_y) * 0.5, text, '1 1 0' * sz_y, alpha, drawflag);
+       }
+}
+
 vector drawfontscale;
 void drawstring_expanding(vector position, string text, vector scale, vector rgb, float alpha, float flag, float fadelerp)
 {
@@ -519,6 +581,28 @@ void drawstring_expanding(vector position, string text, vector scale, vector rgb
        drawfontscale = '1 1 0';
 }
 
+// drawstring wrapper to draw a string as large as possible with preserved aspect ratio into a box
+void drawstring_aspect_expanding(vector pos, string text, vector sz, vector color, float alpha, float drawflag, float fadelerp) {
+       vector textsize;
+       textsize = eX * stringwidth(text, FALSE, '1 1 1' * sz_y) + eY * sz_y;
+       
+       float textaspect;
+       textaspect = textsize_x/textsize_y;
+
+       vector oldsz;
+       oldsz = sz;
+       float aspect;
+       aspect = sz_x/sz_y;
+
+       if(aspect > textaspect) {
+               sz_x = sz_y * textaspect;
+               drawstring_expanding(pos + eX * (oldsz_x - sz_x) * 0.5, text, '1 1 0' * sz_y, color, alpha, drawflag, fadelerp);
+       } else {
+               sz_y = sz_x / textaspect; 
+               drawstring_expanding(pos + eY * (oldsz_y - sz_y) * 0.5, text, '1 1 0' * sz_y, color, alpha, drawflag, fadelerp);
+       }
+}
+
 void drawcolorcodedstring_expanding(vector position, string text, vector scale, float alpha, float flag, float fadelerp)
 {
        float sz;
@@ -530,6 +614,27 @@ void drawcolorcodedstring_expanding(vector position, string text, vector scale,
        drawfontscale = '1 1 0';
 }
 
+void drawcolorcodedstring_aspect_expanding(vector pos, string text, vector sz, float alpha, float drawflag, float fadelerp) {
+       vector textsize;
+       textsize = eX * stringwidth(text, TRUE, '1 1 1' * sz_y) + eY * sz_y;
+       
+       float textaspect;
+       textaspect = textsize_x/textsize_y;
+
+       vector oldsz;
+       oldsz = sz;
+       float aspect;
+       aspect = sz_x/sz_y;
+
+       if(aspect > textaspect) {
+               sz_x = sz_y * textaspect;
+               drawcolorcodedstring_expanding(pos + eX * (oldsz_x - sz_x) * 0.5, text, '1 1 0' * sz_y, alpha, drawflag, fadelerp);
+       } else {
+               sz_y = sz_x / textaspect; 
+               drawcolorcodedstring_expanding(pos + eY * (oldsz_y - sz_y) * 0.5, text, '1 1 0' * sz_y, alpha, drawflag, fadelerp);
+       }
+}
+
 // this draws the triangles of a model DIRECTLY. Don't expect high performance, really...
 void PolyDrawModel(entity e)
 {
diff --git a/qcsrc/client/noise.qc b/qcsrc/client/noise.qc
new file mode 100644 (file)
index 0000000..ef9b855
--- /dev/null
@@ -0,0 +1,33 @@
+.float noise_baccum;
+.float noise_paccum;
+.float noise_paccum2;
+.float noise_paccum3;
+.float noise_bstate;
+float Noise_Brown(entity e, float dt)
+{
+       e.noise_baccum += random() * sqrt(dt); // same stddev for all dt
+       return e.noise_baccum;
+}
+float Noise_Pink(entity e, float dt)
+{
+       float f;
+       f = dt * 60;
+       // http://home.earthlink.net/~ltrammell/tech/pinkalg.htm
+       if(random() > pow(0.3190, f))
+               e.noise_paccum = 0.34848 * (2 * random() - 1);
+       if(random() > pow(0.7756, f))
+               e.noise_paccum2 = 0.28768 * (2 * random() - 1);
+       if(random() > pow(0.9613, f))
+               e.noise_paccum3 = 0.43488 * (2 * random() - 1);
+       return e.noise_paccum + e.noise_paccum2 + e.noise_paccum3;
+}
+float Noise_White(entity e, float dt)
+{
+       return random() * 2 - 1;
+}
+float Noise_Burst(entity e, float dt, float p)
+{
+       if(random() > pow(p, dt))
+               e.noise_bstate = !e.noise_bstate;
+       return 2 * e.noise_bstate - 1;
+}
diff --git a/qcsrc/client/noise.qh b/qcsrc/client/noise.qh
new file mode 100644 (file)
index 0000000..30ce4d0
--- /dev/null
@@ -0,0 +1,5 @@
+// noises "usually" start in the range -1..1
+float Noise_Brown(entity e, float dt);
+float Noise_Pink(entity e, float dt);
+float Noise_White(entity e, float dt);
+float Noise_Burst(entity e, float dt, float p); // +1 or -1
index 5e94475ce23fbff63ae8831c0972bb469c990357..4569e497ce30dc1cffbf40f7ae2371f65836d4ee 100644 (file)
@@ -26,6 +26,7 @@ waypointsprites.qh
 movetypes.qh
 prandom.qh
 bgmscript.qh
+noise.qh
 
 main.qh
 
@@ -62,6 +63,7 @@ waypointsprites.qc
 movetypes.qc
 prandom.qc
 bgmscript.qc
+noise.qc
 
 ../common/util.qc
 ../common/gamecommand.qc
index e1f325a6798003f93b524defef46167617f063cf..407b86c746db7eb8bce41e948ff88b2f186ad1d6 100644 (file)
@@ -22,6 +22,11 @@ void SUB_Stop()
 .float silent;
 .float traileffect;
 
+void Projectile_ResetTrail(vector to)
+{
+       self.trail_oldorigin = to;
+       self.trail_oldtime = time;
+}
 void Projectile_DrawTrail(vector to)
 {
        vector from;
@@ -38,20 +43,8 @@ void Projectile_DrawTrail(vector to)
 
        if (self.traileffect)
        {
-               if(checkextension("DP_CSQC_BOXPARTICLES"))
-               {
-                       /* looks good, but we can do better with particle count
-                       particles_alphamin = particles_alphamax = self.alpha;
-                       boxparticles(self.traileffect, self, from, to, self.velocity, self.velocity, 1, PARTICLES_USEALPHA);
-                       */
-                       /* looks bad
-                       boxparticles(self.traileffect, self, from, to, self.velocity, self.velocity, self.alpha, 0);
-                       */
-                       particles_alphamin = particles_alphamax = sqrt(self.alpha);
-                       boxparticles(self.traileffect, self, from, to, self.velocity, self.velocity, sqrt(self.alpha), PARTICLES_USEALPHA);
-               }
-               else
-                       trailparticles(self, self.traileffect, from, to);
+               particles_alphamin = particles_alphamax = sqrt(self.alpha);
+               boxparticles(self.traileffect, self, from, to, self.velocity, self.velocity, sqrt(self.alpha), PARTICLES_USEALPHA);
        }
 }
 
@@ -143,10 +136,7 @@ void Projectile_Draw()
        if(drawn)
                Projectile_DrawTrail(trailorigin);
        else
-       {
-               self.trail_oldorigin = trailorigin;
-               self.trail_oldtime = time;
-       }
+               Projectile_ResetTrail(trailorigin);
 
        if(!drawn)
                return;
@@ -317,8 +307,8 @@ void Ent_Projectile()
                        case PROJECTILE_ELECTRO:
                                // only new engines support sound moving with object
                                loopsound(self, CHAN_PROJECTILE, "weapons/electro_fly.wav", VOL_BASE, ATTN_NORM);
-                               self.mins = '0 0 -3';
-                               self.maxs = '0 0 -3';
+                               self.mins = '0 0 -4';
+                               self.maxs = '0 0 -4';
                                self.move_movetype = MOVETYPE_BOUNCE;
                                self.move_touch = SUB_Null;
                                break;
index 36168ea2e772ce05fce447b024d1abcbcf8d815d..29fb20642a90fbb514f7a1244c0d79b4541b1dcb 100644 (file)
@@ -297,6 +297,7 @@ void Cmd_HUD_SetFields(float argc)
        hud_num_fields = 0;
 
        drawfont = hud_font;
+       hud_fontsize = HUD_GetFontsize("hud_fontsize"); 
 
        for(i = 0; i < argc - 1; ++i)
        {
@@ -759,7 +760,7 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz
        tmp_y = 1.25 * hud_fontsize_y;
 
        // rounded header
-       drawpic(pos, "gfx/scoreboard/scoreboard_tableheader", tmp, (rgb * hud_color_bg_team) + '0.5 0.5 0.5', scoreboard_alpha_bg, DRAWFLAG_NORMAL);
+       drawpic(pos, "gfx/scoreboard/scoreboard_tableheader", tmp, (rgb * autocvar_hud_color_bg_team) + '0.5 0.5 0.5', scoreboard_alpha_bg, DRAWFLAG_NORMAL);
 
        // table border
        tmp_y += hud_border_thickness;
@@ -775,7 +776,7 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz
 
        // table background
        tmp_y = body_table_height;
-       drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * hud_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL);
+       drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * autocvar_hud_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL);
 
        // anyway, apply some color
        //drawfill(pos, tmp + '2 0 0', rgb, 0.1, DRAWFLAG_NORMAL);
@@ -831,7 +832,7 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz
                        }
 
                        tmp_x = stringwidth(hud_title[i], FALSE, hud_fontsize);
-                       tmp_x = (hud_size[i] - tmp_x) * hud_fontsize_x;
+                       tmp_x = (hud_size[i] - tmp_x);
                        drawstring(pos + tmp, hud_title[i], hud_fontsize, rgb * 1.5, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
                        pos_x -= hud_fontsize_x;
                }
@@ -870,7 +871,9 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz
 }
 
 float HUD_WouldDrawScoreboard() {
-       if (scoreboard_showscores)
+       if (autocvar__hud_configure)
+               return 0;
+       else if (scoreboard_showscores)
                return 1;
        else if (intermission == 1)
                return 1;
@@ -890,7 +893,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size)
        float i;
        float weapon_hit, weapon_damage, weapon_stats;
        float fontsize = 40 * 1/3;
-       float weapon_cnt = 12;
+       float weapon_cnt = WEP_COUNT - 3; // either minstanex/nex are hidden, no port-o-launch, no tuba
        float rows;
        if(cvar("scoreboard_accuracy_doublerows"))
                rows = 2;
@@ -909,7 +912,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size)
        tmp_x = sbwidth;
        tmp_y = height * rows;
 
-       drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * hud_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL);
+       drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * autocvar_hud_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL);
        drawborderlines(hud_accuracy_border_thickness, pos, tmp, '0 0 0', scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL);
 
        // column highlighting
@@ -940,7 +943,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size)
                self = get_weaponinfo(i);
                if not(self.weapons)
                        continue;
-               if ((i == WEP_NEX && g_minstagib) || i == WEP_PORTO || (i == WEP_MINSTANEX && !g_minstagib) || i == WEP_TUBA || i == WEP_FIREBALL) // skip port-o-launch, nex || minstanex, tuba and fireball
+               if ((i == WEP_NEX && g_minstagib) || i == WEP_PORTO || (i == WEP_MINSTANEX && !g_minstagib) || i == WEP_TUBA) // skip port-o-launch, nex || minstanex and tuba
                        continue;
                weapon_hit = weapon_hits[i-WEP_FIRST];
                weapon_damage = weapon_fired[i-WEP_FIRST];
@@ -954,7 +957,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size)
                        weapon_alpha = 0.2 * scoreboard_alpha_fg;
 
                // weapon icon
-               drawpic(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/weapon", self.netname), '1 0 0' * sbwidth * (1/weapon_cnt) + '0 1 0' * height * (2/3), '1 1 1', weapon_alpha, DRAWFLAG_NORMAL);
+               drawpic_aspect_skin(pos, strcat("weapon", self.netname), '1 0 0' * sbwidth * (1/weapon_cnt) + '0 1 0' * height * (2/3), '1 1 1', weapon_alpha, DRAWFLAG_NORMAL);
                // the accuracy
                if(weapon_damage) {
                        weapons_with_stats += 1;
@@ -966,7 +969,26 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size)
                        float padding;
                        padding = ((sbwidth/weapon_cnt) - stringwidth(s, FALSE, '1 0 0' * fontsize)) / 2; // center the accuracy value
 
-                       rgb = HUD_AccuracyColor(weapon_stats);
+                       float weapon_hit, weapon_damage;
+                       weapon_damage = weapon_fired[self.weapon-WEP_FIRST];
+                       if(weapon_damage)
+                       {
+                               weapon_hit = weapon_hits[self.weapon-WEP_FIRST];
+                               weapon_stats = floor(100 * weapon_hit / weapon_damage);
+                       }
+
+                       // find the max level lower than weapon_stats
+                       float j;
+                       j = acc_levels-1;
+                       while ( j && weapon_stats < acc_lev[j] )
+                               --j;
+
+                       // inject color j+1 in color j, how much depending on how much weapon_stats is higher than level j
+                       float factor;
+                       factor = (weapon_stats - acc_lev[j]) / (acc_lev[j+1] - acc_lev[j]);
+                       rgb = acc_color(j);
+                       rgb = rgb + factor * (acc_color(j+1) - rgb);
+
                        drawstring(pos + '1 0 0' * padding + '0 1 0' * height * (2/3), s, '1 1 0' * fontsize, rgb, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
                }
                pos_x += sbwidth/weapon_cnt * rows;
@@ -1012,7 +1034,7 @@ vector HUD_DrawScoreboardRankings(vector pos, entity pl,  vector rgb, vector bg_
        tmp_x = sbwidth;
        tmp_y = hud_fontsize_y * RANKINGS_RECEIVED_CNT;
 
-       drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * hud_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL);
+       drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * autocvar_hud_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL);
        drawborderlines(hud_border_thickness, pos, tmp, '0 0 0', scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL);
 
        // row highlighting
@@ -1114,10 +1136,10 @@ void HUD_DrawScoreboard()
                                continue;
 
                        rgb = GetTeamRGB(tm.team);
-                       HUD_DrawXNum(pos - '9.5 0 0' * hud_fontsize_y + '0 1 0' * hud_fontsize_y, tm.(teamscores[ts_primary]), 6, 0, hud_fontsize_y * 1.5, rgb, 0, 1, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+                       drawstring(pos - '9.5 0 0' * hud_fontsize_y + '0 1 0' * hud_fontsize_y, ftos(tm.(teamscores[ts_primary])), '1 1 0' * hud_fontsize_y * 1.5, rgb, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
 
                        if(ts_primary != ts_secondary)
-                               HUD_DrawXNum(pos - '7.5 0 0' * hud_fontsize_y + '0 2.5 0' * hud_fontsize_y, tm.(teamscores[ts_secondary]), 6, 0, hud_fontsize_y * 1, rgb, 0, 1, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+                               drawstring(pos - '7.5 0 0' * hud_fontsize_y + '0 2.5 0' * hud_fontsize_y, ftos(tm.(teamscores[ts_secondary])), '1 1 0' * hud_fontsize_y * 1, rgb, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
 
                        pos = HUD_Scoreboard_MakeTable(pos, tm, rgb, bg_size);
                }
index 323db5e68cac525d343bf9a75f10871847a09b94..dbb884168d12630a94b22c4060918b815eb5a4c4 100644 (file)
@@ -4,8 +4,8 @@ vector teamradar_origin2d; // 2D origin
 vector teamradar_size2d; // 2D size
 vector teamradar_extraclip_mins, teamradar_extraclip_maxs; // for non-centered radar display
 float teamradar_size; // 2D scale factor
-float hud_radar_scale; // window size = ...qu
-float hud_radar_nohudhack;
+float hud_panel_radar_scale; // window size = ...qu
+float hud_panel_radar_nohudhack;
 float v_flipped;
 
 float vlen2d(vector v)
@@ -53,7 +53,7 @@ vector yinvert(vector v)
        return v;
 }
 
-void draw_teamradar_background(float bg, float fg)
+void draw_teamradar_background(float fg)
 {
        float fga;
        vector fgc;
@@ -106,17 +106,17 @@ void(vector coord3d, vector pangles, vector rgb) draw_teamradar_player =
                rgb2 = '1 1 1';
 
        R_BeginPolygon("", 0);
-       R_PolygonVertex(coord+v_forward*3, '0 0 0', rgb2, hud_fg_alpha);
-       R_PolygonVertex(coord+v_right*4-v_forward*2.5, '0 1 0', rgb2, hud_fg_alpha);
-       R_PolygonVertex(coord-v_forward*2, '1 0 0', rgb2, hud_fg_alpha);
-       R_PolygonVertex(coord-v_right*4-v_forward*2.5, '1 1 0', rgb2, hud_fg_alpha);
+       R_PolygonVertex(coord+v_forward*3, '0 0 0', rgb2, autocvar_hud_panel_fg_alpha);
+       R_PolygonVertex(coord+v_right*4-v_forward*2.5, '0 1 0', rgb2, autocvar_hud_panel_fg_alpha);
+       R_PolygonVertex(coord-v_forward*2, '1 0 0', rgb2, autocvar_hud_panel_fg_alpha);
+       R_PolygonVertex(coord-v_right*4-v_forward*2.5, '1 1 0', rgb2, autocvar_hud_panel_fg_alpha);
        R_EndPolygon();
 
        R_BeginPolygon("", 0);
-       R_PolygonVertex(coord+v_forward*2, '0 0 0', rgb, hud_fg_alpha);
-       R_PolygonVertex(coord+v_right*3-v_forward*2, '0 1 0', rgb, hud_fg_alpha);
-       R_PolygonVertex(coord-v_forward, '1 0 0', rgb, hud_fg_alpha);
-       R_PolygonVertex(coord-v_right*3-v_forward*2, '1 1 0', rgb, hud_fg_alpha);
+       R_PolygonVertex(coord+v_forward*2, '0 0 0', rgb, autocvar_hud_panel_fg_alpha);
+       R_PolygonVertex(coord+v_right*3-v_forward*2, '0 1 0', rgb, autocvar_hud_panel_fg_alpha);
+       R_PolygonVertex(coord-v_forward, '1 0 0', rgb, autocvar_hud_panel_fg_alpha);
+       R_PolygonVertex(coord-v_right*3-v_forward*2, '1 1 0', rgb, autocvar_hud_panel_fg_alpha);
        R_EndPolygon();
 };
 
@@ -161,41 +161,38 @@ void draw_teamradar_link(vector start, vector end, float colors)
        c1 = colormapPaletteColor((colors & 0xF0) / 0x10, FALSE);
 
        R_BeginPolygon("", 0);
-       R_PolygonVertex(start - norm, '0 0 0', c0, hud_fg_alpha);
-       R_PolygonVertex(start + norm, '0 1 0', c0, hud_fg_alpha);
-       R_PolygonVertex(end + norm, '1 1 0', c1, hud_fg_alpha);
-       R_PolygonVertex(end - norm, '1 0 0', c1, hud_fg_alpha);
+       R_PolygonVertex(start - norm, '0 0 0', c0, autocvar_hud_panel_fg_alpha);
+       R_PolygonVertex(start + norm, '0 1 0', c0, autocvar_hud_panel_fg_alpha);
+       R_PolygonVertex(end + norm, '1 1 0', c1, autocvar_hud_panel_fg_alpha);
+       R_PolygonVertex(end - norm, '1 0 0', c1, autocvar_hud_panel_fg_alpha);
        R_EndPolygon();
 }
 
-float hud_radar_scale;
-float hud_radar_background_alpha;
-float hud_radar_foreground_alpha;
-float hud_radar_rotation;
-vector hud_radar_size;
-vector hud_radar_position;
-float hud_radar_zoommode;
+float hud_panel_radar_scale;
+float hud_panel_radar_foreground_alpha;
+float hud_panel_radar_rotation;
+vector hud_panel_radar_size;
+vector hud_panel_radar_position;
+float hud_panel_radar_zoommode;
 
 void teamradar_loadcvars()
 {
        v_flipped = cvar("v_flipped");
-       hud_radar_scale = cvar("hud_radar_scale");
-       hud_radar_background_alpha = cvar("hud_radar_background_alpha") * hud_fg_alpha;
-       hud_radar_foreground_alpha = cvar("hud_radar_foreground_alpha") * hud_fg_alpha;
-       hud_radar_rotation = cvar("hud_radar_rotation");
-       hud_radar_zoommode = cvar("hud_radar_zoommode");
+       hud_panel_radar_scale = cvar("hud_panel_radar_scale");
+       hud_panel_radar_foreground_alpha = cvar("hud_panel_radar_foreground_alpha") * autocvar_hud_panel_fg_alpha;
+       hud_panel_radar_rotation = cvar("hud_panel_radar_rotation");
+       hud_panel_radar_zoommode = cvar("hud_panel_radar_zoommode");
 
        // others default to 0
        // match this to defaultXonotic.cfg!
-       if(!hud_radar_scale) hud_radar_scale = 4096;
-       if(!hud_radar_background_alpha) hud_radar_background_alpha = 0.4 * hud_fg_alpha;
-       if(!hud_radar_foreground_alpha) hud_radar_foreground_alpha = 0.8 * hud_fg_alpha;
-       if(!hud_radar_size_x) hud_radar_size_x = 128;
-       if(!hud_radar_size_y) hud_radar_size_y = hud_radar_size_x;
-
-       hud_radar_size_z = 0;
-       hud_radar_nohudhack = hud_radar_position_z;
-       hud_radar_position_z = 0;
+       if(!hud_panel_radar_scale) hud_panel_radar_scale = 4096;
+       if(!hud_panel_radar_foreground_alpha) hud_panel_radar_foreground_alpha = 0.8 * autocvar_hud_panel_fg_alpha;
+       if(!hud_panel_radar_size_x) hud_panel_radar_size_x = 128;
+       if(!hud_panel_radar_size_y) hud_panel_radar_size_y = hud_panel_radar_size_x;
+
+       hud_panel_radar_size_z = 0;
+       hud_panel_radar_nohudhack = hud_panel_radar_position_z;
+       hud_panel_radar_position_z = 0;
 }
 
 // radar links
index db0fdb83fd81a3dd46293211d9eca60df94157ad..d7b9ee9d01960829aa3992dcebec4eb6bb7e84c8 100644 (file)
@@ -166,7 +166,7 @@ void Draw_WaypointSprite()
        dist = vlen(self.origin - view_origin);
        
        float a;
-       a = self.alpha * hud_fg_alpha;
+       a = self.alpha * autocvar_hud_panel_fg_alpha;
 
        if(self.maxdistance > waypointsprite_normdistance)
                a *= pow(bound(0, (self.maxdistance - dist) / (self.maxdistance - waypointsprite_normdistance), 1), waypointsprite_distancealphaexponent);
index 29d2704fd43a3376387041408e084afb857530fe..53f37bcdd2c48d5bb9b12a0157d926687a41f3d3 100644 (file)
@@ -58,6 +58,9 @@ const float TE_CSQC_VOTERESET = 109;
 const float TE_CSQC_ANNOUNCE = 110;
 const float TE_CSQC_TARGET_MUSIC = 111;
 const float TE_CSQC_NOTIFY = 112;
+const float TE_CSQC_WEAPONCOMPLAIN = 113;
+const float TE_CSQC_CAMPINGRIFLE_SCOPE = 115;
+const float TE_CSQC_NEX_SCOPE = 116;
 
 const float RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder
 const float RACE_NET_CHECKPOINT_CLEAR = 1;
@@ -104,6 +107,9 @@ const float ENT_CLIENT_TUBANOTE = 23;
 const float ENT_CLIENT_WARPZONE = 24;
 const float ENT_CLIENT_WARPZONE_CAMERA = 25;
 const float ENT_CLIENT_TRIGGER_MUSIC = 26;
+const float ENT_CLIENT_HOOK = 27;
+const float ENT_CLIENT_LGBEAM = 28;
+const float ENT_CLIENT_GAUNTLET = 29;
 
 const float ENT_CLIENT_TURRET = 40;
 
@@ -574,6 +580,7 @@ float INFO_GOTFLAG = 10319;
 float INFO_PICKUPFLAG = 10320;
 float INFO_LOSTFLAG = 10321;
 float INFO_RETURNFLAG = 10322;
+float INFO_CAPTUREFLAG = 10323;
 
 // weapon requests
 float WR_SETUP         = 1; // (SVQC) setup weapon data
@@ -589,8 +596,8 @@ float WR_RESETPLAYER    = 10; // (SVQC) does not need to do anything
 float WR_IMPACTEFFECT  = 11; // (CSQC) impact effect
 
 
-float HUD_PANEL_WEAPONICONS    = 0;
-float HUD_PANEL_INVENTORY      = 1;
+float HUD_PANEL_WEAPONS                = 0;
+float HUD_PANEL_AMMO           = 1;
 float HUD_PANEL_POWERUPS       = 2;
 float HUD_PANEL_HEALTHARMOR    = 3;
 float HUD_PANEL_NOTIFY         = 4;
@@ -603,6 +610,23 @@ float HUD_PANEL_MODICONS   = 10;
 float HUD_PANEL_PRESSEDKEYS    = 11;
 float HUD_PANEL_CHAT           = 12;
 float HUD_PANEL_ENGINEINFO     = 13;
-float HUD_PANEL_NUM            = 14; // always last panel id + 1, please increment when adding a new panel
+float HUD_PANEL_INFOMESSAGES   = 14;
+float HUD_PANEL_NUM            = 15; // always last panel id + 1, please increment when adding a new panel
+
+string HUD_PANELNAME_WEAPONS           = "weapons";
+string HUD_PANELNAME_AMMO              = "ammo";
+string HUD_PANELNAME_POWERUPS          = "powerups";
+string HUD_PANELNAME_HEALTHARMOR       = "healtharmor";
+string HUD_PANELNAME_NOTIFY            = "notify";
+string HUD_PANELNAME_TIMER             = "timer";
+string HUD_PANELNAME_RADAR             = "radar";
+string HUD_PANELNAME_SCORE             = "score";
+string HUD_PANELNAME_RACETIMER         = "racetimer";
+string HUD_PANELNAME_VOTE              = "vote";
+string HUD_PANELNAME_MODICONS          = "modicons";
+string HUD_PANELNAME_PRESSEDKEYS       = "pressedkeys";
+string HUD_PANELNAME_CHAT              = "chat";
+string HUD_PANELNAME_ENGINEINFO                = "engineinfo";
+string HUD_PANELNAME_INFOMESSAGES      = "infomessages";
 
 float HUD_MENU_ENABLE          = 0;
index a410474eb559d98500fc3ad9e12f43743f9ecd95..62f2d8551e7c58716280895cd8c7bbc0ce531745 100644 (file)
@@ -49,6 +49,8 @@ float IT_AMMO                                 = 8064; // IT_SHELLS | IT_NAILS | IT_ROCKETS | IT_CELLS | IT_S
 float  IT_PICKUPMASK           = 51; // IT_FUEL_REGEN | IT_JETPACK | IT_UNLIMITED_AMMO; // strength and invincible are handled separately
 float  IT_UNLIMITED_AMMO       = 3; // IT_UNLIMITED_SUPERWEAPONS | IT_UNLIMITED_WEAPON_AMMO;
 
+float AMMO_COUNT = 4; // amount of ammo types to show in the inventory panel
+
 // variables:
 string weaponorder_byid;
 string weaponorder_byimpulse;
index 08eaaeee74ab4dec57ccf070cba0d826fd900c1b..72af701119045b374be237246f0d9289dd32989d 100644 (file)
@@ -226,43 +226,8 @@ float median(float a, float b, float c)
 // works for up to 10 decimals!
 string ftos_decimals(float number, float decimals)
 {
-       string result;
-       string tmp;
-       float len;
-
-       // if negative, cut off the sign first
-       if(number < 0)
-               return strcat("-", ftos_decimals(-number, decimals));
-       // it now is always positive!
-
-       // 3.516 -> 352
-       number = floor(number * pow(10, decimals) + 0.5);
-
-       // 352 -> "352"
-       result = ftos(number);
-       len = strlen(result);
-       // does it have a decimal point (should not happen)? If there is one, it is always at len-7)
-               // if ftos had messed it up, which should never happen: "34278.000000"
-       if(len >= 7)
-               if(substring(result, len - 7, 1) == ".")
-               {
-                       dprint("ftos(integer) has comma? Can't be. Affected result: ", result, "\n");
-                       result = substring(result, 0, len - 7);
-                       len -= 7;
-               }
-               // "34278"
-       if(decimals == 0)
-               return result; // don't insert a point for zero decimals
-       // is it too short? If yes, insert leading zeroes
-       if(len <= decimals)
-       {
-               result = strcat(substring("0000000000", 0, decimals - len + 1), result);
-               len = decimals + 1;
-       }
-       // and now... INSERT THE POINT!
-       tmp = substring(result, len - decimals, decimals);
-       result = strcat(substring(result, 0, len - decimals), ".", tmp);
-       return result;
+       // we have sprintf...
+       return sprintf("%.*f", decimals, number);
 }
 
 float time;
@@ -1948,25 +1913,3 @@ float get_model_parameters(string m, float sk)
 
        return 1;
 }
-
-// return name of given panel id
-string HUD_Panel_GetName(float id)
-{
-       switch(id) {
-               case HUD_PANEL_WEAPONICONS: return "weaponicons"; break;
-               case HUD_PANEL_INVENTORY: return "inventory"; break;
-               case HUD_PANEL_POWERUPS: return "powerups"; break;
-               case HUD_PANEL_HEALTHARMOR: return "healtharmor"; break;
-               case HUD_PANEL_NOTIFY: return "notify"; break;
-               case HUD_PANEL_TIMER: return "timer"; break;
-               case HUD_PANEL_RADAR: return "radar"; break;
-               case HUD_PANEL_SCORE: return "score"; break;
-               case HUD_PANEL_RACETIMER: return "racetimer"; break;
-               case HUD_PANEL_VOTE: return "vote"; break;
-               case HUD_PANEL_MODICONS: return "modicons"; break;
-               case HUD_PANEL_PRESSEDKEYS: return "pressedkeys"; break;
-               case HUD_PANEL_CHAT: return "chat"; break;
-               case HUD_PANEL_ENGINEINFO: return "engineinfo"; break;
-               default: return "";
-       }
-}
index 2a57be012575715b6489ca3a1fca565859d6fafd..f2c2e6702ab99389b17a24227f57258860232215 100644 (file)
@@ -211,4 +211,28 @@ float get_model_parameters_age;
 string get_model_parameters_desc;
 float get_model_parameters(string mod, float skn); // call with string_null to clear; skin -1 means mod is the filename of the txt file and is to be split
 
-string HUD_Panel_GetName(float id)
+// stupid stupid stupid FTEQCC has a max limit on macro sizes, let's work around by splitting the macro into two macros! :(
+#define HUD_Panel_GetName_Part2(id) \
+switch(id) {\
+       case HUD_PANEL_ENGINEINFO: panel_name = HUD_PANELNAME_ENGINEINFO; break; \
+       case HUD_PANEL_INFOMESSAGES: panel_name = HUD_PANELNAME_INFOMESSAGES; break; \
+}
+
+// Get name of specified panel id
+#define HUD_Panel_GetName(id) \
+switch(id) { \
+       case HUD_PANEL_WEAPONS: panel_name = HUD_PANELNAME_WEAPONS; break; \
+       case HUD_PANEL_AMMO: panel_name = HUD_PANELNAME_AMMO; break; \
+       case HUD_PANEL_POWERUPS: panel_name = HUD_PANELNAME_POWERUPS; break; \
+       case HUD_PANEL_HEALTHARMOR: panel_name = HUD_PANELNAME_HEALTHARMOR; break; \
+       case HUD_PANEL_NOTIFY: panel_name = HUD_PANELNAME_NOTIFY; break; \
+       case HUD_PANEL_TIMER: panel_name = HUD_PANELNAME_TIMER; break; \
+       case HUD_PANEL_RADAR: panel_name = HUD_PANELNAME_RADAR; break; \
+       case HUD_PANEL_SCORE: panel_name = HUD_PANELNAME_SCORE; break; \
+       case HUD_PANEL_RACETIMER: panel_name = HUD_PANELNAME_RACETIMER; break; \
+       case HUD_PANEL_VOTE: panel_name = HUD_PANELNAME_VOTE; break; \
+       case HUD_PANEL_MODICONS: panel_name = HUD_PANELNAME_MODICONS; break; \
+       case HUD_PANEL_PRESSEDKEYS: panel_name = HUD_PANELNAME_PRESSEDKEYS; break; \
+       case HUD_PANEL_CHAT: panel_name = HUD_PANELNAME_CHAT; break; \
+}\
+HUD_Panel_GetName_Part2(id)
index 719425ca85dbf252f223b613885d1e1e7f59cc8f..c0568b1e56e5563ff3e8853ec9fa46690722712b 100644 (file)
@@ -41,6 +41,7 @@
 #include "xonotic/slider.c"
 #include "xonotic/slider_resolution.c"
 #include "xonotic/checkbox.c"
+#include "xonotic/checkbox_string.c"
 #include "xonotic/radiobutton.c"
 #include "xonotic/nexposee.c"
 #include "xonotic/rootdialog.c"
 #include "xonotic/dialog_multiplayer_demo.c"
 #include "xonotic/demolist.c"
 #include "xonotic/colorpicker.c"
+#include "xonotic/colorpicker_string.c"
 #include "xonotic/cvarlist.c"
 #include "xonotic/dialog_settings_misc_cvars.c"
 #include "xonotic/dialog_hudsetup_exit.c"
 #include "xonotic/dialog_hudpanel_notification.c"
-#include "xonotic/dialog_hudpanel_inventory.c"
+#include "xonotic/dialog_hudpanel_ammo.c"
 #include "xonotic/dialog_hudpanel_healtharmor.c"
 #include "xonotic/dialog_hudpanel_powerups.c"
 #include "xonotic/dialog_hudpanel_racetimer.c"
@@ -96,4 +98,6 @@
 #include "xonotic/dialog_hudpanel_vote.c"
 #include "xonotic/dialog_hudpanel_modicons.c"
 #include "xonotic/dialog_hudpanel_chat.c"
-#include "xonotic/dialog_hudpanel_weaponicons.c"
+#include "xonotic/dialog_hudpanel_engineinfo.c"
+#include "xonotic/dialog_hudpanel_infomessages.c"
+#include "xonotic/dialog_hudpanel_weapons.c"
index 4a89ab9bae5958726c0254a7f7ea2fc6f7214a49..d2ef187664439735b203728530543167fc54b477 100644 (file)
@@ -64,9 +64,8 @@ void GameCommand(string theCommand)
 
        if(argv(0) == "directpanelhudmenu")
        {
-               highlightedPanel = stof(argv(1));
                // switch to a menu item
-               m_goto(strcat("HUD", HUD_Panel_GetName(highlightedPanel)));
+               m_goto(strcat("HUD", argv(1)));
                return;
        }
 
index 0229b53a55b9d6e18a72ba6e97bdd313d92d5193..236b2352221259a98b0e5604b4e3e2b06180b5c9 100644 (file)
@@ -13,7 +13,6 @@ CLASS(BorderImage) EXTENDS(Label)
        ATTRIB(BorderImage, isNexposeeTitleBar, float, 0)
        ATTRIB(BorderImage, zoomedOutTitleBarPosition, float, 0)
        ATTRIB(BorderImage, zoomedOutTitleBar, float, 0)
-       ATTRIB(BorderImage, borderLines, float, 1)
 ENDCLASS(BorderImage)
 #endif
 
@@ -36,7 +35,8 @@ void BorderImage_resizeNotify(entity me, vector relOrigin, vector relSize, vecto
                me.realFontSize_Nexposeed = me.realFontSize;
        }
        SUPER(BorderImage).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
-       me.borderVec = me.borderHeight / absSize_y * (eY + eX * (absSize_y / absSize_x));
+       me.borderVec_x = me.borderHeight / absSize_x;
+       me.borderVec_y = me.borderHeight / absSize_y;
        me.realOrigin_y = 0.5 * (me.borderVec_y - me.realFontSize_y);
        if(me.closeButton)
        {
@@ -60,7 +60,7 @@ void BorderImage_draw(entity me)
        //print(vtos(me.borderVec), "\n");
 
        if(me.src)
-               draw_BorderPicture('0 0 0', me.src, '1 1 0', me.color, 1, me.borderLines * me.borderVec);
+               draw_BorderPicture('0 0 0', me.src, '1 1 0', me.color, 1, me.borderVec);
        if(me.fontSize > 0)
        {
                vector ro, rf, df;
index 8202fbbb67e4c358989d96c20bae9eb2dd002cec..3d537bfb92f3bc74f735a00a3031100d335e6118 100644 (file)
@@ -59,6 +59,7 @@ CLASS(Dialog) EXTENDS(InputContainer)
        ATTRIB(Dialog, zoomedOutTitleBar, float, 0)
 
        ATTRIB(Dialog, backgroundImage, string, string_null)
+       ATTRIB(Dialog, borderLines, float, 1)
        ATTRIB(Dialog, closeButtonImage, string, string_null)
 
        ATTRIB(Dialog, frame, entity, NULL)
@@ -128,7 +129,7 @@ void Dialog_configureDialog(entity me)
        float absWidth, absHeight;
 
        me.frame = spawnBorderImage();
-       me.frame.configureBorderImage(me.frame, me.title, me.titleFontSize, me.color, me.backgroundImage, me.titleHeight);
+       me.frame.configureBorderImage(me.frame, me.title, me.titleFontSize, me.color, me.backgroundImage, me.borderLines * me.titleHeight);
        me.frame.zoomedOutTitleBarPosition = me.zoomedOutTitleBarPosition;
        me.frame.zoomedOutTitleBar = me.zoomedOutTitleBar;
        me.frame.alpha = me.alpha;
@@ -138,9 +139,9 @@ void Dialog_configureDialog(entity me)
                me.titleHeight = 0; // no title bar
 
        absWidth = me.intendedWidth * conwidth;
-       absHeight = me.titleHeight + me.marginTop + me.rows * me.rowHeight + (me.rows - 1) * me.rowSpacing + me.marginBottom;
+       absHeight = me.borderLines * me.titleHeight + me.marginTop + me.rows * me.rowHeight + (me.rows - 1) * me.rowSpacing + me.marginBottom;
        me.itemOrigin  = eX * (me.marginLeft / absWidth)
-                      + eY * ((me.titleHeight + me.marginTop) / absHeight);
+                      + eY * ((me.borderLines * me.titleHeight + me.marginTop) / absHeight);
        me.itemSize    = eX * ((1 - (me.marginLeft + me.marginRight + me.columnSpacing * (me.columns - 1)) / absWidth) / me.columns)
                       + eY * (me.rowHeight / absHeight);
        me.itemSpacing = me.itemSize
index de4224b934b327f20db496198212903dc15817ad..903700d5d54d5529e174a07feb4fc9a797569c6d 100644 (file)
@@ -40,5 +40,3 @@ void SUB_Null();
 float preMenuInit(); // you have to define this for pre-menu initialization. Return 0 if initialization needs to be retried a frame later, 1 if it succeeded.
 void preMenuDraw(); // this is run before the menu is drawn. You may put some stuff there that has to be done every frame.
 void postMenuDraw(); // this is run just after the menu is drawn (or not). Useful to draw something over everything else.
-
-float highlightedPanel;
diff --git a/qcsrc/menu/xonotic/checkbox_string.c b/qcsrc/menu/xonotic/checkbox_string.c
new file mode 100644 (file)
index 0000000..3b6b36f
--- /dev/null
@@ -0,0 +1,69 @@
+#ifdef INTERFACE
+CLASS(XonoticCheckBoxString) EXTENDS(CheckBox)
+       METHOD(XonoticCheckBoxString, configureXonoticCheckBoxString, void(entity, string, string, string, string))
+       METHOD(XonoticCheckBoxString, setChecked, void(entity, float))
+       ATTRIB(XonoticCheckBoxString, fontSize, float, SKINFONTSIZE_NORMAL)
+       ATTRIB(XonoticCheckBoxString, image, string, SKINGFX_CHECKBOX)
+       ATTRIB(XonoticCheckBoxString, yesString, string, string_null)
+       ATTRIB(XonoticCheckBoxString, noString, string, string_null)
+
+       ATTRIB(XonoticCheckBoxString, color, vector, SKINCOLOR_CHECKBOX_N)
+       ATTRIB(XonoticCheckBoxString, colorC, vector, SKINCOLOR_CHECKBOX_C)
+       ATTRIB(XonoticCheckBoxString, colorF, vector, SKINCOLOR_CHECKBOX_F)
+       ATTRIB(XonoticCheckBoxString, colorD, vector, SKINCOLOR_CHECKBOX_D)
+
+       ATTRIB(XonoticCheckBoxString, cvarName, string, string_null)
+       METHOD(XonoticCheckBoxString, loadCvars, void(entity))
+       METHOD(XonoticCheckBoxString, saveCvars, void(entity))
+
+       ATTRIB(XonoticCheckBoxString, alpha, float, SKINALPHA_TEXT)
+       ATTRIB(XonoticCheckBoxString, disabledAlpha, float, SKINALPHA_DISABLED)
+ENDCLASS(XonoticCheckBoxString)
+entity makeXonoticCheckBoxString(string, string, string, string);
+#endif
+
+#ifdef IMPLEMENTATION
+entity makeXonoticCheckBoxString(string theYesValue, string theNoValue, string theCvar, string theText)
+{
+       entity me;
+       me = spawnXonoticCheckBoxString();
+       me.configureXonoticCheckBoxString(me, theYesValue, theNoValue, theCvar, theText);
+       return me;
+}
+void XonoticCheckBoxString_configureXonoticCheckBoxString(entity me, string theYesValue, string theNoValue, string theCvar, string theText)
+{
+       me.yesString = theYesValue;
+       me.noString = theNoValue;
+       me.checked = 0;
+       if(theCvar)
+       {
+               me.cvarName = theCvar;
+               me.tooltip = getZonedTooltipForIdentifier(theCvar);
+               me.loadCvars(me);
+       }
+       me.configureCheckBox(me, theText, me.fontSize, me.image);
+}
+void XonoticCheckBoxString_setChecked(entity me, float foo)
+{
+       me.checked = !me.checked;
+       me.saveCvars(me);
+}
+void XonoticCheckBoxString_loadCvars(entity me)
+{
+       if not(me.cvarName)
+               return;
+
+       if(cvar_string(me.cvarName) == me.yesString)
+               me.checked = 1;
+}
+void XonoticCheckBoxString_saveCvars(entity me)
+{
+       if not(me.cvarName)
+               return;
+
+       if(me.checked)
+               cvar_set(me.cvarName, me.yesString);
+       else
+               cvar_set(me.cvarName, me.noString);
+}
+#endif
diff --git a/qcsrc/menu/xonotic/colorpicker_string.c b/qcsrc/menu/xonotic/colorpicker_string.c
new file mode 100644 (file)
index 0000000..3633553
--- /dev/null
@@ -0,0 +1,83 @@
+#ifdef INTERFACE
+CLASS(XonoticColorpickerString) EXTENDS(Image)
+       METHOD(XonoticColorpickerString, configureXonoticColorpickerString, void(entity, string))
+       METHOD(XonoticColorpickerString, mousePress, float(entity, vector))
+       METHOD(XonoticColorpickerString, mouseRelease, float(entity, vector))
+       METHOD(XonoticColorpickerString, mouseDrag, float(entity, vector))
+       ATTRIB(XonoticColorpickerString, cvarName, string, string_null)
+       ATTRIB(XonoticColorpickerString, prevcoords, vector, '0 0 0')
+       ATTRIB(XonoticColorpickerString, image, string, SKINGFX_COLORPICKER)
+       ATTRIB(XonoticColorpickerString, imagemargin, vector, SKINMARGIN_COLORPICKER)
+       ATTRIB(XonoticColorpickerString, focusable, float, 1)
+       METHOD(XonoticColorpickerString, draw, void(entity))
+       ATTRIB(XonoticColorpickerString, disabledAlpha, float, 0.3)
+ENDCLASS(XonoticColorpickerString)
+entity makeXonoticColorpickerString(string theCvar);
+#endif
+
+#ifdef IMPLEMENTATION
+entity makeXonoticColorpickerString(string theCvar)
+{
+       entity me;
+       me = spawnXonoticColorpickerString();
+       me.configureXonoticColorpickerString(me, theCvar);
+       return me;
+}
+
+void XonoticColorpickerString_configureXonoticColorpickerString(entity me, string theCvar)
+{
+       me.cvarName = theCvar;
+       me.configureImage(me, me.image);
+       me.prevcoords = '1 1 0';
+}
+
+float XonoticColorpickerString_mousePress(entity me, vector coords)
+{
+       me.mouseDrag(me, coords);
+       return 1;
+}
+
+float XonoticColorpickerString_mouseDrag(entity me, vector coords)
+{
+       if(me.disabled)
+               return 0;
+       vector margin;
+       margin = me.imagemargin;
+       if(coords_x >= margin_x)
+       if(coords_y >= margin_y)
+       if(coords_x <= 1 - margin_x)
+       if(coords_y <= 1 - margin_y)
+       {
+               cvar_set(me.cvarName, sprintf("%v", hslimage_color(coords, margin)));
+               me.prevcoords = coords;
+       }
+
+       return 1;
+}
+
+float XonoticColorpickerString_mouseRelease(entity me, vector coords)
+{
+       me.mouseDrag(me, coords);
+       return 1;
+}
+
+void XonoticColorpickerString_draw(entity me)
+{
+       float save;
+       save = draw_alpha;
+       if(me.disabled)
+               draw_alpha *= me.disabledAlpha;
+
+       SUPER(XonoticColorpickerString).draw(me);
+
+       vector sz;
+       sz = draw_PictureSize(strcat(me.src, "_selected"));
+       sz = globalToBoxSize(sz, draw_scale);
+
+       if(me.disabled)
+               me.prevcoords = '1 1 0';
+       else
+               draw_Picture(me.imgOrigin + me.prevcoords - 0.5 * sz, strcat(me.src, "_selected"), sz, '1 1 1', 1);
+       draw_alpha = save;
+}
+#endif
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_ammo.c b/qcsrc/menu/xonotic/dialog_hudpanel_ammo.c
new file mode 100644 (file)
index 0000000..1e0d4bf
--- /dev/null
@@ -0,0 +1,85 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDAmmoDialog) EXTENDS(XonoticRootDialog)
+       METHOD(XonoticHUDAmmoDialog, fill, void(entity))
+       ATTRIB(XonoticHUDAmmoDialog, title, string, "Ammo Panel")
+       ATTRIB(XonoticHUDAmmoDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+       ATTRIB(XonoticHUDAmmoDialog, intendedWidth, float, 0.4)
+       ATTRIB(XonoticHUDAmmoDialog, rows, float, 15)
+       ATTRIB(XonoticHUDAmmoDialog, columns, float, 4)
+       ATTRIB(XonoticHUDAmmoDialog, name, string, "HUDammo")
+ENDCLASS(XonoticHUDAmmoDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDAmmoDialog_fill(entity me)
+{
+       entity e;
+       string panelname = "ammo";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_ammo", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+                       me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Ammunition display:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "hud_panel_ammo_onlycurrent", "Show only current ammo type"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Align icon:"));
+                       me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_panel_ammo_iconalign", "0", "Left"));
+                       me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_panel_ammo_iconalign", "1", "Right"));
+}
+#endif
index cd9f3854b903f60257b6668424fe09615e890d1f..74fabe0518ac16fd7720e7f358001733555952b2 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDChatDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDChatDialog, fill, void(entity))
-       ATTRIB(XonoticHUDChatDialog, title, string, "Chat Panel Setup")
+       ATTRIB(XonoticHUDChatDialog, title, string, "Chat Panel")
        ATTRIB(XonoticHUDChatDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDChatDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDChatDialog, rows, float, 15)
@@ -14,25 +14,75 @@ ENDCLASS(XonoticHUDChatDialog)
 void XonoticHUDChatDialog_fill(entity me)
 {
        entity e;
+       string panelname = "chat";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_chat", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+                       me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Chat entries:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Chat size:"));
+               me.TD(me, 1, 2.6, e = makeXonoticSlider(6, 20, 1, "con_chatsize"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Chat lifetime:"));
+               me.TD(me, 1, 2.6, e = makeXonoticSlider(5, 60, 5, "con_chattime"));
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_chat", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_chat_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_chat_bg_alpha"));
-       me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Font size:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(6, 16, 1, "con_chatsize"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Message lifetime:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(16, 40, 2, "con_chattime"));
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_chatsound", "Message sound beep"));
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_chatsound", "Chat beep sound"));
 }
 #endif
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.c b/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.c
new file mode 100644 (file)
index 0000000..8d359e9
--- /dev/null
@@ -0,0 +1,80 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDEngineInfoDialog) EXTENDS(XonoticRootDialog)
+       METHOD(XonoticHUDEngineInfoDialog, fill, void(entity))
+       ATTRIB(XonoticHUDEngineInfoDialog, title, string, "Engine Info Panel")
+       ATTRIB(XonoticHUDEngineInfoDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+       ATTRIB(XonoticHUDEngineInfoDialog, intendedWidth, float, 0.4)
+       ATTRIB(XonoticHUDEngineInfoDialog, rows, float, 15)
+       ATTRIB(XonoticHUDEngineInfoDialog, columns, float, 4)
+       ATTRIB(XonoticHUDEngineInfoDialog, name, string, "HUDengineinfo")
+ENDCLASS(XonoticHUDEngineInfoDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDEngineInfoDialog_fill(entity me)
+{
+       entity e;
+       string panelname = "engineinfo";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_engineinfo", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+                       me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Engine info:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_engineinfo_framecounter_exponentialmovingaverage", "Use an averaging algorithm for fps"));
+}
+#endif
index e2e896b3840b2cb3b1c2ebbf5e14e0e9988a1619..b276045b63183c6ba9412599affe4cbc970cf6ef 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDHealthArmorDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDHealthArmorDialog, fill, void(entity))
-       ATTRIB(XonoticHUDHealthArmorDialog, title, string, "Health/Armor Panel Setup")
+       ATTRIB(XonoticHUDHealthArmorDialog, title, string, "Health/Armor Panel")
        ATTRIB(XonoticHUDHealthArmorDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDHealthArmorDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDHealthArmorDialog, rows, float, 15)
@@ -14,26 +14,87 @@ ENDCLASS(XonoticHUDHealthArmorDialog)
 void XonoticHUDHealthArmorDialog_fill(entity me)
 {
        entity e;
+       string panelname = "healtharmor";
+       float i;
+
        me.TR(me);
-               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Status:"));
-               me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_healtharmor"));
-                       e.addValue(e, "Disabled", "0");
-                       e.addValue(e, "Enabled", "1");
-                       e.addValue(e, "Combined h/a", "2");
-                       e.configureXonoticTextSliderValues(e);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_healtharmor", "Enable panel"));
        me.TR(me);
-
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+                       me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_healtharmor_progressbar", "Enable status bar"));
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Status bar alignment:"));
+                       setDependent(e, "hud_panel_healtharmor_progressbar", 1, 1);
        me.TR(me);
-               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                       me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_healtharmor_bg_color_team"));
+               me.TDempty(me, 0.2);
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_panel_healtharmor_baralign", "0", "Left"));
+                       setDependent(e, "hud_panel_healtharmor_progressbar", 1, 1);
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_panel_healtharmor_baralign", "1", "Right"));
+                       setDependent(e, "hud_panel_healtharmor_progressbar", 1, 1);
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_panel_healtharmor_baralign", "3", "Inward"));
+                       setDependent(e, "hud_panel_healtharmor_progressbar", 1, 1);
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_panel_healtharmor_baralign", "4", "Outward"));
+                       setDependent(e, "hud_panel_healtharmor_progressbar", 1, 1);
        me.TR(me);
-               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                       me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_healtharmor_bg_alpha"));
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Icon alignment:"));
        me.TR(me);
-               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_healtharmor_flip", "Flip"));
+               me.TDempty(me, 0.2);
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_panel_healtharmor_iconalign", "0", "Left"));
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_panel_healtharmor_iconalign", "1", "Right"));
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_panel_healtharmor_iconalign", "3", "Inward"));
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_panel_healtharmor_iconalign", "4", "Outward"));
        me.TR(me);
-               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_healtharmor_mirror", "Mirror"));
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_healtharmor_flip", "Flip health and armor positions"));
 }
 #endif
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.c b/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.c
new file mode 100644 (file)
index 0000000..56d4bf4
--- /dev/null
@@ -0,0 +1,80 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDInfoMessagesDialog) EXTENDS(XonoticRootDialog)
+       METHOD(XonoticHUDInfoMessagesDialog, fill, void(entity))
+       ATTRIB(XonoticHUDInfoMessagesDialog, title, string, "Info Messages Panel")
+       ATTRIB(XonoticHUDInfoMessagesDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+       ATTRIB(XonoticHUDInfoMessagesDialog, intendedWidth, float, 0.4)
+       ATTRIB(XonoticHUDInfoMessagesDialog, rows, float, 15)
+       ATTRIB(XonoticHUDInfoMessagesDialog, columns, float, 4)
+       ATTRIB(XonoticHUDInfoMessagesDialog, name, string, "HUDinfomessages")
+ENDCLASS(XonoticHUDInfoMessagesDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDInfoMessagesDialog_fill(entity me)
+{
+       entity e;
+       string panelname = "infomessages";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_infomessages", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+                       me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Info messages:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_infomessages_flip", "Flip align"));
+}
+#endif
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_inventory.c b/qcsrc/menu/xonotic/dialog_hudpanel_inventory.c
deleted file mode 100644 (file)
index b67210a..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifdef INTERFACE
-CLASS(XonoticHUDInventoryDialog) EXTENDS(XonoticRootDialog)
-       METHOD(XonoticHUDInventoryDialog, fill, void(entity))
-       ATTRIB(XonoticHUDInventoryDialog, title, string, "Inventory Panel Setup")
-       ATTRIB(XonoticHUDInventoryDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDInventoryDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDInventoryDialog, rows, float, 15)
-       ATTRIB(XonoticHUDInventoryDialog, columns, float, 4)
-       ATTRIB(XonoticHUDInventoryDialog, name, string, "HUDinventory")
-ENDCLASS(XonoticHUDInventoryDialog)
-#endif
-
-#ifdef IMPLEMENTATION
-void XonoticHUDInventoryDialog_fill(entity me)
-{
-       entity e;
-       me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "hud_inventory", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_inventory_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_inventory_bg_alpha"));
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_inventory_onlycurrent", "Show Current Ammo Only"));             
-       me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
-}
-#endif
index 8635dae06cc85220d00a8113d1e217f99f33fd6d..ebd5f240bedf0603edcaa2689c23200cf935cf03 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDModIconsDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDModIconsDialog, fill, void(entity))
-       ATTRIB(XonoticHUDModIconsDialog, title, string, "Mod Icons Panel Setup")
+       ATTRIB(XonoticHUDModIconsDialog, title, string, "Mod Icons Panel")
        ATTRIB(XonoticHUDModIconsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDModIconsDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDModIconsDialog, rows, float, 15)
@@ -14,17 +14,62 @@ ENDCLASS(XonoticHUDModIconsDialog)
 void XonoticHUDModIconsDialog_fill(entity me)
 {
        entity e;
+       string panelname = "modicons";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_modicons", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+                       me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_modicons", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_modicons_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_modicons_bg_alpha"));
-       me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
 }
 #endif
index 503d50a47fe9b83296c42886fd03186d836b9943..c811cb62832530fd9d5ee71dab5bb0d06767b5bb 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDNotificationDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDNotificationDialog, fill, void(entity))
-       ATTRIB(XonoticHUDNotificationDialog, title, string, "Notification Panel Setup")
+       ATTRIB(XonoticHUDNotificationDialog, title, string, "Notification Panel")
        ATTRIB(XonoticHUDNotificationDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDNotificationDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDNotificationDialog, rows, float, 15)
@@ -14,27 +14,78 @@ ENDCLASS(XonoticHUDNotificationDialog)
 void XonoticHUDNotificationDialog_fill(entity me)
 {
        entity e;
+       string panelname = "notify";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_healtharmor", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+                       me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Notifications:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_notify_print", "Also print notifications to the console"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_notify_flip", "Flip notify order"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Entry lifetime:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticSlider(3, 15, 1, "hud_panel_notify_time"));
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_notify", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_notify_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_notify_bg_alpha"));
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_notify_flip", "Flip"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Message lifetime:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(3, 15, 1, "hud_notify_time"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Message fadetime:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(1, 5, 1, "hud_notify_fadetime"));
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_notify_print", "Also print messages to console"));
-       me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Entry fadetime:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticSlider(0.5, 5, 0.5, "hud_panel_notify_fadetime"));
 }
 #endif
index b6d42326de1b99e0017a6e1a80cfd22955515475..14f4a19268707a3100a0154bd34bb6b1ee3ae01e 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDPowerupsDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDPowerupsDialog, fill, void(entity))
-       ATTRIB(XonoticHUDPowerupsDialog, title, string, "Powerups Panel Setup")
+       ATTRIB(XonoticHUDPowerupsDialog, title, string, "Powerups Panel")
        ATTRIB(XonoticHUDPowerupsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDPowerupsDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDPowerupsDialog, rows, float, 15)
@@ -14,21 +14,87 @@ ENDCLASS(XonoticHUDPowerupsDialog)
 void XonoticHUDPowerupsDialog_fill(entity me)
 {
        entity e;
+       string panelname = "powerups";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_powerups", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+                       me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_powerups_progressbar", "Enable status bar"));
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Status bar alignment:"));
+                       setDependent(e, "hud_panel_powerups_progressbar", 1, 1);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_panel_powerups_baralign", "0", "Left"));
+                       setDependent(e, "hud_panel_powerups_progressbar", 1, 1);
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_panel_powerups_baralign", "1", "Right"));
+                       setDependent(e, "hud_panel_powerups_progressbar", 1, 1);
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_panel_powerups_baralign", "3", "Inward"));
+                       setDependent(e, "hud_panel_powerups_progressbar", 1, 1);
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_panel_powerups_baralign", "4", "Outward"));
+                       setDependent(e, "hud_panel_powerups_progressbar", 1, 1);
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Icon alignment:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_panel_powerups_iconalign", "0", "Left"));
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_panel_powerups_iconalign", "1", "Right"));
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_panel_powerups_iconalign", "3", "Inward"));
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_panel_powerups_iconalign", "4", "Outward"));
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_powerups", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_powerups_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_powerups_bg_alpha"));
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_powerups_flip", "Flip"));
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_powerups_mirror", "Mirror"));
-       me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_powerups_flip", "Flip strength and shield positions"));
 }
 #endif
index 9b66fc3cbac5fadfe8e57a4f531d16acb1a5a0b5..7d32914ddae7b437774f767c0882c7dc59e66179 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDPressedKeysDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDPressedKeysDialog, fill, void(entity))
-       ATTRIB(XonoticHUDPressedKeysDialog, title, string, "Pressed Keys Panel Setup")
+       ATTRIB(XonoticHUDPressedKeysDialog, title, string, "Pressed Keys Panel")
        ATTRIB(XonoticHUDPressedKeysDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDPressedKeysDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDPressedKeysDialog, rows, float, 15)
@@ -14,17 +14,70 @@ ENDCLASS(XonoticHUDPressedKeysDialog)
 void XonoticHUDPressedKeysDialog_fill(entity me)
 {
        entity e;
+       string panelname = "pressedkeys";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_panel_pressedkeys"));
+                       e.addValue(e, "Panel disabled", "0");
+                       e.addValue(e, "Panel enabled when spectating", "1");
+                       e.addValue(e, "Panel always enabled", "2");
+                       e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+                       me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_pressedkeys", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_pressedkeys_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_pressedkeys_bg_alpha"));
-       me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Forced aspect:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticSlider(0.2, 4, 0.1, "hud_panel_pressedkeys_aspect"));
 }
 #endif
index 7fe0f682e9a693eb2f3b0c24af780563ccec7c61..febbd544975720e6d295b365176c09e1d2c2fb68 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDRaceTimerDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDRaceTimerDialog, fill, void(entity))
-       ATTRIB(XonoticHUDRaceTimerDialog, title, string, "Race Timer Panel Setup")
+       ATTRIB(XonoticHUDRaceTimerDialog, title, string, "Race Timer Panel")
        ATTRIB(XonoticHUDRaceTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDRaceTimerDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDRaceTimerDialog, rows, float, 15)
@@ -14,17 +14,62 @@ ENDCLASS(XonoticHUDRaceTimerDialog)
 void XonoticHUDRaceTimerDialog_fill(entity me)
 {
        entity e;
+       string panelname = "racetimer";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_racetimer", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+                       me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_racetimer", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_racetimer_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_racetimer_bg_alpha"));
-       me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
 }
 #endif
index a0ead55ef921604541b9b0c8f2bcc50953fbf9cb..90de04795a9ee59a4f46ae36cc805cfcdaa64843 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDRadarDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDRadarDialog, fill, void(entity))
-       ATTRIB(XonoticHUDRadarDialog, title, string, "Radar Panel Setup")
+       ATTRIB(XonoticHUDRadarDialog, title, string, "Radar Panel")
        ATTRIB(XonoticHUDRadarDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDRadarDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDRadarDialog, rows, float, 15)
@@ -14,37 +14,95 @@ ENDCLASS(XonoticHUDRadarDialog)
 void XonoticHUDRadarDialog_fill(entity me)
 {
        entity e;
+       string panelname = "radar";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_panel_radar"));
+                       e.addValue(e, "Panel disabled", "0");
+                       e.addValue(e, "Panel enabled in teamgames", "1");
+                       e.addValue(e, "Panel always enabled", "2");
+                       e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+                       me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_radar", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_radar_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_radar_bg_alpha"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Foreground Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_radar_foreground_alpha"));
-               me.TR(me);
-                       me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Rotation:"));
-                       me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_radar_rotation"));
-                               e.addValue(e, "Player", "0");
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Radar:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+               me.TD(me, 1, 2.6, e = makeXonoticSlider(0.1, 1, 0.1, "hud_panel_radar_foreground_alpha"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Rotation:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_panel_radar_rotation"));
+                               e.addValue(e, "Forward", "0");
                                e.addValue(e, "West", "1");
                                e.addValue(e, "South", "2");
                                e.addValue(e, "East", "3");
                                e.addValue(e, "North", "4");
                                e.configureXonoticTextSliderValues(e);
-               me.TR(me);
-                       me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Zoom:"));
-                       me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_radar_zoommode"));
-                               e.addValue(e, "Default", "0");
-                               e.addValue(e, "Zoomed", "1");
-                               e.addValue(e, "Always Zoomed", "2");
-                               e.addValue(e, "Zoomed Out", "3");
-                               e.configureXonoticTextSliderValues(e);
        me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Scale:"));
+               me.TD(me, 1, 2.6, e = makeXonoticSlider(1024, 8192, 512, "hud_panel_radar_scale"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Zoom mode:"));
+                       me.TD(me, 1, 1.6, e = makeXonoticTextSlider("hud_panel_radar_zoommode"));
+                               e.addValue(e, "Zoomed in", "0");
+                               e.addValue(e, "Zoomed out", "1");
+                               e.addValue(e, "Always zoomed", "2");
+                               e.addValue(e, "Never zoomed", "3");
+                               e.configureXonoticTextSliderValues(e);
 }
 #endif
index 05fdb74f1076c1773aeca56f0bc1ba14f812c022..8c8561ea79b07aafd9867dbd0017e7ce4b3e226e 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDScoreDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDScoreDialog, fill, void(entity))
-       ATTRIB(XonoticHUDScoreDialog, title, string, "Score Panel Setup")
+       ATTRIB(XonoticHUDScoreDialog, title, string, "Score Panel")
        ATTRIB(XonoticHUDScoreDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDScoreDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDScoreDialog, rows, float, 15)
@@ -14,17 +14,62 @@ ENDCLASS(XonoticHUDScoreDialog)
 void XonoticHUDScoreDialog_fill(entity me)
 {
        entity e;
+       string panelname = "score";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_score", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+                       me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_score", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_score_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_score_bg_alpha"));
-       me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
 }
 #endif
index 6bfa03b995b7dbc1d3b3f83846200ec3f69f4147..748d2911ec71de5f631d062c4f6dc10f85ad1dca 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDTimerDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDTimerDialog, fill, void(entity))
-       ATTRIB(XonoticHUDTimerDialog, title, string, "Timer Panel Setup")
+       ATTRIB(XonoticHUDTimerDialog, title, string, "Timer Panel")
        ATTRIB(XonoticHUDTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDTimerDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDTimerDialog, rows, float, 15)
@@ -14,17 +14,67 @@ ENDCLASS(XonoticHUDTimerDialog)
 void XonoticHUDTimerDialog_fill(entity me)
 {
        entity e;
+       string panelname = "timer";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_timer", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+                       me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Timer:"));
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_timer", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_timer_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_timer_bg_alpha"));
-       me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_timer_increment", "Show elapsed time"));
 }
 #endif
index e96af574aad69cd187a7897194ab13e17845a50f..6c935d9e7f105d3131b3e8e344d9c0b9e51ec970 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDVoteDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDVoteDialog, fill, void(entity))
-       ATTRIB(XonoticHUDVoteDialog, title, string, "Vote Panel Setup")
+       ATTRIB(XonoticHUDVoteDialog, title, string, "Vote Panel")
        ATTRIB(XonoticHUDVoteDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDVoteDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDVoteDialog, rows, float, 15)
@@ -14,17 +14,65 @@ ENDCLASS(XonoticHUDVoteDialog)
 void XonoticHUDVoteDialog_fill(entity me)
 {
        entity e;
+       string panelname = "vote";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_vote", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+                       me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_vote", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_vote_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_vote_bg_alpha"));
-       me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Alpha after voting:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticSlider(0.1, 1, 0.1, "hud_panel_vote_alreadyvoted_alpha"));
 }
 #endif
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_weaponicons.c b/qcsrc/menu/xonotic/dialog_hudpanel_weaponicons.c
deleted file mode 100644 (file)
index 1a55bce..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifdef INTERFACE
-CLASS(XonoticHUDWeaponIconsDialog) EXTENDS(XonoticRootDialog)
-       METHOD(XonoticHUDWeaponIconsDialog, fill, void(entity))
-       ATTRIB(XonoticHUDWeaponIconsDialog, title, string, "Weapon Icons Panel Setup")
-       ATTRIB(XonoticHUDWeaponIconsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDWeaponIconsDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDWeaponIconsDialog, rows, float, 15)
-       ATTRIB(XonoticHUDWeaponIconsDialog, columns, float, 4)
-       ATTRIB(XonoticHUDWeaponIconsDialog, name, string, "HUDweaponicons")
-ENDCLASS(XonoticHUDWeaponIconsDialog)
-#endif
-
-#ifdef IMPLEMENTATION
-void XonoticHUDWeaponIconsDialog_fill(entity me)
-{
-       entity e;
-       me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_weaponicons", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_weaponicons_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_weaponicons_bg_alpha"));
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "hud_weaponicons_number", "Show Weapon Number"));
-       me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
-}
-#endif
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.c b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.c
new file mode 100644 (file)
index 0000000..a32099d
--- /dev/null
@@ -0,0 +1,98 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDWeaponsDialog) EXTENDS(XonoticRootDialog)
+       METHOD(XonoticHUDWeaponsDialog, fill, void(entity))
+       ATTRIB(XonoticHUDWeaponsDialog, title, string, "Weapons Panel")
+       ATTRIB(XonoticHUDWeaponsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+       ATTRIB(XonoticHUDWeaponsDialog, intendedWidth, float, 0.4)
+       ATTRIB(XonoticHUDWeaponsDialog, rows, float, 15)
+       ATTRIB(XonoticHUDWeaponsDialog, columns, float, 4)
+       ATTRIB(XonoticHUDWeaponsDialog, name, string, "HUDweapons")
+ENDCLASS(XonoticHUDWeaponsDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDWeaponsDialog_fill(entity me)
+{
+       entity e;
+       string panelname = "weapons";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_weapons", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+                       me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Weapon icons:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Show weapon ID as:"));
+                       me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_panel_weapons_label", "0", "None"));
+                       me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_panel_weapons_label", "1", "Number"));
+                       me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_panel_weapons_label", "2", "Bind"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "hud_panel_weapons_accuracy", "Show Accuracy"));
+               me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "hud_panel_weapons_ammo", "Show Ammo"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Ammo bar color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString("hud_panel_weapons_ammo_color"));
+                       setDependent(e, "hud_panel_weapons_ammo", 1, 1);
+               me.TR(me);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Ammo bar alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticSlider(0.1, 1, 0.1, "hud_panel_weapons_ammo_alpha"));
+                       setDependent(e, "hud_panel_weapons_ammo", 1, 1);
+}
+#endif
index da75603f4933d948ed6c2a38dca31540258a1267..d3a21c6bf650686a92e81915e5145e39ead70535 100644 (file)
@@ -1,10 +1,10 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDExitDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDExitDialog, fill, void(entity))
-       ATTRIB(XonoticHUDExitDialog, title, string, "HUD Setup")
+       ATTRIB(XonoticHUDExitDialog, title, string, "Panel HUD Setup")
        ATTRIB(XonoticHUDExitDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDExitDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDExitDialog, rows, float, 15)
+       ATTRIB(XonoticHUDExitDialog, rows, float, 18)
        ATTRIB(XonoticHUDExitDialog, columns, float, 4)
        ATTRIB(XonoticHUDExitDialog, name, string, "HUDExit")
 ENDCLASS(XonoticHUDExitDialog)
@@ -15,43 +15,105 @@ ENDCLASS(XonoticHUDExitDialog)
 void XonoticHUDExitDialog_fill(entity me)
 {
        entity e;
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 4, makeXonoticTextLabel(0, "Panel background defaults:"));
+       me.TR(me);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+                       me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_bg"))));
+                               e.addValue(e, "Disable", "0");
+                               e.addValue(e, "border_default", "border_default");
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString("hud_panel_bg_color"));
+       me.TR(me);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_panel_bg_border"));
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_panel_bg_alpha"));
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
        me.TR(me);
-               me.TD(me, 1, 4, makeXonoticTextLabel(0, "Panel Defaults:"));
-                       me.TR(me);
-                               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_bg", "Panel Background"));
-                       me.TR(me);
-                               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                                       me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_bg_color_team"));
-                       me.TR(me);
-                               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                                       me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_bg_alpha"));
-                       me.TR(me);
-                               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Foreground Alpha:"));
-                                       me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_fg_alpha"));
-                       me.TR(me);
-                               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Progress Bar Alpha:"));
-                                       me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_progressbar_alpha"));
-                       me.TR(me);
-                               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_checkcollisions", "Collision Check"));
-       me.TR(me);
-       
-       me.TR(me);
-               me.TD(me, 1, 4, makeXonoticTextLabel(0, "Dock Settings:"));
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_panel_bg_color_team"));
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_panel_bg_padding"));
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
 
-                       me.TR(me);
-                               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                                       me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_dock_color_team"));
-                       me.TR(me);      
-                               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Dock Alpha:"));
-                                       me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_dock_alpha"));
        me.TR(me);
-       
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "HUD Dock:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_dock"));
+                               e.addValue(e, "Disable", "0");
+                               e.addValue(e, "Small", "dock_small");
+                               e.addValue(e, "Medium", "dock");
+                               e.addValue(e, "Large", "dock_large");
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString("hud_dock_color"));
+       me.TR(me);
+       me.TR(me);      
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_dock_alpha"));
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_dock_color_team"));
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 4, makeXonoticTextLabel(0, "Grid settings:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_grid", "Snap panels to grid"));
        me.TR(me);
-               me.TD(me, 1, 4, makeXonoticTextLabel(0, "Grid Settings:"));
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Grid size:"));
+               me.TD(me, 1, 0.2, e = makeXonoticTextLabel(0, "X:"));
+                       me.TD(me, 1, 1.1, e = makeXonoticTextSlider("hud_configure_grid_xsize"));
+                               for(i = 1; i <= 14; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/200, 3)), strzone(ftos(i/200)));
+                               e.configureXonoticTextSliderValues(e);
+                       setDependent(e, "hud_configure_grid", 1, 1);
+               me.TD(me, 1, 0.2, e = makeXonoticTextLabel(0, "Y:"));
+                       me.TD(me, 1, 1.1, e = makeXonoticTextSlider("hud_configure_grid_ysize"));
+                               for(i = 1; i <= 14; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/200, 3)), strzone(ftos(i/200)));
+                               e.configureXonoticTextSliderValues(e);
+                       setDependent(e, "hud_configure_grid", 1, 1);
 
-                       me.TR(me);
-                               me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "hud_configure_grid", "Snap Panel to Grid"));
-                       me.gotoRC(me, me.rows - 1, 0);
-                               me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+       me.gotoRC(me, me.rows - 1, 0);
+               me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit setup", '0 0 0', "_hud_configure 0", 1));
 }
 #endif
index f1cbfffc7555f42d1eedacc0b500811cc5d3b926..72e5faac36fa62d140a0d52b95e55853b2b24252 100644 (file)
@@ -41,7 +41,7 @@ void MainWindow_configureMainWindow(entity me)
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
        
-       i = spawnXonoticHUDInventoryDialog();
+       i = spawnXonoticHUDAmmoDialog();
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
        
@@ -85,7 +85,15 @@ void MainWindow_configureMainWindow(entity me)
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
        
-       i = spawnXonoticHUDWeaponIconsDialog();
+       i = spawnXonoticHUDWeaponsDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+
+       i = spawnXonoticHUDEngineInfoDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+
+       i = spawnXonoticHUDInfoMessagesDialog();
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
index 585a5f7fc1cf342c1dd919eb81959eb750a0b119..f4f7526f04bd610070fc8a4b738baeb773e6ca0d 100644 (file)
@@ -47,10 +47,13 @@ void XonoticPlayerModelSelector_configureXonoticPlayerModelSelector(entity me)
        float sortbuf, glob, i;
        string fn;
 
+       glob = search_begin(get_model_datafilename(string_null, -1, "txt"), TRUE, TRUE);
+       if (glob < 0)
+               return;
+
        me.configureXonoticImage(me, string_null, -1);
 
        sortbuf = buf_create();
-       glob = search_begin(get_model_datafilename(string_null, -1, "txt"), TRUE, TRUE);
        for(i = 0; i < search_getsize(glob); ++i)
        {
                // select model #i!
@@ -85,7 +88,8 @@ void XonoticPlayerModelSelector_configureXonoticPlayerModelSelector(entity me)
        }
        buf_del(sortbuf);
        get_model_parameters(string_null, 0);
-       me.loadCvars(me);
+       me.loadCvars(me); // this will select the initial model, depending on the current cvars
+       me.go(me, 0); // this will set the vars for the selected model
 }
 void XonoticPlayerModelSelector_destroy(entity me)
 {
@@ -95,21 +99,21 @@ void XonoticPlayerModelSelector_destroy(entity me)
 
 void XonoticPlayerModelSelector_loadCvars(entity me)
 {
+       string skin, model;
        float i;
-       if(me.currentModel)
-               strunzone(me.currentModel);
-       me.currentSkin = cvar("_cl_playerskin");
-       me.currentModel = strzone(cvar_string("_cl_playermodel"));
+
+       skin = cvar_string("_cl_playerskin");
+       model = cvar_string("_cl_playermodel");
+
        for(i = 0; i < me.numModels; ++i)
        {
-               if(bufstr_get(me.bufModels, BUFMODELS_COUNT*i+BUFMODELS_MODEL) == me.currentModel)
-               if(bufstr_get(me.bufModels, BUFMODELS_COUNT*i+BUFMODELS_SKIN) == ftos(me.currentSkin))
+               if(bufstr_get(me.bufModels, BUFMODELS_COUNT*i+BUFMODELS_MODEL) == model)
+               if(bufstr_get(me.bufModels, BUFMODELS_COUNT*i+BUFMODELS_SKIN) == skin)
                        break;
        }
        if(i >= me.numModels) // fail
                i = 0;
        me.idxModels = i;
-       me.go(me, 0); // this will set the other vars for currentSkin and currentModel
 }
 
 void XonoticPlayerModelSelector_go(entity me, float d)
@@ -139,12 +143,16 @@ void XonoticPlayerModelSelector_go(entity me, float d)
 
 void PlayerModelSelector_Next_Click(entity btn, entity me)
 {
+       if (me.numModels <= 0)
+               return;
        me.go(me, +1);
        me.saveCvars(me);
 }
 
 void PlayerModelSelector_Prev_Click(entity btn, entity me)
 {
+       if (me.numModels <= 0)
+               return;
        me.go(me, -1);
        me.saveCvars(me);
 }
@@ -161,8 +169,13 @@ void XonoticPlayerModelSelector_draw(entity me)
        float i, n;
        vector o;
 
-       SUPER(XonoticPlayerModelSelector).draw(me);
+       if (me.numModels <= 0)
+       {
+               draw_CenterText('0.5 0.5 0', "<no model found>", me.realFontSize, '1 1 1', 0.6, FALSE);
+               return;
+       }
 
+       SUPER(XonoticPlayerModelSelector).draw(me);
        // draw text on the image, handle \n in the description
        draw_CenterText('0.5 0 0', me.currentModelTitle, me.realFontSize * (me.titleFontSize / me.fontSize), SKINCOLOR_MODELTITLE, SKINALPHA_MODELTITLE, FALSE);
 
index 36334b27127b218ece882fbbc6ea47da559fdad9..66b58df8c356f6f57900ccd9d510bc8dce07c5f4 100644 (file)
@@ -1,3 +1,4 @@
 float autocvar_sv_cheats;
 float autocvar_g_bastet;
 var float autocvar_g_movement_highspeed = 1;
+var float autocvar_sys_ticrate;
index 6ef82679444fc021f0e4d53b42bf278333cf9b8f..a75537907d7560e43e833221663c6659f20cd47c 100644 (file)
@@ -653,7 +653,7 @@ float CheatCommand(float argc)
                        if(self.movetype != MOVETYPE_FLY)
                        {
                                self.movetype = MOVETYPE_FLY;
-                               sprint(self, "flmodey ON\n");
+                               sprint(self, "flymode ON\n");
                                DID_CHEAT();
                        }
                        else
index 73c9169e5e6929341cca72c4f50377ec92c32125..dcebed41a8be8a0307e4f7edcfb8931846533f66 100644 (file)
@@ -1063,9 +1063,18 @@ float ClientInit_SendEntity(entity to, float sf)
 {
        WriteByte(MSG_ENTITY, ENT_CLIENT_INIT);
        WriteByte(MSG_ENTITY, g_nexball_meter_period * 32);
-       WriteCoord(MSG_ENTITY, hook_shotorigin_x);
-       WriteCoord(MSG_ENTITY, hook_shotorigin_y);
-       WriteCoord(MSG_ENTITY, hook_shotorigin_z);
+       WriteInt24_t(MSG_ENTITY, compressShotOrigin(hook_shotorigin[0]));
+       WriteInt24_t(MSG_ENTITY, compressShotOrigin(hook_shotorigin[1]));
+       WriteInt24_t(MSG_ENTITY, compressShotOrigin(hook_shotorigin[2]));
+       WriteInt24_t(MSG_ENTITY, compressShotOrigin(hook_shotorigin[3]));
+       WriteInt24_t(MSG_ENTITY, compressShotOrigin(electro_shotorigin[0]));
+       WriteInt24_t(MSG_ENTITY, compressShotOrigin(electro_shotorigin[1]));
+       WriteInt24_t(MSG_ENTITY, compressShotOrigin(electro_shotorigin[2]));
+       WriteInt24_t(MSG_ENTITY, compressShotOrigin(electro_shotorigin[3]));
+       WriteInt24_t(MSG_ENTITY, compressShotOrigin(gauntlet_shotorigin[0]));
+       WriteInt24_t(MSG_ENTITY, compressShotOrigin(gauntlet_shotorigin[1]));
+       WriteInt24_t(MSG_ENTITY, compressShotOrigin(gauntlet_shotorigin[2]));
+       WriteInt24_t(MSG_ENTITY, compressShotOrigin(gauntlet_shotorigin[3]));
        if(sv_foginterval && world.fog != "")
                WriteString(MSG_ENTITY, world.fog);
        else
@@ -1074,6 +1083,8 @@ float ClientInit_SendEntity(entity to, float sf)
        WriteByte(MSG_ENTITY, self.cnt * 255.0); // g_balance_weaponswitchdelay
        WriteCoord(MSG_ENTITY, self.bouncefactor); // g_balance_grenadelauncher_secondary_bouncefactor
        WriteCoord(MSG_ENTITY, self.bouncestop); // g_balance_grenadelauncher_secondary_bouncestop
+       WriteByte(MSG_ENTITY, cvar("g_balance_nex_secondary")); // client has to know if it should zoom or not
+       WriteByte(MSG_ENTITY, cvar("g_balance_campingrifle_secondary")); // client has to know if it should zoom or not
        return TRUE;
 }
 
@@ -2599,7 +2610,23 @@ void PlayerPreThink (void)
 
                if(frametime)
                {
-                       self.glowmod = colormapPaletteColor(self.clientcolors & 0x0F, TRUE) * 2;
+                       if(self.health <= 0 && cvar("g_deathglow"))
+                       {
+                               if(self.glowmod_x > 0)
+                                       self.glowmod_x -= cvar("g_deathglow") * frametime;
+                               else
+                                       self.glowmod_x = -1;
+                               if(self.glowmod_y > 0)
+                                       self.glowmod_y -= cvar("g_deathglow") * frametime;
+                               else
+                                       self.glowmod_y = -1;
+                               if(self.glowmod_z > 0)
+                                       self.glowmod_z -= cvar("g_deathglow") * frametime;
+                               else
+                                       self.glowmod_z = -1;
+                       }
+                       else
+                               self.glowmod = colormapPaletteColor(self.clientcolors & 0x0F, TRUE) * 2;
                        player_powerups();
                }
 
@@ -2659,7 +2686,6 @@ void PlayerPreThink (void)
                FOR_EACH_PLAYER(other) if(self != other)
                {
                        if(time > other.touchexplode_time)
-                       if(other.classname == "player")
                        if(other.deadflag == DEAD_NO)
                        if not(IS_INDEPENDENT_PLAYER(other))
                        if(boxesoverlap(self.absmin, self.absmax, other.absmin, other.absmax))
@@ -2777,7 +2803,7 @@ void PlayerPreThink (void)
        }
 
        if(!zoomstate_set)
-               SetZoomState(self.BUTTON_ZOOM || (self.BUTTON_ATCK2 && self.weapon == WEP_NEX));
+               SetZoomState(self.BUTTON_ZOOM || (self.BUTTON_ATCK2 && self.weapon == WEP_NEX) || (self.BUTTON_ATCK2 && self.weapon == WEP_CAMPINGRIFLE && cvar("g_balance_campingrifle_secondary") == 0));
 
        float oldspectatee_status;
        oldspectatee_status = self.spectatee_status;
index ac6789586793c86387026ffdfbb787d44850cebd..70e702505cd2d5d9c482d968552b8f377619e4b9 100644 (file)
@@ -16,6 +16,7 @@ float sv_maxairstrafespeed;
 float sv_airstrafeaccel_qw;
 float sv_aircontrol;
 float sv_aircontrol_power;
+float sv_aircontrol_penalty;
 float sv_warsowbunny_airforwardaccel;
 float sv_warsowbunny_accel;
 float sv_warsowbunny_topspeed;
@@ -470,7 +471,9 @@ void CPM_PM_Aircontrol(vector wishdir, float wishspeed)
 
        if(dot > 0) // we can't change direction while slowing down
        {
-               k *= fabs(sv_aircontrol)*pow(dot, sv_aircontrol_power)*frametime;
+               k *= pow(dot, sv_aircontrol_power)*frametime;
+               xyspeed = max(0, xyspeed - sv_aircontrol_penalty * sqrt(max(0, 1 - dot*dot)) * k/32);
+               k *= sv_aircontrol;
                self.velocity = normalize(self.velocity * xyspeed + wishdir * k);
        }
 
@@ -1202,8 +1205,13 @@ void SV_PlayerPhysics()
 
                        // CPM
                        if(sv_airstopaccelerate)
-                               if(self.velocity * wishdir < 0)
-                                       airaccel = sv_airstopaccelerate*maxspd_mod;
+                       {
+                               vector curdir;
+                               curdir = self.velocity;
+                               curdir_z = 0;
+                               curdir = normalize(curdir);
+                               airaccel = airaccel + (sv_airstopaccelerate*maxspd_mod - airaccel) * max(0, -(curdir * wishdir));
+                       }
                        // note that for straight forward jumping:
                        // step = accel * frametime * wishspeed0;
                        // accel  = bound(0, wishspeed - vel_xy_current, step) * accelqw + step * (1 - accelqw);
index 15898759ede6b82578b755a365ecebcda5a1cc36..925d53fa7e3cc218cfeba460f432969db25d7a47 100644 (file)
@@ -125,14 +125,14 @@ void W_HitPlotAnalysis(entity player, vector screenforward, vector screenright,
 
 vector w_shotorg;
 vector w_shotdir;
+vector w_shotend;
 
 // this function calculates w_shotorg and w_shotdir based on the weapon model
 // offset, trueaim and antilag, and won't put w_shotorg inside a wall.
 // make sure you call makevectors first (FIXME?)
-void W_SetupShot_Dir_ProjectileSize(entity ent, vector s_forward, vector mi, vector ma, float antilag, float recoil, string snd, float maxdamage)
+void W_SetupShot_Dir_ProjectileSize_Range(entity ent, vector s_forward, vector mi, vector ma, float antilag, float recoil, string snd, float maxdamage, float range)
 {
        float nudge = 1; // added to traceline target and subtracted from result
-       local vector trueaimpoint;
        local float oldsolid;
        vector vecs, dv;
        oldsolid = ent.dphitcontentsmask;
@@ -141,17 +141,17 @@ void W_SetupShot_Dir_ProjectileSize(entity ent, vector s_forward, vector mi, vec
        else
                ent.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE;
        if(antilag)
-               WarpZone_traceline_antilag(world, ent.origin + ent.view_ofs, ent.origin + ent.view_ofs + s_forward * MAX_SHOT_DISTANCE, MOVE_NORMAL, ent, ANTILAG_LATENCY(ent));
+               WarpZone_traceline_antilag(world, ent.origin + ent.view_ofs, ent.origin + ent.view_ofs + s_forward * range, MOVE_NORMAL, ent, ANTILAG_LATENCY(ent));
                // passing world, because we do NOT want it to touch dphitcontentsmask
        else
-               WarpZone_TraceLine(ent.origin + ent.view_ofs, ent.origin + ent.view_ofs + s_forward * MAX_SHOT_DISTANCE, MOVE_NOMONSTERS, ent);
+               WarpZone_TraceLine(ent.origin + ent.view_ofs, ent.origin + ent.view_ofs + s_forward * range, MOVE_NOMONSTERS, ent);
        ent.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE;
 
        vector vf, vr, vu;
        vf = v_forward;
        vr = v_right;
        vu = v_up;
-       trueaimpoint = WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos); // warpzone support
+       w_shotend = WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos); // warpzone support
        v_forward = vf;
        v_right = vr;
        v_up = vu;
@@ -169,17 +169,13 @@ void W_SetupShot_Dir_ProjectileSize(entity ent, vector s_forward, vector mi, vec
        W_HitPlotAnalysis(ent, v_forward, v_right, v_up);
 
        if(ent.weaponentity.movedir_x > 0)
-       {
                vecs = ent.weaponentity.movedir;
-               vecs_y = -vecs_y;
-       }
        else
                vecs = '0 0 0';
-
        if(debug_shotorg != '0 0 0')
                vecs = debug_shotorg;
 
-       dv = v_right * vecs_y + v_up * vecs_z;
+       dv = v_right * -vecs_y + v_up * vecs_z;
        w_shotorg = ent.origin + ent.view_ofs + dv;
 
        // now move the shotorg forward as much as requested if possible
@@ -194,17 +190,17 @@ void W_SetupShot_Dir_ProjectileSize(entity ent, vector s_forward, vector mi, vec
                tracebox(w_shotorg, mi, ma, w_shotorg + v_forward * (vecs_x + nudge), MOVE_NORMAL, ent);
        w_shotorg = trace_endpos - v_forward * nudge;
        // calculate the shotdir from the chosen shotorg
-       w_shotdir = normalize(trueaimpoint - w_shotorg);
+       w_shotdir = normalize(w_shotend - w_shotorg);
 
        if (antilag)
        if (!ent.cvar_cl_noantilag)
        {
                if (cvar("g_antilag") == 1) // switch to "ghost" if not hitting original
                {
-                       traceline(w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, MOVE_NORMAL, ent);
+                       traceline(w_shotorg, w_shotorg + w_shotdir * range, MOVE_NORMAL, ent);
                        if (!trace_ent.takedamage)
                        {
-                               traceline_antilag_force (ent, w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, MOVE_NORMAL, ent, ANTILAG_LATENCY(ent));
+                               traceline_antilag_force (ent, w_shotorg, w_shotorg + w_shotdir * range, MOVE_NORMAL, ent, ANTILAG_LATENCY(ent));
                                if (trace_ent.takedamage && trace_ent.classname == "player")
                                {
                                        entity e;
@@ -225,7 +221,7 @@ void W_SetupShot_Dir_ProjectileSize(entity ent, vector s_forward, vector mi, vec
                        {
                                // verify that the shot would miss without antilag
                                // (avoids an issue where guns would always shoot at their origin)
-                               traceline(w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, MOVE_NORMAL, ent);
+                               traceline(w_shotorg, w_shotorg + w_shotdir * range, MOVE_NORMAL, ent);
                                if (!trace_ent.takedamage)
                                {
                                        // verify that the shot would hit if altered
@@ -252,11 +248,16 @@ void W_SetupShot_Dir_ProjectileSize(entity ent, vector s_forward, vector mi, vec
        if (ent.items & IT_STRENGTH)
        if (!g_minstagib)
                sound (ent, CHAN_AUTO, "weapons/strength_fire.wav", VOL_BASE, ATTN_NORM);
+
+       // nudge w_shotend so a trace to w_shotend hits
+       w_shotend = w_shotend + normalize(w_shotend - w_shotorg) * nudge;
 };
 
+#define W_SetupShot_Dir_ProjectileSize(ent,s_forward,mi,ma,antilag,recoil,snd,maxdamage) W_SetupShot_Dir_ProjectileSize_Range(ent, s_forward, mi, ma, antilag, recoil, snd, maxdamage, MAX_SHOT_DISTANCE)
 #define W_SetupShot_ProjectileSize(ent,mi,ma,antilag,recoil,snd,maxdamage) W_SetupShot_Dir_ProjectileSize(ent, v_forward, mi, ma, antilag, recoil, snd, maxdamage)
 #define W_SetupShot_Dir(ent,s_forward,antilag,recoil,snd,maxdamage) W_SetupShot_Dir_ProjectileSize(ent, s_forward, '0 0 0', '0 0 0', antilag, recoil, snd, maxdamage)
 #define W_SetupShot(ent,antilag,recoil,snd,maxdamage) W_SetupShot_ProjectileSize(ent, '0 0 0', '0 0 0', antilag, recoil, snd, maxdamage)
+#define W_SetupShot_Range(ent,antilag,recoil,snd,maxdamage,range) W_SetupShot_Dir_ProjectileSize_Range(ent, v_forward, '0 0 0', '0 0 0', antilag, recoil, snd, maxdamage, range)
 
 void LaserTarget_Think()
 {
@@ -391,228 +392,258 @@ vector weapon_adjust = '10 0 -15';
  *    g_tuba.md3 - pickup model
  */
 
-void CL_Weaponentity_Think()
+// writes:
+//   self.origin, self.angles
+//   self.weaponentity
+//   self.movedir, self.view_ofs
+//   attachment stuff
+//   anim stuff
+// to free:
+//   call again with ""
+//   remove the ent
+void CL_WeaponEntity_SetModel(string name)
 {
-       float tb, v_shot_idx;
-       self.nextthink = time;
-       if (intermission_running)
-               self.frame = self.anim_idle_x;
-       if (self.owner.weaponentity != self)
+       string animfilename;
+       float animfile;
+       float v_shot_idx;
+       if (name != "")
        {
-               if (self.weaponentity)
-                       remove(self.weaponentity);
-               remove(self);
-               return;
-       }
-       if (self.owner.deadflag != DEAD_NO)
-       {
-               self.model = "";
+               // if there is a child entity, hide it until we're sure we use it
                if (self.weaponentity)
                        self.weaponentity.model = "";
-               return;
-       }
-       if (self.cnt != self.owner.weapon || self.dmg != self.owner.modelindex || self.deadflag != self.owner.deadflag)
-       {
-               self.cnt = self.owner.weapon;
-               self.dmg = self.owner.modelindex;
-               self.deadflag = self.owner.deadflag;
+               setmodel(self, strcat("models/weapons/v_", name, ".md3")); // precision set below
+               v_shot_idx = gettagindex(self, "shot"); // used later
+               if(!v_shot_idx)
+                       v_shot_idx = gettagindex(self, "tag_shot");
 
-               string animfilename;
-               float animfile;
-               if (self.owner.weaponname != "")
+               if(qcweaponanimation)
                {
-                       // if there is a child entity, hide it until we're sure we use it
-                       if (self.weaponentity)
-                               self.weaponentity.model = "";
-                       setmodel(self, strcat("models/weapons/v_", self.owner.weaponname, ".md3")); // precision set below
-                       v_shot_idx = gettagindex(self, "shot"); // used later
-                       if(!v_shot_idx)
-                               v_shot_idx = gettagindex(self, "tag_shot");
+                       self.angles = '0 0 0';
+                       makevectors(self.angles_x * '-1 0 0' + self.angles_y * '0 1 0' + self.angles_z * '0 0 1');
+                       self.movedir = weapon_offset_x * v_forward - weapon_offset_y * v_right + weapon_offset_z * v_up + weapon_adjust;
+                       self.movedir_x += 32;
+                       self.spawnorigin = self.movedir;
+                       // oldorigin - not calculated here
+               }
+               else
+               {
+                       setmodel(self, strcat("models/weapons/h_", name, ".iqm")); // precision set below
+                       animfilename = strcat("models/weapons/h_", name, ".iqm.animinfo");
+                       animfile = fopen(animfilename, FILE_READ);
+                       // preset some defaults that work great for renamed zym files (which don't need an animinfo)
+                       self.anim_fire1  = '0 1 0.01';
+                       self.anim_fire2  = '1 1 0.01';
+                       self.anim_idle   = '2 1 0.01';
+                       self.anim_reload = '3 1 0.01';
+                       if (animfile >= 0)
+                       {
+                               animparseerror = FALSE;
+                               self.anim_fire1  = animparseline(animfile);
+                               self.anim_fire2  = animparseline(animfile);
+                               self.anim_idle   = animparseline(animfile);
+                               self.anim_reload = animparseline(animfile);
+                               fclose(animfile);
+                               if (animparseerror)
+                                       print("Parse error in ", animfilename, ", some player animations are broken\n");
+                       }
 
-                       if(qcweaponanimation)
+                       // if we have a "weapon" tag, let's attach the v_ model to it ("invisible hand" style model)
+                       // if we don't, this is a "real" animated model
+                       if(gettagindex(self, "weapon"))
+                       {
+                               if (!self.weaponentity)
+                                       self.weaponentity = spawn();
+                               setmodel(self.weaponentity, strcat("models/weapons/v_", name, ".md3")); // precision does not matter
+                               setattachment(self.weaponentity, self, "weapon");
+                       }
+                       else if(gettagindex(self, "tag_weapon"))
                        {
-                               self.angles = '0 0 0';
-                               makevectors(self.angles_x * '-1 0 0' + self.angles_y * '0 1 0' + self.angles_z * '0 0 1');
-                               self.movedir = weapon_offset_x * v_forward - weapon_offset_y * v_right + weapon_offset_z * v_up + weapon_adjust;
-                               self.movedir_x += 32;
-                               self.spawnorigin = self.movedir;
-                               // oldorigin - not calculated here
+                               if (!self.weaponentity)
+                                       self.weaponentity = spawn();
+                               setmodel(self.weaponentity, strcat("models/weapons/v_", name, ".md3")); // precision does not matter
+                               setattachment(self.weaponentity, self, "tag_weapon");
                        }
                        else
                        {
-                               setmodel(self, strcat("models/weapons/h_", self.owner.weaponname, ".iqm")); // precision set below
-                               animfilename = strcat("models/weapons/h_", self.owner.weaponname, ".iqm.animinfo");
-                               animfile = fopen(animfilename, FILE_READ);
-                               // preset some defaults that work great for renamed zym files (which don't need an animinfo)
-                               self.anim_fire1  = '0 1 0.01';
-                               self.anim_fire2  = '1 1 0.01';
-                               self.anim_idle   = '2 1 0.01';
-                               self.anim_reload = '3 1 0.01';
-                               if (animfile >= 0)
-                               {
-                                       animparseerror = FALSE;
-                                       self.anim_fire1  = animparseline(animfile);
-                                       self.anim_fire2  = animparseline(animfile);
-                                       self.anim_idle   = animparseline(animfile);
-                                       self.anim_reload = animparseline(animfile);
-                                       fclose(animfile);
-                                       if (animparseerror)
-                                               print("Parse error in ", animfilename, ", some player animations are broken\n");
-                               }
-
-                               // if we have a "weapon" tag, let's attach the v_ model to it ("invisible hand" style model)
-                               // if we don't, this is a "real" animated model
-                               if(gettagindex(self, "weapon"))
-                               {
-                                       if (!self.weaponentity)
-                                               self.weaponentity = spawn();
-                                       setmodel(self.weaponentity, strcat("models/weapons/v_", self.owner.weaponname, ".md3")); // precision does not matter
-                                       setattachment(self.weaponentity, self, "weapon");
-                               }
-                               else if(gettagindex(self, "tag_weapon"))
-                               {
-                                       if (!self.weaponentity)
-                                               self.weaponentity = spawn();
-                                       setmodel(self.weaponentity, strcat("models/weapons/v_", self.owner.weaponname, ".md3")); // precision does not matter
-                                       setattachment(self.weaponentity, self, "tag_weapon");
-                               }
-                               else
-                               {
-                                       if(self.weaponentity)
-                                               remove(self.weaponentity);
-                                       self.weaponentity = world;
-                               }
+                               if(self.weaponentity)
+                                       remove(self.weaponentity);
+                               self.weaponentity = world;
+                       }
 
-                               setorigin(self,'0 0 0');
-                               self.angles = '0 0 0';
-                               self.frame = 0;
-                               self.viewmodelforclient = world;
+                       setorigin(self,'0 0 0');
+                       self.angles = '0 0 0';
+                       self.frame = 0;
+                       self.viewmodelforclient = world;
 
-                               float idx;
+                       float idx;
 
-                               if(v_shot_idx) // v_ model attached to invisible h_ model
+                       if(v_shot_idx) // v_ model attached to invisible h_ model
+                       {
+                               self.movedir = gettaginfo(self.weaponentity, v_shot_idx);
+                       }
+                       else
+                       {
+                               idx = gettagindex(self, "shot");
+                               if(!idx)
+                                       idx = gettagindex(self, "tag_shot");
+                               if(idx)
+                                       self.movedir = gettaginfo(self, idx);
+                               else
                                {
-                                       self.movedir = gettaginfo(self.weaponentity, v_shot_idx);
+                                       print("WARNING: weapon model ", self.model, " does not support the 'shot' tag, will display shots TOTALLY wrong\n");
+                                       self.movedir = '0 0 0';
                                }
+                       }
+
+                       if(self.weaponentity) // v_ model attached to invisible h_ model
+                       {
+                               idx = gettagindex(self.weaponentity, "shell");
+                               if(!idx)
+                                       idx = gettagindex(self.weaponentity, "tag_shell");
+                               if(idx)
+                                       self.spawnorigin = gettaginfo(self.weaponentity, idx);
+                       }
+                       else
+                               idx = 0;
+                       if(!idx)
+                       {
+                               idx = gettagindex(self, "shell");
+                               if(!idx)
+                                       idx = gettagindex(self, "tag_shell");
+                               if(idx)
+                                       self.spawnorigin = gettaginfo(self, idx);
                                else
                                {
-                                       idx = gettagindex(self, "shot");
-                                       if(!idx)
-                                               idx = gettagindex(self, "tag_shot");
-                                       if(idx)
-                                               self.movedir = gettaginfo(self, idx);
-                                       else
-                                       {
-                                               print("WARNING: weapon model ", self.model, " does not support the 'shot' tag, will display shots TOTALLY wrong\n");
-                                               self.movedir = '0 0 0';
-                                       }
+                                       print("WARNING: weapon model ", self.model, " does not support the 'shell' tag, will display casings wrong\n");
+                                       self.spawnorigin = self.movedir;
                                }
+                       }
 
-                               if(self.weaponentity) // v_ model attached to invisible h_ model
+                       if(v_shot_idx)
+                       {
+                               self.oldorigin = '0 0 0'; // use regular attachment
+                       }
+                       else
+                       {
+                               if(self.weaponentity)
                                {
-                                       idx = gettagindex(self.weaponentity, "shell");
+                                       idx = gettagindex(self, "weapon");
                                        if(!idx)
-                                               idx = gettagindex(self.weaponentity, "tag_shell");
-                                       if(idx)
-                                               self.spawnorigin = gettaginfo(self.weaponentity, idx);
+                                               idx = gettagindex(self, "tag_weapon");
                                }
                                else
-                                       idx = 0;
-                               if(!idx)
                                {
-                                       idx = gettagindex(self, "shell");
+                                       idx = gettagindex(self, "handle");
                                        if(!idx)
-                                               idx = gettagindex(self, "tag_shell");
-                                       if(idx)
-                                               self.spawnorigin = gettaginfo(self, idx);
-                                       else
-                                       {
-                                               print("WARNING: weapon model ", self.model, " does not support the 'shell' tag, will display casings wrong\n");
-                                               self.spawnorigin = self.movedir;
-                                       }
+                                               idx = gettagindex(self, "tag_handle");
                                }
-
-                               if(v_shot_idx)
+                               if(idx)
                                {
-                                       self.oldorigin = '0 0 0'; // use regular attachment
+                                       self.oldorigin = self.movedir - gettaginfo(self, idx);
                                }
                                else
                                {
-                                       if(self.weaponentity)
-                                       {
-                                               idx = gettagindex(self, "weapon");
-                                               if(!idx)
-                                                       idx = gettagindex(self, "tag_weapon");
-                                       }
-                                       else
-                                       {
-                                               idx = gettagindex(self, "handle");
-                                               if(!idx)
-                                                       idx = gettagindex(self, "tag_handle");
-                                       }
-                                       if(idx)
-                                       {
-                                               self.oldorigin = self.movedir - gettaginfo(self, idx);
-                                       }
-                                       else
-                                       {
-                                               print("WARNING: weapon model ", self.model, " does not support the 'handle' tag and neither does the v_ model support the 'shot' tag, will display muzzle flashes TOTALLY wrong\n");
-                                               self.oldorigin = '0 0 0'; // there is no way to recover from this
-                                       }
+                                       print("WARNING: weapon model ", self.model, " does not support the 'handle' tag and neither does the v_ model support the 'shot' tag, will display muzzle flashes TOTALLY wrong\n");
+                                       self.oldorigin = '0 0 0'; // there is no way to recover from this
                                }
-
-                               self.viewmodelforclient = self.owner;
                        }
+
+                       self.viewmodelforclient = self.owner;
                }
-               else
-               {
-                       self.model = "";
-                       if(self.weaponentity)
-                               remove(self.weaponentity);
-                       self.weaponentity = world;
-                       self.movedir = '0 0 0';
-                       self.spawnorigin = '0 0 0';
-                       self.oldorigin = '0 0 0';
-                       self.anim_fire1  = '0 1 0.01';
-                       self.anim_fire2  = '0 1 0.01';
-                       self.anim_idle   = '0 1 0.01';
-                       self.anim_reload = '0 1 0.01';
-               }
+       }
+       else
+       {
+               self.model = "";
+               if(self.weaponentity)
+                       remove(self.weaponentity);
+               self.weaponentity = world;
+               self.movedir = '0 0 0';
+               self.spawnorigin = '0 0 0';
+               self.oldorigin = '0 0 0';
+               self.anim_fire1  = '0 1 0.01';
+               self.anim_fire2  = '0 1 0.01';
+               self.anim_idle   = '0 1 0.01';
+               self.anim_reload = '0 1 0.01';
+       }
 
-               self.view_ofs = '0 0 0';
+       self.view_ofs = '0 0 0';
 
-               if(self.movedir_x >= 0)
-               {
-                       vector v0;
-                       v0 = self.movedir;
-                       self.movedir = shotorg_adjust(v0, FALSE, FALSE);
-                       self.view_ofs = shotorg_adjust(v0, FALSE, TRUE) - v0;
-               }
-               self.owner.stat_shotorg = compressShotOrigin(self.movedir);
-               self.movedir = decompressShotOrigin(self.owner.stat_shotorg); // make them match perfectly
+       if(self.movedir_x >= 0)
+       {
+               vector v0;
+               v0 = self.movedir;
+               self.movedir = shotorg_adjust(v0, FALSE, FALSE);
+               self.view_ofs = shotorg_adjust(v0, FALSE, TRUE) - v0;
+       }
+       self.owner.stat_shotorg = compressShotOrigin(self.movedir);
+       self.movedir = decompressShotOrigin(self.owner.stat_shotorg); // make them match perfectly
 
-               self.spawnorigin += self.view_ofs; // offset the casings origin by the same amount
+       self.spawnorigin += self.view_ofs; // offset the casings origin by the same amount
 
-               // check if an instant weapon switch occurred
-               if (qcweaponanimation)
+       // check if an instant weapon switch occurred
+       if (qcweaponanimation)
+       {
+               if (self.state == WS_READY)
                {
-                       if (self.state == WS_READY)
-                       {
-                               self.angles = '0 0 0';
-                               makevectors(self.angles_x * '-1 0 0' + self.angles_y * '0 1 0' + self.angles_z * '0 0 1');
-                               setorigin(self, QCWEAPONANIMATION_ORIGIN(self));
-                       }
+                       self.angles = '0 0 0';
+                       makevectors(self.angles_x * '-1 0 0' + self.angles_y * '0 1 0' + self.angles_z * '0 0 1');
+                       setorigin(self, QCWEAPONANIMATION_ORIGIN(self));
                }
-               else
-                       setorigin(self, self.view_ofs);
-               // reset animstate now
-               self.wframe = WFRAME_IDLE;
-               self.weapon_morph0time = 0;
-               self.weapon_morph1time = 0;
-               self.weapon_morph2time = 0;
-               self.weapon_morph3time = 0;
-               self.weapon_morph4time = 0;
-               setanim(self, self.anim_idle, TRUE, FALSE, TRUE);
+       }
+       else
+               setorigin(self, self.view_ofs);
+       // reset animstate now
+       self.wframe = WFRAME_IDLE;
+       self.weapon_morph0time = 0;
+       self.weapon_morph1time = 0;
+       self.weapon_morph2time = 0;
+       self.weapon_morph3time = 0;
+       self.weapon_morph4time = 0;
+       setanim(self, self.anim_idle, TRUE, FALSE, TRUE);
+}
+
+vector CL_Weapon_GetShotOrg(float wpn)
+{
+       entity wi, oldself;
+       vector ret;
+       wi = get_weaponinfo(wpn);
+       oldself = self;
+       self = spawn();
+       CL_WeaponEntity_SetModel(wi.mdl);
+       ret = self.movedir;
+       CL_WeaponEntity_SetModel("");
+       remove(self);
+       self = oldself;
+       return ret;
+}
+
+void CL_Weaponentity_Think()
+{
+       float tb;
+       self.nextthink = time;
+       if (intermission_running)
+               self.frame = self.anim_idle_x;
+       if (self.owner.weaponentity != self)
+       {
+               if (self.weaponentity)
+                       remove(self.weaponentity);
+               remove(self);
+               return;
+       }
+       if (self.owner.deadflag != DEAD_NO)
+       {
+               self.model = "";
+               if (self.weaponentity)
+                       self.weaponentity.model = "";
+               return;
+       }
+       if (self.cnt != self.owner.weapon || self.dmg != self.owner.modelindex || self.deadflag != self.owner.deadflag)
+       {
+               self.cnt = self.owner.weapon;
+               self.dmg = self.owner.modelindex;
+               self.deadflag = self.owner.deadflag;
+
+               CL_WeaponEntity_SetModel(self.owner.weaponname);
        }
 
        tb = (self.effects & (EF_TELEPORT_BIT | EF_RESTARTANIM_BIT));
@@ -907,6 +938,16 @@ void CL_SpawnWeaponentity()
        self.exteriorweaponentity.nextthink = time;
 };
 
+void Send_WeaponComplain (entity e, float wpn, string wpnname, float type)
+{
+       msg_entity = e;
+       WriteByte(MSG_ONE, SVC_TEMPENTITY);
+       WriteByte(MSG_ONE, TE_CSQC_WEAPONCOMPLAIN);
+       WriteByte(MSG_ONE, wpn);
+       WriteString(MSG_ONE, wpnname);
+       WriteByte(MSG_ONE, type);
+}
+
 .float hasweapon_complain_spam;
 
 float client_hasweapon(entity cl, float wpn, float andammo, float complain)
@@ -949,6 +990,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
                                {
                                        play2(cl, "weapons/unavailable.wav");
                                        sprint(cl, strcat("You don't have any ammo for the ^2", W_Name(wpn), "\n"));
+                                       Send_WeaponComplain (cl, wpn, W_Name(wpn), 0);
                                }
                                return FALSE;
                        }
@@ -962,6 +1004,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
                if(weaponsInMap & weaponbit)
                {
                        sprint(cl, strcat("You do not have the ^2", W_Name(wpn), "\n") );
+                       Send_WeaponComplain (cl, wpn, W_Name(wpn), 1);
 
                        if(cvar("g_showweaponspawns"))
                        {
@@ -989,7 +1032,10 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
                        }
                }
                else
+               {
+                       Send_WeaponComplain (cl, wpn, W_Name(wpn), 2);
                        sprint(cl, strcat("The ^2", W_Name(wpn), "^7 is ^1NOT AVAILABLE^7 in this map\n") );
+               }
 
                play2(cl, "weapons/unavailable.wav");
        }
@@ -1342,7 +1388,10 @@ void W_AttachToShotorg(entity flash, vector offset)
        }
        else
        {
-               setattachment(flash, self.weaponentity, "shot");
+               if(gettagindex(self.weaponentity, "shot"))
+                       setattachment(flash, self.weaponentity, "shot");
+               else
+                       setattachment(flash, self.weaponentity, "tag_shot");
                setorigin(flash, offset);
 
                xflash = spawn();
@@ -1357,7 +1406,11 @@ void W_AttachToShotorg(entity flash, vector offset)
                }
                else
                {
-                       setattachment(xflash, self.exteriorweaponentity, "shot");
+                       if(gettagindex(self.exteriorweaponentity, "shot"))
+                               setattachment(xflash, self.exteriorweaponentity, "shot");
+                       else
+                               setattachment(xflash, self.exteriorweaponentity, "tag_shot");
+                       setorigin(xflash, offset);
                }
        }
 }
index 4148136daf62dd0454c3c80f9c92c3359edeb75e..6e314c88efd50f223f1c6ef15a8a1ae2a7c721e6 100644 (file)
@@ -473,7 +473,7 @@ void FlagTouch()
                                h0 = strcat(h0, "^7's"); // h0: display text for previous netname
                        if (flagcaptimerecord == 0)
                        {
-                               bprint(other.netname, "^7 captured the ", other.flagcarried.netname, " in ", s, " seconds\n");
+                               s = strcat(" in ", s, " seconds");
                                flagcaptimerecord = t;
                                db_put(ServerProgsDB, strcat(GetMapname(), "/captimerecord/time"), ftos(t));
                                db_put(ServerProgsDB, strcat(GetMapname(), "/captimerecord/netname"), h1);
@@ -481,7 +481,7 @@ void FlagTouch()
                        }
                        else if (t < flagcaptimerecord)
                        {
-                               bprint(other.netname, "^7 captured the ", other.flagcarried.netname, " in ", s, ", breaking ", strcat(h0, " previous record of ", s0, " seconds\n"));
+                               s = strcat(" in ", s, " seconds, breaking ", h0, " previous record of ", s0, " seconds");
                                flagcaptimerecord = t;
                                db_put(ServerProgsDB, strcat(GetMapname(), "/captimerecord/time"), ftos(t));
                                db_put(ServerProgsDB, strcat(GetMapname(), "/captimerecord/netname"), h1);
@@ -489,11 +489,13 @@ void FlagTouch()
                        }
                        else
                        {
-                               bprint(other.netname, "^7 captured the ", other.flagcarried.netname, " in ", s, ", failing to break ", strcat(h0, " record of ", s0, " seconds\n"));
+                               s = strcat(" in ", s, " seconds, failing to break ", h0, " record of ", s0, " seconds");
                        }
                }
                else
-                       bprint(other.netname, "^7 captured the ", other.flagcarried.netname, "\n");
+                       s = "";
+
+               Send_KillNotification (other.netname, other.flagcarried.netname, s, INFO_CAPTUREFLAG, MSG_INFO);
 
                PlayerTeamScore_Add(other, SP_CTF_CAPS, ST_CTF_CAPS, 1);
                LogCTF("capture", other.flagcarried.team, other);
index d87d8419b25b5302d127ecd49780191e1601d3d0..5bf2b9ad86c531a5c611761c74341ec4fdb382ce 100644 (file)
@@ -17,6 +17,9 @@ Note: The only teams who can use dom control points are identified by spawnfunc_
 
 #define DOMPOINTFRAGS frags
 
+float g_domination_point_amt;
+float g_domination_point_rate;
+
 .float enemy_playerid;
 .entity sprite;
 .float captime;
@@ -63,7 +66,19 @@ void dompoint_captured ()
        //bprint(self.message);
        //bprint("\n");
 
-       bprint("^3", head.netname, "^3", self.message, "\n");
+       float points, wait_time;
+       if (g_domination_point_amt)
+               points = g_domination_point_amt;
+       else
+               points = self.frags;
+       if (g_domination_point_rate)
+               wait_time = g_domination_point_rate;
+       else
+               wait_time = self.wait;
+
+       bprint("^3", head.netname, "^3", self.message);
+       bprint(" ^7(", ftos(points), " points every ", ftos(wait_time), " seconds)\n");
+
        if(self.enemy.playerid == self.enemy_playerid)
                PlayerScore_Add(self.enemy, SP_DOM_TAKES, 1);
        else
@@ -80,10 +95,7 @@ void dompoint_captured ()
        //self.nextthink = time + cvar("g_domination_point_rate");
        //self.think = dompointthink;
 
-       if(cvar("g_domination_point_rate"))
-               self.delay = time + cvar("g_domination_point_rate");
-       else
-               self.delay = time + self.wait;
+       self.delay = time + wait_time;
 
        // do trigger work
        old_delay = self.delay;
@@ -131,7 +143,6 @@ void AnimateDomPoint()
 
 void dompointthink()
 {
-       local float waittime;
        local float fragamt;
 
        self.nextthink = time + 0.1;
@@ -146,17 +157,21 @@ void dompointthink()
        if (gameover || self.delay > time || time < game_starttime)     // game has ended, don't keep giving points
                return;
 
-       waittime = cvar("g_domination_point_rate");
-       if(!waittime)
-               waittime = self.wait;
-       self.delay = time + waittime;
+       g_domination_point_rate = cvar("g_domination_point_rate");
+       g_domination_point_amt = cvar("g_domination_point_amt");
+
+       if(g_domination_point_rate)
+               self.delay = time + g_domination_point_rate;
+       else
+               self.delay = time + self.wait;
 
        // give credit to the team
        // NOTE: this defaults to 0
        if (self.goalentity.netname != "")
        {
-               fragamt = cvar("g_domination_point_amt");
-               if(!fragamt)
+               if(g_domination_point_amt)
+                       fragamt = g_domination_point_amt;
+               else
                        fragamt = self.DOMPOINTFRAGS;
                TeamScore_AddToTeam(self.goalentity.team, ST_SCORE, fragamt);
                TeamScore_AddToTeam(self.goalentity.team, ST_DOM_TICKS, fragamt);
index 30e49cd56f7d782b11c0721fee96bde7bba0396b..45962bee7b3e69cb94513c8b57eccb36ba225446 100644 (file)
@@ -257,20 +257,21 @@ void Send_KillNotification (string s1, string s2, string s3, float msg, float ty
        WriteByte(MSG_ALL, type);
 }
 
-// TODO: writespectatable?
 // Function is used to send a generic centerprint whose content CSQC gets to decide (gentle version or not in the below cases)
 void Send_CSQC_Centerprint(entity e, string s1, string s2, float msg, float type)
 {
        if (clienttype(e) == CLIENTTYPE_REAL)
        {
                msg_entity = e;
-               WriteByte(MSG_ONE, SVC_TEMPENTITY);
-               WriteByte(MSG_ONE, TE_CSQC_NOTIFY);
-               WriteByte(MSG_ONE, CSQC_CENTERPRINT);
-               WriteString(MSG_ONE, s1);
-               WriteString(MSG_ONE, s2);
-               WriteShort(MSG_ONE, msg);
-               WriteByte(MSG_ONE, type);
+               WRITESPECTATABLE_MSG_ONE({
+                       WriteByte(MSG_ONE, SVC_TEMPENTITY);
+                       WriteByte(MSG_ONE, TE_CSQC_NOTIFY);
+                       WriteByte(MSG_ONE, CSQC_CENTERPRINT);
+                       WriteString(MSG_ONE, s1);
+                       WriteString(MSG_ONE, s2);
+                       WriteShort(MSG_ONE, msg);
+                       WriteByte(MSG_ONE, type);
+               });
        }
 }
 
@@ -294,19 +295,6 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                msg = ColoredTeamName(targ.team); // TODO: check if needed?
                        Send_CSQC_Centerprint(targ, msg, "", deathtype, MSG_SUICIDE);
 
-                       if(deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_QUIET)
-                       {
-                               LogDeath("suicide", deathtype, targ, targ);
-                               GiveFrags(attacker, targ, -1);
-                       }
-                       // TODO: hmm?
-                       /*
-                               if (targ.killcount > 2)
-                                       bprint ("^1",s,"^1 faded after a ",ftos(targ.killcount)," point spree\n");
-                       */
-
-                       // TODO: wut is this?
-                       // givefrags for logging apparently?
                        if(deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_QUIET)
                        {
                                LogDeath("suicide", deathtype, targ, targ);
@@ -315,7 +303,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 
                        if (targ.killcount > 2)
                                msg = ftos(targ.killcount);
-                       if(teams_matter && attacker.team == targ.team)
+                       if(teams_matter && deathtype == DEATH_MIRRORDAMAGE)
                        {
                                if(attacker.team == COLOR_TEAM1)
                                        deathtype = KILL_TEAM_RED;
@@ -359,7 +347,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                {
                                        checkrules_firstblood = TRUE;
                                        Send_KillNotification(a, "", "", KILL_FIRST_BLOOD, MSG_KILL);
-                                       // TODO: make these print at newline if they dont
+                                       // TODO: make these print a newline if they dont
                                        Send_CSQC_Centerprint(attacker, "", "", KILL_FIRST_BLOOD, MSG_KILL);
                                        Send_CSQC_Centerprint(targ, "", "", KILL_FIRST_VICTIM, MSG_KILL);
                                }
@@ -375,13 +363,14 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                attacker.taunt_soundtime = time + 1;
 
                                // TODO: fix this?
-                                       if (deathtype == DEATH_CUSTOM)
-                                               msg = strcat(deathmessage, " by ^1", msg);
-                                       else if (deathtype == DEATH_HURTTRIGGER && inflictor.message2 != "")
-                                       {
-                                               msg = ftos(strstrofs(inflictor.message2, "#", 0));
-                                       }
-                                       Send_KillNotification(s, a, msg, deathtype, MSG_KILL);
+                               if (deathtype == DEATH_CUSTOM)
+                                       msg = strcat(deathmessage, " by ^1", msg);
+                               else if (deathtype == DEATH_HURTTRIGGER && inflictor.message2 != "")
+                               {
+                                       msg = ftos(strstrofs(inflictor.message2, "#", 0));
+                               }
+
+                               Send_KillNotification(a, s, msg, deathtype, MSG_KILL);
 
                                if(g_ctf && targ.flagcarried)
                                {
@@ -401,10 +390,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                if (attacker.killcount > 2) {
                                        Send_KillNotification(a, ftos(attacker.killcount), "", KILL_SPREE, MSG_SPREE);
                                }
-
-                               LogDeath("frag", deathtype, attacker, targ);
-
-                               if (attacker.killcount == 3)
+                               else if (attacker.killcount == 3)
                                {
                                        Send_KillNotification(a, "", "", KILL_SPREE_3, MSG_SPREE);
                                        AnnounceTo(attacker, "03kills");
@@ -439,6 +425,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                        Send_KillNotification(a, "", "", KILL_SPREE_30, MSG_SPREE);
                                        AnnounceTo(attacker, "30kills");
                                }
+                               LogDeath("frag", deathtype, attacker, targ);
                        }
                }
                else
@@ -475,6 +462,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 entity damage_targ;
 entity damage_inflictor;
 entity damage_attacker;
+.float prevhitsound;
 
 void Damage (entity targ, entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
 {
@@ -737,10 +725,14 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
                                {
                                        if(damage > 0)
                                        {
-                                               if(targ.BUTTON_CHAT)
-                                                       attacker.typehitsound += 1;
-                                               else
-                                                       attacker.hitsound += 1;
+                                               if(attacker.weapon != WEP_ELECTRO && attacker.weapon != WEP_LASER || ((attacker.weapon == WEP_ELECTRO && cvar("g_balance_electro_lightning") || attacker.weapon == WEP_LASER) && attacker.prevhitsound + cvar("sv_hitsound_antispam_time") < time))
+                                               {
+                                                       if(targ.BUTTON_CHAT)
+                                                               attacker.typehitsound += 1;
+                                                       else
+                                                               attacker.hitsound += 1;
+                                                       attacker.prevhitsound = time;
+                                               }
 
                                                damage_goodhits += 1;
                                                damage_gooddamage += damage;
index a88fae947bf9b987646fde1e361cffd27038708c..ce3d9b72b8fe9db1f484e27ac4bc620d90bd3b53 100644 (file)
@@ -114,10 +114,37 @@ void GrapplingHook_Stop()
        self.hook_length = -1;
 }
 
+.vector hook_start, hook_end;
+float GrapplingHookSend(entity to, float sf)
+{
+       WriteByte(MSG_ENTITY, ENT_CLIENT_HOOK);
+       sf = sf & 0x7F;
+       if(sound_allowed(MSG_BROADCAST, self.owner))
+               sf |= 0x80;
+       WriteByte(MSG_ENTITY, sf);
+       if(sf & 1)
+       {
+               WriteByte(MSG_ENTITY, num_for_edict(self.owner));
+       }
+       if(sf & 2)
+       {
+               WriteCoord(MSG_ENTITY, self.hook_start_x);
+               WriteCoord(MSG_ENTITY, self.hook_start_y);
+               WriteCoord(MSG_ENTITY, self.hook_start_z);
+       }
+       if(sf & 4)
+       {
+               WriteCoord(MSG_ENTITY, self.hook_end_x);
+               WriteCoord(MSG_ENTITY, self.hook_end_y);
+               WriteCoord(MSG_ENTITY, self.hook_end_z);
+       }
+       return TRUE;
+}
+
 void GrapplingHookThink()
 {
-       float spd, dist, minlength, pullspeed, ropestretch, ropeairfriction, rubberforce, newlength, rubberforce_overstretch;
-       vector dir, org, end, v0, dv, v, myorg;
+       float spd, dist, minlength, pullspeed, ropestretch, ropeairfriction, rubberforce, newlength, rubberforce_overstretch, s;
+       vector dir, org, end, v0, dv, v, myorg, vs;
        if(self.owner.health <= 0 || self.owner.hook != self)   // how did that happen?
        {                                                                                                               // well, better fix it anyway
                remove(self);
@@ -133,8 +160,14 @@ void GrapplingHookThink()
 
        self.nextthink = time;
 
+       s = self.owner.cvar_cl_gunalign;
+       if(s != 1 && s != 2 && s != 4)
+               s = 3; // default value
+       --s;
+       vs = hook_shotorigin[s];
+
        makevectors(self.owner.v_angle);
-       org = self.owner.origin + self.owner.view_ofs + v_forward * hook_shotorigin_x + v_right * hook_shotorigin_y + v_up * hook_shotorigin_z;
+       org = self.owner.origin + self.owner.view_ofs + v_forward * vs_x + v_right * -vs_y + v_up * vs_z;
        myorg = WarpZone_RefSys_TransformOrigin(self.owner, self, org);
 
        if(self.hook_length < 0)
@@ -235,7 +268,18 @@ void GrapplingHookThink()
        }
 
        makevectors(self.angles_x * '-1 0 0' + self.angles_y * '0 1 0');
-       te_beam(self.owner, WarpZone_RefSys_TransformOrigin(self, self.owner, self.origin) + v_forward * (-9), org);
+       myorg = WarpZone_RefSys_TransformOrigin(self, self.owner, self.origin) + v_forward * (-9);
+
+       if(myorg != self.hook_start)
+       {
+               self.SendFlags |= 2;
+               self.hook_start = myorg;
+       }
+       if(org != self.hook_end)
+       {
+               self.SendFlags |= 4;
+               self.hook_end = org;
+       }
 }
 
 void GrapplingHookTouch (void)
@@ -282,15 +326,23 @@ void FireGrapplingHook (void)
 {
        local entity missile;
        local vector org;
+       float s;
+       vector vs;
 
        if((arena_roundbased && time < warmup) || (time < game_starttime))
                return;
 
        makevectors(self.v_angle);
 
+       s = self.cvar_cl_gunalign;
+       if(s != 1 && s != 2 && s != 4)
+               s = 3; // default value
+       --s;
+       vs = hook_shotorigin[s];
+
        // UGLY WORKAROUND: play this on CHAN_WEAPON2 so it can't cut off fire sounds
        sound (self, CHAN_WEAPON2, "weapons/hook_fire.wav", VOL_BASE, ATTN_NORM);
-       org = self.origin + self.view_ofs + v_forward * hook_shotorigin_x + v_right * hook_shotorigin_y + v_up * hook_shotorigin_z;
+       org = self.origin + self.view_ofs + v_forward * vs_x + v_right * -vs_y + v_up * vs_z;
        pointparticles(particleeffectnum("grapple_muzzleflash"), org, '0 0 0', 1);
 
        missile = WarpZone_RefSys_SpawnSameRefSys(self);
@@ -301,7 +353,7 @@ void FireGrapplingHook (void)
        missile.movetype = MOVETYPE_FLY;
        PROJECTILE_MAKETRIGGER(missile);
 
-       setmodel (missile, "models/hook.md3"); // precision set below
+       //setmodel (missile, "models/hook.md3"); // precision set below
        setsize (missile, '-3 -3 -3', '3 3 3');
        setorigin (missile, org);
 
@@ -322,6 +374,10 @@ void FireGrapplingHook (void)
        missile.event_damage = GrapplingHook_Damage;
        missile.takedamage = DAMAGE_AIM;
        missile.damageforcescale = 0;
+
+       missile.hook_start = missile.hook_end = missile.origin;
+
+       Net_LinkEntity(missile, FALSE, 0, GrapplingHookSend);
 }
 
 //  void GrapplingHookFrame()
@@ -434,9 +490,20 @@ void GrapplingHookFrame()
 void GrappleHookInit()
 {
        if(g_grappling_hook)
-               hook_shotorigin = '8 -8 -12';
+       {
+               hook_shotorigin[0] = '8 8 -12';
+               hook_shotorigin[1] = '8 8 -12';
+               hook_shotorigin[2] = '8 8 -12';
+               hook_shotorigin[3] = '8 8 -12';
+       }
        else
-               hook_shotorigin = shotorg_adjust('26.2148 9.2059 -15.9772', TRUE, FALSE);
+       {
+               weapon_action(WEP_HOOK, WR_PRECACHE);
+               hook_shotorigin[0] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK), FALSE, FALSE, 1);
+               hook_shotorigin[1] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK), FALSE, FALSE, 2);
+               hook_shotorigin[2] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK), FALSE, FALSE, 3);
+               hook_shotorigin[3] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK), FALSE, FALSE, 4);
+       }
 }
 
 void SetGrappleHookBindings()
index 1ebbb9b8f1984037c5c2acda9c9b4efdb3357c3b..b8e0da557d8358c3b2e9f7ba68c4ef447eea4849 100644 (file)
@@ -14,4 +14,4 @@ float HOOK_WAITING_FOR_RELEASE = 16;
 .float hook_state;
 
 void GrappleHookInit();
-vector hook_shotorigin;
+vector hook_shotorigin[4];
index 2a7a82d463a0d47a47ac7ebd3f46d80d67af1918..1d1f0bb9bd0f1bfee26d37846ad17085026bbdb4 100644 (file)
@@ -37,6 +37,7 @@ void setanim(entity e, vector anim, float looping, float override, float restart
        e.animstate_looping = looping;
        e.animstate_override = override;
        e.frame = e.animstate_startframe;
+       e.frame1time = servertime;
 };
 
 void updateanim(entity e)
index a5165706bae3f9351e22be5d9b48a2f571a79f16..07898df16817501ada15cc655255c3cec5cf9f0e 100644 (file)
@@ -512,6 +512,8 @@ void spawnfunc_worldspawn (void)
        InitGameplayMode();
        readlevelcvars();
        GrappleHookInit();
+       ElectroInit();
+       LaserInit();
 
        player_count = 0;
        bot_waypoints_for_items = cvar("g_waypoints_for_items");
index a6881b293ca52ae2754bc9f80ebfa281a386589f..b5c68ca79bcbb84f2ce8aa11bb8627d26e9106ec 100644 (file)
@@ -951,6 +951,7 @@ void GameCommand(string command)
        if(argv(0) == "debug_shotorg")
        {
                debug_shotorg = stov(argv(1));
+               debug_shotorg_y = -debug_shotorg_y;
                return;
        }
 
index aeee9cecbac843cc4e6203e29de494a0b8e41374..5b0fa2b8caabc429fd3bdae394326bffb1ef616b 100644 (file)
@@ -2330,9 +2330,9 @@ void write_recordmarker(entity pl, float tstart, float dt)
                  " ", ftos(tstart), " ", ftos(dt), "\n"));
 }
 
-vector shotorg_adjustfromclient(vector vecs, float y_is_right, float allowcenter)
+vector shotorg_adjustfromclient(vector vecs, float y_is_right, float allowcenter, float algn)
 {
-       switch(self.owner.cvar_cl_gunalign)
+       switch(algn)
        {
                case 1: // right
                        break;
@@ -2372,7 +2372,7 @@ vector shotorg_adjustfromclient(vector vecs, float y_is_right, float allowcenter
        return vecs;
 }
 
-vector shotorg_adjust(vector vecs, float y_is_right, float visual)
+vector shotorg_adjust_values(vector vecs, float y_is_right, float visual, float algn)
 {
        string s;
        vector v;
@@ -2381,7 +2381,7 @@ vector shotorg_adjust(vector vecs, float y_is_right, float visual)
        {
                if (visual)
                {
-                       vecs = shotorg_adjustfromclient(vecs, y_is_right, TRUE);
+                       vecs = shotorg_adjustfromclient(vecs, y_is_right, TRUE, algn);
                }
                else
                {
@@ -2393,7 +2393,7 @@ vector shotorg_adjust(vector vecs, float y_is_right, float visual)
        {
                if (visual)
                {
-                       vecs = shotorg_adjustfromclient(vecs, y_is_right, TRUE);
+                       vecs = shotorg_adjustfromclient(vecs, y_is_right, TRUE, algn);
                }
                else
                {
@@ -2413,11 +2413,15 @@ vector shotorg_adjust(vector vecs, float y_is_right, float visual)
        }
        else if (cvar("g_shootfromclient"))
        {
-               vecs = shotorg_adjustfromclient(vecs, y_is_right, (cvar("g_shootfromclient") >= 2));
+               vecs = shotorg_adjustfromclient(vecs, y_is_right, (cvar("g_shootfromclient") >= 2), algn);
        }
        return vecs;
 }
 
+vector shotorg_adjust(vector vecs, float y_is_right, float visual)
+{
+       return shotorg_adjust_values(vecs, y_is_right, visual, self.owner.cvar_cl_gunalign);
+}
 
 
 void attach_sameorigin(entity e, entity to, string tag)
index c174177b2002cf0251ed6bc05d8762592f7c0b24..adf4b4a1d89545418734228dddc0b16345100f0a 100644 (file)
@@ -43,6 +43,8 @@ cheats.qh
 portals.qh
 
 g_hook.qh
+w_electro.qh
+w_laser.qh
 
 scores.qh
 
index a79f9a473b0638911a9918f2ec78513eab9a0cca..44a47c95dc5ed653c2cf40afb68bf7c788570b5d 100644 (file)
@@ -191,6 +191,7 @@ void StartFrame (void)
        sv_maxairstrafespeed = cvar("sv_maxairstrafespeed");
        sv_airstrafeaccel_qw = cvar("sv_airstrafeaccel_qw");
        sv_aircontrol = cvar("sv_aircontrol");
+       sv_aircontrol_penalty = cvar("sv_aircontrol_penalty");
        sv_aircontrol_power = cvar("sv_aircontrol_power");
        sv_warsowbunny_airforwardaccel = cvar("sv_warsowbunny_airforwardaccel");
        sv_warsowbunny_accel = cvar("sv_warsowbunny_accel");
index cb8f0b1025bd204260b6ea396918afad7e890268..c291e79a009f715fb67e0decc66d0cde175fb809 100644 (file)
@@ -112,7 +112,7 @@ void Item_Show (entity e, float mode)
                e.model = e.mdl;
                e.solid = SOLID_NOT;
                e.colormod = stov(cvar_string("g_ghost_items_color"));
-               self.glowmod = self.colormod;
+               e.glowmod = e.colormod;
                e.alpha = g_ghost_items;
                e.customizeentityforclient = func_null;
 
@@ -124,7 +124,7 @@ void Item_Show (entity e, float mode)
                e.model = string_null;
                e.solid = SOLID_NOT;
                e.colormod = stov(cvar_string("g_ghost_items_color"));
-               self.glowmod = self.colormod;
+               e.glowmod = e.colormod;
                e.alpha = 0;
                e.customizeentityforclient = func_null;
 
@@ -291,7 +291,7 @@ float Item_GiveTo(entity item, entity player)
                                //      AnnounceTo(player, "ammo");
 
                                if (item.weapons & WEPBIT_MINSTANEX)
-                                       W_GiveWeapon (player, WEP_MINSTANEX, "Nex");
+                                       W_GiveWeapon (player, WEP_MINSTANEX, item.netname);
                                if (item.ammo_cells)
                                        player.ammo_cells = min (player.ammo_cells + cvar("g_minstagib_ammo_drop"), 999);
                                player.health = 100;
@@ -303,7 +303,7 @@ float Item_GiveTo(entity item, entity player)
                                pickedup = TRUE;
                                // sound not available
                                // AnnounceTo(player, "_lives");
-                               player.armorvalue = player.armorvalue + cvar("g_minstagib_extralives");
+                               player.armorvalue = min(player.armorvalue + cvar("g_minstagib_extralives"), 999);
                                sprint(player, "^3You picked up some extra lives\n");
                        }
 
@@ -713,9 +713,6 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
                        return;
                }
 
-               itemid = self.items;
-               weaponid = self.weapons;
-
                self.reset = Item_Reset;
                // it's a level item
                if(self.spawnflags & 1)
@@ -798,8 +795,6 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
                        self.is_item = TRUE;
                }
 
-               weaponsInMap |= weaponid;
-
                if(g_lms || g_ca)
                {
                        startitem_failed = TRUE;
@@ -829,17 +824,20 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
                        return;
                }
 
+               weaponsInMap |= weaponid;
+
                precache_model (itemmodel);
                precache_sound (pickupsound);
-               precache_sound ("misc/itemrespawn.wav");
-               precache_sound ("misc/itemrespawncountdown.wav");
 
-               if(itemid == IT_STRENGTH)
+               precache_sound ("misc/itemrespawncountdown.wav");
+               if(!g_minstagib && itemid == IT_STRENGTH)
                        precache_sound ("misc/strength_respawn.wav");
-               if(itemid == IT_INVINCIBLE)
+               else if(!g_minstagib && itemid == IT_INVINCIBLE)
                        precache_sound ("misc/shield_respawn.wav");
+               else
+                       precache_sound ("misc/itemrespawn.wav");
 
-               if((itemid & (IT_STRENGTH | IT_INVINCIBLE | IT_HEALTH | IT_ARMOR | IT_KEY1 | IT_KEY2)) || (weaponid & WEPBIT_ALL))
+               if((itemflags & (FL_POWERUP | FL_WEAPON)) || (itemid & (IT_HEALTH | IT_ARMOR | IT_KEY1 | IT_KEY2)))
                        self.target = "###item###"; // for finding the nearest item using find()
        }
 
@@ -893,16 +891,6 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
  */
 void minstagib_items (float itemid)
 {
-       // we don't want to replace dropped weapons ;)
-       if (self.classname == "droppedweapon")
-       {
-               self.ammo_cells = 25;
-               StartItem ("models/weapons/g_nex.md3",
-                       "weapons/weaponpickup.wav", 15, 0,
-                       "MinstaNex", 0, WEPBIT_MINSTANEX, FL_WEAPON, generic_pickupevalfunc, 1000);
-               return;
-       }
-
        local float rnd;
        self.classname = "minstagib";
 
@@ -912,7 +900,7 @@ void minstagib_items (float itemid)
                self.ammo_cells = 1;
                StartItem ("models/items/a_cells.md3",
                        "misc/itempickup.wav", 45, 0,
-                       "Nex Ammo", IT_CELLS, 0, 0, generic_pickupevalfunc, 100);
+                       "MinstaNex Ammo", IT_CELLS, 0, 0, generic_pickupevalfunc, 100);
                return;
        }
 
@@ -940,7 +928,6 @@ void minstagib_items (float itemid)
                StartItem ("models/items/g_h100.md3",
                        "misc/megahealth.wav", g_pickup_respawntime_powerup, g_pickup_respawntimejitter_powerup,
                        "Extralife", IT_NAILS, 0, FL_POWERUP, generic_pickupevalfunc, BOT_PICKUP_RATING_HIGH);
-
        }
        // replace with speed
        if (itemid == IT_INVINCIBLE)
@@ -950,7 +937,6 @@ void minstagib_items (float itemid)
                        "misc/powerup_shield.wav", g_pickup_respawntime_powerup, g_pickup_respawntimejitter_powerup,
                        "Speed", IT_INVINCIBLE, 0, FL_POWERUP, generic_pickupevalfunc, BOT_PICKUP_RATING_MID);
        }
-
 }
 
 float minst_no_auto_cells;
@@ -1138,7 +1124,7 @@ void spawnfunc_weapon_rocketlauncher (void)
 {
        if (g_minstagib)
        {
-               minstagib_items(IT_CELLS);
+               minstagib_items(IT_CELLS); // replace rocketlauncher with cells
                self.think = minst_remove_item;
                self.nextthink = time;
                return;
@@ -1376,9 +1362,6 @@ void spawnfunc_target_items (void)
        if(!self.invincible_finished)
                self.invincible_finished = cvar("g_balance_powerup_invincible_time");
 
-       precache_sound("misc/itempickup.wav");
-       precache_sound("misc/itempickup.wav");
-       precache_sound("misc/itempickup.wav");
        precache_sound("misc/itempickup.wav");
        precache_sound("misc/megahealth.wav");
        precache_sound("misc/armor25.wav");
@@ -1774,6 +1757,12 @@ float GiveItems(entity e, float beginarg, float endarg)
        POSTGIVE_VALUE_ROT(e, armorvalue, 1, pauserotarmor_finished, cvar("g_balance_pause_armor_rot"), pauseregen_finished, cvar("g_balance_pause_health_regen"), "misc/armor25.wav", string_null);
        POSTGIVE_VALUE_ROT(e, health, 1, pauserothealth_finished, cvar("g_balance_pause_health_rot"), pauseregen_finished, cvar("g_balance_pause_health_regen"), "misc/megahealth.wav", string_null);
 
+       if (g_minstagib)
+       {
+               e.health = bound(0, e.health, 100);
+               e.armorvalue = bound(0, e.armorvalue, 999);
+       }
+
        if(e.strength_finished <= 0)
                e.strength_finished = 0;
        else
index d7f4de67aa61eda41f70256ecf3979402074a22b..06392ec0db7978f515f6edc1d985ff8ffbf0f5fa 100644 (file)
@@ -84,13 +84,13 @@ void raptor_loadsettings()
     raptor_beam_leangth = CCVAR("_beam_length");
     raptor_beam_refire  = CCVAR("_beam_refire");
 
-    raptor_shield_max    = CCVAR("_shield_max");
+    raptor_shield_max    = CCVAR("_shield");
     raptor_shield_regen  = CCVAR("_shield_regen");
 
-    raptor_health_max    = CCVAR("_health_max");
+    raptor_health_max    = CCVAR("_health");
     raptor_health_regen  = CCVAR("_health_regen");
 
-    raptor_energy_max    = CCVAR("_energy_max");
+    raptor_energy_max    = CCVAR("_energy");
     raptor_energy_regen  = CCVAR("_energy_regen");
 }
 
@@ -234,7 +234,6 @@ void raptor_setanim(float start, float end, float length)
 }
 
 void raptor_beam (vector start, vector end, vector smin, vector smax, float bforce, float f_dmg, float deathtype)
-
 {
     vector hitloc, force, endpoint, dir;
     entity ent;
@@ -520,6 +519,7 @@ float raptor_pplug()
     setorigin(player,vhic.origin + '0 0 32');
 
     // Aim the gunz
+    /*
     vector target_angle, move_angle, org1, org2, targ;
 
     makevectors(player.v_angle);
@@ -549,7 +549,7 @@ float raptor_pplug()
     move_angle = shortangle_vxy(move_angle,(vhic.angles + vhic.gun2.angles));
     vhic.gun2.angles_x = bound(-15,move_angle_x + vhic.gun2.angles_x,15);
     vhic.gun2.angles_y = bound(-20,move_angle_y + vhic.gun2.angles_y,20);
-
+       */
     if(player.BUTTON_ATCK)
     if(vhic.vehicle_energy > (raptor_beam_aps * sys_frametime))
     {
@@ -832,7 +832,7 @@ void raptor_dinit()
     raptor_spawn();
 }
 
-void spawnfunc_vehicle_raptor2()
+void spawnfunc_vehicle_raptor()
 {
     self.cvar_basename      = "g_vehicle_raptor";
     raptor_loadsettings();
@@ -869,7 +869,7 @@ void spawnfunc_vehicle_raptor2()
 }
 
 
-void spawnfunc_vehicle_raptor()
+void spawnfunc_vehicle_raptor2()
 {
     entity iqm,dpm,md3;
 
index 5aac0f0f06f4235fd8edd56bc2c4fbb3a14a7bf8..7cc2949f6d90413957bb270bd598b4264597bfc6 100644 (file)
@@ -66,14 +66,15 @@ void vehicle_stdproc_damage(entity inflictor, entity attacker, float damage, flo
     if((self.vehicle_flags & VHF_HASSHIELD) && (self.vehicle_shield > 0))
     {
 
-        if not (self.tur_head.enemy)
+        
+        if (wasfreed(self.tur_head.enemy) || self.tur_head.enemy == world)
         {
             self.tur_head.enemy = spawn();
             self.tur_head.enemy.effects = EF_LOWPRECISION;
         }
 
-        setmodel(self.tur_head.enemy,"models/vhshield.md3");
-        setattachment(self.tur_head.enemy,self,"");
+        setmodel(self.tur_head.enemy, "models/vhshield.md3");
+        setattachment(self.tur_head.enemy, self, "");
 
         self.tur_head.enemy.colormod = '1 1 1';
         self.tur_head.enemy.alpha = 0.45;
index 192d83f6da4f21085cdf753b84dcc9b277eec9b2..8e452478e29ae2d344f1dd507efda99fc7d47322 100644 (file)
@@ -22,6 +22,8 @@ float SVC_UPDATEENTITY = 128; // Net.Protocol 0x80
 .entity gun1;
 .entity gun2;
 
+.entity shield;
+
 .float vehicle_health;
 .float vehicle_shield;
 .float vehicle_energy;
index 338d98476b38b2a685cfd71ce2b396d827e204b5..e67b5378073820b7815b4c428d000aec986b0237 100644 (file)
@@ -120,7 +120,7 @@ void VoteDialog_UpdateHighlight(float selected) {
        WriteByte(MSG_ONE, SVC_TEMPENTITY);
        WriteByte(MSG_ONE, TE_CSQC_VOTE);
        WriteByte(MSG_ONE, 1);
-       WriteShort(MSG_ONE, selected);
+       WriteByte(MSG_ONE, selected);
 }
 
 void VoteDialog_Reset() {
@@ -545,9 +545,9 @@ void VoteDialog_Update(float msg, float vyes, float vno, float needed) {
        WriteByte(msg, SVC_TEMPENTITY);
        WriteByte(msg, TE_CSQC_VOTE);
        WriteByte(msg, 0);
-       WriteShort(msg, vyes);
-       WriteShort(msg, vno);
-       WriteShort(msg, needed);
+       WriteByte(msg, vyes);
+       WriteByte(msg, vno);
+       WriteByte(msg, needed);
 }
 
 void VoteCount() {
index 8fc8d839da6ca97b686bc86079c7c52cccbdf2f7..1cd280e007b531f7f23122fbde2c16890e7fa9f3 100644 (file)
@@ -219,17 +219,22 @@ float w_campingrifle(float req)
                                self.campingrifle_accumulator += cvar("g_balance_campingrifle_primary_burstcost");
                        }
                        if (self.BUTTON_ATCK2)
-                       if (weapon_prepareattack_check(1, cvar("g_balance_campingrifle_secondary_refire")))
-                       if (time >= self.campingrifle_accumulator + cvar("g_balance_campingrifle_secondary_burstcost"))
-                       {
-                               weapon_prepareattack_do(1, cvar("g_balance_campingrifle_secondary_refire"));
-                               W_CampingRifle_BulletHail(cvar("g_balance_campingrifle_secondary_bullethail"), W_CampingRifle_Attack2, WFRAME_FIRE2, cvar("g_balance_campingrifle_secondary_animtime"), cvar("g_balance_campingrifle_primary_refire"));
-                               self.campingrifle_accumulator += cvar("g_balance_campingrifle_secondary_burstcost");
+                       {       
+                               if (cvar("g_balance_campingrifle_secondary"))
+                               {
+                                       if (weapon_prepareattack_check(1, cvar("g_balance_campingrifle_secondary_refire")))
+                                       if (time >= self.campingrifle_accumulator + cvar("g_balance_campingrifle_secondary_burstcost"))
+                                       {
+                                               weapon_prepareattack_do(1, cvar("g_balance_campingrifle_secondary_refire"));
+                                               W_CampingRifle_BulletHail(cvar("g_balance_campingrifle_secondary_bullethail"), W_CampingRifle_Attack2, WFRAME_FIRE2, cvar("g_balance_campingrifle_secondary_animtime"), cvar("g_balance_campingrifle_primary_refire"));
+                                               self.campingrifle_accumulator += cvar("g_balance_campingrifle_secondary_burstcost");
+                                       }
+                               }
                        }
                }
        }
        else if (req == WR_PRECACHE)
-       {               
+       {
                precache_model ("models/weapons/g_campingrifle.md3");
                precache_model ("models/weapons/v_campingrifle.md3");
                precache_model ("models/weapons/h_campingrifle.iqm");
@@ -290,32 +295,32 @@ float w_campingrifle(float req)
        else if (req == WR_SUICIDEMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = "shot themself automatically";
+                       w_deathtypestring = "%s shot themself automatically";
                else
-                       w_deathtypestring = "sniped themself somehow";
+                       w_deathtypestring = "%s sniped themself somehow";
        }
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
                {
                        if(w_deathtype & HITTYPE_BOUNCE)
-                               w_deathtypestring = "failed to hide from #'s bullet hail";
+                               w_deathtypestring = "%s failed to hide from %s's bullet hail";
                        else
-                               w_deathtypestring = "died in #'s bullet hail";
+                               w_deathtypestring = "%s died in %s's bullet hail";
                }
                else
                {
                        if(w_deathtype & HITTYPE_BOUNCE)
                        {
                                // TODO special headshot message here too?
-                               w_deathtypestring = "failed to hide from #'s rifle";
+                               w_deathtypestring = "%s failed to hide from %s's rifle";
                        }
                        else
                        {
                                if(w_deathtype & HITTYPE_HEADSHOT)
-                                       w_deathtypestring = "got hit in the head by #";
+                                       w_deathtypestring = "%s got hit in the head by %s";
                                else
-                                       w_deathtypestring = "was sniped by #";
+                                       w_deathtypestring = "%s was sniped by %s";
                        }
                }
        }
index d80317a346ef1a1b3a3be3479b3c67e038133aad..e9015f5806e4ec5124ae3c9e75187e7b74b57714 100644 (file)
@@ -6,22 +6,54 @@ REGISTER_WEAPON(CRYLINK, w_crylink, IT_CELLS, 6, WEP_FLAG_NORMAL | WEP_TYPE_SPLA
 
 .entity realowner;
 
+.entity queuenext;
+.entity queueprev;
+
+// force projectile to explode
+void W_Crylink_LinkExplode (entity e, entity e2)
+{
+       float a;
+       a = bound(0, 1 - (time - e.fade_time) * e.fade_rate, 1);
+
+       RadiusDamage (e, e.realowner, cvar("g_balance_crylink_primary_damage") * a, cvar("g_balance_crylink_primary_edgedamage") * a, cvar("g_balance_crylink_primary_radius"), world, cvar("g_balance_crylink_primary_force") * a, e.projectiledeathtype, other);
+
+       if(e.queuenext != e2)
+               W_Crylink_LinkExplode(e.queuenext, e2);
+       remove (e);
+}
+
 // NO bounce protection, as bounces are limited!
 void W_Crylink_Touch (void)
 {
        float finalhit;
        float f;
-       PROJECTILE_TOUCH;
+       //PROJECTILE_TOUCH;
+       local entity savenext, saveprev;
+       savenext = self.queuenext;
+       saveprev = self.queueprev;
+       if(WarpZone_Projectile_Touch())
+       {
+               if(wasfreed(self))
+               {
+                       savenext.queueprev = saveprev;
+                       saveprev.queuenext = savenext;
+               }
+               return;
+       }
+
+       float a;
+       a = bound(0, 1 - (time - self.fade_time) * self.fade_rate, 1);
+
        finalhit = ((self.cnt <= 0) || (other.takedamage != DAMAGE_NO));
        if(finalhit)
                f = 1;
        else
                f = cvar("g_balance_crylink_primary_bouncedamagefactor");
-       if(self.alpha)
-               f *= self.alpha;
-       RadiusDamage (self, self.realowner, cvar("g_balance_crylink_primary_damage") * f, cvar("g_balance_crylink_primary_edgedamage") * f, cvar("g_balance_crylink_primary_radius"), world, cvar("g_balance_crylink_primary_force") * f, self.projectiledeathtype, other);
-       if (finalhit)
+       if(a)
+               f *= a;
+       if (RadiusDamage (self, self.realowner, cvar("g_balance_crylink_primary_damage") * f, cvar("g_balance_crylink_primary_edgedamage") * f, cvar("g_balance_crylink_primary_radius"), world, cvar("g_balance_crylink_primary_force") * f, self.projectiledeathtype, other) || finalhit)
        {
+               W_Crylink_LinkExplode(self.queuenext, self);
                remove (self);
                return;
        }
@@ -38,17 +70,33 @@ void W_Crylink_Touch2 (void)
 {
        float finalhit;
        float f;
-       PROJECTILE_TOUCH;
+       //PROJECTILE_TOUCH;
+       local entity savenext, saveprev;
+       savenext = self.queuenext;
+       saveprev = self.queueprev;
+       if(WarpZone_Projectile_Touch())
+       {
+               if(wasfreed(self))
+               {
+                       savenext.queueprev = saveprev;
+                       saveprev.queuenext = savenext;
+               }
+               return;
+       }
+
+       float a;
+       a = 1 - (time - self.fade_time) * self.fade_rate;
+
        finalhit = ((self.cnt <= 0) || (other.takedamage != DAMAGE_NO));
        if(finalhit)
                f = 1;
        else
                f = cvar("g_balance_crylink_secondary_bouncedamagefactor");
-       if(self.alpha)
-               f *= self.alpha;
-       RadiusDamage (self, self.realowner, cvar("g_balance_crylink_secondary_damage") * f, cvar("g_balance_crylink_secondary_edgedamage") * f, cvar("g_balance_crylink_secondary_radius"), world, cvar("g_balance_crylink_secondary_force") * f, self.projectiledeathtype, other);
-       if (finalhit)
+       if(a)
+               f *= a;
+       if (RadiusDamage (self, self.realowner, cvar("g_balance_crylink_secondary_damage") * f, cvar("g_balance_crylink_secondary_edgedamage") * f, cvar("g_balance_crylink_secondary_radius"), world, cvar("g_balance_crylink_secondary_force") * f, self.projectiledeathtype, other) || finalhit)
        {
+               W_Crylink_LinkExplode(self.queuenext, self);
                remove (self);
                return;
        }
@@ -61,10 +109,17 @@ void W_Crylink_Touch2 (void)
        //      CSQCProjectile(proj, TRUE, PROJECTILE_CRYLINK, TRUE);
 }
 
+void W_Crylink_Fadethink (void)
+{
+       self.queuenext.queueprev = self.queueprev;
+       self.queueprev.queuenext = self.queuenext;
+       remove(self);
+}
+
 void W_Crylink_Attack (void)
 {
        local float counter, shots;
-       local entity proj;
+       local entity proj, prevproj, firstproj;
        local vector s;
        vector forward, right, up;
 
@@ -85,6 +140,21 @@ void W_Crylink_Attack (void)
                proj.classname = "spike";
                proj.bot_dodge = TRUE;
                proj.bot_dodgerating = cvar("g_balance_crylink_primary_damage");
+               if(counter == 0) { // first projectile, store in firstproj for now
+                       firstproj = proj;
+               }
+               else if(counter == shots - 1) { // last projectile, link up with first projectile
+                       prevproj.queuenext = proj;
+                       firstproj.queueprev = proj;
+                       proj.queuenext = firstproj;
+                       proj.queueprev = prevproj;
+               }
+               else { // else link up with previous projectile
+                       prevproj.queuenext = proj;
+                       proj.queueprev = prevproj;
+               }
+
+               prevproj = proj;
 
                proj.movetype = MOVETYPE_BOUNCEMISSILE;
                PROJECTILE_MAKETRIGGER(proj);
@@ -107,12 +177,26 @@ void W_Crylink_Attack (void)
                s = s * cvar("g_balance_crylink_primary_spread") * g_weaponspreadfactor;
                W_SetupProjectileVelocityEx(proj, w_shotdir + right * s_y + up * s_z, v_up, cvar("g_balance_crylink_primary_speed"), 0, 0, 0);
                proj.touch = W_Crylink_Touch;
+
+               proj.think = W_Crylink_Fadethink;
                if(counter == 0)
-                       SUB_SetFade(proj, time + cvar("g_balance_crylink_primary_middle_lifetime"), cvar("g_balance_crylink_primary_middle_fadetime"));
+               {
+                       proj.fade_time = time + cvar("g_balance_crylink_primary_middle_lifetime");
+                       self.fade_rate = 1 / cvar("g_balance_crylink_primary_middle_fadetime");
+                       proj.nextthink = time + cvar("g_balance_crylink_primary_middle_lifetime") + cvar("g_balance_crylink_primary_middle_fadetime");
+               }
                else if(counter <= 3)
-                       SUB_SetFade(proj, time + cvar("g_balance_crylink_primary_star_lifetime"), cvar("g_balance_crylink_primary_star_fadetime"));
+               {
+                       proj.fade_time = time + cvar("g_balance_crylink_primary_star_lifetime");
+                       self.fade_rate = 1 / cvar("g_balance_crylink_primary_star_fadetime");
+                       proj.nextthink = time + cvar("g_balance_crylink_primary_star_lifetime") + cvar("g_balance_crylink_primary_star_fadetime");
+               }
                else
-                       SUB_SetFade(proj, time + cvar("g_balance_crylink_primary_other_lifetime"), cvar("g_balance_crylink_primary_other_fadetime"));
+               {
+                       proj.fade_time = time + cvar("g_balance_crylink_primary_other_lifetime");
+                       self.fade_rate = 1 / cvar("g_balance_crylink_primary_other_fadetime");
+                       proj.nextthink = time + cvar("g_balance_crylink_primary_other_lifetime") + cvar("g_balance_crylink_primary_other_fadetime");
+               }
                proj.cnt = cvar("g_balance_crylink_primary_bounces");
                //proj.scale = 1 + 1 * proj.cnt;
 
@@ -131,7 +215,7 @@ void W_Crylink_Attack (void)
 void W_Crylink_Attack2 (void)
 {
        local float counter, shots;
-       local entity proj;
+       local entity proj, prevproj, firstproj;
 
        if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
                self.ammo_cells = self.ammo_cells - cvar("g_balance_crylink_secondary_ammo");
@@ -147,6 +231,21 @@ void W_Crylink_Attack2 (void)
                proj.classname = "spike";
                proj.bot_dodge = TRUE;
                proj.bot_dodgerating = cvar("g_balance_crylink_secondary_damage");
+               if(counter == 0) { // first projectile, store in firstproj for now
+                       firstproj = proj;
+               }
+               else if(counter == shots - 1) { // last projectile, link up with first projectile
+                       prevproj.queuenext = proj;
+                       firstproj.queueprev = proj;
+                       proj.queuenext = firstproj;
+                       proj.queueprev = prevproj;
+               }
+               else { // else link up with previous projectile
+                       prevproj.queuenext = proj;
+                       proj.queueprev = prevproj;
+               }
+
+               prevproj = proj;
 
                proj.movetype = MOVETYPE_BOUNCEMISSILE;
                PROJECTILE_MAKETRIGGER(proj);
@@ -158,10 +257,19 @@ void W_Crylink_Attack2 (void)
 
                W_SetupProjectileVelocityEx(proj, (w_shotdir + (((counter + 0.5) / shots) * 2 - 1) * v_right * cvar("g_balance_crylink_secondary_spread") * g_weaponspreadfactor), v_up, cvar("g_balance_crylink_secondary_speed"), 0, 0, 0);
                proj.touch = W_Crylink_Touch2;
+               proj.think = W_Crylink_Fadethink;
                if(counter == (shots - 1) / 2)
-                       SUB_SetFade(proj, time + cvar("g_balance_crylink_secondary_middle_lifetime"), cvar("g_balance_crylink_secondary_middle_fadetime"));
+               {
+                       proj.fade_time = time + cvar("g_balance_crylink_secondary_middle_lifetime");
+                       self.fade_rate = 1 / cvar("g_balance_crylink_secondary_middle_fadetime");
+                       proj.nextthink = time + cvar("g_balance_crylink_secondary_middle_lifetime") + cvar("g_balance_crylink_secondary_middle_fadetime");
+               }
                else
-                       SUB_SetFade(proj, time + cvar("g_balance_crylink_secondary_line_lifetime"), cvar("g_balance_crylink_secondary_line_fadetime"));
+               {
+                       proj.fade_time = time + cvar("g_balance_crylink_secondary_line_lifetime");
+                       self.fade_rate = 1 / cvar("g_balance_crylink_secondary_line_fadetime");
+                       proj.nextthink = time + cvar("g_balance_crylink_secondary_line_lifetime") + cvar("g_balance_crylink_secondary_line_fadetime");
+               }
                proj.cnt = cvar("g_balance_crylink_secondary_bounces");
                //proj.scale = 1 + 1 * proj.cnt;
 
@@ -250,16 +358,16 @@ float w_crylink(float req)
        }
        else if (req == WR_SUICIDEMESSAGE)
        {
-               w_deathtypestring = "succeeded at self-destructing themself with the Crylink";
+               w_deathtypestring = "%s succeeded at self-destructing themself with the Crylink";
        }
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_BOUNCE)
-                       w_deathtypestring = "could not hide from #'s Crylink"; // unchecked: SPLASH (SECONDARY can't be)
+                       w_deathtypestring = "%s could not hide from %s's Crylink"; // unchecked: SPLASH (SECONDARY can't be)
                else if(w_deathtype & HITTYPE_SPLASH)
-                       w_deathtypestring = "was too close to #'s Crylink"; // unchecked: SECONDARY
+                       w_deathtypestring = "%s was too close to %s's Crylink"; // unchecked: SECONDARY
                else
-                       w_deathtypestring = "took a close look at #'s Crylink"; // unchecked: SECONDARY
+                       w_deathtypestring = "%s took a close look at %s's Crylink"; // unchecked: SECONDARY
        }
        return TRUE;
 }
index 0b35eae662de8cc2848cb04ebe8d9e52a88f428a..a98c5a9153a0214842e84a67edc3bbb1bdf8529c 100644 (file)
@@ -142,7 +142,7 @@ void W_Electro_Attack2()
 {
        local entity proj;
 
-       W_SetupShot_ProjectileSize (self, '0 0 -3', '0 0 -3', FALSE, 2, "weapons/electro_fire2.wav", cvar("g_balance_electro_secondary_damage"));
+       W_SetupShot_ProjectileSize (self, '0 0 -4', '0 0 -4', FALSE, 2, "weapons/electro_fire2.wav", cvar("g_balance_electro_secondary_damage"));
        w_shotdir = v_forward; // no TrueAim for grenades please
 
        pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
@@ -166,7 +166,7 @@ void W_Electro_Attack2()
        proj.movetype = MOVETYPE_BOUNCE;
        W_SETUPPROJECTILEVELOCITY_UP(proj, g_balance_electro_secondary);
        proj.touch = W_Plasma_Touch;
-       setsize(proj, '0 0 -3', '0 0 -3');
+       setsize(proj, '0 0 -4', '0 0 -4');
        proj.takedamage = DAMAGE_YES;
        proj.damageforcescale = cvar("g_balance_electro_secondary_damageforcescale");
        proj.health = cvar("g_balance_electro_secondary_health");
@@ -184,19 +184,117 @@ void W_Electro_Attack2()
        CSQCProjectile(proj, TRUE, PROJECTILE_ELECTRO, FALSE); // no culling, it has sound
 }
 
+.vector hook_start, hook_end;
+float lgbeam_send(entity to, float sf)
+{
+       WriteByte(MSG_ENTITY, ENT_CLIENT_LGBEAM);
+       sf = sf & 0x7F;
+       if(sound_allowed(MSG_BROADCAST, self.owner))
+               sf |= 0x80;
+       WriteByte(MSG_ENTITY, sf);
+       if(sf & 1)
+       {
+               WriteByte(MSG_ENTITY, num_for_edict(self.owner));
+               WriteCoord(MSG_ENTITY, cvar("g_balance_electro_primary_range"));
+       }
+       if(sf & 2)
+       {
+               WriteCoord(MSG_ENTITY, self.hook_start_x);
+               WriteCoord(MSG_ENTITY, self.hook_start_y);
+               WriteCoord(MSG_ENTITY, self.hook_start_z);
+       }
+       if(sf & 4)
+       {
+               WriteCoord(MSG_ENTITY, self.hook_end_x);
+               WriteCoord(MSG_ENTITY, self.hook_end_y);
+               WriteCoord(MSG_ENTITY, self.hook_end_z);
+       }
+       return TRUE;
+}
+.entity lgbeam;
+.float prevlgfire;
+void lgbeam_think()
+{
+       self.owner.prevlgfire = time;
+       if (self.owner.weaponentity.state != WS_INUSE || (self.owner.ammo_cells <= 0 && !(self.owner.items & IT_UNLIMITED_WEAPON_AMMO)) || self != self.owner.lgbeam || self.owner.deadflag != DEAD_NO || !self.owner.BUTTON_ATCK)
+       {
+               remove(self);
+               return;
+       }
+
+       self.nextthink = time;
+
+       makevectors(self.owner.v_angle);
+
+       float dt;
+       dt = frametime;
+       if not(self.owner.items & IT_UNLIMITED_WEAPON_AMMO)
+       {
+               if(cvar("g_balance_electro_primary_ammo"))
+                       dt = min(frametime, self.owner.ammo_cells / cvar("g_balance_electro_primary_ammo"));
+               self.owner.ammo_cells = max(0, self.owner.ammo_cells - cvar("g_balance_electro_primary_ammo") * frametime);
+       }
+
+       W_SetupShot_Range(self.owner, TRUE, 0, "", cvar("g_balance_electro_primary_damage") * dt, cvar("g_balance_electro_primary_range"));
+       WarpZone_traceline_antilag(self.owner, w_shotorg, w_shotend, MOVE_NORMAL, self.owner, ANTILAG_LATENCY(self.owner));
+
+       // apply the damage
+       if(trace_ent)
+       {
+               vector force;
+               force = w_shotdir * cvar("g_balance_electro_primary_force") + '0 0 1' * cvar("g_balance_electro_primary_force_up");
+               Damage (trace_ent, self.owner, self.owner, cvar("g_balance_electro_primary_damage") * dt, WEP_ELECTRO, trace_endpos, force * dt);
+               Damage_RecordDamage(self.owner, WEP_ELECTRO, cvar("g_balance_electro_primary_damage") * dt);
+       }
+       W_Plasma_TriggerCombo(trace_endpos, cvar("g_balance_electro_primary_comboradius"), self.owner);
+
+       // draw effect
+       if(w_shotorg != self.hook_start)
+       {
+               self.SendFlags |= 2;
+               self.hook_start = w_shotorg;
+       }
+       if(w_shotend != self.hook_end)
+       {
+               self.SendFlags |= 4;
+               self.hook_end = w_shotend;
+       }
+}
+
 // experimental lightning gun
 void W_Electro_Attack3 (void)
 {
-       if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-               self.ammo_cells = self.ammo_cells - cvar("g_balance_electro_primary_ammo");
-       W_SetupShot (self, TRUE, 0, "weapons/crylink_fire2.wav", cvar("g_balance_electro_primary_damage"));
-
-       traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * cvar("g_balance_electro_primary_radius"), FALSE, self, ANTILAG_LATENCY(self));
+       // only play fire sound if 0.5 sec has passed since player let go the fire button
+       if(time - self.prevlgfire > 0.5)
+       {
+               sound (self, CHAN_WEAPON, "weapons/lgbeam_fire.wav", VOL_BASE, ATTN_NORM);
+       }
 
-       te_lightning1(self, w_shotorg, trace_endpos);
+       entity beam, oldself;
+
+       self.lgbeam = beam = spawn();
+       beam.solid = SOLID_NOT;
+       beam.think = lgbeam_think;
+       beam.owner = self;
+       beam.movetype = MOVETYPE_NONE;
+       beam.shot_spread = 0;
+       beam.bot_dodge = TRUE;
+       beam.bot_dodgerating = cvar("g_balance_electro_primary_damage");
+       Net_LinkEntity(beam, FALSE, 0, lgbeam_send);
+
+       oldself = self;
+       self = beam;
+       self.think();
+       self = oldself;
+}
 
-       if (trace_fraction < 1)
-               Damage(trace_ent, self, self, cvar("g_balance_electro_primary_damage"), WEP_ELECTRO | HITTYPE_SECONDARY, trace_endpos, cvar("g_balance_electro_primary_force") * w_shotdir);
+void ElectroInit()
+{
+       weapon_action(WEP_ELECTRO, WR_PRECACHE);
+       electro_shotorigin[0] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ELECTRO), FALSE, FALSE, 1);
+       electro_shotorigin[1] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ELECTRO), FALSE, FALSE, 2);
+       electro_shotorigin[2] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ELECTRO), FALSE, FALSE, 3);
+       electro_shotorigin[3] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ELECTRO), FALSE, FALSE, 4);
 }
 
 void spawnfunc_weapon_electro (void)
@@ -220,6 +318,7 @@ void w_electro_checkattack()
 }
 
 .float bot_secondary_electromooth;
+.float BUTTON_ATCK_prev;
 float w_electro(float req)
 {
        if (req == WR_AIM)
@@ -248,15 +347,28 @@ float w_electro(float req)
        else if (req == WR_THINK)
        {
                if (self.BUTTON_ATCK)
-               if (weapon_prepareattack(0, cvar("g_balance_electro_primary_refire")))
                {
-                       if(cvar("g_balance_electro_lightning"))
-                               W_Electro_Attack3();
-                       else
-                               W_Electro_Attack();
-                       weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_electro_primary_animtime"), w_ready);
+                       if (weapon_prepareattack(0, (cvar("g_balance_electro_lightning") ? 0 : cvar("g_balance_electro_primary_refire"))))
+                       {
+                               if(cvar("g_balance_electro_lightning"))
+                               {
+                                       if (self.BUTTON_ATCK_prev == 0)
+                                       {
+                                               W_Electro_Attack3();
+                                       }
+                                       self.BUTTON_ATCK_prev = 1;
+                               }
+                               else
+                               {
+                                       W_Electro_Attack();
+                               }
+                               weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_electro_primary_animtime"), w_ready);
+                       }
+               } else {
+                       self.BUTTON_ATCK_prev = 0;
                }
-               if (self.BUTTON_ATCK2 && !cvar("g_balance_electro_lightning"))
+
+               if (self.BUTTON_ATCK2)
                if (time >= self.electro_secondarytime)
                if (weapon_prepareattack(1, cvar("g_balance_electro_secondary_refire")))
                {
@@ -277,12 +389,19 @@ float w_electro(float req)
                precache_sound ("weapons/electro_impact.wav");
                precache_sound ("weapons/electro_impact_combo.wav");
                if(cvar("g_balance_electro_lightning"))
-                       precache_sound ("weapons/crylink_fire2.wav");
+               {
+                       precache_sound ("weapons/lgbeam_fire.wav");
+               }
        }
        else if (req == WR_SETUP)
                weapon_setup(WEP_ELECTRO);
        else if (req == WR_CHECKAMMO1)
-               return self.ammo_cells >= cvar("g_balance_electro_primary_ammo");
+       {
+               if(cvar("g_balance_electro_lightning"))
+                       return self.ammo_cells >= cvar("g_balance_electro_primary_ammo") * cvar("g_balance_electro_primary_refire");
+               else
+                       return self.ammo_cells >= cvar("g_balance_electro_primary_ammo");
+       }
        else if (req == WR_CHECKAMMO2)
                return self.ammo_cells >= cvar("g_balance_electro_secondary_ammo");
        else if (req == WR_RESETPLAYER)
@@ -330,27 +449,27 @@ float w_electro(float req)
        else if (req == WR_SUICIDEMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = "could not remember where they put plasma";
+                       w_deathtypestring = "%s could not remember where they put plasma";
                else
-                       w_deathtypestring = "played with plasma";
+                       w_deathtypestring = "%s played with plasma";
        }
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
                {
                        if(w_deathtype & HITTYPE_SPLASH) // unchecked: BOUNCE
-                               w_deathtypestring = "just noticed #'s blue ball";
+                               w_deathtypestring = "%s just noticed %s's blue ball";
                        else // unchecked: BOUNCE
-                               w_deathtypestring = "got in touch with #'s blue ball";
+                               w_deathtypestring = "%s got in touch with %s's blue ball";
                }
                else
                {
                        if(w_deathtype & HITTYPE_BOUNCE) // combo
-                               w_deathtypestring = "felt the electrifying air of #'s combo";
+                               w_deathtypestring = "%s felt the electrifying air of %s's combo";
                        else if(w_deathtype & HITTYPE_SPLASH)
-                               w_deathtypestring = "got too close to #'s blue beam";
+                               w_deathtypestring = "%s got too close to %s's blue beam";
                        else
-                               w_deathtypestring = "was blasted by #'s blue beam";
+                               w_deathtypestring = "%s was blasted by %s's blue beam";
                }
        }
        return TRUE;
diff --git a/qcsrc/server/w_electro.qh b/qcsrc/server/w_electro.qh
new file mode 100644 (file)
index 0000000..98c0be1
--- /dev/null
@@ -0,0 +1,2 @@
+void ElectroInit();
+vector electro_shotorigin[4];
index 278099c633877a2e056bc2fcbd9a72d20d773af9..368faecbf3b9c340fb945a673102e20e31ba2f97 100644 (file)
@@ -384,36 +384,32 @@ float w_fireball(float req)
        else if (req == WR_SUICIDEMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = "forgot about some firemine";
+                       w_deathtypestring = "%s forgot about some firemine";
                else
-                       w_deathtypestring = "should have used a smaller gun";
+                       w_deathtypestring = "%s should have used a smaller gun";
        }
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
                {
                        if(w_deathtype & HITTYPE_HEADSHOT)
-                               w_deathtypestring = "tried to catch #'s firemine";
+                               w_deathtypestring = "%s tried to catch %s's firemine";
                        else
-                               w_deathtypestring = "fatefully ignored #'s firemine";
+                               w_deathtypestring = "%s fatefully ignored %s's firemine";
                }
                else
                {
                        if(w_deathtype & HITTYPE_BOUNCE)
                        {
                                if(w_deathtype & HITTYPE_SPLASH) // BFG effect
-                               {
-                                       w_deathtypestring = "could not hide from #'s fireball";
-                               }
+                                       w_deathtypestring = "%s could not hide from %s's fireball";
                                else // laser
-                               {
-                                       w_deathtypestring = "saw the pretty lights of #'s fireball";
-                               }
+                                       w_deathtypestring = "%s saw the pretty lights of %s's fireball";
                        }
                        else if(w_deathtype & HITTYPE_SPLASH)
-                               w_deathtypestring = "got too close to #'s fireball";
+                               w_deathtypestring = "%s got too close to %s's fireball";
                        else
-                               w_deathtypestring = "tasted #'s fireball";
+                               w_deathtypestring = "%s tasted %s's fireball";
                }
        }
        return TRUE;
index a7d9a4935d7202a7a4a2bf18975cdafb4b1c5af1..6848b2a5ad90a8fdd3bef7a70c86f1f22138845e 100644 (file)
@@ -13,6 +13,10 @@ void W_Grenade_Explode (void)
 
        self.event_damage = SUB_Null;
        self.takedamage = DAMAGE_NO;
+
+       if(self.movetype == MOVETYPE_NONE)
+               self.velocity = self.oldvelocity;
+
        RadiusDamage (self, self.owner, cvar("g_balance_grenadelauncher_primary_damage"), cvar("g_balance_grenadelauncher_primary_edgedamage"), cvar("g_balance_grenadelauncher_primary_radius"), world, cvar("g_balance_grenadelauncher_primary_force"), self.projectiledeathtype, other);
 
        remove (self);
@@ -33,47 +37,83 @@ void W_Grenade_Explode2 (void)
        remove (self);
 }
 
+void W_Grenade_Damage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
+{
+       if (self.health <= 0)
+               return;
+       self.health = self.health - damage;
+       if (self.health <= 0)
+       {
+               W_PrepareExplosionByDamage(attacker, self.think);
+       }
+}
+
 void W_Grenade_Touch1 (void)
 {
        PROJECTILE_TOUCH;
-       W_Grenade_Explode ();
+       if(cvar("g_balance_grenadelauncher_primary_sticky") && other.takedamage != DAMAGE_AIM)
+       {
+               spamsound (self, CHAN_PROJECTILE, "weapons/grenade_stick.wav", VOL_BASE, ATTN_NORM);
+
+               // let it stick whereever it is
+               self.oldvelocity = self.velocity;
+               self.velocity = '0 0 0';
+               self.movetype = MOVETYPE_NONE; // also disables gravity
+               self.gravity = 0; // nope, it does NOT! maybe a bug in CSQC code? TODO
+               UpdateCSQCProjectile(self);
+
+               // do not respond to any more touches
+               self.solid = SOLID_NOT;
+
+               self.nextthink = min(self.nextthink, time + cvar("g_balance_grenadelauncher_primary_lifetime2"));
+       }
+       else
+               W_Grenade_Explode ();
 }
 
 void W_Grenade_Touch2 (void)
 {
        PROJECTILE_TOUCH;
-       if (other.takedamage == DAMAGE_AIM)
+       if(cvar("g_balance_grenadelauncher_secondary_sticky") && other.takedamage != DAMAGE_AIM)
        {
-               self.use ();
+               spamsound (self, CHAN_PROJECTILE, "weapons/grenade_stick.wav", VOL_BASE, ATTN_NORM);
+
+               // let it stick whereever it is
+               self.oldvelocity = self.velocity;
+               self.velocity = '0 0 0';
+               self.movetype = MOVETYPE_NONE; // also disables gravity
+               self.gravity = 0; // nope, it does NOT! maybe a bug in CSQC code? TODO
+               UpdateCSQCProjectile(self);
+
+               // do not respond to any more touches
+               self.solid = SOLID_NOT;
+
+               self.nextthink = min(self.nextthink, time + cvar("g_balance_grenadelauncher_secondary_lifetime2"));
        }
        else
        {
-               float r;
-               r = random() * 6;
-               if(r < 1)
-                       spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce1.wav", VOL_BASE, ATTN_NORM);
-               else if(r < 2)
-                       spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce2.wav", VOL_BASE, ATTN_NORM);
-               else if(r < 3)
-                       spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce3.wav", VOL_BASE, ATTN_NORM);
-               else if(r < 4)
-                       spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce4.wav", VOL_BASE, ATTN_NORM);
-               else if(r < 5)
-                       spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce5.wav", VOL_BASE, ATTN_NORM);
+               if (other.takedamage == DAMAGE_AIM)
+               {
+                       self.use ();
+               }
                else
-                       spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce6.wav", VOL_BASE, ATTN_NORM);
-               self.projectiledeathtype |= HITTYPE_BOUNCE;
-       }
-}
-
-void W_Grenade_Damage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
-{
-       if (self.health <= 0)
-               return;
-       self.health = self.health - damage;
-       if (self.health <= 0)
-       {
-               W_PrepareExplosionByDamage(attacker, self.think);
+               {
+                       float r;
+                       r = random() * 6;
+                       if(r < 1)
+                               spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce1.wav", VOL_BASE, ATTN_NORM);
+                       else if(r < 2)
+                               spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce2.wav", VOL_BASE, ATTN_NORM);
+                       else if(r < 3)
+                               spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce3.wav", VOL_BASE, ATTN_NORM);
+                       else if(r < 4)
+                               spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce4.wav", VOL_BASE, ATTN_NORM);
+                       else if(r < 5)
+                               spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce5.wav", VOL_BASE, ATTN_NORM);
+                       else
+                               spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce6.wav", VOL_BASE, ATTN_NORM);
+                       self.projectiledeathtype |= HITTYPE_BOUNCE;
+               }
        }
 }
 
@@ -103,6 +143,10 @@ void W_Grenade_Attack (void)
        gren.think = adaptor_think2use_hittype_splash;
        gren.use = W_Grenade_Explode;
        gren.touch = W_Grenade_Touch1;
+
+       gren.takedamage = DAMAGE_YES;
+       gren.health = cvar("g_balance_grenadelauncher_primary_health");
+       gren.event_damage = W_Grenade_Damage;
        W_SETUPPROJECTILEVELOCITY_UP(gren, g_balance_grenadelauncher_primary);
 
        gren.angles = vectoangles (gren.velocity);
@@ -132,13 +176,14 @@ void W_Grenade_Attack2 (void)
        gren.bouncestop = cvar("g_balance_grenadelauncher_secondary_bouncestop");
        PROJECTILE_MAKETRIGGER(gren);
        gren.projectiledeathtype = WEP_GRENADE_LAUNCHER | HITTYPE_SECONDARY;
-       setsize(gren, '0 0 -3', '0 0 -3');
        setorigin(gren, w_shotorg);
+       setsize(gren, '0 0 -3', '0 0 -3');
 
        gren.nextthink = time + cvar("g_balance_grenadelauncher_secondary_lifetime");
        gren.think = adaptor_think2use_hittype_splash;
        gren.use = W_Grenade_Explode2;
        gren.touch = W_Grenade_Touch2;
+
        gren.takedamage = DAMAGE_YES;
        gren.health = cvar("g_balance_grenadelauncher_secondary_health");
        gren.damageforcescale = cvar("g_balance_grenadelauncher_secondary_damageforcescale");
@@ -148,7 +193,10 @@ void W_Grenade_Attack2 (void)
        gren.angles = vectoangles (gren.velocity);
        gren.flags = FL_PROJECTILE;
 
-       CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE_BOUNCING, TRUE);
+       if(cvar("g_balance_grenadelauncher_secondary_sticky"))
+               CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE, TRUE);
+       else
+               CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE_BOUNCING, TRUE);
 }
 
 void spawnfunc_weapon_grenadelauncher (void)
@@ -209,6 +257,7 @@ float w_glauncher(float req)
                precache_sound ("weapons/grenade_bounce4.wav");
                precache_sound ("weapons/grenade_bounce5.wav");
                precache_sound ("weapons/grenade_bounce6.wav");
+               precache_sound ("weapons/grenade_stick.wav");
                precache_sound ("weapons/grenade_fire.wav");
        }
        else if (req == WR_SETUP)
@@ -238,19 +287,19 @@ float w_glauncher(float req)
        else if (req == WR_SUICIDEMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = "tried out his own grenade";
+                       w_deathtypestring = "%s tried out his own grenade";
                else
-                       w_deathtypestring = "detonated";
+                       w_deathtypestring = "%s detonated";
        }
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_SPLASH)
                        if(w_deathtype & HITTYPE_BOUNCE) // (must be secondary then)
-                               w_deathtypestring = "didn't see #'s grenade";
+                               w_deathtypestring = "%s didn't see %s's grenade";
                        else // unchecked: SECONDARY
-                               w_deathtypestring = "almost dodged #'s grenade";
+                               w_deathtypestring = "%s almost dodged %s's grenade";
                else // unchecked: SECONDARY, BOUNCE
-                       w_deathtypestring = "ate #'s grenade";
+                       w_deathtypestring = "%s ate %s's grenade";
        }
        return TRUE;
 }
index d3723573687c76230d790fc810ed4bfc282877ea..1d9e9e698e211b3ac12812cf4ebdb8a987e48c40 100644 (file)
@@ -179,13 +179,13 @@ float w_hagar(float req)
                precache_sound("weapons/hagexp3.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "played with tiny rockets";
+               w_deathtypestring = "%s played with tiny rockets";
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_BOUNCE) // must be secondary; unchecked: SPLASH
-                       w_deathtypestring = "hoped #'s missiles wouldn't bounce";
+                       w_deathtypestring = "%s hoped %s's missiles wouldn't bounce";
                else // unchecked: SPLASH, SECONDARY
-                       w_deathtypestring = "was pummeled by";
+                       w_deathtypestring = "%s was pummeled by %s";
        }
        return TRUE;
 }
index 88990de62821685de13d1ce24ca0decad035ac23..9abb8a7a0200f76e63a5ecbe6b2ddeb2d19e7652 100644 (file)
@@ -226,9 +226,9 @@ float w_hlac(float req)
                precache_sound("weapons/laserimpact.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "should have used a smaller gun";
+               w_deathtypestring = "%s should have used a smaller gun";
        else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = "was cut down by";
+               w_deathtypestring = "%s was cut down by %s";
        return TRUE;
 }
 #endif
index c8d1369f7b42b11363f032163ec8b95eb306dc81..70fe77814de201e42e9f583d1e7b49c3da89e8a2 100644 (file)
@@ -262,9 +262,9 @@ float w_hook(float req)
                precache_sound("weapons/hookbomb_impact.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
+               w_deathtypestring = "%s did the impossible";
        else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = "has run into #'s gravity bomb";
+               w_deathtypestring = "%s has run into %s's gravity bomb";
        return TRUE;
 }
 #endif
index cdfdaa537c048af9fa45594d5334f35c256eda78..18715a9b4ba51ff79c7f995cd665d5a0bb1e88b5 100644 (file)
@@ -40,10 +40,7 @@ void W_Laser_Attack (float issecondary)
        else
                nodamage = FALSE;
 
-       if (issecondary == 1)
-               a = cvar("g_balance_laser_secondary_shotangle");
-       else
-               a = cvar("g_balance_laser_primary_shotangle");
+       a = cvar("g_balance_laser_primary_shotangle");
        s_forward = v_forward * cos(a * DEG2RAD) + v_up * sin(a * DEG2RAD);
 
        if(nodamage)
@@ -57,28 +54,20 @@ void W_Laser_Attack (float issecondary)
        missile = spawn ();
        missile.owner = self;
        missile.classname = "laserbolt";
-       missile.dmg = (issecondary == 1);
+       missile.dmg = 0;
        if(!nodamage)
        {
                missile.bot_dodge = TRUE;
-               if (issecondary == 1)
-                       missile.bot_dodgerating = cvar("g_balance_laser_secondary_damage");
-               else
-                       missile.bot_dodgerating = cvar("g_balance_laser_primary_damage");
+               missile.bot_dodgerating = cvar("g_balance_laser_primary_damage");
        }
 
        PROJECTILE_MAKETRIGGER(missile);
        missile.projectiledeathtype = WEP_LASER;
-       if(issecondary == 1)
-               missile.projectiledeathtype |= HITTYPE_SECONDARY;
 
        setorigin (missile, w_shotorg);
        setsize(missile, '0 0 0', '0 0 0');
 
-       if (issecondary == 1)
-               W_SETUPPROJECTILEVELOCITY(missile, g_balance_laser_secondary);
-       else
-               W_SETUPPROJECTILEVELOCITY(missile, g_balance_laser_primary);
+       W_SETUPPROJECTILEVELOCITY(missile, g_balance_laser_primary);
        missile.angles = vectoangles (missile.velocity);
        //missile.glow_color = 250; // 244, 250
        //missile.glow_size = 120;
@@ -87,10 +76,7 @@ void W_Laser_Attack (float issecondary)
        missile.flags = FL_PROJECTILE;
 
        missile.think = W_Laser_Think;
-       if (issecondary == 1)
-               missile.nextthink = time + cvar("g_balance_laser_secondary_delay");
-       else
-               missile.nextthink = time + cvar("g_balance_laser_primary_delay");
+       missile.nextthink = time + cvar("g_balance_laser_primary_delay");
        if(time >= missile.nextthink)
        {
                entity oldself;
@@ -101,16 +87,114 @@ void W_Laser_Attack (float issecondary)
        }
 }
 
-void W_Laser_Attack2 (void) // gauntlet
+.vector hook_start, hook_end;
+float gauntletbeam_send(entity to, float sf)
+{
+       WriteByte(MSG_ENTITY, ENT_CLIENT_GAUNTLET);
+       sf = sf & 0x7F;
+       if(sound_allowed(MSG_BROADCAST, self.owner))
+               sf |= 0x80;
+       WriteByte(MSG_ENTITY, sf);
+       if(sf & 1)
+       {
+               WriteByte(MSG_ENTITY, num_for_edict(self.owner));
+       }
+       if(sf & 2)
+       {
+               WriteCoord(MSG_ENTITY, self.hook_start_x);
+               WriteCoord(MSG_ENTITY, self.hook_start_y);
+               WriteCoord(MSG_ENTITY, self.hook_start_z);
+       }
+       if(sf & 4)
+       {
+               WriteCoord(MSG_ENTITY, self.hook_end_x);
+               WriteCoord(MSG_ENTITY, self.hook_end_y);
+               WriteCoord(MSG_ENTITY, self.hook_end_z);
+       }
+       return TRUE;
+}
+.entity gauntletbeam;
+.float prevgauntletfire;
+void gauntletbeam_think()
+{
+       float damage, myforce, myradius;
+       damage = cvar("g_balance_laser_secondary_damage");
+       myforce = cvar("g_balance_laser_secondary_force");
+       myradius = cvar("g_balance_laser_secondary_radius");
+
+       self.owner.prevgauntletfire = time;
+       if (self.owner.weaponentity.state != WS_INUSE || self != self.owner.gauntletbeam || self.owner.deadflag != DEAD_NO || !self.owner.BUTTON_ATCK2)
+       {
+               remove(self);
+               return;
+       }
+
+       self.nextthink = time;
+
+       makevectors(self.owner.v_angle);
+
+       float dt;
+       dt = frametime;
+
+       W_SetupShot_Range(self.owner, TRUE, 0, "", damage * dt, myradius);
+       WarpZone_traceline_antilag(self.owner, w_shotorg, w_shotend, MOVE_NORMAL, self.owner, ANTILAG_LATENCY(self.owner));
+
+       // apply the damage
+       if(trace_ent)
+       {
+               vector force;
+               force = w_shotdir * myforce;
+               Damage (trace_ent, self.owner, self.owner, damage * dt, WEP_LASER | HITTYPE_SECONDARY, trace_endpos, force * dt);
+               Damage_RecordDamage(self.owner, WEP_LASER | HITTYPE_SECONDARY, damage * dt);
+       }
+
+       // draw effect
+       if(w_shotorg != self.hook_start)
+       {
+               self.SendFlags |= 2;
+               self.hook_start = w_shotorg;
+       }
+       if(w_shotend != self.hook_end)
+       {
+               self.SendFlags |= 4;
+               self.hook_end = w_shotend;
+       }
+}
+
+// experimental gauntlet
+void W_Laser_Attack2 ()
 {
-       W_SetupShot (self, TRUE, 0, "weapons/gauntlet_fire.wav", cvar("g_balance_laser_primary_damage"));
+       // only play fire sound if 0.5 sec has passed since player let go the fire button
+       if(time - self.prevgauntletfire > 0.5)
+       {
+               sound (self, CHAN_WEAPON, "weapons/gauntlet_fire.wav", VOL_BASE, ATTN_NORM);
+       }
 
-       WarpZone_traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * cvar("g_balance_laser_primary_radius"), FALSE, self, ANTILAG_LATENCY(self));
+       entity beam, oldself;
 
-       pointparticles(particleeffectnum("laser_gauntlet"), w_shotorg + w_shotdir * cvar("g_balance_laser_primary_radius"), '0 0 0', 1);
+       self.gauntletbeam = beam = spawn();
+       beam.solid = SOLID_NOT;
+       beam.think = gauntletbeam_think;
+       beam.owner = self;
+       beam.movetype = MOVETYPE_NONE;
+       beam.shot_spread = 0;
+       beam.bot_dodge = TRUE;
+       beam.bot_dodgerating = cvar("g_balance_laser_primary_damage");
+       Net_LinkEntity(beam, FALSE, 0, gauntletbeam_send);
 
-       if (trace_fraction < 1)
-               Damage(trace_ent, self, self, cvar("g_balance_laser_primary_damage"), WEP_LASER | HITTYPE_SECONDARY, trace_endpos, cvar("g_balance_laser_primary_force") * w_shotdir);
+       oldself = self;
+       self = beam;
+       self.think();
+       self = oldself;
+}
+
+void LaserInit()
+{
+       weapon_action(WEP_LASER, WR_PRECACHE);
+       gauntlet_shotorigin[0] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_LASER), FALSE, FALSE, 1);
+       gauntlet_shotorigin[1] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_LASER), FALSE, FALSE, 2);
+       gauntlet_shotorigin[2] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_LASER), FALSE, FALSE, 3);
+       gauntlet_shotorigin[3] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_LASER), FALSE, FALSE, 4);
 }
 
 void spawnfunc_weapon_laser (void)
@@ -141,19 +225,16 @@ float w_laser(float req)
                if (self.BUTTON_ATCK)
                if (weapon_prepareattack(0, cvar("g_balance_laser_primary_refire")))
                {
-                       if(cvar("g_balance_laser_gauntlet"))
-                               W_Laser_Attack2();
-                       else
-                               W_Laser_Attack(0);
+                       W_Laser_Attack(1);
                        weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_laser_primary_animtime"), w_ready);
                }
                if (self.BUTTON_ATCK2)
                {
                        if(cvar("g_balance_laser_secondary"))
                        {
-                               if (weapon_prepareattack(0, cvar("g_balance_laser_secondary_refire")))
+                               if (weapon_prepareattack(0, 0))
                                {
-                                       W_Laser_Attack(1);
+                                       W_Laser_Attack2();
                                        weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_laser_secondary_animtime"), w_ready);
                                }
                        }
@@ -197,10 +278,13 @@ float w_laser(float req)
                precache_sound("weapons/laserimpact.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "lasered themself to hell";
+               w_deathtypestring = "%s lasered themself to hell";
        else if (req == WR_KILLMESSAGE)
        {
-               w_deathtypestring = "was lasered to death by"; // unchecked: SPLASH
+               if(w_deathtype & HITTYPE_SECONDARY)
+                       w_deathtypestring = "%s was cut in half by %s's gauntlet"; // unchecked: SPLASH
+               else
+                       w_deathtypestring = "%s was lasered to death by %s"; // unchecked: SPLASH
        }
        return TRUE;
 }
diff --git a/qcsrc/server/w_laser.qh b/qcsrc/server/w_laser.qh
new file mode 100644 (file)
index 0000000..0f2c137
--- /dev/null
@@ -0,0 +1,2 @@
+void LaserInit();
+vector gauntlet_shotorigin[4];
index 65d02dcb2d6422151b971a9b6c47e92cb1aa9e8f..352aa2b25c6edfee928e7b3541eb51f9b9a58ad5 100644 (file)
@@ -255,9 +255,9 @@ float w_minstanex(float req)
                precache_sound("weapons/neximpact.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
+               w_deathtypestring = "%s did the impossible";
        else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = "has been vaporized by";
+               w_deathtypestring = "%s has been vaporized by %s";
        return TRUE;
 }
 #endif
index 4c30f4c675c5f6b1bd45102cd199324c11476708..a6ec07d6a819791392f8716325d6556900668445 100644 (file)
@@ -16,15 +16,37 @@ void SendCSQCNexBeamParticle() {
        WriteCoord(MSG_BROADCAST, v_z);
 }
 
-void W_Nex_Attack (void)
+void W_Nex_Attack (float issecondary)
 {
+       float mydmg, myforce, mymindist, mymaxdist, myhalflife, myforcehalflife, myammo;
+       if(issecondary)
+       {
+               mydmg = cvar("g_balance_nex_secondary_damage");
+               myforce = cvar("g_balance_nex_secondary_force");
+               mymindist = cvar("g_balance_nex_secondary_damagefalloff_mindist");
+               mymaxdist = cvar("g_balance_nex_secondary_damagefalloff_maxdist");
+               myhalflife = cvar("g_balance_nex_secondary_damagefalloff_halflife");
+               myforcehalflife = cvar("g_balance_nex_secondary_damagefalloff_forcehalflife");
+               myammo = cvar("g_balance_nex_secondary_ammo");
+       }
+       else
+       {
+               mydmg = cvar("g_balance_nex_primary_damage");
+               myforce = cvar("g_balance_nex_primary_force");
+               mymindist = cvar("g_balance_nex_primary_damagefalloff_mindist");
+               mymaxdist = cvar("g_balance_nex_primary_damagefalloff_maxdist");
+               myhalflife = cvar("g_balance_nex_primary_damagefalloff_halflife");
+               myforcehalflife = cvar("g_balance_nex_primary_damagefalloff_forcehalflife");
+               myammo = cvar("g_balance_nex_primary_ammo");
+       }
+
        float flying;
        flying = IsFlying(self); // do this BEFORE to make the trace values from FireRailgunBullet last
 
-       W_SetupShot (self, TRUE, 5, "weapons/nexfire.wav", cvar("g_balance_nex_damage"));
+       W_SetupShot (self, TRUE, 5, "weapons/nexfire.wav", mydmg);
 
        yoda = 0;
-       FireRailgunBullet (w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, cvar("g_balance_nex_damage"), cvar("g_balance_nex_force"), cvar("g_balance_nex_damagefalloff_mindist"), cvar("g_balance_nex_damagefalloff_maxdist"), cvar("g_balance_nex_damagefalloff_halflife"), cvar("g_balance_nex_damagefalloff_forcehalflife"), WEP_NEX);
+       FireRailgunBullet (w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, mydmg, myforce, mymindist, mymaxdist, myhalflife, myforcehalflife, WEP_NEX);
 
        if(yoda && flying)
                AnnounceTo(self, "yoda");
@@ -34,10 +56,10 @@ void W_Nex_Attack (void)
        
        // flash and burn the wall
        if (trace_ent.solid == SOLID_BSP && !(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT))
-               Damage_DamageInfo(trace_endpos, cvar("g_balance_nex_damage"), 0, 0, cvar("g_balance_nex_force") * w_shotdir, WEP_NEX, self);
+               Damage_DamageInfo(trace_endpos, mydmg, 0, 0, myforce * w_shotdir, WEP_NEX, self);
 
        if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-               self.ammo_cells = self.ammo_cells - cvar("g_balance_nex_ammo");
+               self.ammo_cells = self.ammo_cells - myammo;
 }
 
 void spawnfunc_weapon_nex (void); // defined in t_items.qc
@@ -45,15 +67,29 @@ void spawnfunc_weapon_nex (void); // defined in t_items.qc
 float w_nex(float req)
 {
        if (req == WR_AIM)
+       {
                self.BUTTON_ATCK = bot_aim(1000000, 0, 1, FALSE);
+               self.BUTTON_ATCK2 = bot_aim(1000000, 0, 1, FALSE);
+       }
        else if (req == WR_THINK)
        {
                if (self.BUTTON_ATCK)
                {
-                       if (weapon_prepareattack(0, cvar("g_balance_nex_refire")))
+                       if (weapon_prepareattack(0, cvar("g_balance_nex_primary_refire")))
+                       {
+                               W_Nex_Attack(0);
+                               weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_nex_primary_animtime"), w_ready);
+                       }
+               }
+               if (self.BUTTON_ATCK2)
+               {
+                       if(cvar("g_balance_nex_secondary"))
                        {
-                               W_Nex_Attack();
-                               weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_nex_animtime"), w_ready);
+                               if (weapon_prepareattack(0, cvar("g_balance_nex_secondary_refire")))
+                               {
+                                       W_Nex_Attack(1);
+                                       weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_nex_secondary_animtime"), w_ready);
+                               }
                        }
                }
        }
@@ -71,9 +107,9 @@ float w_nex(float req)
        else if (req == WR_SETUP)
                weapon_setup(WEP_NEX);
        else if (req == WR_CHECKAMMO1)
-               return self.ammo_cells >= cvar("g_balance_nex_ammo");
+               return self.ammo_cells >= cvar("g_balance_nex_primary_ammo");
        else if (req == WR_CHECKAMMO2)
-               return FALSE;
+               return self.ammo_cells >= cvar("g_balance_nex_secondary_ammo");
        return TRUE;
 };
 #endif
@@ -93,9 +129,9 @@ float w_nex(float req)
                precache_sound("weapons/neximpact.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
+               w_deathtypestring = "%s did the impossible";
        else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = "has been vaporized by";
+               w_deathtypestring = "%s has been vaporized by %s";
        return TRUE;
 }
 #endif
index b78e85574312d4cda870c4fec880701f29324686..010a0f8b36546ccf7ad18a47b3460349b3d61a18 100644 (file)
@@ -288,9 +288,9 @@ float w_porto(float req)
                // nothing to do
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
+               w_deathtypestring = "%s did the impossible";
        else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = "felt # doing the impossible to him";
+               w_deathtypestring = "%s felt %s doing the impossible to him";
        return TRUE;
 }
 #endif
index 35ca569777f4cce38f988bcb93ad9671352fcac6..d4056763a84d1e418075a0bd7ffe6a35318eb798 100644 (file)
@@ -14,7 +14,7 @@ void W_Rocket_Unregister()
        }
 }
 
-void W_Rocket_Explode (void)
+void W_Rocket_Explode ()
 {
        W_Rocket_Unregister();
 
@@ -26,6 +26,7 @@ void W_Rocket_Explode (void)
 
        self.event_damage = SUB_Null;
        self.takedamage = DAMAGE_NO;
+
        RadiusDamage (self, self.owner, cvar("g_balance_rocketlauncher_damage"), cvar("g_balance_rocketlauncher_edgedamage"), cvar("g_balance_rocketlauncher_radius"), world, cvar("g_balance_rocketlauncher_force"), self.projectiledeathtype, other);
 
        if (self.owner.weapon == WEP_ROCKET_LAUNCHER)
@@ -42,6 +43,29 @@ void W_Rocket_Explode (void)
        remove (self);
 }
 
+void W_Rocket_DoRemoteExplode ()
+{
+       W_Rocket_Unregister();
+
+       self.event_damage = SUB_Null;
+       self.takedamage = DAMAGE_NO;
+
+       RadiusDamage (self, self.owner, cvar("g_balance_rocketlauncher_remote_damage"), cvar("g_balance_rocketlauncher_remote_edgedamage"), cvar("g_balance_rocketlauncher_remote_radius"), world, cvar("g_balance_rocketlauncher_remote_force"), self.projectiledeathtype | HITTYPE_BOUNCE, world);
+
+       if (self.owner.weapon == WEP_ROCKET_LAUNCHER)
+       {
+               if(self.owner.ammo_rockets < cvar("g_balance_rocketlauncher_ammo"))
+               {
+                       self.owner.cnt = WEP_ROCKET_LAUNCHER;
+                       ATTACK_FINISHED(self.owner) = time;
+                       self.owner.switchweapon = w_getbestweapon(self.owner);
+               }
+               if(g_laserguided_missile)
+                       ATTACK_FINISHED(self.owner) = time + cvar("g_balance_rocketlauncher_refire") * W_WeaponRateFactor();
+       }
+       remove (self);
+}
+
 entity FindLaserTarget(entity e, float dist_variance, float dot_variance)
 {
        entity head, selected;
@@ -104,12 +128,7 @@ void W_Rocket_RemoteExplode()
                        : (vlen(NearestPointOnBox(self.owner, self.origin) - self.origin) > cvar("g_balance_rocketlauncher_radius")) // safety device
                )
                {
-                       other = world;
-                       self.projectiledeathtype |= HITTYPE_BOUNCE;
-                       W_Rocket_Explode ();
-               }
-               else
-               {
+                       W_Rocket_DoRemoteExplode();
                }
        }
 }
@@ -567,15 +586,15 @@ float w_rlauncher(float req)
                precache_sound("weapons/rocket_impact.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "exploded";
+               w_deathtypestring = "%s exploded";
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation)
-                       w_deathtypestring = "got too close to #'s rocket";
+                       w_deathtypestring = "%s got too close to %s's rocket";
                else if(w_deathtype & HITTYPE_SPLASH)
-                       w_deathtypestring = "almost dodged #'s rocket";
+                       w_deathtypestring = "%s almost dodged %s's rocket";
                else
-                       w_deathtypestring = "ate #'s rocket";
+                       w_deathtypestring = "%s ate %s's rocket";
        }
        return TRUE;
 }
index 3b23c211294895996cfd5ca80567b4f5b1fc271d..c91e4f40869ff7fb11e74a8cd9f514422c31b790 100644 (file)
@@ -468,15 +468,6 @@ float w_seeker(float req)
                return self.ammo_rockets >= cvar("g_balance_seeker_tag_ammo") + cvar("g_balance_seeker_missile_ammo");
        else if (req == WR_CHECKAMMO2)
                return self.ammo_rockets >= cvar("g_balance_seeker_flac_ammo");
-       else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "played with tiny rockets";
-       else if (req == WR_KILLMESSAGE)
-       {
-               if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = "ran into #'s flac";
-               else
-                       w_deathtypestring = "was tagged by";
-       }
        return TRUE;
 };
 #endif
@@ -548,6 +539,15 @@ float w_seeker(float req)
                precache_sound("weapons/tagexp3.wav");
                precache_sound("weapons/tag_impact.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+               w_deathtypestring = "%s played with tiny rockets";
+       else if (req == WR_KILLMESSAGE)
+       {
+               if(w_deathtype & HITTYPE_SECONDARY)
+                       w_deathtypestring = "%s ran into %s's flac";
+               else
+                       w_deathtypestring = "%s was tagged by %s";
+       }
        return TRUE;
 }
 #endif
index c347648dff324c5300e837630fa197b1be17992d..b186230ecf5b5f36b7b506717edf3f1d31a4840a 100644 (file)
@@ -46,59 +46,50 @@ void W_Shotgun_Attack (void)
 
 }
 
-void W_Shotgun_Attack2 (void)
+void shotgun_meleethink (void)
 {
-       float   sc;
-       float   ammoamount;
-       float   bullets;
-       float   d;
-       float   f;
-       float   spread;
-       float   bulletspeed;
-       float   bulletconstant;
-       local entity flash;
-
-       ammoamount = cvar("g_balance_shotgun_secondary_ammo");
-       bullets = cvar("g_balance_shotgun_secondary_bullets");
-       d = cvar("g_balance_shotgun_secondary_damage");
-       f = cvar("g_balance_shotgun_secondary_force");
-       spread = cvar("g_balance_shotgun_secondary_spread");
-       bulletspeed = cvar("g_balance_shotgun_secondary_speed");
-       bulletconstant = cvar("g_balance_shotgun_secondary_bulletconstant");
+       // store time when we started swinging down inside self.cnt
+       if(!self.cnt)
+               self.cnt = time;
 
-       W_SetupShot (self, cvar("g_antilag_bullets") && bulletspeed >= cvar("g_antilag_bullets"), 5, "weapons/shotgun_fire.wav", cvar("g_balance_shotgun_secondary_damage"));
-       for (sc = 0;sc < bullets;sc = sc + 1)
-               fireBallisticBullet(w_shotorg, w_shotdir, spread, bulletspeed, 5, d, 0, f, WEP_SHOTGUN | HITTYPE_SECONDARY, 0, 1, bulletconstant);
-       endFireBallisticBullet();
-       if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-               self.ammo_shells = self.ammo_shells - ammoamount;
+       makevectors(self.owner.v_angle);
+       vector angle;
+       angle = v_forward;
 
-       pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 1000, cvar("g_balance_shotgun_secondary_ammo"));
+       // perform trace
+       float f;
+       f = (self.cnt + cvar("g_balance_shotgun_secondary_melee_time") - time) / cvar("g_balance_shotgun_secondary_melee_time") * 2 - 1;
+       vector targpos;
+       targpos = self.owner.origin + self.owner.view_ofs + angle * cvar("g_balance_shotgun_secondary_melee_range") + v_right * f * cvar("g_balance_shotgun_secondary_melee_swing") + v_up * f * cvar("g_balance_shotgun_secondary_melee_swing");
 
-       // casing code
-       if (cvar("g_casings") >= 1)
-               for (sc = 0;sc < ammoamount;sc = sc + 1)
-                       SpawnCasing (((random () * 50 + 50) * v_right) - (v_forward * (random () * 25 + 25)) - ((random () * 5 - 30) * v_up), 2, vectoangles(v_forward),'0 250 0', 100, 1, self);
+       WarpZone_traceline_antilag(self.owner, self.owner.origin + self.owner.view_ofs, targpos, FALSE, self.owner, ANTILAG_LATENCY(self.owner));
 
-       flash = spawn();
-       setmodel(flash, "models/uziflash.md3"); // precision set below
-       flash.scale = 1.2;
-       flash.think = SUB_Remove;
-       flash.nextthink = time + 0.06;
-       flash.effects = EF_ADDITIVE | EF_FULLBRIGHT | EF_LOWPRECISION;
-       W_AttachToShotorg(flash, '5 0 0');
+       // apply the damage, also remove self
+       if(trace_fraction < 1 && trace_ent.takedamage == DAMAGE_AIM && trace_ent.classname == "player")
+       {
+               vector force;
+               force = angle * cvar("g_balance_shotgun_secondary_force");
+               Damage (trace_ent, self.owner, self.owner, cvar("g_balance_shotgun_secondary_damage") * ((f + 1) / 2), WEP_SHOTGUN | HITTYPE_SECONDARY , self.owner.origin + self.owner.view_ofs, force);
+               Damage_RecordDamage(self.owner, WEP_SHOTGUN | HITTYPE_SECONDARY, cvar("g_balance_shotgun_secondary_damage") * ((f + 1) / 2));
+               remove(self);
+       }
+       else if(time >= self.cnt + cvar("g_balance_shotgun_secondary_melee_time")) // missed, remove ent
+               remove(self);
+       else // continue swinging the weapon in hope of hitting someone :)
+               self.nextthink = time;
 }
 
-// weapon frames
-void shotgun_fire2_03()
+void W_Shotgun_Attack2 (void)
 {
-       W_Shotgun_Attack2();
+       sound (self, CHAN_PROJECTILE, "weapons/shotgun_melee.wav", VOL_BASE, ATTN_NORM);
        weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_shotgun_secondary_animtime"), w_ready);
-}
-void shotgun_fire2_02()
-{
-       W_Shotgun_Attack2();
-       weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_shotgun_secondary_animtime"), shotgun_fire2_03);
+
+       entity meleetemp;
+       meleetemp = spawn();
+       meleetemp.owner = self;
+       meleetemp.think = shotgun_meleethink;
+       meleetemp.nextthink = time + cvar("g_balance_shotgun_secondary_melee_delay");
+       W_SetupShot_Range(self, TRUE, 0, "", cvar("g_balance_shotgun_secondary_damage"), cvar("g_balance_shotgun_secondary_melee_range"));
 }
 
 void spawnfunc_weapon_shotgun(); // defined in t_items.qc
@@ -121,8 +112,8 @@ float w_shotgun(float req)
                if (self.BUTTON_ATCK2 && cvar("g_balance_shotgun_secondary"))
                if (weapon_prepareattack(1, cvar("g_balance_shotgun_secondary_refire")))
                {
-                       W_Shotgun_Attack2();
-                       weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_shotgun_secondary_animtime"), shotgun_fire2_02);
+                       // attempt forcing playback of the anim by switching to another anim (that we never play) here...
+                       weapon_thinkf(WFRAME_FIRE1, 0, W_Shotgun_Attack2);
                }
        }
        else if (req == WR_PRECACHE)
@@ -133,13 +124,16 @@ float w_shotgun(float req)
                precache_model ("models/weapons/h_shotgun.iqm");
                precache_sound ("misc/itempickup.wav");
                precache_sound ("weapons/shotgun_fire.wav");
+               precache_sound ("weapons/shotgun_melee.wav");
        }
        else if (req == WR_SETUP)
                weapon_setup(WEP_SHOTGUN);
        else if (req == WR_CHECKAMMO1)
                return self.ammo_shells >= cvar("g_balance_shotgun_primary_ammo");
        else if (req == WR_CHECKAMMO2)
-               return self.ammo_shells >= cvar("g_balance_shotgun_secondary_ammo") * 3;
+       {
+               return TRUE;
+       }
        return TRUE;
 };
 #endif
@@ -168,10 +162,13 @@ float w_shotgun(float req)
                precache_sound("weapons/ric3.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
+               w_deathtypestring = "%s did the impossible";
        else if (req == WR_KILLMESSAGE)
        {
-               w_deathtypestring = "was gunned by"; // unchecked: SECONDARY
+               if(w_deathtype & HITTYPE_SECONDARY)
+                       w_deathtypestring = "%2$s ^7slapped %1$s ^7around a bit with a large ^2shotgun";
+               else
+                       w_deathtypestring = "%s was gunned by %s";
        }
        return TRUE;
 }
index 243b32b20e2b0bdbb3b787dec2275f6bba515d79..c89735e55930fc81a8f8bc752890c5bd1fa1f73d 100644 (file)
@@ -257,11 +257,11 @@ float w_tuba(float req)
        }
        else if (req == WR_SUICIDEMESSAGE)
        {
-               w_deathtypestring = "hurt his own ears with the @!#%'n Tuba";
+               w_deathtypestring = "%s hurt his own ears with the @!#%%'n Tuba";
        }
        else if (req == WR_KILLMESSAGE)
        {
-               w_deathtypestring = "died of #'s great playing on the @!#%'n Tuba";
+               w_deathtypestring = "%s died of %s's great playing on the @!#%%'n Tuba";
        }
        return TRUE;
 }
index 245ad652f6d8bb33eab902171e4975c7580195af..d9197412b98287e9805d0736220ee97bbfc4cfb4 100644 (file)
@@ -4,17 +4,20 @@ REGISTER_WEAPON(UZI, w_uzi, IT_NAILS, 3, WEP_FLAG_NORMAL | WEP_TYPE_HITSCAN, BOT
 #ifdef SVQC
 // leilei's fancy muzzleflash stuff
 void W_Uzi_Flash_Go() {
-       if (self.frame > 10){
-               SUB_Remove();
+       if (self.alpha >= 0)
+       {
+               setmodel(self, "");
                return;
        }
        self.frame = self.frame + 2;
-       self.alpha = self.alpha - 0.2;
+       self.scale = self.scale * 0.5;
+       self.alpha = self.alpha - 0.25;
        self.think = W_Uzi_Flash_Go;
-       self.nextthink = time + 0.02;
+       self.nextthink = time + 0.05;
 };
 
 .float uzi_bulletcounter;
+.entity muzzleflash;
 void W_Uzi_Attack (float deathtype)
 {
        local entity flash;
@@ -44,16 +47,20 @@ void W_Uzi_Attack (float deathtype)
 
        pointparticles(particleeffectnum("uzi_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
 
+       if ((self.muzzleflash == world) || wasfreed(self.muzzleflash))
+               self.muzzleflash = spawn();
+       
        // muzzle flash for 1st person view
-       flash = spawn();
-       setmodel(flash, "models/uziflash.md3"); // precision set below
+       setmodel(self.muzzleflash, "models/uziflash.md3"); // precision set below
        //SUB_SetFade(flash, time + 0.06, 0);
-       flash.think = W_Uzi_Flash_Go;
-       flash.nextthink = time + 0.02;
-       flash.frame = 2;
-       flash.alpha = 1;
-       flash.effects = EF_ADDITIVE | EF_FULLBRIGHT | EF_LOWPRECISION;
-       W_AttachToShotorg(flash, '5 0 0');
+       self.muzzleflash.scale = 0.75;
+       self.muzzleflash.think = W_Uzi_Flash_Go;
+       self.muzzleflash.nextthink = time + 0.02;
+       self.muzzleflash.frame = 2;
+       self.muzzleflash.alpha = 0.75;
+       self.muzzleflash.angles_z = random() * 180;
+       self.muzzleflash.effects = EF_ADDITIVE | EF_FULLBRIGHT | EF_LOWPRECISION;
+       W_AttachToShotorg(self.muzzleflash, '5 0 0');
 
        // casing code
        if (cvar("g_casings") >= 2)
@@ -152,13 +159,13 @@ float w_uzi(float req)
                precache_sound("weapons/ric3.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
+               w_deathtypestring = "%s did the impossible";
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = "was sniped by";
+                       w_deathtypestring = "%s was sniped by %s";
                else
-                       w_deathtypestring = "was riddled full of holes by";
+                       w_deathtypestring = "%s was riddled full of holes by %s";
        }
        return TRUE;
 }
index e52c0d7ce8e328c03ac41a7e4b7c187a603b1ba9..3c3eaf5a3dacda1350719773fe293690f8f8e1c5 100644 (file)
@@ -102,6 +102,39 @@ void WarpZone_Outside()
        //cvar_set("cl_forwardspeed", ftos(warpzone_fixingview_forwardspeed));
 }
 
+vector WarpZone_FixNearClip(vector o, vector c0, vector c1, vector c2, vector c3)
+{
+       float nearclipdistance;
+       vector mi, ma;
+       entity e;
+       float pd;
+
+       mi_x = min5(o_x, c0_x, c1_x, c2_x, c3_x);
+       ma_x = max5(o_x, c0_x, c1_x, c2_x, c3_x);
+       mi_y = min5(o_y, c0_y, c1_y, c2_y, c3_y);
+       ma_y = max5(o_y, c0_y, c1_y, c2_y, c3_y);
+       mi_z = min5(o_z, c0_z, c1_z, c2_z, c3_z);
+       ma_z = max5(o_z, c0_z, c1_z, c2_z, c3_z);
+
+       e = WarpZone_Find(mi, ma);
+       if(e)
+       {
+               if(WarpZone_PlaneDist(e, o) < 0)
+                       return '0 0 0';
+                       // can't really be, though, but if it is, this is not my warpzone, but a random different one in the same mins/maxs
+               pd = min4(
+                               WarpZone_PlaneDist(e, c0),
+                               WarpZone_PlaneDist(e, c1),
+                               WarpZone_PlaneDist(e, c2),
+                               WarpZone_PlaneDist(e, c3)
+                       );
+               if(pd < 0)
+                       return e.warpzone_forward * -pd;
+       }
+
+       return '0 0 0';
+}
+
 float warpzone_saved;
 vector warpzone_saved_origin;
 vector warpzone_saved_angles;
@@ -112,12 +145,21 @@ var float autocvar_cl_rollkillspeed = 10;
 void WarpZone_FixView()
 {
        float pd, f;
+       vector o;
        entity e;
+       vector corner0, corner1, corner2, corner3, nearclip;
+
        warpzone_saved = 0;
        warpzone_saved_origin = warpzone_fixview_origin;
        warpzone_saved_angles = warpzone_fixview_angles;
        warpzone_saved_cl_viewangles = warpzone_fixview_cl_viewangles;
 
+       nearclip = '0 0 1' * (cvar("r_nearclip") * 1.125);
+       corner0 = cs_unproject('0 0 0' + nearclip);
+       corner1 = cs_unproject('1 0 0' * cvar("vid_conwidth") + nearclip);
+       corner2 = cs_unproject('0 1 0' * cvar("vid_conheight") + nearclip);
+       corner3 = cs_unproject('1 0 0' * cvar("vid_conwidth") + '0 1 0' * cvar("vid_conheight") + nearclip);
+
 #ifndef KEEP_ROLL
        if(warpzone_fixview_angles_z != 0 || warpzone_fixview_cl_viewangles_z != 0)
        {
@@ -139,6 +181,10 @@ void WarpZone_FixView()
        {
                warpzone_saved = 1;
                warpzone_fixview_origin = WarpZone_TransformOrigin(e, warpzone_fixview_origin);
+               corner0 = WarpZone_TransformOrigin(e, corner0);
+               corner1 = WarpZone_TransformOrigin(e, corner1);
+               corner2 = WarpZone_TransformOrigin(e, corner2);
+               corner3 = WarpZone_TransformOrigin(e, corner3);
                warpzone_fixview_angles = WarpZone_TransformVAngles(e, warpzone_fixview_angles);
                warpzone_fixview_cl_viewangles = WarpZone_TransformVAngles(e, warpzone_fixview_cl_viewangles);
                WarpZone_Inside();
@@ -147,16 +193,11 @@ void WarpZone_FixView()
                WarpZone_Outside();
 
        // if we are near any warpzone planes - MOVE AWAY (work around nearclip)
-       float nearclip = 2;
-       e = WarpZone_Find(warpzone_fixview_origin - '1 1 1' * nearclip, warpzone_fixview_origin + '1 1 1' * nearclip);
-       if(e)
+       o = WarpZone_FixNearClip(warpzone_fixview_origin, corner0, corner1, corner2, corner3);
+       if(o != '0 0 0')
        {
-               pd = WarpZone_PlaneDist(e, warpzone_fixview_origin);
-               if(pd >= 0 && pd < nearclip)
-               {
-                       warpzone_saved = 1;
-                       warpzone_fixview_origin = warpzone_fixview_origin + e.warpzone_forward * (nearclip - pd);
-               }
+               warpzone_saved = 1;
+               warpzone_fixview_origin += o;
        }
 
        if(warpzone_saved == 1)
index 5cf155642bd6019d1d4587f0881093a7466171ca..1c3835afa35235a51d9a88e47ef5d7b749038c0a 100644 (file)
@@ -1,3 +1,6 @@
+float trace_dphitcontents;
+.float dphitcontents;
+
 void WarpZone_Accumulator_Clear(entity acc)
 {
        acc.warpzone_transform = '0 0 0';
@@ -165,7 +168,9 @@ void WarpZone_Trace_AddTransform(entity wz)
 
 void WarpZone_TraceBox_ThroughZone(vector org, vector mi, vector ma, vector end, float nomonsters, entity forent, entity zone, WarpZone_trace_callback_t cb)
 {
+       float nomonsters_adjusted;
        float frac, sol, i;
+       float contentshack;
        vector o0, e0;
        entity wz;
        vector vf, vr, vu;
@@ -174,6 +179,20 @@ void WarpZone_TraceBox_ThroughZone(vector org, vector mi, vector ma, vector end,
        vu = v_up;
        o0 = org;
        e0 = end;
+
+       switch(nomonsters)
+       {
+               case MOVE_WORLDONLY:
+               case MOVE_NOTHING:
+                       nomonsters_adjusted = MOVE_NOMONSTERS;
+                       break;
+               default:
+                       nomonsters_adjusted = nomonsters;
+                       break;
+       }
+       if((contentshack = (forent.dphitcontentsmask && !(forent.dphitcontentsmask & DPCONTENTS_SOLID))))
+               forent.dphitcontentsmask |= DPCONTENTS_SOLID;
+
        WarpZone_Trace_InitTransform();
        // if starting in warpzone, first transform
        wz = WarpZone_Find(org + mi, org + ma);
@@ -203,7 +222,7 @@ void WarpZone_TraceBox_ThroughZone(vector org, vector mi, vector ma, vector end,
                        trace_ent = world;
                        break;
                }
-               tracebox(org, mi, ma, end, nomonsters, forent);
+               tracebox(org, mi, ma, end, nomonsters_adjusted, forent);
                if(cb)
                        cb(org, trace_endpos, end);
                if(sol < 0)
@@ -213,7 +232,17 @@ void WarpZone_TraceBox_ThroughZone(vector org, vector mi, vector ma, vector end,
                if(trace_fraction >= 1)
                        break;
                if(trace_ent.classname != "trigger_warpzone")
+               {
+                       if((nomonsters == MOVE_NOTHING) || ((nomonsters == MOVE_WORLDONLY) && trace_ent) || (contentshack && (trace_dphitcontents & forent.dphitcontentsmask) == DPCONTENTS_SOLID))
+                       {
+                               // continue the trace, ignoring this hit (we only care for warpzones)
+                               org = trace_endpos + normalize(end - org);
+                               continue;
+                               // we cannot do an inverted trace here, as we do care for further warpzones inside that "solid" to be found
+                               // otherwise, players could block entrances that way
+                       }
                        break;
+               }
                if(trace_ent == wz)
                {
                        dprint("I transformed into the same zone again, wtf, aborting the trace\n");
@@ -230,6 +259,8 @@ void WarpZone_TraceBox_ThroughZone(vector org, vector mi, vector ma, vector end,
        }
        WarpZone_MakeAllOther();
 :fail
+       if(contentshack)
+               forent.dphitcontentsmask &~= DPCONTENTS_SOLID;
        trace_startsolid = sol;
        v_forward = vf;
        v_right = vr;
@@ -257,6 +288,7 @@ void WarpZone_TraceToss_ThroughZone(entity e, entity forent, entity zone, WarpZo
        vu = v_up;
        o0 = e.origin;
        v0 = e.velocity;
+
        WarpZone_Trace_InitTransform();
        // if starting in warpzone, first transform
        wz = WarpZone_Find(e.origin + e.mins, e.origin + e.maxs);
index c58571eefbf129eca85d0303d473ce0e14ff50a0..1a4c368c3e08098d7fd401df78e615b250c749a5 100644 (file)
@@ -20,6 +20,7 @@ entity WarpZone_Find(vector mi, vector ma);
 void WarpZone_MakeAllSolid();
 void WarpZone_MakeAllOther();
 
+#define MOVE_NOTHING -1
 typedef void(vector start, vector hit, vector end) WarpZone_trace_callback_t; // called on every elementary trace
 const var WarpZone_trace_callback_t WarpZone_trace_callback_t_null;
 entity WarpZone_trace_transform; // transform accumulator during a trace
index 01906932c7d4810b559c758fbb9a349345320967..03802f65d10547e699bf900878269346e311d095 100644 (file)
Binary files a/sound/weapons/gauntlet_fire.ogg and b/sound/weapons/gauntlet_fire.ogg differ
diff --git a/sound/weapons/gauntletbeam_fly.ogg b/sound/weapons/gauntletbeam_fly.ogg
new file mode 100644 (file)
index 0000000..874d246
Binary files /dev/null and b/sound/weapons/gauntletbeam_fly.ogg differ
diff --git a/sound/weapons/lgbeam_fire.ogg b/sound/weapons/lgbeam_fire.ogg
new file mode 100644 (file)
index 0000000..d3cd355
Binary files /dev/null and b/sound/weapons/lgbeam_fire.ogg differ
diff --git a/sound/weapons/lgbeam_fly.ogg b/sound/weapons/lgbeam_fly.ogg
new file mode 100644 (file)
index 0000000..3531310
Binary files /dev/null and b/sound/weapons/lgbeam_fly.ogg differ
diff --git a/sound/weapons/shotgun_melee.ogg b/sound/weapons/shotgun_melee.ogg
new file mode 100644 (file)
index 0000000..0562b55
Binary files /dev/null and b/sound/weapons/shotgun_melee.ogg differ
index 10bd39d94b738433bf00628933b5185f9d2f7975..539c0c1df1df5efba5ed86592053039633f3b84a 100755 (executable)
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-countw=`awk '/^seta? g_/ { print $2; }' balance.cfg       | sort -u | tr -d '\r' | git hash-object --stdin | cut -c 1-32`
+countw=`awk '/^seta? g_/ { print $2; }' balanceXonotic.cfg       | sort -u | tr -d '\r' | git hash-object --stdin | cut -c 1-32`
 for b in balance*.cfg; do
        countb=`awk '/^seta? g_/ { print $2; }' "$b"  | sort -u | tr -d '\r' | git hash-object --stdin | cut -c 1-32`
        if [ "$countw" != "$countb" ]; then
-               echo "Mismatch between balance.cfg and $b. Aborting."
+               echo "Mismatch between balanceXonotic.cfg and $b. Aborting."
                exit 1
        fi
 done
diff --git a/vehicle_raptor.cfg b/vehicle_raptor.cfg
new file mode 100644 (file)
index 0000000..bd2ff7c
--- /dev/null
@@ -0,0 +1,37 @@
+set g_vehicle_raptor_reload             1\r
+\r
+set g_vehicle_raptor_movestyle 1\r
+set g_vehicle_raptor_turnspeed 90\r
+set g_vehicle_raptor_turnroll 0.1\r
+set g_vehicle_raptor_pitchspeed 45\r
+set g_vehicle_raptor_speed_forward 1500\r
+set g_vehicle_raptor_speed_strafe 1500\r
+set g_vehicle_raptor_speed_up 1250\r
+set g_vehicle_raptor_speed_down 1400\r
+\r
+set g_vehicle_raptor_bomblet_waves  2\r
+set g_vehicle_raptor_bomblet_wavefirst  0.5\r
+set g_vehicle_raptor_bomblet_wavenext   0.3\r
+set g_vehicle_raptor_bomblet_wawespread 0.3\r
+set g_vehicle_raptor_bomblets       3\r
+set g_vehicle_raptor_bomblet_damage 90\r
+set g_vehicle_raptor_bomblet_edgedamage 40\r
+set g_vehicle_raptor_bomblet_radius 250\r
+set g_vehicle_raptor_bomblet_force  300\r
+set g_vehicle_raptor_bombs_refire   1\r
+\r
+set g_vehicle_raptor_beam_dps     200\r
+set g_vehicle_raptor_beam_fops    150\r
+set g_vehicle_raptor_beam_aps     100\r
+set g_vehicle_raptor_beam_size    8\r
+set g_vehicle_raptor_beam_leangth 1\r
+set g_vehicle_raptor_beam_refire  2\r
+\r
+set g_vehicle_raptor_shield   250\r
+set g_vehicle_raptor_shield_regen 50\r
+\r
+set g_vehicle_raptor_health   250\r
+set g_vehicle_raptor_health_regen 10\r
+\r
+set g_vehicle_raptor_energy   300\r
+set g_vehicle_raptor_energy_regen 50
\ No newline at end of file