Merge branch 'master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 14 Jul 2010 18:16:22 +0000 (21:16 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 14 Jul 2010 18:16:22 +0000 (21:16 +0300)
196 files changed:
balance.cfg
balance25.cfg
balanceFruit.cfg
balanceSamual.cfg
balanceXPM.cfg
defaultXPM.cfg
defaultXonotic.cfg
effectinfo.txt
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_chat.tga [new file with mode: 0644]
gfx/hud/default/border_healtharmor.tga [new file with mode: 0644]
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/border_inventory.tga [new file with mode: 0644]
gfx/hud/default/border_modicons.tga [new file with mode: 0644]
gfx/hud/default/border_powerups.tga [new file with mode: 0644]
gfx/hud/default/border_radar.tga [new file with mode: 0644]
gfx/hud/default/border_score.tga [new file with mode: 0644]
gfx/hud/default/border_timer.tga [new file with mode: 0644]
gfx/hud/default/border_vote.tga [new file with mode: 0644]
gfx/hud/default/border_weaponicons.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/dock_small.tga [new file with mode: 0644]
gfx/hud/default/flag_blue_captured.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_returned.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_captured.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_returned.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_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_lava.tga [new file with mode: 0644]
gfx/hud/default/notify_outofammo.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.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_0.tga [new file with mode: 0644]
gfx/hud/default/num_0_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_1.tga [new file with mode: 0644]
gfx/hud/default/num_1_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_2.tga [new file with mode: 0644]
gfx/hud/default/num_2_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_3.tga [new file with mode: 0644]
gfx/hud/default/num_3_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_4.tga [new file with mode: 0644]
gfx/hud/default/num_4_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_5.tga [new file with mode: 0644]
gfx/hud/default/num_5_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_6.tga [new file with mode: 0644]
gfx/hud/default/num_6_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_7.tga [new file with mode: 0644]
gfx/hud/default/num_7_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_8.tga [new file with mode: 0644]
gfx/hud/default/num_8_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_9.tga [new file with mode: 0644]
gfx/hud/default/num_9_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_colon.tga [new file with mode: 0644]
gfx/hud/default/num_colon_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_dot.tga [new file with mode: 0644]
gfx/hud/default/num_dot_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_leading.tga [new file with mode: 0644]
gfx/hud/default/num_minus.tga [new file with mode: 0644]
gfx/hud/default/num_minus_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_plus.tga [new file with mode: 0644]
gfx/hud/default/num_plus_stroke.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/rifle_ring_1.tga [new file with mode: 0644]
gfx/hud/default/rifle_ring_2.tga [new file with mode: 0644]
gfx/hud/default/rifle_ring_3.tga [new file with mode: 0644]
gfx/hud/default/rifle_ring_4.tga [new file with mode: 0644]
gfx/hud/default/rifle_ring_5.tga [new file with mode: 0644]
gfx/hud/default/rifle_ring_6.tga [new file with mode: 0644]
gfx/hud/default/rifle_ring_7.tga [new file with mode: 0644]
gfx/hud/default/rifle_ring_8.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_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/old/num_leading.tga [new file with mode: 0644]
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/wickedhud/flag_blue_captured.tga [new file with mode: 0644]
gfx/hud/wickedhud/flag_blue_carrying.tga
gfx/hud/wickedhud/flag_blue_lost.tga
gfx/hud/wickedhud/flag_blue_returned.tga [new file with mode: 0644]
gfx/hud/wickedhud/flag_blue_shielded.tga
gfx/hud/wickedhud/flag_blue_taken.tga
gfx/hud/wickedhud/flag_red_captured.tga [new file with mode: 0644]
gfx/hud/wickedhud/flag_red_carrying.tga
gfx/hud/wickedhud/flag_red_lost.tga
gfx/hud/wickedhud/flag_red_returned.tga [new file with mode: 0644]
gfx/hud/wickedhud/flag_red_shielded.tga
gfx/hud/wickedhud/flag_red_taken.tga
gfx/hud/wickedhud/notify_teamkill.tga
gfx/hud/wickedhud/num_leading.tga [new file with mode: 0644]
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/voteprogress_back.tga
gfx/hud/wickedhud/voteprogress_prog.tga
gfx/hud/wickedhud/voteprogress_voted.tga
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]
hud_wickedhud_default.cfg
hud_wickedhud_minimalistic.cfg [new file with mode: 0644]
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/gibs.qc
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/miscfunctions.qc
qcsrc/client/scoreboard.qc
qcsrc/common/constants.qh
qcsrc/common/items.qh
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/menu/gamecommand.qc
qcsrc/menu/menu.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/g_damage.qc
qcsrc/server/vote.qc
qcsrc/server/w_electro.qc
qcsrc/server/w_grenadelauncher.qc
qcsrc/server/w_laser.qc

index 156b69aed586e61776ebd45bc3dc5ee7035f6e99..e824e271ba095c3aa0063f6de66215e74e805bc0 100644 (file)
@@ -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,11 @@ 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_damage 70
 set g_balance_grenadelauncher_secondary_edgedamage 38
 set g_balance_grenadelauncher_secondary_force 400
index a4369249fad75c47203fb17c752354c91dcf8677..963e94153b725e08bbce9a14664edcb0289e8080 100644 (file)
@@ -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,11 @@ 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_damage 70
 set g_balance_grenadelauncher_secondary_edgedamage 38
 set g_balance_grenadelauncher_secondary_force 400
index 415a45808426df32717ab3684ff11492f19b0cc4..a591ae3883b33da6e9b61ccacdfda9487aab0274 100644 (file)
@@ -139,7 +139,7 @@ set g_balance_fuel_limit 999
 
 // {{{ misc
 set g_balance_selfdamagepercent 0.65
-set g_balance_weaponswitchdelay 0.15
+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"
@@ -149,7 +149,7 @@ 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
+set g_projectiles_newton_style 0
 // possible values:
 // 0: absolute velocity projectiles (like Quake)
 // 1: relative velocity projectiles, "Newtonian" (like Tribes 2)
@@ -206,14 +206,14 @@ set g_balance_grapplehook_health 130
 
 // {{{ weapon properties
 // {{{ laser
-set g_balance_laser_primary_damage 22
+set g_balance_laser_primary_damage 10
 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_force 75
+set g_balance_laser_primary_radius 10
 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_refire 0.066
+set g_balance_laser_primary_animtime 0.066
 set g_balance_laser_primary_lifetime 0
 set g_balance_laser_primary_shotangle 0
 set g_balance_laser_primary_delay 0
@@ -226,7 +226,7 @@ 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_animtime 0
 set g_balance_laser_secondary_lifetime 30
 set g_balance_laser_secondary_shotangle 0
 set g_balance_laser_secondary_delay 0
@@ -237,7 +237,7 @@ 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_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
@@ -254,12 +254,12 @@ 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_damage 14
 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_damage 7
 set g_balance_uzi_sustained_force 20
 set g_balance_uzi_sustained_spread 0.0125
 set g_balance_uzi_sustained_refire 0.1
@@ -269,29 +269,32 @@ 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_sticky 1
+set g_balance_grenadelauncher_primary_damage 100
+set g_balance_grenadelauncher_primary_edgedamage 30
+set g_balance_grenadelauncher_primary_force 300
+set g_balance_grenadelauncher_primary_radius 240
+set g_balance_grenadelauncher_primary_speed 1000
+set g_balance_grenadelauncher_primary_speed_up 0
+set g_balance_grenadelauncher_primary_speed_z 200
 set g_balance_grenadelauncher_primary_spread 0
-set g_balance_grenadelauncher_primary_lifetime 10
+set g_balance_grenadelauncher_primary_lifetime 5
+set g_balance_grenadelauncher_primary_lifetime2 1
 set g_balance_grenadelauncher_primary_refire 0.8
-set g_balance_grenadelauncher_primary_animtime 0.5
+set g_balance_grenadelauncher_primary_animtime 0.2
 set g_balance_grenadelauncher_primary_ammo 2
