From: Rudolf Polzer Date: Tue, 30 Nov 2010 14:14:02 +0000 (+0100) Subject: Merge remote branch 'origin/morphed/minelayer' X-Git-Tag: xonotic-v0.1.0preview~86^2~6 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=43e505de8b1da79c86378b8d58c1bfb071fc8cb7;hp=bf9bc8b3de0741ba39c3c7547fc29c12073d2f0c Merge remote branch 'origin/morphed/minelayer' --- diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg index ddcd45a36..932e95bf9 100644 --- a/_hud_descriptions.cfg +++ b/_hud_descriptions.cfg @@ -59,6 +59,10 @@ seta hud_panel_ammo_bg_color_team "" "override panel color with team color in te seta hud_panel_ammo_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" seta hud_panel_ammo_bg_border "" "if set to something else than \"\" = override default size of border around the background" seta hud_panel_ammo_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" +seta hud_panel_ammo_progressbar "" "use progressbar behind ammo icons" +seta hud_panel_ammo_progressbar_xoffset "" "percentage of mySize_x to offset progressbar with" +seta hud_panel_ammo_progressbar_name "" "name of progressbar to use behind ammo icons" +seta hud_panel_ammo_text "" "show text/icons in the ammo panel" seta hud_panel_powerups "" "enable/disable this panel" seta hud_panel_powerups_pos "" "position of this panel" @@ -73,6 +77,9 @@ seta hud_panel_powerups_bg_alpha "" "if set to something else than \"\" = overri seta hud_panel_powerups_bg_border "" "if set to something else than \"\" = override default size of border around the background" seta hud_panel_powerups_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" seta hud_panel_powerups_progressbar "" "enable progressbar in panel" +seta hud_panel_powerups_progressbar_strength "" "progressbar image for strength" +seta hud_panel_powerups_progressbar_shield "" "progressbar image for shield" +seta hud_panel_powerups_text "" "show text/icons in the powerups panel" seta hud_panel_healtharmor "" "enable/disable this panel, 2 = combined health/armor display" seta hud_panel_healtharmor_pos "" "position of this panel" @@ -87,6 +94,9 @@ seta hud_panel_healtharmor_bg_alpha "" "if set to something else than \"\" = ove seta hud_panel_healtharmor_bg_border "" "if set to something else than \"\" = override default size of border around the background" seta hud_panel_healtharmor_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" seta hud_panel_healtharmor_progressbar "" "enable progressbar in panel" +seta hud_panel_healtharmor_progressbar_health "" "progressbar image for health" +seta hud_panel_healtharmor_progressbar_armor "" "progressbar image for armor" +seta hud_panel_healtharmor_text "" "show text/icons in the healtharmor panel" seta hud_panel_notify "" "enable/disable this panel" seta hud_panel_notify_pos "" "position of this base of the panel" diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg index ade867648..baca6f9f3 100644 --- a/balanceLeeStricklin.cfg +++ b/balanceLeeStricklin.cfg @@ -1,13 +1,3 @@ -////2.4.2 weapons (with some tweaks) VS balanceLeeStricklin - -// {{{ weapon replacement -// NOTE: this only replaces weapons on the map -// use g_start_weapon_* to also replace the on-startup weapons! -// example: g_weaponreplace_nex "nex minstanex", then Nexes become MinstaNexes 50% of the times -// set the cvars to "0" to totally disable a weapon -set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun" -// }}} - // {{{ starting gear set g_start_weapon_laser -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" set g_start_weapon_shotgun -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" @@ -63,7 +53,6 @@ set g_balance_nix_ammoincr_fuel 2 // }}} // {{{ pickup items -// Ammo caps copied from balanceFruit set g_pickup_ammo_anyway 0 set g_pickup_weapons_anyway 1 set g_pickup_shells 20 @@ -299,7 +288,7 @@ set g_balance_uzi_sustained_ammo 1 set g_balance_uzi_speed 18000 set g_balance_uzi_bulletconstant 300 // 13.1qu // }}} -// {{{ mortar +// {{{ mortar // TODO set g_balance_grenadelauncher_primary_type 0 set g_balance_grenadelauncher_primary_damage 65 set g_balance_grenadelauncher_primary_edgedamage 35 @@ -340,14 +329,14 @@ set g_balance_grenadelauncher_bouncefactor 0.7 set g_balance_grenadelauncher_bouncestop 0.12 // }}} // {{{ minelayer // TODO -set g_balance_minelayer_damage 35 +set g_balance_minelayer_damage 65 set g_balance_minelayer_edgedamage 30 set g_balance_minelayer_force 250 set g_balance_minelayer_radius 175 set g_balance_minelayer_proximityradius 150 set g_balance_minelayer_speed 750 set g_balance_minelayer_lifetime 60 -set g_balance_minelayer_refire 1.5 +set g_balance_minelayer_refire 1.3 set g_balance_minelayer_animtime 0.4 set g_balance_minelayer_ammo 5 set g_balance_minelayer_health 15 @@ -361,7 +350,7 @@ set g_balance_minelayer_remote_edgedamage 40 set g_balance_minelayer_remote_radius 200 set g_balance_minelayer_remote_force 300 // }}} -// {{{ electro +// {{{ electro // TODO set g_balance_electro_lightning 0 set g_balance_electro_primary_damage 55 set g_balance_electro_primary_edgedamage 5 @@ -386,8 +375,8 @@ set g_balance_electro_secondary_radius 150 set g_balance_electro_secondary_speed 900 set g_balance_electro_secondary_speed_up 200 set g_balance_electro_secondary_speed_z 0 -set g_balance_electro_secondary_lifetime 3 set g_balance_electro_secondary_spread 0.05 +set g_balance_electro_secondary_lifetime 3 set g_balance_electro_secondary_refire 0.2 set g_balance_electro_secondary_refire2 1 set g_balance_electro_secondary_animtime 0.3 @@ -459,11 +448,11 @@ set g_balance_crylink_secondary_line_lifetime 2 // range: 4000 full, fades to 80 set g_balance_crylink_secondary_line_fadetime 2 // }}} // {{{ nex -set g_balance_nex_primary_ammo 13 -set g_balance_nex_primary_animtime 0.3 set g_balance_nex_primary_damage 78 set g_balance_nex_primary_force 600 set g_balance_nex_primary_refire 1.505 +set g_balance_nex_primary_animtime 0.3 +set g_balance_nex_primary_ammo 13 set g_balance_nex_primary_damagefalloff_mindist 9999999 set g_balance_nex_primary_damagefalloff_maxdist 9999999 set g_balance_nex_primary_damagefalloff_halflife 9999999 @@ -525,7 +514,7 @@ set g_balance_hagar_secondary_lifetime_rand 0 set g_balance_hagar_secondary_refire 0.15 set g_balance_hagar_secondary_ammo 2 // }}} -// {{{ rocketlauncher +// {{{ rocketlauncher // TODO set g_balance_rocketlauncher_damage 65 set g_balance_rocketlauncher_edgedamage 25 set g_balance_rocketlauncher_force 360 @@ -711,7 +700,7 @@ set g_balance_seeker_missile_accel 1.05 set g_balance_seeker_missile_ammo 2 set g_balance_seeker_missile_animtime 0.3 set g_balance_seeker_missile_count 8 -set g_balance_seeker_missile_damage 15 +set g_balance_seeker_missile_damage 25 set g_balance_seeker_missile_damageforcescale 4 set g_balance_seeker_missile_decel 0.9 set g_balance_seeker_missile_delay 0.25 diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 275c8a28f..bf1d943da 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -89,13 +89,14 @@ _cl_color 102 _cl_name Player _cl_playermodel models/player/umbra.iqm _cl_playerskin 0 -seta crosshair 3 +seta crosshair 16 seta crosshair_color "0.6 0.8 1" -seta crosshair_alpha 1 -seta crosshair_size 0.35 +seta crosshair_alpha 0.3 +seta crosshair_size 0.5 seta crosshair_dot 1 seta crosshair_dot_alpha 1 -seta crosshair_dot_size 1 +seta crosshair_dot_size 0.6 +seta crosshair_dot_color "1 0 0" "when != 0, use custom color for the crosshair dot" seta crosshair_pickup 0.25 seta crosshair_pickup_speed 4 seta crosshair_per_weapon 0 "when 1, each gun will display a different crosshair" @@ -1348,6 +1349,11 @@ seta hud_panel_weapons_ammo_full_fuel 100 "show 100% of the status bar at this a seta hud_panel_weapons_timeout "3" "panel disappears if you don't switch weapon for this amount of seconds" seta hud_panel_weapons_timeout_effect "1" "disappearance effect: 0) no effect; 1) panel moves out of screen; 2) panel fades out" +seta hud_panel_ammo_maxammo "40" "when you have this much ammo, the ammo status bar is full" + +seta hud_panel_healtharmor_maxhealth "250" "when you have this much health, the health status bar is full" +seta hud_panel_healtharmor_maxarmor "150" "when you have this much armor, the armor status bar is full" + seta hud_panel_notify_time 10 "time that a new entry stays until it fades out" seta hud_panel_notify_fadetime 3 "fade out time" @@ -1699,7 +1705,7 @@ seta cl_showspeed_position 0.7 "Y-axis positioning of the numbers" seta cl_showacceleration 0 "show the XY acceleration of the player" seta cl_showacceleration_z 0 "include the speed on the Z-axis" seta cl_showacceleration_size 40 "height of the bar" -seta cl_showacceleration_scale 5 "X-axis scale of the bar" +seta cl_showacceleration_scale 1 "X-axis scale of the bar" seta cl_showacceleration_alpha 0.5 "alpha of the bar" seta cl_showacceleration_color_custom 0 "0 = dynamic color depending on acceleration, 1 = use custom color" seta cl_showacceleration_color "1 0 0" "color of the bar, needs cl_showacceleration_color_custom to be 1" diff --git a/gfx/hud/luminos_xhair/ammo_bullets.tga b/gfx/hud/luminos_xhair/ammo_bullets.tga new file mode 100644 index 000000000..8e2783ccf Binary files /dev/null and b/gfx/hud/luminos_xhair/ammo_bullets.tga differ diff --git a/gfx/hud/luminos_xhair/ammo_cells.tga b/gfx/hud/luminos_xhair/ammo_cells.tga new file mode 100644 index 000000000..3735acdaa Binary files /dev/null and b/gfx/hud/luminos_xhair/ammo_cells.tga differ diff --git a/gfx/hud/luminos_xhair/ammo_current_bg.tga b/gfx/hud/luminos_xhair/ammo_current_bg.tga new file mode 100644 index 000000000..8b41e0fbc Binary files /dev/null and b/gfx/hud/luminos_xhair/ammo_current_bg.tga differ diff --git a/gfx/hud/luminos_xhair/ammo_rockets.tga b/gfx/hud/luminos_xhair/ammo_rockets.tga new file mode 100644 index 000000000..de61d5a74 Binary files /dev/null and b/gfx/hud/luminos_xhair/ammo_rockets.tga differ diff --git a/gfx/hud/luminos_xhair/ammo_shells.tga b/gfx/hud/luminos_xhair/ammo_shells.tga new file mode 100644 index 000000000..fd70b4368 Binary files /dev/null and b/gfx/hud/luminos_xhair/ammo_shells.tga differ diff --git a/gfx/hud/luminos_xhair/border_healtharmor.tga b/gfx/hud/luminos_xhair/border_healtharmor.tga new file mode 100644 index 000000000..ab30e14a1 Binary files /dev/null and b/gfx/hud/luminos_xhair/border_healtharmor.tga differ diff --git a/gfx/hud/luminos_xhair/progressbar_ammo.tga b/gfx/hud/luminos_xhair/progressbar_ammo.tga new file mode 100644 index 000000000..9db210f73 Binary files /dev/null and b/gfx/hud/luminos_xhair/progressbar_ammo.tga differ diff --git a/gfx/hud/luminos_xhair/progressbar_armor_vertical.tga b/gfx/hud/luminos_xhair/progressbar_armor_vertical.tga new file mode 100644 index 000000000..0eb29726c Binary files /dev/null and b/gfx/hud/luminos_xhair/progressbar_armor_vertical.tga differ diff --git a/gfx/hud/luminos_xhair/progressbar_health_vertical.tga b/gfx/hud/luminos_xhair/progressbar_health_vertical.tga new file mode 100644 index 000000000..1bfe49b1b Binary files /dev/null and b/gfx/hud/luminos_xhair/progressbar_health_vertical.tga differ diff --git a/hud_luminos.cfg b/hud_luminos.cfg index 0ded41942..8a946578f 100644 --- a/hud_luminos.cfg +++ b/hud_luminos.cfg @@ -57,6 +57,10 @@ seta hud_panel_ammo_bg_border "" seta hud_panel_ammo_bg_padding "" seta hud_panel_ammo_onlycurrent "0" seta hud_panel_ammo_iconalign "0" +seta hud_panel_ammo_progressbar "0" +seta hud_panel_ammo_progressbar_xoffset "0" +seta hud_panel_ammo_progressbar_name "progressbar" +seta hud_panel_ammo_text "1" seta hud_panel_powerups 1 seta hud_panel_powerups_pos "0.660000 0.940000" @@ -71,6 +75,9 @@ seta hud_panel_powerups_flip "1" seta hud_panel_powerups_iconalign "4" seta hud_panel_powerups_baralign "4" seta hud_panel_powerups_progressbar "1" +seta hud_panel_powerups_progressbar_strength "progressbar" +seta hud_panel_powerups_progressbar_shield "progressbar" +seta hud_panel_powerups_text "1" seta hud_panel_healtharmor 1 seta hud_panel_healtharmor_pos "0.330000 0.920000" @@ -85,6 +92,9 @@ seta hud_panel_healtharmor_flip "0" seta hud_panel_healtharmor_iconalign "4" seta hud_panel_healtharmor_baralign "4" seta hud_panel_healtharmor_progressbar "1" +seta hud_panel_healtharmor_progressbar_health "progressbar" +seta hud_panel_healtharmor_progressbar_armor "progressbar" +seta hud_panel_healtharmor_text "1" seta hud_panel_notify 1 seta hud_panel_notify_pos "0.660000 0.730000" diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg new file mode 100644 index 000000000..8ee4ea778 --- /dev/null +++ b/hud_luminos_minimal.cfg @@ -0,0 +1,215 @@ +seta hud_skin "luminos" +seta hud_panel_bg "0" +seta hud_panel_bg_color "1 0.4375 0" +seta hud_panel_bg_color_team "0" +seta hud_panel_bg_alpha "1" +seta hud_panel_bg_border "8" +seta hud_panel_bg_padding "2" +seta hud_panel_fg_alpha "1" + +seta hud_dock "0" +seta hud_dock_color "0 0.449576 0.860796" +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_panelorder "10 3 0 14 6 9 13 4 1 2 11 12 7 5 8 " + +seta hud_configure_grid "1" +seta hud_configure_grid_xsize "0.010000" +seta hud_configure_grid_ysize "0.010000" + +seta scr_centerpos "0.25" + +seta hud_panel_weapons 1 +seta hud_panel_weapons_pos "0.350000 0.940000" +seta hud_panel_weapons_size "0.300000 0.060000" +seta hud_panel_weapons_bg "" +seta hud_panel_weapons_bg_color "" +seta hud_panel_weapons_bg_color_team "" +seta hud_panel_weapons_bg_alpha "" +seta hud_panel_weapons_bg_border "" +seta hud_panel_weapons_bg_padding "" +seta hud_panel_weapons_complainbubble "1" +seta hud_panel_weapons_complainbubble_padding "-10" +seta hud_panel_weapons_complainbubble_color_outofammo "0.8 0 0" +seta hud_panel_weapons_complainbubble_color_donthave "0.8 0.5 0" +seta hud_panel_weapons_complainbubble_color_unavailable "0 0.3 0.8" +seta hud_panel_weapons_ammo_color "0 1 0" +seta hud_panel_weapons_ammo_alpha "1" +seta hud_panel_weapons_aspect "2" + +seta hud_panel_ammo 1 +seta hud_panel_ammo_pos "0.650000 0.890000" +seta hud_panel_ammo_size "0.055000 0.110000" +seta hud_panel_ammo_bg "" +seta hud_panel_ammo_bg_color "" +seta hud_panel_ammo_bg_color_team "" +seta hud_panel_ammo_bg_alpha "" +seta hud_panel_ammo_bg_border "" +seta hud_panel_ammo_bg_padding "" +seta hud_panel_ammo_onlycurrent "0" +seta hud_panel_ammo_iconalign "0" +seta hud_panel_ammo_progressbar "0" +seta hud_panel_ammo_progressbar_xoffset "0" +seta hud_panel_ammo_progressbar_name "progressbar" +seta hud_panel_ammo_text "1" + +seta hud_panel_powerups 1 +seta hud_panel_powerups_pos "0.290000 0.890000" +seta hud_panel_powerups_size "0.055000 0.110000" +seta hud_panel_powerups_bg "0" +seta hud_panel_powerups_bg_color "" +seta hud_panel_powerups_bg_color_team "" +seta hud_panel_powerups_bg_alpha "" +seta hud_panel_powerups_bg_border "" +seta hud_panel_powerups_bg_padding "-3" +seta hud_panel_powerups_flip "1" +seta hud_panel_powerups_iconalign "1" +seta hud_panel_powerups_baralign "1" +seta hud_panel_powerups_progressbar "1" +seta hud_panel_powerups_progressbar_strength "progressbar" +seta hud_panel_powerups_progressbar_shield "progressbar" +seta hud_panel_powerups_text "1" + +seta hud_panel_healtharmor 1 +seta hud_panel_healtharmor_pos "0.350000 0.890000" +seta hud_panel_healtharmor_size "0.300000 0.050000" +seta hud_panel_healtharmor_bg "" +seta hud_panel_healtharmor_bg_color "" +seta hud_panel_healtharmor_bg_color_team "" +seta hud_panel_healtharmor_bg_alpha "" +seta hud_panel_healtharmor_bg_border "" +seta hud_panel_healtharmor_bg_padding "0" +seta hud_panel_healtharmor_flip "0" +seta hud_panel_healtharmor_iconalign "3" +seta hud_panel_healtharmor_baralign "3" +seta hud_panel_healtharmor_progressbar "1" +seta hud_panel_healtharmor_progressbar_health "progressbar" +seta hud_panel_healtharmor_progressbar_armor "progressbar" +seta hud_panel_healtharmor_text "1" + +seta hud_panel_notify 1 +seta hud_panel_notify_pos "0 0" +seta hud_panel_notify_size "0.210000 0.260000" +seta hud_panel_notify_bg "0" +seta hud_panel_notify_bg_color "" +seta hud_panel_notify_bg_color_team "" +seta hud_panel_notify_bg_alpha "" +seta hud_panel_notify_bg_border "" +seta hud_panel_notify_bg_padding "" +seta hud_panel_notify_flip "1" +seta hud_panel_notify_print "0" + +seta hud_panel_timer 1 +seta hud_panel_timer_pos "0.435000 0" +seta hud_panel_timer_size "0.135000 0.060000" +seta hud_panel_timer_bg "0" +seta hud_panel_timer_bg_color "" +seta hud_panel_timer_bg_color_team "" +seta hud_panel_timer_bg_alpha "" +seta hud_panel_timer_bg_border "" +seta hud_panel_timer_bg_padding "0" + +seta hud_panel_radar 2 +seta hud_panel_radar_pos "0.810000 0" +seta hud_panel_radar_size "0.190000 0.250000" +seta hud_panel_radar_bg "border_radar" +seta hud_panel_radar_bg_color "" +seta hud_panel_radar_bg_color_team "" +seta hud_panel_radar_bg_alpha "0.500000" +seta hud_panel_radar_bg_border "0" +seta hud_panel_radar_bg_padding "0" +seta hud_panel_radar_foreground_alpha "0.500000" + +seta hud_panel_score 1 +seta hud_panel_score_pos "0.465000 0.045000" +seta hud_panel_score_size "0.090000 0.060000" +seta hud_panel_score_bg "" +seta hud_panel_score_bg_color "" +seta hud_panel_score_bg_color_team "" +seta hud_panel_score_bg_alpha "" +seta hud_panel_score_bg_border "" +seta hud_panel_score_bg_padding "" + +seta hud_panel_racetimer 1 +seta hud_panel_racetimer_pos "0.360000 0.090000" +seta hud_panel_racetimer_size "0.280000 0.090000" +seta hud_panel_racetimer_bg "0" +seta hud_panel_racetimer_bg_color "" +seta hud_panel_racetimer_bg_color_team "" +seta hud_panel_racetimer_bg_alpha "" +seta hud_panel_racetimer_bg_border "" +seta hud_panel_racetimer_bg_padding "" + +seta hud_panel_vote 1 +seta hud_panel_vote_pos "0 0.890000" +seta hud_panel_vote_size "0.170000 0.110000" +seta hud_panel_vote_bg "" +seta hud_panel_vote_bg_color "" +seta hud_panel_vote_bg_color_team "" +seta hud_panel_vote_bg_alpha "" +seta hud_panel_vote_bg_border "" +seta hud_panel_vote_bg_padding "" +seta hud_panel_vote_alreadyvoted_alpha "0.800000" + +seta hud_panel_modicons 1 +seta hud_panel_modicons_pos "0.560000 0" +seta hud_panel_modicons_size "0.050000 0.100000" +seta hud_panel_modicons_bg "" +seta hud_panel_modicons_bg_color "" +seta hud_panel_modicons_bg_color_team "" +seta hud_panel_modicons_bg_alpha "" +seta hud_panel_modicons_bg_border "" +seta hud_panel_modicons_bg_padding "" + +seta hud_panel_pressedkeys 1 +seta hud_panel_pressedkeys_pos "0.450000 0.650000" +seta hud_panel_pressedkeys_size "0.100000 0.110000" +seta hud_panel_pressedkeys_bg "0" +seta hud_panel_pressedkeys_bg_color "" +seta hud_panel_pressedkeys_bg_color_team "" +seta hud_panel_pressedkeys_bg_alpha "" +seta hud_panel_pressedkeys_bg_border "" +seta hud_panel_pressedkeys_bg_padding "" +seta hud_panel_pressedkeys_aspect "1.600000" + +seta hud_panel_chat 1 +seta hud_panel_chat_pos "0 0.775000" +seta hud_panel_chat_size "0.460000 0.110000" +seta hud_panel_chat_bg "0" +seta hud_panel_chat_bg_color "" +seta hud_panel_chat_bg_color_team "" +seta hud_panel_chat_bg_alpha "" +seta hud_panel_chat_bg_border "" +seta hud_panel_chat_bg_padding "" + +seta hud_panel_engineinfo 0 +seta hud_panel_engineinfo_pos "0.910000 0.970000" +seta hud_panel_engineinfo_size "0.090000 0.030000" +seta hud_panel_engineinfo_bg "0" +seta hud_panel_engineinfo_bg_color "" +seta hud_panel_engineinfo_bg_color_team "" +seta hud_panel_engineinfo_bg_alpha "" +seta hud_panel_engineinfo_bg_border "" +seta hud_panel_engineinfo_bg_padding "" + +seta hud_panel_infomessages 1 +seta hud_panel_infomessages_pos "0.710000 0" +seta hud_panel_infomessages_size "0.290000 0.100000" +seta hud_panel_infomessages_bg "0" +seta hud_panel_infomessages_bg_color "" +seta hud_panel_infomessages_bg_color_team "" +seta hud_panel_infomessages_bg_alpha "" +seta hud_panel_infomessages_bg_border "" +seta hud_panel_infomessages_bg_padding "0" +seta hud_panel_infomessages_flip "1" + +menu_sync diff --git a/hud_luminos_xhair_minimal.cfg b/hud_luminos_xhair_minimal.cfg new file mode 100644 index 000000000..ba9e01a90 --- /dev/null +++ b/hud_luminos_xhair_minimal.cfg @@ -0,0 +1,213 @@ +seta hud_skin "luminos_xhair" +seta hud_panel_bg "0" +seta hud_panel_bg_color "1 0.4375 0" +seta hud_panel_bg_color_team "0" +seta hud_panel_bg_alpha "1" +seta hud_panel_bg_border "8" +seta hud_panel_bg_padding "2" +seta hud_panel_fg_alpha "1" + +seta hud_dock "0" +seta hud_dock_color "0 0.449576 0.860796" +seta hud_dock_color_team "0.700000" +seta hud_dock_alpha "1" + +seta hud_progressbar_alpha "0.3" +seta hud_progressbar_strength_color "0 0 0.6" +seta hud_progressbar_shield_color "0.6 0 0.6" +seta hud_progressbar_health_color "0.6 0 0" +seta hud_progressbar_armor_color "0 0.6 0" +seta hud_progressbar_fuel_color "0.6 0.6 0" +seta hud_progressbar_nexball_color "0.7 0.1 0" + +seta _hud_panelorder "3 1 2 11 10 0 14 6 9 13 4 12 7 5 8 " + +seta hud_configure_grid "1" +seta hud_configure_grid_xsize "0.010000" +seta hud_configure_grid_ysize "0.010000" + +seta scr_centerpos "0.25" + +seta hud_panel_weapons 1 +seta hud_panel_weapons_pos "0.350000 0.940000" +seta hud_panel_weapons_size "0.300000 0.060000" +seta hud_panel_weapons_bg "" +seta hud_panel_weapons_bg_color "" +seta hud_panel_weapons_bg_color_team "" +seta hud_panel_weapons_bg_alpha "" +seta hud_panel_weapons_bg_border "" +seta hud_panel_weapons_bg_padding "" +seta hud_panel_weapons_complainbubble "1" +seta hud_panel_weapons_complainbubble_padding "-10" +seta hud_panel_weapons_complainbubble_color_outofammo "0.8 0 0" +seta hud_panel_weapons_complainbubble_color_donthave "0.8 0.5 0" +seta hud_panel_weapons_complainbubble_color_unavailable "0 0.3 0.8" +seta hud_panel_weapons_ammo_color "0 1 0" +seta hud_panel_weapons_ammo_alpha "1" +seta hud_panel_weapons_aspect "2" + +seta hud_panel_ammo 1 +seta hud_panel_ammo_pos "0.450000 0.630000" +seta hud_panel_ammo_size "0.080000 0.040000" +seta hud_panel_ammo_bg "" +seta hud_panel_ammo_bg_color "" +seta hud_panel_ammo_bg_color_team "" +seta hud_panel_ammo_bg_alpha "" +seta hud_panel_ammo_bg_border "" +seta hud_panel_ammo_bg_padding "" +seta hud_panel_ammo_onlycurrent "1" +seta hud_panel_ammo_iconalign "0" +seta hud_panel_ammo_progressbar "1" +seta hud_panel_ammo_progressbar_name "progressbar_ammo" +seta hud_panel_ammo_text "1" + +seta hud_panel_powerups 1 +seta hud_panel_powerups_pos "0.270000 0.940000" +seta hud_panel_powerups_size "0.080000 0.060000" +seta hud_panel_powerups_bg "0" +seta hud_panel_powerups_bg_color "" +seta hud_panel_powerups_bg_color_team "" +seta hud_panel_powerups_bg_alpha "" +seta hud_panel_powerups_bg_border "" +seta hud_panel_powerups_bg_padding "-3" +seta hud_panel_powerups_flip "1" +seta hud_panel_powerups_iconalign "1" +seta hud_panel_powerups_baralign "1" +seta hud_panel_powerups_progressbar "1" +seta hud_panel_powerups_progressbar_strength "progressbar" +seta hud_panel_powerups_progressbar_shield "progressbar" + +seta hud_panel_healtharmor 1 +seta hud_panel_healtharmor_pos "0.350000 0.380000" +seta hud_panel_healtharmor_size "0.070000 0.240000" +seta hud_panel_healtharmor_bg "border_healtharmor" +seta hud_panel_healtharmor_bg_color "0.464391 0.464391 0.464391" +seta hud_panel_healtharmor_bg_color_team "" +seta hud_panel_healtharmor_bg_alpha "0.600000" +seta hud_panel_healtharmor_bg_border "-1" +seta hud_panel_healtharmor_bg_padding "0" +seta hud_panel_healtharmor_flip "0" +seta hud_panel_healtharmor_iconalign "1" +seta hud_panel_healtharmor_baralign "1" +seta hud_panel_healtharmor_progressbar "1" +seta hud_panel_healtharmor_progressbar_health "progressbar_health" +seta hud_panel_healtharmor_progressbar_armor "progressbar_armor" +seta hud_panel_healtharmor_text "0" + +seta hud_panel_notify 1 +seta hud_panel_notify_pos "0 0" +seta hud_panel_notify_size "0.210000 0.260000" +seta hud_panel_notify_bg "0" +seta hud_panel_notify_bg_color "" +seta hud_panel_notify_bg_color_team "" +seta hud_panel_notify_bg_alpha "" +seta hud_panel_notify_bg_border "" +seta hud_panel_notify_bg_padding "" +seta hud_panel_notify_flip "1" +seta hud_panel_notify_print "0" + +seta hud_panel_timer 1 +seta hud_panel_timer_pos "0.435000 0" +seta hud_panel_timer_size "0.135000 0.060000" +seta hud_panel_timer_bg "0" +seta hud_panel_timer_bg_color "" +seta hud_panel_timer_bg_color_team "" +seta hud_panel_timer_bg_alpha "" +seta hud_panel_timer_bg_border "" +seta hud_panel_timer_bg_padding "0" + +seta hud_panel_radar 2 +seta hud_panel_radar_pos "0.810000 0" +seta hud_panel_radar_size "0.190000 0.250000" +seta hud_panel_radar_bg "border_radar" +seta hud_panel_radar_bg_color "" +seta hud_panel_radar_bg_color_team "" +seta hud_panel_radar_bg_alpha "0.500000" +seta hud_panel_radar_bg_border "0" +seta hud_panel_radar_bg_padding "0" +seta hud_panel_radar_foreground_alpha "0.500000" + +seta hud_panel_score 1 +seta hud_panel_score_pos "0.465000 0.045000" +seta hud_panel_score_size "0.090000 0.060000" +seta hud_panel_score_bg "" +seta hud_panel_score_bg_color "" +seta hud_panel_score_bg_color_team "" +seta hud_panel_score_bg_alpha "" +seta hud_panel_score_bg_border "" +seta hud_panel_score_bg_padding "" + +seta hud_panel_racetimer 1 +seta hud_panel_racetimer_pos "0.360000 0.090000" +seta hud_panel_racetimer_size "0.280000 0.090000" +seta hud_panel_racetimer_bg "0" +seta hud_panel_racetimer_bg_color "" +seta hud_panel_racetimer_bg_color_team "" +seta hud_panel_racetimer_bg_alpha "" +seta hud_panel_racetimer_bg_border "" +seta hud_panel_racetimer_bg_padding "" + +seta hud_panel_vote 1 +seta hud_panel_vote_pos "0 0.890000" +seta hud_panel_vote_size "0.170000 0.110000" +seta hud_panel_vote_bg "" +seta hud_panel_vote_bg_color "" +seta hud_panel_vote_bg_color_team "" +seta hud_panel_vote_bg_alpha "" +seta hud_panel_vote_bg_border "" +seta hud_panel_vote_bg_padding "" +seta hud_panel_vote_alreadyvoted_alpha "0.800000" + +seta hud_panel_modicons 1 +seta hud_panel_modicons_pos "0.560000 0" +seta hud_panel_modicons_size "0.050000 0.100000" +seta hud_panel_modicons_bg "" +seta hud_panel_modicons_bg_color "" +seta hud_panel_modicons_bg_color_team "" +seta hud_panel_modicons_bg_alpha "" +seta hud_panel_modicons_bg_border "" +seta hud_panel_modicons_bg_padding "" + +seta hud_panel_pressedkeys 1 +seta hud_panel_pressedkeys_pos "0.450000 0.690000" +seta hud_panel_pressedkeys_size "0.100000 0.110000" +seta hud_panel_pressedkeys_bg "0" +seta hud_panel_pressedkeys_bg_color "" +seta hud_panel_pressedkeys_bg_color_team "" +seta hud_panel_pressedkeys_bg_alpha "" +seta hud_panel_pressedkeys_bg_border "" +seta hud_panel_pressedkeys_bg_padding "" +seta hud_panel_pressedkeys_aspect "1.600000" + +seta hud_panel_chat 1 +seta hud_panel_chat_pos "0 0.775000" +seta hud_panel_chat_size "0.460000 0.110000" +seta hud_panel_chat_bg "0" +seta hud_panel_chat_bg_color "" +seta hud_panel_chat_bg_color_team "" +seta hud_panel_chat_bg_alpha "" +seta hud_panel_chat_bg_border "" +seta hud_panel_chat_bg_padding "" + +seta hud_panel_engineinfo 0 +seta hud_panel_engineinfo_pos "0.910000 0.970000" +seta hud_panel_engineinfo_size "0.090000 0.030000" +seta hud_panel_engineinfo_bg "0" +seta hud_panel_engineinfo_bg_color "" +seta hud_panel_engineinfo_bg_color_team "" +seta hud_panel_engineinfo_bg_alpha "" +seta hud_panel_engineinfo_bg_border "" +seta hud_panel_engineinfo_bg_padding "" + +seta hud_panel_infomessages 1 +seta hud_panel_infomessages_pos "0.710000 0" +seta hud_panel_infomessages_size "0.290000 0.100000" +seta hud_panel_infomessages_bg "0" +seta hud_panel_infomessages_bg_color "" +seta hud_panel_infomessages_bg_color_team "" +seta hud_panel_infomessages_bg_alpha "" +seta hud_panel_infomessages_bg_border "" +seta hud_panel_infomessages_bg_padding "0" +seta hud_panel_infomessages_flip "1" + +menu_sync diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg index bdd7a97f2..dfecf7400 100644 --- a/hud_nexuiz.cfg +++ b/hud_nexuiz.cfg @@ -57,6 +57,10 @@ seta hud_panel_ammo_bg_border "" seta hud_panel_ammo_bg_padding "" seta hud_panel_ammo_onlycurrent "0" seta hud_panel_ammo_iconalign "0" +seta hud_panel_ammo_progressbar "0" +seta hud_panel_ammo_progressbar_xoffset "0" +seta hud_panel_ammo_progressbar_name "progressbar" +seta hud_panel_ammo_text "1" seta hud_panel_powerups 1 seta hud_panel_powerups_pos "0.660000 0.910000" @@ -71,6 +75,9 @@ seta hud_panel_powerups_flip "1" seta hud_panel_powerups_iconalign "0" seta hud_panel_powerups_baralign "0" seta hud_panel_powerups_progressbar "0" +seta hud_panel_powerups_progressbar_strength "progressbar" +seta hud_panel_powerups_progressbar_shield "progressbar" +seta hud_panel_powerups_text "1" seta hud_panel_healtharmor 1 seta hud_panel_healtharmor_pos "0.370000 0.930000" @@ -85,6 +92,9 @@ seta hud_panel_healtharmor_flip "0" seta hud_panel_healtharmor_iconalign "0" seta hud_panel_healtharmor_baralign "0" seta hud_panel_healtharmor_progressbar "0" +seta hud_panel_healtharmor_progressbar_health "progressbar" +seta hud_panel_healtharmor_progressbar_armor "progressbar" +seta hud_panel_healtharmor_text "1" seta hud_panel_notify 0 seta hud_panel_notify_pos "0 0.650000" diff --git a/merge-settings-into-cfg.pl b/merge-settings-into-cfg.pl deleted file mode 100644 index 3f2d5fac0..000000000 --- a/merge-settings-into-cfg.pl +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; - -my ($in, $out) = @ARGV; - -my %changes = (); -while() -{ - chomp; - /^(?:seta?\s)?\s*(\S+)\s+(.*)/ - or next; - $changes{$1} = $2; -} - -my %changes_unapplied = %changes; -my $result = ""; -open my $fh, "<", $in - or die "<$in: $!"; -while(<$fh>) -{ - chomp; - /^(seta?\s?\s*)(\S+)(\s+)(.*)/ - or do { $result .= "$_\n"; next; }; - my $v = exists($changes{$2}) ? $changes{$2} : $4; - $result .= "$1$2$3$v\n"; - delete $changes_unapplied{$2}; -} -close $fh; -open $fh, ">", $out - or die ">$out: $!"; -print $fh $result; -print $fh "set $_ $changes_unapplied{$_}\n" for keys %changes_unapplied; -close $fh; diff --git a/models/elaser.mdl b/models/elaser.mdl index 02fd59d3a..ce62d46b5 100644 Binary files a/models/elaser.mdl and b/models/elaser.mdl differ diff --git a/models/hlac_bullet.md3 b/models/hlac_bullet.md3 index 8ae609a06..a1be45958 100644 Binary files a/models/hlac_bullet.md3 and b/models/hlac_bullet.md3 differ diff --git a/models/laser.mdl b/models/laser.mdl index c3a5d99e0..8809d1645 100644 Binary files a/models/laser.mdl and b/models/laser.mdl differ diff --git a/models/plasmatrail.mdl b/models/plasmatrail.mdl index 59dcdb9cd..5669bc4cc 100644 Binary files a/models/plasmatrail.mdl and b/models/plasmatrail.mdl differ diff --git a/physicsLeeStricklin-ModdedFruit.cfg b/physicsLeeStricklin-ModdedFruit.cfg new file mode 100644 index 000000000..805df99b8 --- /dev/null +++ b/physicsLeeStricklin-ModdedFruit.cfg @@ -0,0 +1,40 @@ +// "NoQWBunny" physics based on XPM +sv_gravity 800 +sv_maxspeed 424 +sv_maxairspeed 400 + +sv_stopspeed 100 +sv_accelerate 13 +sv_airaccelerate 2 +sv_friction 8 +edgefriction 1 +sv_stepheight 26 +// Q1: 16+2 +// Nex: 32+2 +// we try: 24+2 + +// actually, what we want is 266.6666 for 180bpm +// but 260 takes same amount of frames and is nicer to mappers +sv_jumpvelocity 260 +sv_wateraccelerate -1 +sv_waterfriction -1 +sv_airaccel_sideways_friction 0 // breaks strafing? +sv_airaccel_qw -0.8 + +sv_airstopaccelerate -0.95 +sv_airstrafeaccelerate 24 +sv_maxairstrafespeed 100 +sv_airstrafeaccel_qw -0.97 +sv_aircontrol 125 +sv_aircontrol_penalty 150 +sv_aircontrol_power 2.5 +sv_airspeedlimit_nonqw 800 +sv_warsowbunny_turnaccel 0 +sv_warsowbunny_accel 0.1593 +sv_warsowbunny_topspeed 925 +sv_warsowbunny_backtosideratio 0.8 +sv_friction_on_land 0 +sv_doublejump 0 // TINY (1.35x normal) doublejumps only, can be disabled if wanted... +sv_jumpspeedcap_min 0 // need predicting? (it should already be in CSQC prediction code) +sv_jumpspeedcap_max "" +sv_jumpspeedcap_max_disable_on_ramps 1 diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index 65f36cf7a..714b5d333 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -1001,7 +1001,14 @@ void CSQC_UpdateView(float w, float h) CROSSHAIR_DRAW(wcross_resolution, wcross_name, wcross_alpha * f); if(cvar("crosshair_dot")) - CROSSHAIR_DRAW(wcross_resolution * cvar("crosshair_dot_size"), "gfx/crosshairdot.tga", wcross_alpha * f * cvar("crosshair_dot_alpha")); + { + vector wcross_color_old; + wcross_color_old = wcross_color; + if(cvar_string("crosshair_dot_color") != "0") + wcross_color = stov(cvar_string("crosshair_dot_color")); + CROSSHAIR_DRAW(wcross_resolution * cvar("crosshair_dot_size"), "gfx/crosshairdot.tga", f * cvar("crosshair_dot_alpha")); + wcross_color = wcross_color_old; + } wcross_name_alpha_goal_prev = f; } diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 01dc01663..7ad148b0c 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -14,7 +14,12 @@ 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 + if (theBorderSize_x < 0 && theBorderSize_y < 0) // draw whole image as it is + { + drawpic(theOrigin, pic, theSize, theColor, theAlpha, 0); + return; + } + 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); @@ -491,18 +496,26 @@ void HUD_Panel_ExportCfg(string cfgname) case HUD_PANEL_AMMO: HUD_Write_PanelCvar_q("_onlycurrent"); HUD_Write_PanelCvar_q("_iconalign"); + HUD_Write_PanelCvar_q("_progressbar"); + HUD_Write_PanelCvar_q("_progressbar_name"); + HUD_Write_PanelCvar_q("_text"); break; case HUD_PANEL_POWERUPS: HUD_Write_PanelCvar_q("_flip"); HUD_Write_PanelCvar_q("_iconalign"); HUD_Write_PanelCvar_q("_baralign"); HUD_Write_PanelCvar_q("_progressbar"); + HUD_Write_PanelCvar_q("_progressbar_strength"); + HUD_Write_PanelCvar_q("_progressbar_shield"); break; case HUD_PANEL_HEALTHARMOR: HUD_Write_PanelCvar_q("_flip"); HUD_Write_PanelCvar_q("_iconalign"); HUD_Write_PanelCvar_q("_baralign"); HUD_Write_PanelCvar_q("_progressbar"); + HUD_Write_PanelCvar_q("_progressbar_health"); + HUD_Write_PanelCvar_q("_progressbar_armor"); + HUD_Write_PanelCvar_q("_text"); break; case HUD_PANEL_NOTIFY: HUD_Write_PanelCvar_q("_flip"); @@ -553,31 +566,37 @@ 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);\ } ENDS_WITH_CURLY_BRACE -void HUD_Panel_DrawProgressBar(vector pos, float vertical, vector mySize, vector color, float alpha, float drawflag) +void HUD_Panel_DrawProgressBar(vector pos, vector mySize, string pic, float vertical, float barflip, float x, vector color, float alpha, float drawflag) { - if(!alpha) + if(!alpha || x == 0) return; - string pic; + x = bound(0, x, 1); + if(vertical) { - pic = strcat(hud_skin_path, "/statusbar_vertical"); + pic = strcat(hud_skin_path, "/", pic, "_vertical"); if(precache_pic(pic) == "") { pic = "gfx/hud/default/statusbar_vertical"; } - 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); + + if(barflip) + drawsetcliparea(pos_x, pos_y + mySize_y * (1 - x), mySize_x, mySize_y * x); + else + drawsetcliparea(pos_x, pos_y, mySize_x, mySize_y * x); } else { - pic = strcat(hud_skin_path, "/statusbar"); + pic = strcat(hud_skin_path, "/", pic); 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); + + if(barflip) + drawsetcliparea(pos_x + mySize_x * (1 - x), pos_y, mySize_x * x, mySize_y); + else + drawsetcliparea(pos_x, pos_y, mySize_x * x, mySize_y); } + + drawpic(pos, pic, mySize, color, alpha, drawflag); + drawresetcliparea(); } void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float alpha, float drawflag) @@ -1896,10 +1915,16 @@ void DrawAmmoItem(vector myPos, vector mySize, float itemcode, float currently_s if (currently_selected) drawpic_aspect_skin(myPos, "ammo_current_bg", mySize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - if(a > 0) - drawstring_aspect(numpos, ftos(a), eX * (2/3) * mySize_x + eY * mySize_y, color, panel_fg_alpha * alpha, DRAWFLAG_NORMAL); - else // "ghost" ammo count - drawstring_aspect(numpos, ftos(a), eX * (2/3) * mySize_x + eY * mySize_y, '0 0 0', panel_fg_alpha * alpha * 0.5, DRAWFLAG_NORMAL); + if(a > 0 && cvar("hud_panel_ammo_progressbar")) + HUD_Panel_DrawProgressBar(myPos + eX * cvar("hud_panel_ammo_progressbar_xoffset") * mySize_x, mySize - eX * cvar("hud_panel_ammo_progressbar_xoffset") * mySize_x, cvar_string("hud_panel_ammo_progressbar_name"), 0, 0, min(1, a/cvar("hud_panel_ammo_maxammo")), color, autocvar_hud_progressbar_alpha * panel_fg_alpha * alpha, DRAWFLAG_NORMAL); + + if(cvar("hud_panel_ammo_text")) + { + if(a > 0) + drawstring_aspect(numpos, ftos(a), eX * (2/3) * mySize_x + eY * mySize_y, color, panel_fg_alpha * alpha, DRAWFLAG_NORMAL); + else // "ghost" ammo count + drawstring_aspect(numpos, ftos(a), eX * (2/3) * mySize_x + eY * mySize_y, '0 0 0', panel_fg_alpha * alpha * 0.5, DRAWFLAG_NORMAL); + } if(a > 0) drawpic_aspect_skin(picpos, GetAmmoPicture(itemcode), '1 1 0' * mySize_y, '1 1 1', panel_fg_alpha * alpha, DRAWFLAG_NORMAL); else // "ghost" ammo icon @@ -2099,129 +2124,147 @@ void HUD_Powerups(void) { vector numpos; string leftname, rightname; + string leftprogressname, rightprogressname; float leftcnt, rightcnt; float leftexact, rightexact; float flip = cvar("hud_panel_powerups_flip"); if (flip) { leftname = "strength"; + leftprogressname = cvar_string("hud_panel_powerups_progressbar_strength"); leftcnt = ceil(strength_time); leftexact = strength_time; rightname = "shield"; + rightprogressname = cvar_string("hud_panel_powerups_progressbar_shield"); rightcnt = ceil(shield_time); rightexact = shield_time; } else { leftname = "shield"; + leftprogressname = cvar_string("hud_panel_powerups_progressbar_shield"); leftcnt = ceil(shield_time); leftexact = shield_time; rightname = "strength"; + rightprogressname = cvar_string("hud_panel_powerups_progressbar_strength"); rightcnt = ceil(strength_time); rightexact = strength_time; } drawfont = hud_bigfont; float baralign = cvar("hud_panel_powerups_baralign"); + float barflip; float iconalign = cvar("hud_panel_powerups_iconalign"); float progressbar = cvar("hud_panel_powerups_progressbar"); if (mySize_x/mySize_y > 4) { + barsize = eX * 0.5 * mySize_x + eY * mySize_y; if(leftcnt) { if(baralign == 1 || 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; + barpos = pos + eX * 0.5 * mySize_x; + barflip = 1; } else { // left align - barpos = pos; - barsize = eX * 0.5 * mySize_x * min(1, leftcnt/30) + eY * mySize_y; + barpos = pos; + barflip = 0; } if(progressbar) { HUD_Panel_GetProgressBarColorForString(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); + HUD_Panel_DrawProgressBar(barpos, barsize, leftprogressname, 0, barflip, min(1, leftcnt/30), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); } - if(leftcnt > 1) - DrawNumIcon(iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, '1 1 1', 1); - if(leftcnt <= 5) - DrawNumIcon_expanding(iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, '1 1 1', bound(0, (leftcnt - leftexact) / 0.5, 1)); + if(cvar("hud_panel_powerups_text")) + { + if(leftcnt > 1) + DrawNumIcon(iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, '1 1 1', 1); + if(leftcnt <= 5) + DrawNumIcon_expanding(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) { if(baralign == 0 || baralign == 3) { // left align - barpos = pos + eX * 0.5 * mySize_x; - barsize = eX * 0.5 * mySize_x * min(1, rightcnt/30) + eY * mySize_y; + barpos = pos; + barflip = 0; } 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; + barpos = pos + eX * 0.5 * mySize_x; + barflip = 1; } if(progressbar) { HUD_Panel_GetProgressBarColorForString(rightname); - 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); + HUD_Panel_DrawProgressBar(barpos, barsize, rightprogressname, 0, barflip, min(1, rightcnt/30), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); } - if(rightcnt > 1) - DrawNumIcon(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) - DrawNumIcon_expanding(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)); + if(cvar("hud_panel_powerups_text")) + { + if(rightcnt > 1) + DrawNumIcon(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) + DrawNumIcon_expanding(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) { + barsize = eX * mySize_x + eY * 0.5 * mySize_y; if(leftcnt) { - if(baralign == 1 || 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; - } else { // left align - barpos = pos; - barsize = eX * mySize_x * min(1, leftcnt/30) + eY * 0.5 * mySize_y; + barpos = pos; + if(baralign == 1 || baralign == 3) { // right/down align + barflip = 1; + } else { // left/up align + barflip = 0; } if(progressbar) { HUD_Panel_GetProgressBarColorForString(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); + HUD_Panel_DrawProgressBar(barpos, barsize, leftprogressname, 0, barflip, min(1, leftcnt/30), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); } - if(leftcnt > 1) - DrawNumIcon(iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, '1 1 1', 1); - if(leftcnt <= 5) - DrawNumIcon_expanding(iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, '1 1 1', bound(0, (leftcnt - leftexact) / 0.5, 1)); + if(cvar("hud_panel_powerups_text")) + { + if(leftcnt > 1) + DrawNumIcon(iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, '1 1 1', 1); + if(leftcnt <= 5) + DrawNumIcon_expanding(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) { + barpos = pos + eY * 0.5 * mySize_y; if(baralign == 0 || baralign == 3) { // left align - barpos = pos + eY * 0.5 * mySize_y; - barsize = eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y; + barflip = 0; } 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; + barflip = 1; } if(progressbar) { HUD_Panel_GetProgressBarColorForString(rightname); - 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); + HUD_Panel_DrawProgressBar(barpos, barsize, rightprogressname, 0, barflip, min(1, rightcnt/30), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); } - if(rightcnt > 1) - DrawNumIcon(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) - DrawNumIcon_expanding(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)); + if(cvar("hud_panel_powerups_text")) + { + if(rightcnt > 1) + DrawNumIcon(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) + DrawNumIcon_expanding(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 { + barsize = eX * 0.5 * mySize_x + eY * mySize_y; if(leftcnt) { + barpos = pos; if(baralign == 1 || 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); + barflip = 1; } else { // up align - barpos = pos; - barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30); + barflip = 0; } if(iconalign == 1 || iconalign == 3) { // down align @@ -2235,23 +2278,25 @@ void HUD_Powerups(void) { if(progressbar) { HUD_Panel_GetProgressBarColorForString(leftname); - HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, leftprogressname, 1, barflip, min(1, leftcnt/30), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); } - if(leftcnt <= 5) - 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(cvar("hud_panel_powerups_text")) + { + if(leftcnt <= 5) + 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) { - if(baralign == 0 || baralign == 3) { // up align - barpos = pos + eX * 0.5 * mySize_x; - barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/30); - } 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); + barpos = pos + eX * 0.5 * mySize_x; + if(baralign == 0 || baralign == 3) { // down align + barflip = 1; + } else { // up align + barflip = 0; } if(iconalign == 0 || iconalign == 3) { // up align @@ -2265,13 +2310,16 @@ void HUD_Powerups(void) { if(progressbar) { HUD_Panel_GetProgressBarColorForString(rightname); - HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, rightprogressname, 1, barflip, min(1, rightcnt/30), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); } - if(rightcnt <= 5) - 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); + if(cvar("hud_panel_powerups_text")) + { + if(rightcnt <= 5) + 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; @@ -2304,9 +2352,9 @@ void HUD_HealthArmor(void) if(autocvar__hud_configure) { - armor = 150; - health = 100; - fuel = 70; + armor = 75; + health = 150; + fuel = 20; } if(health <= 0) @@ -2320,6 +2368,9 @@ void HUD_HealthArmor(void) float baralign = cvar("hud_panel_healtharmor_baralign"); float iconalign = cvar("hud_panel_healtharmor_iconalign"); float progressbar = cvar("hud_panel_healtharmor_progressbar"); + + float maxhealth = cvar("hud_panel_healtharmor_maxhealth"); + float maxarmor = cvar("hud_panel_healtharmor_maxarmor"); if(autocvar_hud_panel_healtharmor == 2) // combined health and armor display { vector v; @@ -2328,13 +2379,10 @@ void HUD_HealthArmor(void) float x; x = floor(v_x + 1); - if(baralign == 1 || 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; - } else { // left align - barpos = pos; - barsize = eX * mySize_x * min(1, x/400) + eY * mySize_y; - } + float maxtotal = maxhealth + maxarmor; + + barpos = pos; + barsize = mySize; string biggercount; if(v_z) // NOT fully armored @@ -2343,9 +2391,10 @@ void HUD_HealthArmor(void) if(progressbar) { HUD_Panel_GetProgressBarColor(health); - HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, cvar_string("hud_panel_healtharmor_progressbar_health"), 0, mod(baralign, 2), x/maxtotal, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } if(armor) + if(cvar("hud_panel_healtharmor_text")) 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 @@ -2354,170 +2403,170 @@ void HUD_HealthArmor(void) if(progressbar) { HUD_Panel_GetProgressBarColor(armor); - HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, cvar_string("hud_panel_healtharmor_progressbar_armor"), 0, mod(baralign, 2), x/maxtotal, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } if(health) + if(cvar("hud_panel_healtharmor_text")) 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); } - DrawNumIcon(iconalign, pos, mySize, x, biggercount, 1, HUD_Get_Num_Color(x, 2 * 200), 1); + if(cvar("hud_panel_healtharmor_text")) + DrawNumIcon(iconalign, pos, mySize, x, biggercount, 1, HUD_Get_Num_Color(x, maxtotal), 1); // fuel if(fuel) { - if(baralign == 0 || 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; - } + barpos = pos; + barsize = eX * mySize_x + eY * 0.2 * mySize_y; HUD_Panel_GetProgressBarColor(fuel); - HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, "progressbar", 0, mod(baralign, 2), min(1, fuel/100), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); } } else { string leftname, rightname; + string leftprogressname, rightprogressname; float leftcnt, rightcnt; + float leftmax, rightmax; float leftactive, rightactive; float leftalpha, rightalpha; float flip = cvar("hud_panel_healtharmor_flip"); + float barflip; if (flip) { // old style layout with armor left/top of health leftname = "armor"; + leftprogressname = cvar_string("hud_panel_healtharmor_progressbar_armor"); leftcnt = armor; if(leftcnt) leftactive = 1; leftalpha = min((armor+10)/55, 1); + leftmax = maxarmor; rightname = "health"; + rightprogressname = cvar_string("hud_panel_healtharmor_progressbar_health"); rightcnt = health; rightactive = 1; rightalpha = 1; + rightmax = maxhealth; } else { leftname = "health"; + leftprogressname = cvar_string("hud_panel_healtharmor_progressbar_health"); leftcnt = health; leftactive = 1; leftalpha = 1; + leftmax = maxhealth; rightname = "armor"; + rightprogressname = cvar_string("hud_panel_healtharmor_progressbar_armor"); rightcnt = armor; if(rightcnt) rightactive = 1; rightalpha = min((armor+10)/55, 1); + rightmax = maxarmor; } if (mySize_x/mySize_y > 4) { + barsize = eX * 0.5 * mySize_x + eY * mySize_y; if(leftactive) { + barpos = pos; if(baralign == 1 || 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; + barflip = 1; } else { // left align - barpos = pos; - barsize = eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y; + barflip = 0; } if(progressbar) { HUD_Panel_GetProgressBarColorForString(leftname); - HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, leftprogressname, 0, barflip, min(1, leftcnt/leftmax), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } - DrawNumIcon(iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, 200), 1); + if(cvar("hud_panel_healtharmor_text")) + DrawNumIcon(iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, leftmax), 1); } if(rightactive) { + barpos = pos + eX * 0.5 * mySize_x; if(baralign == 0 || baralign == 3) { // left align - barpos = pos + eX * 0.5 * mySize_x; - barsize = eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y; + barflip = 0; } 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; + barflip = 1; } if(progressbar) { HUD_Panel_GetProgressBarColorForString(rightname); - HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, rightprogressname, 0, barflip, min(1, rightcnt/rightmax), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } - DrawNumIcon(iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(rightcnt, 200), 1); + if(cvar("hud_panel_healtharmor_text")) + DrawNumIcon(iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(rightcnt, rightmax), 1); } if(fuel) { - if(baralign == 0 || 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); + barpos = pos; + barsize = eX * mySize_x + eY * 0.2 * mySize_y; + HUD_Panel_GetProgressBarColor(fuel); + HUD_Panel_DrawProgressBar(barpos, barsize, "progressbar", 0, mod(baralign, 2), min(1, fuel/100), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); } } else if (mySize_x/mySize_y > 1.5) { + barsize = eX * mySize_x + eY * 0.5 * mySize_y; if(leftactive) { + barpos = pos; if(baralign == 1 || 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; + barflip = 1; } else { // left align - barpos = pos; - barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y; + barflip = 0; } if(progressbar) { HUD_Panel_GetProgressBarColorForString(leftname); - HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, leftprogressname, 0, barflip, min(1, leftcnt/leftmax), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } - DrawNumIcon(iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, 200), 1); + if(cvar("hud_panel_healtharmor_text")) + DrawNumIcon(iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, leftmax), 1); } if(rightactive) { + barpos = pos + eY * 0.5 * mySize_y; if(baralign == 0 || baralign == 3) { // left align - barpos = pos + eY * 0.5 * mySize_y; - barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; + barflip = 0; } 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; + barflip = 1; } if(progressbar) { HUD_Panel_GetProgressBarColorForString(rightname); - HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, rightprogressname, 0, barflip, min(1, rightcnt/rightmax), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } - DrawNumIcon(iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(rightcnt, 200), 1); + if(cvar("hud_panel_healtharmor_text")) + DrawNumIcon(iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(rightcnt, rightmax), 1); } if(fuel) { - if(baralign == 0 || 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); + barpos = pos; + barsize = eX * mySize_x + eY * 0.2 * mySize_y; + HUD_Panel_GetProgressBarColor(fuel); + HUD_Panel_DrawProgressBar(barpos, barsize, "progressbar", 0, mod(baralign, 2), min(1, fuel/100), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); } } else { + barsize = eX * 0.5 * mySize_x + eY * mySize_y; if(leftactive) { - if(baralign == 1 || 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); + barpos = pos; + if(baralign == 1 || baralign == 3) { // right align + barflip = 1; + } else { // left align + barflip = 0; } if(iconalign == 1 || iconalign == 3) { // down align @@ -2531,20 +2580,22 @@ void HUD_HealthArmor(void) if(progressbar) { HUD_Panel_GetProgressBarColorForString(leftname); - HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, leftprogressname, 1, barflip, min(1, leftcnt/leftmax), 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(cvar("hud_panel_healtharmor_text")) + { + 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, leftmax), panel_fg_alpha, DRAWFLAG_NORMAL); + } } if(rightactive) { - if(baralign == 0 || baralign == 3) { // up align - barpos = pos + eX * 0.5 * mySize_x; - barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/200); - } 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); + barpos = pos + eX * 0.5 * mySize_x; + if(baralign == 0 || baralign == 3) { // left align + barflip = 0; + } else { // right align + barflip = 1; } if(iconalign == 0 || iconalign == 3) { // up align @@ -2558,23 +2609,21 @@ void HUD_HealthArmor(void) if(progressbar) { HUD_Panel_GetProgressBarColorForString(rightname); - HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, rightprogressname, 1, barflip, min(1, rightcnt/rightmax), 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(cvar("hud_panel_healtharmor_text")) + { + 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, rightmax), panel_fg_alpha, DRAWFLAG_NORMAL); + } } if(fuel) { - if(baralign == 0 || 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); + barpos = pos; + barsize = eX * 0.05 * mySize_x + eY * mySize_y; + HUD_Panel_GetProgressBarColor(fuel); + HUD_Panel_DrawProgressBar(barpos, barsize, "progressbar", 1, mod(baralign, 2), min(1, fuel/100), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); } } } @@ -4326,20 +4375,17 @@ void HUD_Mod_NexBall(vector pos, vector mySize) p = 2 - p; //Draw the filling - vector barsize; float vertical; if(mySize_x > mySize_y) { - barsize = eX * p * mySize_x + eY * mySize_y; vertical = 0; } else { - barsize = eX * mySize_x + eY * p * mySize_y; vertical = 1; } HUD_Panel_GetProgressBarColor(nexball); - HUD_Panel_DrawProgressBar(pos, vertical, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(pos, mySize, "statusbar", vertical, 0, p, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } if (stat_items & IT_KEY1) @@ -5014,9 +5060,9 @@ void HUD_ShowAcceleration(void) } if (acceleration > 0) - HUD_Panel_DrawProgressBar(pos, 0, acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * autocvar_hud_panel_fg_alpha * hud_fade_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(pos, eX * (vid_conwidth - pos_x) + eY * sz, "statusbar", 0, 0, acceleration * scale, rgb, alpha * autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); else - HUD_Panel_DrawProgressBar(pos + acceleration * scale * '40 0 0', 0, -acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * autocvar_hud_panel_fg_alpha * hud_fade_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(eY * pos_y, eX * pos_x + eY * sz, "statusbar", 0, 1, -acceleration * scale, rgb, alpha * autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } void HUD_Reset (void) diff --git a/qcsrc/menu/xonotic/crosshairbutton.c b/qcsrc/menu/xonotic/crosshairbutton.c index 26b9bcb8f..434a7bc87 100644 --- a/qcsrc/menu/xonotic/crosshairbutton.c +++ b/qcsrc/menu/xonotic/crosshairbutton.c @@ -104,6 +104,10 @@ void XonoticCrosshairButton_draw(entity me) draw_Picture('0.5 0.5 0' - 0.5 * sz, me.src3, sz, rgb, a); if(cvar("crosshair_dot")) + { + if(cvar_string("crosshair_dot_color") != "0") + rgb = stov(cvar_string("crosshair_dot_color")); draw_Picture('0.5 0.5 0' - 0.5 * sz * cvar("crosshair_dot_size"), me.src4, sz * cvar("crosshair_dot_size"), rgb, a * cvar("crosshair_dot_alpha")); + } } #endif diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.c b/qcsrc/menu/xonotic/dialog_settings_misc.c index 89c8471ca..14293d7f2 100644 --- a/qcsrc/menu/xonotic/dialog_settings_misc.c +++ b/qcsrc/menu/xonotic/dialog_settings_misc.c @@ -61,7 +61,7 @@ void XonoticMiscSettingsTab_fill(entity me) me.TDempty(me, 0.2); me.TD(me, 1, 2.8/2, e = makeXonoticTextLabel(0, "Accelerometer scale:")); setDependent(e, "cl_showacceleration", 1, 1); - me.TD(me, 1, 2.8/2, e = makeXonoticSlider(1, 10, 0.5, "cl_showacceleration_scale")); + me.TD(me, 1, 2.8/2, e = makeXonoticSlider(0.2, 2, 0.2, "cl_showacceleration_scale")); setDependent(e, "cl_showacceleration", 1, 1); me.TR(me); me.TR(me); diff --git a/scripts/projectiles.shader b/scripts/projectiles.shader new file mode 100644 index 000000000..28b1e9492 --- /dev/null +++ b/scripts/projectiles.shader @@ -0,0 +1,90 @@ +crylink_projectile_core +{ + surfaceparm nonsolid + surfaceparm nolightmap + deformVertexes autosprite + { + map textures/projectiles/crylink_projectile_core.tga + blendfunc add + rgbGen lightingDiffuse + } +} +crylink_projectile_long +{ + surfaceparm nonsolid + surfaceparm nolightmap + deformVertexes autosprite2 + { + map textures/projectiles/crylink_projectile_long.tga + blendfunc add + rgbGen lightingDiffuse + } +} +hlac_projectile_core +{ + surfaceparm nonsolid + surfaceparm nolightmap + deformVertexes autosprite + { + map textures/projectiles/hlac_projectile_core.tga + blendfunc add + rgbGen lightingDiffuse + } +} +hlac_projectile_long +{ + surfaceparm nonsolid + surfaceparm nolightmap + deformVertexes autosprite2 + { + map textures/projectiles/hlac_projectile_long.tga + blendfunc add + rgbGen lightingDiffuse + } +} +electro_projectile_core +{ + surfaceparm nonsolid + surfaceparm nolightmap + deformVertexes autosprite + { + map textures/projectiles/electro_projectile_core.tga + blendfunc add + tcmod page 4 1 0.1 + rgbGen lightingDiffuse + } +} +electro_projectile_long +{ + surfaceparm nonsolid + surfaceparm nolightmap + deformVertexes autosprite2 + { + map textures/projectiles/electro_projectile_long.tga + blendfunc add + tcmod page 4 1 0.1 + rgbGen lightingDiffuse + } +} +laser_projectile_core +{ + surfaceparm nonsolid + surfaceparm nolightmap + deformVertexes autosprite + { + map textures/projectiles/laser_projectile_core.tga + blendfunc add + rgbGen lightingDiffuse + } +} +laser_projectile_long +{ + surfaceparm nonsolid + surfaceparm nolightmap + deformVertexes autosprite2 + { + map textures/projectiles/laser_projectile_long.tga + blendfunc add + rgbGen lightingDiffuse + } +} \ No newline at end of file diff --git a/textures/projectiles/crylink_projectile_core.tga b/textures/projectiles/crylink_projectile_core.tga new file mode 100644 index 000000000..a9f686b43 Binary files /dev/null and b/textures/projectiles/crylink_projectile_core.tga differ diff --git a/textures/projectiles/crylink_projectile_core_glow.tga b/textures/projectiles/crylink_projectile_core_glow.tga new file mode 100644 index 000000000..b53993b2c Binary files /dev/null and b/textures/projectiles/crylink_projectile_core_glow.tga differ diff --git a/textures/projectiles/crylink_projectile_long.tga b/textures/projectiles/crylink_projectile_long.tga new file mode 100644 index 000000000..6f78dd03b Binary files /dev/null and b/textures/projectiles/crylink_projectile_long.tga differ diff --git a/textures/projectiles/crylink_projectile_long_glow.tga b/textures/projectiles/crylink_projectile_long_glow.tga new file mode 100644 index 000000000..6f78dd03b Binary files /dev/null and b/textures/projectiles/crylink_projectile_long_glow.tga differ diff --git a/textures/projectiles/electro_projectile_core.tga b/textures/projectiles/electro_projectile_core.tga new file mode 100644 index 000000000..b9a19304b Binary files /dev/null and b/textures/projectiles/electro_projectile_core.tga differ diff --git a/textures/projectiles/electro_projectile_core_glow.tga b/textures/projectiles/electro_projectile_core_glow.tga new file mode 100644 index 000000000..b9a19304b Binary files /dev/null and b/textures/projectiles/electro_projectile_core_glow.tga differ diff --git a/textures/projectiles/electro_projectile_long.tga b/textures/projectiles/electro_projectile_long.tga new file mode 100644 index 000000000..467276314 Binary files /dev/null and b/textures/projectiles/electro_projectile_long.tga differ diff --git a/textures/projectiles/electro_projectile_long_glow.tga b/textures/projectiles/electro_projectile_long_glow.tga new file mode 100644 index 000000000..467276314 Binary files /dev/null and b/textures/projectiles/electro_projectile_long_glow.tga differ diff --git a/textures/projectiles/hlac_projectile_core.tga b/textures/projectiles/hlac_projectile_core.tga new file mode 100644 index 000000000..f5a49e1b0 Binary files /dev/null and b/textures/projectiles/hlac_projectile_core.tga differ diff --git a/textures/projectiles/hlac_projectile_core_glow.tga b/textures/projectiles/hlac_projectile_core_glow.tga new file mode 100644 index 000000000..f5a49e1b0 Binary files /dev/null and b/textures/projectiles/hlac_projectile_core_glow.tga differ diff --git a/textures/projectiles/hlac_projectile_long.tga b/textures/projectiles/hlac_projectile_long.tga new file mode 100644 index 000000000..a7e68da2d Binary files /dev/null and b/textures/projectiles/hlac_projectile_long.tga differ diff --git a/textures/projectiles/hlac_projectile_long_glow.tga b/textures/projectiles/hlac_projectile_long_glow.tga new file mode 100644 index 000000000..a7e68da2d Binary files /dev/null and b/textures/projectiles/hlac_projectile_long_glow.tga differ diff --git a/textures/projectiles/laser_projectile_core.tga b/textures/projectiles/laser_projectile_core.tga new file mode 100644 index 000000000..1fdec98be Binary files /dev/null and b/textures/projectiles/laser_projectile_core.tga differ diff --git a/textures/projectiles/laser_projectile_core_glow.tga b/textures/projectiles/laser_projectile_core_glow.tga new file mode 100644 index 000000000..1fdec98be Binary files /dev/null and b/textures/projectiles/laser_projectile_core_glow.tga differ diff --git a/textures/projectiles/laser_projectile_long.tga b/textures/projectiles/laser_projectile_long.tga new file mode 100644 index 000000000..361342df9 Binary files /dev/null and b/textures/projectiles/laser_projectile_long.tga differ diff --git a/textures/projectiles/laser_projectile_long_glow.tga b/textures/projectiles/laser_projectile_long_glow.tga new file mode 100644 index 000000000..361342df9 Binary files /dev/null and b/textures/projectiles/laser_projectile_long_glow.tga differ diff --git a/xonotic-credits.txt b/xonotic-credits.txt index d253bd159..0e4cb8628 100644 --- a/xonotic-credits.txt +++ b/xonotic-credits.txt @@ -54,6 +54,7 @@ Antonio "terencehill" Piu Ben "MooKow" Banker Calinou chooksta +Cuinn "Cuinnton" Herrick Kristian "morfar" Johansson kojn Maik "SavageX" Merten