-set g_balance_grenadelauncher_secondary_damage 65
+set g_balance_grenadelauncher_primary_health 25
+set g_balance_grenadelauncher_secondary_damage 100
 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 600
 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_lifetime 1.5
 set g_balance_grenadelauncher_secondary_refire 0.8
-set g_balance_grenadelauncher_secondary_animtime 0.5
+set g_balance_grenadelauncher_secondary_animtime 0.2
 set g_balance_grenadelauncher_secondary_ammo 2
 set g_balance_grenadelauncher_secondary_health 0
 set g_balance_grenadelauncher_secondary_damageforcescale 0
@@ -299,18 +302,21 @@ 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_lightning 1
+set g_balance_electro_primary_damage 2
 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_force 13
+set g_balance_electro_primary_force_up 100
+set g_balance_electro_primary_radius 850
 set g_balance_electro_primary_comboradius 0
-set g_balance_electro_primary_speed 2000
+set g_balance_electro_primary_speed 0
 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_lifetime 0
+set g_balance_electro_primary_refire 0
+set g_balance_electro_primary_animtime 0
+set g_balance_electro_primary_ammo 0.66
+set g_balance_electro_primary_range 800
+set g_balance_electro_primary_velocityfactor 0.75
 set g_balance_electro_secondary_damage 50
 set g_balance_electro_secondary_spread 0.05
 set g_balance_electro_secondary_edgedamage 0
@@ -345,7 +351,7 @@ 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_animtime 0.2
 set g_balance_crylink_primary_ammo 2
 set g_balance_crylink_primary_bouncedamagefactor 0.5
 
@@ -366,7 +372,7 @@ 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_animtime 0.2
 set g_balance_crylink_secondary_ammo 2
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 
@@ -423,7 +429,7 @@ 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_animtime 0.2
 set g_balance_rocketlauncher_ammo 3
 set g_balance_rocketlauncher_health 0
 set g_balance_rocketlauncher_damageforcescale 0
@@ -505,7 +511,7 @@ 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_tracer 1
 set g_balance_campingrifle_primary_damage 60
 set g_balance_campingrifle_primary_headshotaddeddamage 100
 set g_balance_campingrifle_primary_spread 0
index 21242f16f0364632fbd0eaeb42bf0fba6d854283..2b716463eb9f298caa8105fa83d34fd8877ed09a 100644 (file)
@@ -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,11 @@ 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_damage 60
 set g_balance_grenadelauncher_secondary_edgedamage 38
 set g_balance_grenadelauncher_secondary_force 400
index bb0416a3418daac9523bfc87c806ba0c4054d29c..83bd146b09b345f0192f96dacff7a107a5e75d2f 100644 (file)
@@ -270,6 +270,7 @@ set g_balance_uzi_bulletconstant 115 // 13.1qu
 // }}}
 // {{{ mortar
 set g_balance_grenadelauncher_primary2secondary 1
+set g_balance_grenadelauncher_primary_sticky 0
 set g_balance_grenadelauncher_primary_damage 60
 set g_balance_grenadelauncher_primary_edgedamage 10
 set g_balance_grenadelauncher_primary_force 250
@@ -279,9 +280,11 @@ 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_lifetime2 1
 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_primary_health 25
 set g_balance_grenadelauncher_secondary_damage 65
 set g_balance_grenadelauncher_secondary_edgedamage 10
 set g_balance_grenadelauncher_secondary_force 300
index f480e22215a7ee43a9480584136a1f1f5a6b929b..3141a2409ce510d4a63d3de22a394148ea003a72 100644 (file)
@@ -19,5 +19,26 @@ set g_weaponreplace_fireball 0
 set g_weaponreplace_seeker 0
 set sv_q3acompat_machineshotgunswap 0
 
+// other options
+set sv_fragmessage_information_ping 1
+set sv_fragmessage_information_handicap 2
+set sv_fragmessage_information_stats 1
+set sv_fragmessage_information_typefrag 1
+
+set sv_defaultcharacter 1
+set sv_defaultplayermodel "models/player/nyx.iqm"
+set sv_defaultplayercolors 60 // force some visible color for now
+
+set g_jump_grunt 1
+set g_footsteps 1
+set g_shootfromcenter 1
+set g_fullbrightplayers 1 // until all models are visible with this set to 0
+set g_forced_respawn 1
+set g_mirrordamage 0
+set g_friendlyfire 1
+
+set timelimit_overtimes 1
+set timelimit_override 15 // for now, maybe not in future
+
 exec physicsXPM.cfg
-exec balanceXPM.cfg
+exec balanceFruit.cfg
index 19fe9fef501474f09ddbd1450be10692d2196a65..cc131c9f4faf6d6ce5d0393bc486e4eea3839931 100644 (file)
@@ -1327,14 +1327,36 @@ set _hud_configure 0 "1 = configure the HUD"
 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_xsize 0.01 "snap to X * vid_conwidth"
+seta hud_configure_grid_ysize 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
 
+// user preference cvars (i.e. shouldn't be adjusted by a skin config) 
+seta hud_weaponicons_number 1 "1 = show number of weapon, 2 = show bound key of weapon"
+seta hud_weaponicons_complainbubble_time 1 "time that a new entry stays until it fades out"
+seta hud_weaponicons_complainbubble_fadetime 0.25 "fade out time"
+seta hud_weaponicons_accuracy_yellow 40 "percentage at which the accuracy color is yellow"
+
+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_timer_increment 0 "show elapsed time instead of remaining time"
+
+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_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"
+
 // scoreboard
 seta scoreboard_columns default
 seta scoreboard_border_thickness 1 "scoreboard border thickness"
@@ -1618,8 +1640,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"
index 53926a7a0b203cb37859fb8cc5a92443d0d15ee1..9f98d6af50f9585ea538cbafaac59c6db2dc53f8 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,46 @@ 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 smoke
+color 0x283880 0x283880 // 0x202020 0x404040
+tex 65 65
+size 10 10
+alpha 256 256 1500
+originjitter 1.5 1.5 1.5
+velocityjitter 6 6 6
+sizeincrease -20
+velocitymultiplier 0.01
+
+effect electro_lightning
+count 3
+type spark
+tex 8 15
+color 0xD9FDFF 0xD9FDFF
+size 3 7
+alpha 110 228 2024
+originjitter 1 1 1
+velocityjitter 150 150 150
+velocitymultiplier 0.5
+airfriction 2
+stretchfactor 1.5
+
+effect electro_lightning
+count 5
+type spark
+tex 41 41
+color 0xD9FDFF 0xD9FDFF
+size 3 4
+alpha 110 228 1500
+originjitter 1 1 1
+velocityjitter 350 350 350
+velocitymultiplier 2.5
+airfriction 8
+gravity 1.3
+stretchfactor 0.1
diff --git a/gfx/hud/default/ammo_bullets.tga b/gfx/hud/default/ammo_bullets.tga
new file mode 100644 (file)
index 0000000..e7cd01a
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..664eb23
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..bd07205
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..8450a2f
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..c37f077
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..59bea4b
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..92046b4
Binary files /dev/null and b/gfx/hud/default/armor.tga differ
index 6535f36e89caebe59d19f1adaa587e1beb57dcbe..8ceee44525062106e8dcb827fd3fd664871977d5 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_chat.tga b/gfx/hud/default/border_chat.tga
new file mode 100644 (file)
index 0000000..1cd065e
Binary files /dev/null and b/gfx/hud/default/border_chat.tga differ
diff --git a/gfx/hud/default/border_healtharmor.tga b/gfx/hud/default/border_healtharmor.tga
new file mode 100644 (file)
index 0000000..7109ab5
Binary files /dev/null and b/gfx/hud/default/border_healtharmor.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/border_inventory.tga b/gfx/hud/default/border_inventory.tga
new file mode 100644 (file)
index 0000000..20ae8f6
Binary files /dev/null and b/gfx/hud/default/border_inventory.tga differ
diff --git a/gfx/hud/default/border_modicons.tga b/gfx/hud/default/border_modicons.tga
new file mode 100644 (file)
index 0000000..5437b04
Binary files /dev/null and b/gfx/hud/default/border_modicons.tga differ
diff --git a/gfx/hud/default/border_powerups.tga b/gfx/hud/default/border_powerups.tga
new file mode 100644 (file)
index 0000000..f8fbf44
Binary files /dev/null and b/gfx/hud/default/border_powerups.tga differ
diff --git a/gfx/hud/default/border_radar.tga b/gfx/hud/default/border_radar.tga
new file mode 100644 (file)
index 0000000..a300f52
Binary files /dev/null and b/gfx/hud/default/border_radar.tga differ
diff --git a/gfx/hud/default/border_score.tga b/gfx/hud/default/border_score.tga
new file mode 100644 (file)
index 0000000..a4d8b6c
Binary files /dev/null and b/gfx/hud/default/border_score.tga differ
diff --git a/gfx/hud/default/border_timer.tga b/gfx/hud/default/border_timer.tga
new file mode 100644 (file)
index 0000000..c657136
Binary files /dev/null and b/gfx/hud/default/border_timer.tga differ
diff --git a/gfx/hud/default/border_vote.tga b/gfx/hud/default/border_vote.tga
new file mode 100644 (file)
index 0000000..13b948e
Binary files /dev/null and b/gfx/hud/default/border_vote.tga differ
diff --git a/gfx/hud/default/border_weaponicons.tga b/gfx/hud/default/border_weaponicons.tga
new file mode 100644 (file)
index 0000000..08e8dcd
Binary files /dev/null and b/gfx/hud/default/border_weaponicons.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..9dd4e2f
Binary files /dev/null and b/gfx/hud/default/dock.tga differ
diff --git a/gfx/hud/default/dock_small.tga b/gfx/hud/default/dock_small.tga
new file mode 100644 (file)
index 0000000..5135876
Binary files /dev/null and b/gfx/hud/default/dock_small.tga differ
diff --git a/gfx/hud/default/flag_blue_captured.tga b/gfx/hud/default/flag_blue_captured.tga
new file mode 100644 (file)
index 0000000..7cff17e
Binary files /dev/null and b/gfx/hud/default/flag_blue_captured.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..ace6a5f
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..67d894d
Binary files /dev/null and b/gfx/hud/default/flag_blue_lost.tga differ
diff --git a/gfx/hud/default/flag_blue_returned.tga b/gfx/hud/default/flag_blue_returned.tga
new file mode 100644 (file)
index 0000000..8e8b67f
Binary files /dev/null and b/gfx/hud/default/flag_blue_returned.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..a8993f6
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..6847e7c
Binary files /dev/null and b/gfx/hud/default/flag_blue_taken.tga differ
diff --git a/gfx/hud/default/flag_red_captured.tga b/gfx/hud/default/flag_red_captured.tga
new file mode 100644 (file)
index 0000000..72814ec
Binary files /dev/null and b/gfx/hud/default/flag_red_captured.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..3393083
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..f96e021
Binary files /dev/null and b/gfx/hud/default/flag_red_lost.tga differ
diff --git a/gfx/hud/default/flag_red_returned.tga b/gfx/hud/default/flag_red_returned.tga
new file mode 100644 (file)
index 0000000..deee468
Binary files /dev/null and b/gfx/hud/default/flag_red_returned.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..e7ec491
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..bf71977
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..0ed8a90
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..4de0f33
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..bef0d1c
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..00b2dfe
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..2cdbda8
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..dfe2233
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..7bbea60
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..d02b2db
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..c54bb37
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..60fe71f
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..92bc615
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..308c03b
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..8f04be4
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_camping.tga b/gfx/hud/default/notify_camping.tga
new file mode 100644 (file)
index 0000000..2766dd1
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..d5e8045
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..febd1d0
Binary files /dev/null and b/gfx/hud/default/notify_fall.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..3976e8b
Binary files /dev/null and b/gfx/hud/default/notify_lava.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..82a11dd
Binary files /dev/null and b/gfx/hud/default/notify_outofammo.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..646a1a2
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..048e015
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..c08a6a3
Binary files /dev/null and b/gfx/hud/default/notify_slime.tga differ
diff --git a/gfx/hud/default/notify_teamkill.tga b/gfx/hud/default/notify_teamkill.tga
new file mode 100644 (file)
index 0000000..a40920b
Binary files /dev/null and b/gfx/hud/default/notify_teamkill.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..1e2d280
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..8315f12
Binary files /dev/null and b/gfx/hud/default/notify_water.tga differ
diff --git a/gfx/hud/default/num_0.tga b/gfx/hud/default/num_0.tga
new file mode 100644 (file)
index 0000000..f0ab2f1
Binary files /dev/null and b/gfx/hud/default/num_0.tga differ
diff --git a/gfx/hud/default/num_0_stroke.tga b/gfx/hud/default/num_0_stroke.tga
new file mode 100644 (file)
index 0000000..e9c6e5b
Binary files /dev/null and b/gfx/hud/default/num_0_stroke.tga differ
diff --git a/gfx/hud/default/num_1.tga b/gfx/hud/default/num_1.tga
new file mode 100644 (file)
index 0000000..78f1f45
Binary files /dev/null and b/gfx/hud/default/num_1.tga differ
diff --git a/gfx/hud/default/num_1_stroke.tga b/gfx/hud/default/num_1_stroke.tga
new file mode 100644 (file)
index 0000000..1ff552f
Binary files /dev/null and b/gfx/hud/default/num_1_stroke.tga differ
diff --git a/gfx/hud/default/num_2.tga b/gfx/hud/default/num_2.tga
new file mode 100644 (file)
index 0000000..205dd03
Binary files /dev/null and b/gfx/hud/default/num_2.tga differ
diff --git a/gfx/hud/default/num_2_stroke.tga b/gfx/hud/default/num_2_stroke.tga
new file mode 100644 (file)
index 0000000..08d26df
Binary files /dev/null and b/gfx/hud/default/num_2_stroke.tga differ
diff --git a/gfx/hud/default/num_3.tga b/gfx/hud/default/num_3.tga
new file mode 100644 (file)
index 0000000..335b5da
Binary files /dev/null and b/gfx/hud/default/num_3.tga differ
diff --git a/gfx/hud/default/num_3_stroke.tga b/gfx/hud/default/num_3_stroke.tga
new file mode 100644 (file)
index 0000000..a5fddda
Binary files /dev/null and b/gfx/hud/default/num_3_stroke.tga differ
diff --git a/gfx/hud/default/num_4.tga b/gfx/hud/default/num_4.tga
new file mode 100644 (file)
index 0000000..2b9f46f
Binary files /dev/null and b/gfx/hud/default/num_4.tga differ
diff --git a/gfx/hud/default/num_4_stroke.tga b/gfx/hud/default/num_4_stroke.tga
new file mode 100644 (file)
index 0000000..fe87933
Binary files /dev/null and b/gfx/hud/default/num_4_stroke.tga differ
diff --git a/gfx/hud/default/num_5.tga b/gfx/hud/default/num_5.tga
new file mode 100644 (file)
index 0000000..8bb7043
Binary files /dev/null and b/gfx/hud/default/num_5.tga differ
diff --git a/gfx/hud/default/num_5_stroke.tga b/gfx/hud/default/num_5_stroke.tga
new file mode 100644 (file)
index 0000000..3a6978a
Binary files /dev/null and b/gfx/hud/default/num_5_stroke.tga differ
diff --git a/gfx/hud/default/num_6.tga b/gfx/hud/default/num_6.tga
new file mode 100644 (file)
index 0000000..1db8c0e
Binary files /dev/null and b/gfx/hud/default/num_6.tga differ
diff --git a/gfx/hud/default/num_6_stroke.tga b/gfx/hud/default/num_6_stroke.tga
new file mode 100644 (file)
index 0000000..f64e178
Binary files /dev/null and b/gfx/hud/default/num_6_stroke.tga differ
diff --git a/gfx/hud/default/num_7.tga b/gfx/hud/default/num_7.tga
new file mode 100644 (file)
index 0000000..0099d68
Binary files /dev/null and b/gfx/hud/default/num_7.tga differ
diff --git a/gfx/hud/default/num_7_stroke.tga b/gfx/hud/default/num_7_stroke.tga
new file mode 100644 (file)
index 0000000..252e796
Binary files /dev/null and b/gfx/hud/default/num_7_stroke.tga differ
diff --git a/gfx/hud/default/num_8.tga b/gfx/hud/default/num_8.tga
new file mode 100644 (file)
index 0000000..aa20157
Binary files /dev/null and b/gfx/hud/default/num_8.tga differ
diff --git a/gfx/hud/default/num_8_stroke.tga b/gfx/hud/default/num_8_stroke.tga
new file mode 100644 (file)
index 0000000..e2cd39d
Binary files /dev/null and b/gfx/hud/default/num_8_stroke.tga differ
diff --git a/gfx/hud/default/num_9.tga b/gfx/hud/default/num_9.tga
new file mode 100644 (file)
index 0000000..87b9c21
Binary files /dev/null and b/gfx/hud/default/num_9.tga differ
diff --git a/gfx/hud/default/num_9_stroke.tga b/gfx/hud/default/num_9_stroke.tga
new file mode 100644 (file)
index 0000000..5a8d610
Binary files /dev/null and b/gfx/hud/default/num_9_stroke.tga differ
diff --git a/gfx/hud/default/num_colon.tga b/gfx/hud/default/num_colon.tga
new file mode 100644 (file)
index 0000000..e22c09a
Binary files /dev/null and b/gfx/hud/default/num_colon.tga differ
diff --git a/gfx/hud/default/num_colon_stroke.tga b/gfx/hud/default/num_colon_stroke.tga
new file mode 100644 (file)
index 0000000..68ad28a
Binary files /dev/null and b/gfx/hud/default/num_colon_stroke.tga differ
diff --git a/gfx/hud/default/num_dot.tga b/gfx/hud/default/num_dot.tga
new file mode 100644 (file)
index 0000000..7fbfdd0
Binary files /dev/null and b/gfx/hud/default/num_dot.tga differ
diff --git a/gfx/hud/default/num_dot_stroke.tga b/gfx/hud/default/num_dot_stroke.tga
new file mode 100644 (file)
index 0000000..29ad696
Binary files /dev/null and b/gfx/hud/default/num_dot_stroke.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..f2f59d3
Binary files /dev/null and b/gfx/hud/default/num_leading.tga differ
diff --git a/gfx/hud/default/num_minus.tga b/gfx/hud/default/num_minus.tga
new file mode 100644 (file)
index 0000000..10721f2
Binary files /dev/null and b/gfx/hud/default/num_minus.tga differ
diff --git a/gfx/hud/default/num_minus_stroke.tga b/gfx/hud/default/num_minus_stroke.tga
new file mode 100644 (file)
index 0000000..26455a0
Binary files /dev/null and b/gfx/hud/default/num_minus_stroke.tga differ
diff --git a/gfx/hud/default/num_plus.tga b/gfx/hud/default/num_plus.tga
new file mode 100644 (file)
index 0000000..3cb17b3
Binary files /dev/null and b/gfx/hud/default/num_plus.tga differ
diff --git a/gfx/hud/default/num_plus_stroke.tga b/gfx/hud/default/num_plus_stroke.tga
new file mode 100644 (file)
index 0000000..7df2faa
Binary files /dev/null and b/gfx/hud/default/num_plus_stroke.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..cd1164b
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..c8fa157
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..0af3c59
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..aa8bae1
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..c9647b9
Binary files /dev/null and b/gfx/hud/default/race_newtime.tga differ
diff --git a/gfx/hud/default/rifle_ring_1.tga b/gfx/hud/default/rifle_ring_1.tga
new file mode 100644 (file)
index 0000000..a90927c
Binary files /dev/null and b/gfx/hud/default/rifle_ring_1.tga differ
diff --git a/gfx/hud/default/rifle_ring_2.tga b/gfx/hud/default/rifle_ring_2.tga
new file mode 100644 (file)
index 0000000..6f6ca4c
Binary files /dev/null and b/gfx/hud/default/rifle_ring_2.tga differ
diff --git a/gfx/hud/default/rifle_ring_3.tga b/gfx/hud/default/rifle_ring_3.tga
new file mode 100644 (file)
index 0000000..68f6df7
Binary files /dev/null and b/gfx/hud/default/rifle_ring_3.tga differ
diff --git a/gfx/hud/default/rifle_ring_4.tga b/gfx/hud/default/rifle_ring_4.tga
new file mode 100644 (file)
index 0000000..0a5db15
Binary files /dev/null and b/gfx/hud/default/rifle_ring_4.tga differ
diff --git a/gfx/hud/default/rifle_ring_5.tga b/gfx/hud/default/rifle_ring_5.tga
new file mode 100644 (file)
index 0000000..d5cc95b
Binary files /dev/null and b/gfx/hud/default/rifle_ring_5.tga differ
diff --git a/gfx/hud/default/rifle_ring_6.tga b/gfx/hud/default/rifle_ring_6.tga
new file mode 100644 (file)
index 0000000..4a126e7
Binary files /dev/null and b/gfx/hud/default/rifle_ring_6.tga differ
diff --git a/gfx/hud/default/rifle_ring_7.tga b/gfx/hud/default/rifle_ring_7.tga
new file mode 100644 (file)
index 0000000..846212b
Binary files /dev/null and b/gfx/hud/default/rifle_ring_7.tga differ
diff --git a/gfx/hud/default/rifle_ring_8.tga b/gfx/hud/default/rifle_ring_8.tga
new file mode 100644 (file)
index 0000000..137e24d
Binary files /dev/null and b/gfx/hud/default/rifle_ring_8.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..e271438
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..2348be8
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..574d5d7
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..ffc90a2
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..4a451b1
Binary files /dev/null and b/gfx/hud/default/weapon_accuracy.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..a3c53a3
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..5a8f936
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..f11c173
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..fb6413b
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..e48ad4d
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..73c791b
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..d7ea1fb
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..c09081b
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..69a7b72
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..2ba3853
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..0c7fd40
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..1f016e1
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..26877c2
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..4ed91bc
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..46dd107
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..f5449b3
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..566ee86
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..055841c
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..8b80015
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..c0e75d1
Binary files /dev/null and b/gfx/hud/default/weaponuzi.tga differ
diff --git a/gfx/hud/old/num_leading.tga b/gfx/hud/old/num_leading.tga
new file mode 100644 (file)
index 0000000..0e5233c
Binary files /dev/null and b/gfx/hud/old/num_leading.tga 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/wickedhud/flag_blue_captured.tga b/gfx/hud/wickedhud/flag_blue_captured.tga
new file mode 100644 (file)
index 0000000..7cff17e
Binary files /dev/null and b/gfx/hud/wickedhud/flag_blue_captured.tga differ
index 0700cd5bc77d69776a417c0d171633f77df88b2f..ace6a5f2c3a01c554eda6a1ba10944252499d5c2 100644 (file)
Binary files a/gfx/hud/wickedhud/flag_blue_carrying.tga and b/gfx/hud/wickedhud/flag_blue_carrying.tga differ
index f0bb89d2ee80532e0ec9f4d8664e81c802b6a93d..67d894d82dfce9467ee18d6e90604b224d1eadab 100644 (file)
Binary files a/gfx/hud/wickedhud/flag_blue_lost.tga and b/gfx/hud/wickedhud/flag_blue_lost.tga differ
diff --git a/gfx/hud/wickedhud/flag_blue_returned.tga b/gfx/hud/wickedhud/flag_blue_returned.tga
new file mode 100644 (file)
index 0000000..8e8b67f
Binary files /dev/null and b/gfx/hud/wickedhud/flag_blue_returned.tga differ
index e385437f1c17c57acbef3b583c19f8e5d5db9fde..a8993f6b2cc58a3e92f5ae12ceba9e1a81d970de 100644 (file)
Binary files a/gfx/hud/wickedhud/flag_blue_shielded.tga and b/gfx/hud/wickedhud/flag_blue_shielded.tga differ
index e51e297bab335ccb70f8e29d7f580e8835858285..6847e7cc19ed17384a8112b0d36b9bbfd1d4e3d7 100644 (file)
Binary files a/gfx/hud/wickedhud/flag_blue_taken.tga and b/gfx/hud/wickedhud/flag_blue_taken.tga differ
diff --git a/gfx/hud/wickedhud/flag_red_captured.tga b/gfx/hud/wickedhud/flag_red_captured.tga
new file mode 100644 (file)
index 0000000..72814ec
Binary files /dev/null and b/gfx/hud/wickedhud/flag_red_captured.tga differ
index c28cea877c2d82bbe53e6431fcb512e9d663a6c2..33930833233d10c4649fe955dc7fb7ce6456109d 100644 (file)
Binary files a/gfx/hud/wickedhud/flag_red_carrying.tga and b/gfx/hud/wickedhud/flag_red_carrying.tga differ
index 93d55793e9a87d17d12d3e48202599efc61eb098..f96e02147e738af1d0f051efe1b9b4138d04f00b 100644 (file)
Binary files a/gfx/hud/wickedhud/flag_red_lost.tga and b/gfx/hud/wickedhud/flag_red_lost.tga differ
diff --git a/gfx/hud/wickedhud/flag_red_returned.tga b/gfx/hud/wickedhud/flag_red_returned.tga
new file mode 100644 (file)
index 0000000..deee468
Binary files /dev/null and b/gfx/hud/wickedhud/flag_red_returned.tga differ
index ed9994ac402c568a34afeed31b52f4a0c7e1dbcb..e7ec491fd6bcc7bb49fcf053de2642a179a492c5 100644 (file)
Binary files a/gfx/hud/wickedhud/flag_red_shielded.tga and b/gfx/hud/wickedhud/flag_red_shielded.tga differ
index f999476d232e2d7730b9b04ae092660ab90f2832..bf71977e149ab7de484f221c14fab285c61a411f 100644 (file)
Binary files a/gfx/hud/wickedhud/flag_red_taken.tga and b/gfx/hud/wickedhud/flag_red_taken.tga differ
index 0f28ebb36e1de6a5811c883c61f0d6a4f04b1109..a40920b204ada24a40da0b3ed7ff3445af9147ac 100644 (file)
Binary files a/gfx/hud/wickedhud/notify_teamkill.tga and b/gfx/hud/wickedhud/notify_teamkill.tga differ
diff --git a/gfx/hud/wickedhud/num_leading.tga b/gfx/hud/wickedhud/num_leading.tga
new file mode 100644 (file)
index 0000000..f2f59d3
Binary files /dev/null and b/gfx/hud/wickedhud/num_leading.tga 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
index fc031ce0b2a52f32b65ed1f3eb7923d19ca0b65b..2348be8251e606d6dc600a100816fc3f445c7a08 100644 (file)
Binary files a/gfx/hud/wickedhud/voteprogress_back.tga and b/gfx/hud/wickedhud/voteprogress_back.tga differ
index 9f3f6148701cd8ca6940fab441dd9876ed626625..574d5d70a68b67f2db1106093c35bddbfec42965 100644 (file)
Binary files a/gfx/hud/wickedhud/voteprogress_prog.tga and b/gfx/hud/wickedhud/voteprogress_prog.tga differ
index a21fe6a4b8f98f0ace44203c388f19c8ac442c6b..ffc90a255ca1b3466f94af61e85188f092089850 100644 (file)
Binary files a/gfx/hud/wickedhud/voteprogress_voted.tga and b/gfx/hud/wickedhud/voteprogress_voted.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
index 62d9d11b314cf24fbfb6c90797adb0f620c1edfb..7fc258413a7556e53788d1454e1b03163b5fa619 100644 (file)
@@ -20,11 +20,13 @@ seta hud_progressbar_armor_color "0 0.6 0" "R G B vector of the progress bar bac
 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_panelorder "6 0 1 2 3 4 5 7 8 9 10 11 12 13 14" "contains order in which panels are to be drawn"
+
 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_complainbubble 1 "complain bubble (out of ammo, weapon not available etc)"
+seta hud_weaponicons_complainbubble_padding -10 "padding for the complainbubble"
 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"
@@ -36,6 +38,7 @@ 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_iconalign 0 "0 = align icons to the left, 1 = align icons to the right"
 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"
@@ -47,7 +50,8 @@ 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_baralign 0 "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_powerups_iconalign 0 "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_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"
@@ -59,7 +63,8 @@ seta hud_healtharmor 1 "enable/disable this panel, 2 = combined health/armor dis
 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_baralign 0 "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_healtharmor_iconalign 0 "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_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"
@@ -78,14 +83,10 @@ seta hud_notify_bg_border "" "if set to something else than \"\" = override defa
 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"
@@ -103,10 +104,6 @@ seta hud_radar_bg_alpha "" "if set to something else than \"\" = override defaul
 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"
@@ -178,8 +175,14 @@ seta hud_engineinfo_bg_color_team "" "override panel color with team color in te
 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"
+
+seta hud_infomessages 1 "enable/disable this panel
+seta hud_infomessages_pos "0.020000 0.680000" "position of this base of the panel"
+seta hud_infomessages_size "0.320000 0.090000" "size of this panel"
+seta hud_infomessages_bg "border_modicons" "if set to something else than \"\" = override default background"
+seta hud_infomessages_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_infomessages_bg_color_team "" "override panel color with team color in team based games"
+seta hud_infomessages_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha"
+seta hud_infomessages_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_infomessages_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_infomessages_flip 0 "1 = align the items to the right"
diff --git a/hud_wickedhud_minimalistic.cfg b/hud_wickedhud_minimalistic.cfg
new file mode 100644 (file)
index 0000000..ad2ae87
--- /dev/null
@@ -0,0 +1,173 @@
+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 ""
+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.040000"
+seta hud_weaponicons_size "0.060000 0.630000"
+seta hud_weaponicons_bg "0"
+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 0.810000"
+seta hud_inventory_size "0.090000 0.190000"
+seta hud_inventory_bg "0"
+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 "0"
+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.100000 0.920000"
+seta hud_healtharmor_size "0.560000 0.080000"
+seta hud_healtharmor_bg "0"
+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 1
+
+seta hud_notify 1
+seta hud_notify_pos "0.670000 0.680000"
+seta hud_notify_size "0.330000 0.230000"
+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.940000 0"
+seta hud_timer_size "0.060000 0.030000"
+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 0
+seta hud_radar_pos "0 0"
+seta hud_radar_size "0.190000 0.230000"
+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.830000 0.920000"
+seta hud_score_size "0.170000 0.060000"
+seta hud_score_bg "0"
+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.690000 0"
+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.700000 0.920000"
+seta hud_modicons_size "0.120000 0.080000"
+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 0
+seta hud_pressedkeys_pos "0 0"
+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.100000 0.790000"
+seta hud_chat_size "0.560000 0.120000"
+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 0
+seta hud_engineinfo_pos "0 0"
+seta hud_engineinfo_size "0.130000 0.034667"
+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 ""
+
index 1a6996ce666bebecedf9b82fd052cca27b0856bd..de5aad9d48311eaa69f1f2ea7f330063fd0291c5 100644 (file)
@@ -183,6 +183,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)
@@ -1223,13 +1224,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 +1252,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.
@@ -1321,6 +1334,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..8c642415ddebede591b7cbe57ae4e86c19cb2364 100644 (file)
@@ -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;
@@ -879,7 +879,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
index 83cdc12767f70d2abe9e13fee61c0b4adda3d43f..f12d5bbcfe16061d192352d49073e7c854b359d0 100644 (file)
@@ -5,3 +5,212 @@ 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__menu_alpha;
+
+var float autocvar__hud_configure;
+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 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_bg;
+var vector autocvar_hud_bg_color;
+var float autocvar_hud_bg_color_team;
+var float autocvar_hud_bg_alpha;
+var float autocvar_hud_bg_border;
+var float autocvar_hud_bg_padding;
+var float autocvar_hud_fg_alpha;
+
+var float autocvar_hud_weaponicons;
+var vector autocvar_hud_weaponicons_pos;
+var vector autocvar_hud_weaponicons_size;
+var string autocvar_hud_weaponicons_bg;
+var string autocvar_hud_weaponicons_bg_color;
+var string autocvar_hud_weaponicons_bg_color_team;
+var string autocvar_hud_weaponicons_bg_alpha;
+var string autocvar_hud_weaponicons_bg_border;
+var string autocvar_hud_weaponicons_bg_padding;
+var float autocvar_hud_weaponicons_accuracy_yellow;
+var float autocvar_hud_weaponicons_number;
+var float autocvar_hud_weaponicons_complainbubble;
+var float autocvar_hud_weaponicons_complainbubble_padding;
+var float autocvar_hud_weaponicons_complainbubble_time;
+var float autocvar_hud_weaponicons_complainbubble_fadetime;
+
+var float autocvar_hud_inventory;
+var vector autocvar_hud_inventory_pos;
+var vector autocvar_hud_inventory_size;
+var string autocvar_hud_inventory_bg;
+var string autocvar_hud_inventory_bg_color;
+var string autocvar_hud_inventory_bg_color_team;
+var string autocvar_hud_inventory_bg_alpha;
+var string autocvar_hud_inventory_bg_border;
+var string autocvar_hud_inventory_bg_padding;
+var float autocvar_hud_inventory_onlycurrent;
+var float autocvar_hud_inventory_iconalign;
+
+var float autocvar_hud_powerups;
+var vector autocvar_hud_powerups_pos;
+var vector autocvar_hud_powerups_size;
+var string autocvar_hud_powerups_bg;
+var string autocvar_hud_powerups_bg_color;
+var string autocvar_hud_powerups_bg_color_team;
+var string autocvar_hud_powerups_bg_alpha;
+var string autocvar_hud_powerups_bg_border;
+var string autocvar_hud_powerups_bg_padding;
+var float autocvar_hud_powerups_flip;
+var float autocvar_hud_powerups_iconalign;
+var float autocvar_hud_powerups_baralign;
+
+var float autocvar_hud_healtharmor;
+var vector autocvar_hud_healtharmor_pos;
+var vector autocvar_hud_healtharmor_size;
+var string autocvar_hud_healtharmor_bg;
+var string autocvar_hud_healtharmor_bg_color;
+var string autocvar_hud_healtharmor_bg_color_team;
+var string autocvar_hud_healtharmor_bg_alpha;
+var string autocvar_hud_healtharmor_bg_border;
+var string autocvar_hud_healtharmor_bg_padding;
+var float autocvar_hud_healtharmor_flip;
+var float autocvar_hud_healtharmor_iconalign;
+var float autocvar_hud_healtharmor_baralign;
+
+var float autocvar_hud_notify;
+var vector autocvar_hud_notify_pos;
+var vector autocvar_hud_notify_size;
+var string autocvar_hud_notify_bg;
+var string autocvar_hud_notify_bg_color;
+var string autocvar_hud_notify_bg_color_team;
+var string autocvar_hud_notify_bg_alpha;
+var string autocvar_hud_notify_bg_border;
+var string autocvar_hud_notify_bg_padding;
+var float autocvar_hud_notify_print;
+var float autocvar_hud_notify_time;
+var float autocvar_hud_notify_fadetime;
+var float autocvar_hud_notify_flip;
+
+var float autocvar_hud_timer;
+var vector autocvar_hud_timer_pos;
+var vector autocvar_hud_timer_size;
+var string autocvar_hud_timer_bg;
+var string autocvar_hud_timer_bg_color;
+var string autocvar_hud_timer_bg_color_team;
+var string autocvar_hud_timer_bg_alpha;
+var string autocvar_hud_timer_bg_border;
+var string autocvar_hud_timer_bg_padding;
+var float autocvar_hud_timer_increment;
+
+var float autocvar_hud_radar;
+var vector autocvar_hud_radar_pos;
+var vector autocvar_hud_radar_size;
+var string autocvar_hud_radar_bg;
+var string autocvar_hud_radar_bg_color;
+var string autocvar_hud_radar_bg_color_team;
+var string autocvar_hud_radar_bg_alpha;
+var string autocvar_hud_radar_bg_border;
+var string autocvar_hud_radar_bg_padding;
+
+var float autocvar_hud_score;
+var vector autocvar_hud_score_pos;
+var vector autocvar_hud_score_size;
+var string autocvar_hud_score_bg;
+var string autocvar_hud_score_bg_color;
+var string autocvar_hud_score_bg_color_team;
+var string autocvar_hud_score_bg_alpha;
+var string autocvar_hud_score_bg_border;
+var string autocvar_hud_score_bg_padding;
+
+var float autocvar_hud_racetimer;
+var vector autocvar_hud_racetimer_pos;
+var vector autocvar_hud_racetimer_size;
+var string autocvar_hud_racetimer_bg;
+var string autocvar_hud_racetimer_bg_color;
+var string autocvar_hud_racetimer_bg_color_team;
+var string autocvar_hud_racetimer_bg_alpha;
+var string autocvar_hud_racetimer_bg_border;
+var string autocvar_hud_racetimer_bg_padding;
+
+var float autocvar_hud_vote;
+var vector autocvar_hud_vote_pos;
+var vector autocvar_hud_vote_size;
+var string autocvar_hud_vote_bg;
+var string autocvar_hud_vote_bg_color;
+var string autocvar_hud_vote_bg_color_team;
+var string autocvar_hud_vote_bg_alpha;
+var string autocvar_hud_vote_bg_border;
+var string autocvar_hud_vote_bg_padding;
+var float autocvar_hud_vote_alreadyvoted_alpha;
+
+var float autocvar_hud_modicons;
+var vector autocvar_hud_modicons_pos;
+var vector autocvar_hud_modicons_size;
+var string autocvar_hud_modicons_bg;
+var string autocvar_hud_modicons_bg_color;
+var string autocvar_hud_modicons_bg_color_team;
+var string autocvar_hud_modicons_bg_alpha;
+var string autocvar_hud_modicons_bg_border;
+var string autocvar_hud_modicons_bg_padding;
+
+var float autocvar_hud_pressedkeys;
+var vector autocvar_hud_pressedkeys_pos;
+var vector autocvar_hud_pressedkeys_size;
+var string autocvar_hud_pressedkeys_bg;
+var string autocvar_hud_pressedkeys_bg_color;
+var string autocvar_hud_pressedkeys_bg_color_team;
+var string autocvar_hud_pressedkeys_bg_alpha;
+var string autocvar_hud_pressedkeys_bg_border;
+var string autocvar_hud_pressedkeys_bg_padding;
+
+var float autocvar_hud_chat;
+var vector autocvar_hud_chat_pos;
+var vector autocvar_hud_chat_size;
+var string autocvar_hud_chat_bg;
+var string autocvar_hud_chat_bg_color;
+var string autocvar_hud_chat_bg_color_team;
+var string autocvar_hud_chat_bg_alpha;
+var string autocvar_hud_chat_bg_border;
+var string autocvar_hud_chat_bg_padding;
+
+var float autocvar_hud_engineinfo;
+var vector autocvar_hud_engineinfo_pos;
+var vector autocvar_hud_engineinfo_size;
+var string autocvar_hud_engineinfo_bg;
+var string autocvar_hud_engineinfo_bg_color;
+var string autocvar_hud_engineinfo_bg_color_team;
+var string autocvar_hud_engineinfo_bg_alpha;
+var string autocvar_hud_engineinfo_bg_border;
+var string autocvar_hud_engineinfo_bg_padding;
+
+var float autocvar_hud_infomessages;
+var vector autocvar_hud_infomessages_pos;
+var vector autocvar_hud_infomessages_size;
+var string autocvar_hud_infomessages_bg;
+var string autocvar_hud_infomessages_bg_color;
+var string autocvar_hud_infomessages_bg_color_team;
+var string autocvar_hud_infomessages_bg_alpha;
+var string autocvar_hud_infomessages_bg_border;
+var string autocvar_hud_infomessages_bg_padding;
+var float autocvar_hud_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 1b8b2366e0122f52b1b7d9e814970fff075acba7..18e71d265dcc5bb952750faaccb77838518f792d 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,7 +417,7 @@ 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"));
@@ -598,10 +433,10 @@ void HUD_Panel_ExportCfg(string cfgname)
                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,127 @@ 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");
+
                // 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_name, " ", cvar_string(strcat("hud_", panel_name)), "\n"));
+                       fputs(fh, strcat("seta hud_", panel_name, "_pos \"", cvar_string(strcat("hud_", panel_name, "_pos")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_", panel_name, "_size \"", cvar_string(strcat("hud_", panel_name, "_size")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_", panel_name, "_bg \"", cvar_string(strcat("hud_", panel_name, "_bg")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_", panel_name, "_bg_color \"", cvar_string(strcat("hud_", panel_name, "_bg_color")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_", panel_name, "_bg_color_team \"", cvar_string(strcat("hud_", panel_name, "_bg_color_team")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_", panel_name, "_bg_alpha \"", cvar_string(strcat("hud_", panel_name, "_bg_alpha")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_", panel_name, "_bg_border \"", cvar_string(strcat("hud_", panel_name, "_bg_border")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_", panel_name, "_bg_padding \"", cvar_string(strcat("hud_", 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_WEAPONICONS:
+                                       fputs(fh, strcat("seta hud_", panel_name, "_complainbubble \"", cvar_string(strcat("hud_", panel_name, "_complainbubble")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_", panel_name, "_complainbubble_padding \"", cvar_string(strcat("hud_", panel_name, "_complainbubble_padding")), "\"", "\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_INVENTORY:
+                                       fputs(fh, strcat("seta hud_", panel_name, "_onlycurrent \"", cvar_string(strcat("hud_", panel_name, "_onlycurrent")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_", panel_name, "_iconalign \"", cvar_string(strcat("hud_", 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_name, "_flip \"", cvar_string(strcat("hud_", panel_name, "_flip")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_", panel_name, "_iconalign \"", cvar_string(strcat("hud_", panel_name, "_iconalign")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_", panel_name, "_baralign \"", cvar_string(strcat("hud_", panel_name, "_baralign")), "\"", "\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_name, "_flip \"", cvar_string(strcat("hud_", panel_name, "_flip")), "\n"));
+                                       fputs(fh, strcat("seta hud_", panel_name, "_iconalign \"", cvar_string(strcat("hud_", panel_name, "_iconalign")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_", panel_name, "_baralign \"", cvar_string(strcat("hud_", panel_name, "_baralign")), "\"", "\n"));
+                                       break;
+                               case HUD_PANEL_NOTIFY:
+                                       fputs(fh, strcat("seta hud_", panel_name, "_flip \"", cvar_string(strcat("hud_", panel_name, "_flip")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_", panel_name, "_print \"", cvar_string(strcat("hud_", panel_name, "_print")), "\"", "\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_RADAR:
+                                       fputs(fh, strcat("seta hud_", panel_name, "_foreground_alpha \"", cvar_string(strcat("hud_", panel_name, "_foreground_alpha")), "\"", "\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_VOTE:
+                                       fputs(fh, strcat("seta hud_", panel_name, "_alreadyvoted_alpha \"", cvar_string(strcat("hud_", panel_name, "_alreadyvoted_alpha")), "\"", "\n"));
                                        break;
                        }
                        fputs(fh, "\n");
                }
 
-               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 +580,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 +603,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);
+       mySize = panel_size;
 
-       if(cvar("hud_configure_checkcollisions"))
-               pos = HUD_Panel_CheckMove(id, pos, mySize);
-
-       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_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 +717,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 +726,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 +764,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 +834,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 +863,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_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_name, "_pos"), s);
 }
 
 float mouseClicked;
@@ -1219,9 +881,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 +996,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 +1020,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(hit_con_bind)
-               return false;
-
-       return true; // Suppress ALL other input
+       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 +1223,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_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 +1270,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 +1280,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_WeaponIcons_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)
@@ -1422,13 +1330,17 @@ float weaponorder_cmp(float i, float j, entity pass)
 
 void HUD_WeaponIcons(void)
 {
+       if(!autocvar_hud_weaponicons && !autocvar__hud_configure)
+               return;
+
        float id = HUD_PANEL_WEAPONICONS;
+       HUD_Panel_UpdateCvarsForId(id);
        float alpha, stat_weapons; // "constants"
-       vector pos, mySize, accuracy_color;
+       vector pos, mySize;
        float i, weapid, fade, weapon_stats, weapon_hit, weapon_damage, weapon_cnt; // variables
 
-       pos = HUD_Panel_GetPos(id);
-       mySize = HUD_Panel_GetSize(id);
+       pos = panel_pos;
+       mySize = panel_size;
 
        stat_weapons = getstati(STAT_WEAPONS);
        weapon_cnt = 0;
@@ -1460,13 +1372,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
@@ -1495,6 +1405,14 @@ void HUD_WeaponIcons(void)
 
        columns = ceil(WEP_COUNT/rows);
        float row, column;
+
+       float a;
+       float when;
+       when = autocvar_hud_weaponicons_complainbubble_time;
+       float fadetime;
+       fadetime = autocvar_hud_weaponicons_complainbubble_fadetime;
+
+       vector color;
        for(i = 0; i < weapon_cnt; ++i)
        {
                self = weaponorder[i];
@@ -1507,7 +1425,7 @@ void HUD_WeaponIcons(void)
 
                // 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(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 * panel_fg_alpha, DRAWFLAG_NORMAL);
 
                // draw the weapon accuracy on the HUD
                if(hud_accuracy_hud && !(gametype == GAME_RACE || gametype == GAME_CTS))
@@ -1515,22 +1433,73 @@ void HUD_WeaponIcons(void)
                        if(weapon_damage)
                                weapon_stats = floor(100 * weapon_hit / weapon_damage);
 
-                       accuracy_color = HUD_AccuracyColor(weapon_stats);
+                       // yellow_accuracy = value at which accuracy becomes yellow
+                       if(weapon_stats >= 100) {
+                               color_x = 0;
+                               color_y = 1;
+                       }
+                       else if(weapon_stats > autocvar_hud_weaponicons_accuracy_yellow) {
+                               color_x = 1 - (weapon_stats-autocvar_hud_weaponicons_accuracy_yellow)/(100-autocvar_hud_weaponicons_accuracy_yellow); // red value between 1 -> 0
+                               color_y = 1;
+                       } else {
+                               color_x = 1;
+                               color_y = weapon_stats/autocvar_hud_weaponicons_accuracy_yellow; // green value between 0 -> 1
+                       }
+
                        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(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), color, panel_fg_alpha, DRAWFLAG_NORMAL);
                }
 
                // draw the weapon icon
                if((self.impulse >= 0) && (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(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 * 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);
+                       if(autocvar_hud_weaponicons_number == 1) // weapon number
+                               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', panel_fg_alpha, DRAWFLAG_NORMAL);
+                       else if(autocvar_hud_weaponicons_number == 2) // bind
+                               drawstring(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), getcommandkey(ftos(weapid), strcat("impulse ", ftos(weapid))), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
                }
+
+               // 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(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', panel_fg_alpha * 0.5, DRAWFLAG_NORMAL);
+               }
+
+               // draw the complain message
+               if(time - complain_weapon_time < when + fadetime && self.weapon == complain_weapon && autocvar_hud_weaponicons_complainbubble)
+               {
+                       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 = '1 0 0';
+                       }
+                       else if(complain_weapon_type == 1) {
+                               s = "Don't have";
+                               color = '1 1 0';
+                       }
+                       else {
+                               s = "Unavailable";
+                               color = '1 1 1';
+                       }
+                       drawpic_aspect_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows) + '1 1 0' * autocvar_hud_weaponicons_complainbubble_padding, "weapon_complainbubble", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows) - '2 2 0' * autocvar_hud_weaponicons_complainbubble_padding, color, a * panel_fg_alpha, DRAWFLAG_NORMAL);
+                       drawstring_aspect(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows) + '1 1 0' * autocvar_hud_weaponicons_complainbubble_padding, s, eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows) - '2 2 0' * autocvar_hud_weaponicons_complainbubble_padding, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
                }
 
                ++row;
@@ -1545,6 +1514,7 @@ void HUD_WeaponIcons(void)
 
 // Inventory (#1)
 //
+// TODO: macro
 float GetAmmoStat(float i)
 {
        switch(i)
@@ -1584,104 +1554,189 @@ string GetAmmoPicture(float i)
        }
 }
 
+void DrawAmmoItem(vector myPos, vector mySize, float itemcode, float currently_selected)
+{
+       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_inventory_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;
+       drawstring_aspect(numpos, ftos(a), eX * (2/3) * newSize_x + eY * newSize_y, color, panel_fg_alpha * alpha, DRAWFLAG_NORMAL);
+       drawfont = hud_font;
+       drawpic_aspect_skin(picpos, GetAmmoPicture(itemcode), '1 1 0' * newSize_y, '1 1 1', panel_fg_alpha * alpha, DRAWFLAG_NORMAL);
+}
+
 void HUD_Inventory(void)
 {
+       if(!autocvar_hud_inventory && !autocvar__hud_configure)
+               return;
+
        float id = HUD_PANEL_INVENTORY;
-       float i;
-       float stat_items;
+       HUD_Panel_UpdateCvarsForId(id);
+       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_inventory_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) {
+       if(!autocvar_hud_powerups && !autocvar__hud_configure)
+               return;
+
        float id = HUD_PANEL_POWERUPS;
+       HUD_Panel_UpdateCvarsForId(id);
        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 +1747,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 +1775,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_powerups_flip) {
                leftname = "strength";
                leftcnt = ceil(strength_time);
                leftexact = strength_time;
@@ -1742,177 +1792,161 @@ 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_powerups_baralign == 1 || autocvar_hud_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);
+                       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_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_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_powerups_baralign == 0 || autocvar_hud_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);
+                       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_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_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_powerups_baralign == 1 || autocvar_hud_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);
+                       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_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_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_powerups_baralign == 0 || autocvar_hud_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);
+                       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_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_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_powerups_baralign == 1 || autocvar_hud_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_powerups_iconalign == 1 || autocvar_hud_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);
+                       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_powerups_baralign == 0 || autocvar_hud_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_powerups_iconalign == 0 || autocvar_hud_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;
+                       }
+
+                       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)
 {
+       if(!autocvar_hud_healtharmor && !autocvar__hud_configure)
+               return;
+
        float id = HUD_PANEL_HEALTHARMOR;
+       HUD_Panel_UpdateCvarsForId(id);
        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 +1956,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 +1966,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_healtharmor == 2) // combined health and armor display
        {
                vector v;
                v = healtharmor_maxdamage(health, armor, armorblockpercent);
@@ -1945,53 +1979,54 @@ void HUD_HealthArmor(void)
                float x;
                x = floor(v_x + 1);
 
-               if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+               if(autocvar_hud_healtharmor_baralign == 1 || autocvar_hud_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";
+                       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";
+                       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_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_healtharmor_baralign == 0 || autocvar_hud_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_healtharmor_flip) { // old style layout with armor left/top of health
                        leftname = "armor";
                        leftcnt = armor;
                        if(leftcnt)
@@ -2015,172 +2050,163 @@ 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_healtharmor_baralign == 1 || autocvar_hud_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));
+                               HUD_Panel_GetProgressBarColor(leftname)
+                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+                               DrawNumIcon(autocvar_hud_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_healtharmor_baralign == 0 || autocvar_hud_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));
+                               HUD_Panel_GetProgressBarColor(rightname)
+                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+                               DrawNumIcon(autocvar_hud_healtharmor_iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(leftcnt, 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_healtharmor_baralign == 0 || autocvar_hud_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_healtharmor_baralign == 1 || autocvar_hud_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 {
+                                       barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
+                               } 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;
+                                       barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 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));
+                               HUD_Panel_GetProgressBarColor(leftname)
+                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+                               DrawNumIcon(autocvar_hud_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_healtharmor_baralign == 0 || autocvar_hud_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));
+                               HUD_Panel_GetProgressBarColor(rightname)
+                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+                               DrawNumIcon(autocvar_hud_healtharmor_iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(leftcnt, 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_healtharmor_baralign == 0 || autocvar_hud_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_healtharmor_baralign == 1 || autocvar_hud_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_healtharmor_iconalign == 1 || autocvar_hud_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));
+                               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_healtharmor_baralign == 0 || autocvar_hud_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_healtharmor_iconalign == 0 || autocvar_hud_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);
+                               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_healtharmor_baralign == 0 || autocvar_hud_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,11 +2257,11 @@ 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_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);
@@ -2288,20 +2314,20 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
                        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 +2428,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 +2478,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 +2491,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 +2500,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 +2513,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 +2542,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 +2551,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");
@@ -2557,78 +2583,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 +2670,51 @@ void HUD_Centerprint(string s1, string s2, float type, float msg)
 
 void HUD_Notify (void)
 {
+       if(!autocvar_hud_notify && !autocvar__hud_configure)
+               return;
+
        float id = HUD_PANEL_NOTIFY;
+       HUD_Panel_UpdateCvarsForId(id);
        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_notify_time;
        float fadetime;
-       fadetime = cvar("hud_notify_fadetime");
+       fadetime = autocvar_hud_notify_fadetime;
 
        string s;
+       vector color;
 
        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_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)
                {
@@ -2703,341 +2732,202 @@ void HUD_Notify (void)
                }
 
                // 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";
+                               color = '1 1 1';
                        }
                        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";
+                               color = '1 1 1';
                        }
                        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";
+                               color = '1 1 1';
                        }
                        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";
+                               color = '1 1 1';
                        }
                        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";
+                               color = '1 0 0';
                        }
                        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";
+                               color = '0 0 1';
                        }
                        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_";
+                               color = '1 1 1';
                        }
                        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_";
+                               color = '1 1 1';
                        }
                        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_";
+                               color = '1 1 1';
                        }
                        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_";
+                               color = '1 1 1';
                        }
                        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_";
+                               color = '1 1 1';
                        }
                        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_";
+                               color = '1 1 1';
                        }
                        else if(killnotify_deathtype[j] == INFO_GOTFLAG)
                        {
                                if(killnotify_victims[j] == "^1RED^7 flag")
-                                       s = "red";
+                               {
+                                       s = "flag_red_carrying";
+                                       color = '1 0 0';
+                               }
                                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 = "flag_blue_carrying";
+                                       color = '0 0 1';
+                               }
                        }
                        else if(killnotify_deathtype[j] == INFO_RETURNFLAG)
                        {
                                if(killnotify_victims[j] == "^1RED^7 flag")
-                                       s = "red";
+                               {
+                                       s = "flag_red_taken";
+                                       color = '1 0 0';
+                               }
                                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 = "flag_blue_taken";
+                                       color = '0 0 1';
+                               }
                        }
                        else if(killnotify_deathtype[j] == INFO_LOSTFLAG)
                        {
                                if(killnotify_victims[j] == "^1RED^7 flag")
-                                       s = "red";
+                               {
+                                       s = "flag_red_lost";
+                                       color = '1 0 0';
+                               }
                                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 = "flag_blue_lost";
+                                       color = '0 0 1';
+                               }
+                       }
+                       if(s != "" && a)
+                       {
+                               drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, color, 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
                        {
-                               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 = "weaponelectro";
+                               color = '1 1 1';
                        }
                        else if(WEP_VALID(killnotify_deathtype[j]))
                        {
                                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 = strcat("weapon", self.netname);
+                               color = '1 1 1';
                        }
                        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";
+                               color = '1 0 0';
                        }
                        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";
+                               color = '0 0 1';
                        }
                        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";
+                               color = '1 1 1';
                        }
                        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";
+                               color = '1 1 1';
                        }
                        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);
+      &nb