Commit 17a1111f authored by TimePath's avatar TimePath

Merge branch 'master' into TimePath/features/jetpack_jump

parents 5ebc9d94 939f709e
......@@ -761,3 +761,44 @@ set g_balance_arc_weaponstart 0
set g_balance_arc_weaponstartoverride -1
set g_balance_arc_weaponthrowable 1
// }}}
// {{{ #21: Heavy Machine Gun
set g_balance_hmg_ammo 1
set g_balance_hmg_damage 10
set g_balance_hmg_force 5
set g_balance_hmg_refire 0.05
set g_balance_hmg_reload_ammo 120
set g_balance_hmg_reload_time 1
set g_balance_hmg_solidpenetration 32
set g_balance_hmg_spread_add 0.01
set g_balance_hmg_spread_max 0.05
set g_balance_hmg_spread_min 0.02
set g_balance_hmg_switchdelay_drop 0.2
set g_balance_hmg_switchdelay_raise 0.2
set g_balance_hmg_weaponreplace ""
set g_balance_hmg_weaponstart 0
set g_balance_hmg_weaponstartoverride 0
set g_balance_hmg_weaponthrowable 0
// }}}
// {{{ #22: Rocket Propelled Chainsaw
set g_balance_rpc_ammo 10
set g_balance_rpc_animtime 1
set g_balance_rpc_damage 150
set g_balance_rpc_damage2 500
set g_balance_rpc_damageforcescale 2
set g_balance_rpc_edgedamage 50
set g_balance_rpc_force 400
set g_balance_rpc_health 25
set g_balance_rpc_lifetime 30
set g_balance_rpc_radius 300
set g_balance_rpc_refire 1
set g_balance_rpc_reload_ammo 10
set g_balance_rpc_reload_time 1
set g_balance_rpc_speed 1250
set g_balance_rpc_speedaccel 5000
set g_balance_rpc_switchdelay_drop 0.2
set g_balance_rpc_switchdelay_raise 0.2
set g_balance_rpc_weaponreplace ""
set g_balance_rpc_weaponstart 0
set g_balance_rpc_weaponstartoverride 0
set g_balance_rpc_weaponthrowable 0
// }}}
This diff is collapsed.
......@@ -759,3 +759,44 @@ set g_balance_shotgun_weaponstart 0
set g_balance_shotgun_weaponstartoverride -1
set g_balance_shotgun_weaponthrowable 1
// }}}
// {{{ #21: Heavy Machine Gun
set g_balance_hmg_ammo 1
set g_balance_hmg_damage 10
set g_balance_hmg_force 5
set g_balance_hmg_refire 0.05
set g_balance_hmg_reload_ammo 120
set g_balance_hmg_reload_time 1
set g_balance_hmg_solidpenetration 32
set g_balance_hmg_spread_add 0.01
set g_balance_hmg_spread_max 0.05
set g_balance_hmg_spread_min 0.02
set g_balance_hmg_switchdelay_drop 0.2
set g_balance_hmg_switchdelay_raise 0.2
set g_balance_hmg_weaponreplace ""
set g_balance_hmg_weaponstart 0
set g_balance_hmg_weaponstartoverride 0
set g_balance_hmg_weaponthrowable 0
// }}}
// {{{ #22: Rocket Propelled Chainsaw
set g_balance_rpc_ammo 10
set g_balance_rpc_animtime 1
set g_balance_rpc_damage 150
set g_balance_rpc_damage2 500
set g_balance_rpc_damageforcescale 2
set g_balance_rpc_edgedamage 50
set g_balance_rpc_force 400
set g_balance_rpc_health 25
set g_balance_rpc_lifetime 30
set g_balance_rpc_radius 300
set g_balance_rpc_refire 1
set g_balance_rpc_reload_ammo 10
set g_balance_rpc_reload_time 1
set g_balance_rpc_speed 1250
set g_balance_rpc_speedaccel 5000
set g_balance_rpc_switchdelay_drop 0.2
set g_balance_rpc_switchdelay_raise 0.2
set g_balance_rpc_weaponreplace ""
set g_balance_rpc_weaponstart 0
set g_balance_rpc_weaponstartoverride 0
set g_balance_rpc_weaponthrowable 0
// }}}
......@@ -761,3 +761,44 @@ set g_balance_arc_weaponstart 0
set g_balance_arc_weaponstartoverride -1
set g_balance_arc_weaponthrowable 1
// }}}
// {{{ #21: Heavy Machine Gun
set g_balance_hmg_ammo 1
set g_balance_hmg_damage 10
set g_balance_hmg_force 5
set g_balance_hmg_refire 0.05
set g_balance_hmg_reload_ammo 120
set g_balance_hmg_reload_time 1
set g_balance_hmg_solidpenetration 32
set g_balance_hmg_spread_add 0.01
set g_balance_hmg_spread_max 0.05
set g_balance_hmg_spread_min 0.02
set g_balance_hmg_switchdelay_drop 0.2
set g_balance_hmg_switchdelay_raise 0.2
set g_balance_hmg_weaponreplace ""
set g_balance_hmg_weaponstart 0
set g_balance_hmg_weaponstartoverride 0
set g_balance_hmg_weaponthrowable 0
// }}}
// {{{ #22: Rocket Propelled Chainsaw
set g_balance_rpc_ammo 10
set g_balance_rpc_animtime 1
set g_balance_rpc_damage 150
set g_balance_rpc_damage2 500
set g_balance_rpc_damageforcescale 2
set g_balance_rpc_edgedamage 50
set g_balance_rpc_force 400
set g_balance_rpc_health 25
set g_balance_rpc_lifetime 30
set g_balance_rpc_radius 300
set g_balance_rpc_refire 1
set g_balance_rpc_reload_ammo 10
set g_balance_rpc_reload_time 1
set g_balance_rpc_speed 1250
set g_balance_rpc_speedaccel 5000
set g_balance_rpc_switchdelay_drop 0.2
set g_balance_rpc_switchdelay_raise 0.2
set g_balance_rpc_weaponreplace ""
set g_balance_rpc_weaponstart 0
set g_balance_rpc_weaponstartoverride 0
set g_balance_rpc_weaponthrowable 0
// }}}
......@@ -761,3 +761,44 @@ set g_balance_arc_weaponstart 0
set g_balance_arc_weaponstartoverride -1
set g_balance_arc_weaponthrowable 1
// }}}
// {{{ #21: Heavy Machine Gun
set g_balance_hmg_ammo 1
set g_balance_hmg_damage 10
set g_balance_hmg_force 5
set g_balance_hmg_refire 0.05
set g_balance_hmg_reload_ammo 120
set g_balance_hmg_reload_time 1
set g_balance_hmg_solidpenetration 32
set g_balance_hmg_spread_add 0.01
set g_balance_hmg_spread_max 0.05
set g_balance_hmg_spread_min 0.02
set g_balance_hmg_switchdelay_drop 0.2
set g_balance_hmg_switchdelay_raise 0.2
set g_balance_hmg_weaponreplace ""
set g_balance_hmg_weaponstart 0
set g_balance_hmg_weaponstartoverride 0
set g_balance_hmg_weaponthrowable 0
// }}}
// {{{ #22: Rocket Propelled Chainsaw
set g_balance_rpc_ammo 10
set g_balance_rpc_animtime 1
set g_balance_rpc_damage 150
set g_balance_rpc_damage2 500
set g_balance_rpc_damageforcescale 2
set g_balance_rpc_edgedamage 50
set g_balance_rpc_force 400
set g_balance_rpc_health 25
set g_balance_rpc_lifetime 30
set g_balance_rpc_radius 300
set g_balance_rpc_refire 1
set g_balance_rpc_reload_ammo 10
set g_balance_rpc_reload_time 1
set g_balance_rpc_speed 1250
set g_balance_rpc_speedaccel 5000
set g_balance_rpc_switchdelay_drop 0.2
set g_balance_rpc_switchdelay_raise 0.2
set g_balance_rpc_weaponreplace ""
set g_balance_rpc_weaponstart 0
set g_balance_rpc_weaponstartoverride 0
set g_balance_rpc_weaponthrowable 0
// }}}
......@@ -761,3 +761,44 @@ set g_balance_arc_weaponstart 0
set g_balance_arc_weaponstartoverride -1
set g_balance_arc_weaponthrowable 1
// }}}
// {{{ #21: Heavy Machine Gun
set g_balance_hmg_ammo 1
set g_balance_hmg_damage 10
set g_balance_hmg_force 5
set g_balance_hmg_refire 0.05
set g_balance_hmg_reload_ammo 120
set g_balance_hmg_reload_time 1
set g_balance_hmg_solidpenetration 32
set g_balance_hmg_spread_add 0.01
set g_balance_hmg_spread_max 0.05
set g_balance_hmg_spread_min 0.02
set g_balance_hmg_switchdelay_drop 0.2
set g_balance_hmg_switchdelay_raise 0.2
set g_balance_hmg_weaponreplace ""
set g_balance_hmg_weaponstart 0
set g_balance_hmg_weaponstartoverride 0
set g_balance_hmg_weaponthrowable 0
// }}}
// {{{ #22: Rocket Propelled Chainsaw
set g_balance_rpc_ammo 10
set g_balance_rpc_animtime 1
set g_balance_rpc_damage 150
set g_balance_rpc_damage2 500
set g_balance_rpc_damageforcescale 2
set g_balance_rpc_edgedamage 50
set g_balance_rpc_force 400
set g_balance_rpc_health 25
set g_balance_rpc_lifetime 30
set g_balance_rpc_radius 300
set g_balance_rpc_refire 1
set g_balance_rpc_reload_ammo 10
set g_balance_rpc_reload_time 1
set g_balance_rpc_speed 1250
set g_balance_rpc_speedaccel 5000
set g_balance_rpc_switchdelay_drop 0.2
set g_balance_rpc_switchdelay_raise 0.2
set g_balance_rpc_weaponreplace ""
set g_balance_rpc_weaponstart 0
set g_balance_rpc_weaponstartoverride 0
set g_balance_rpc_weaponthrowable 0
// }}}
g_mod_balance Overkill
// {{{ starting gear
set g_balance_health_start 100
set g_balance_armor_start 0
set g_start_ammo_shells 15
set g_start_ammo_nails 0
set g_start_ammo_rockets 0
set g_start_ammo_cells 0
set g_start_ammo_plasma 0
set g_start_ammo_fuel 0
set g_warmup_start_health 100 "starting values when being in warmup-stage"
set g_warmup_start_armor 100 "starting values when being in warmup-stage"
set g_warmup_start_ammo_shells 30 "starting values when being in warmup-stage"
set g_warmup_start_ammo_nails 160 "starting values when being in warmup-stage"
set g_warmup_start_ammo_rockets 80 "starting values when being in warmup-stage"
set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
set g_warmup_start_ammo_plasma 90 "starting values when being in warmup-stage"
set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
set g_lms_start_health 200
set g_lms_start_armor 200
set g_lms_start_ammo_shells 60
set g_lms_start_ammo_nails 320
set g_lms_start_ammo_rockets 160
set g_lms_start_ammo_cells 180
set g_lms_start_ammo_plasma 180
set g_lms_start_ammo_fuel 0
set g_balance_nix_roundtime 25
set g_balance_nix_incrtime 1.6
set g_balance_nix_ammo_shells 60
set g_balance_nix_ammo_nails 320
set g_balance_nix_ammo_rockets 160
set g_balance_nix_ammo_cells 180
set g_balance_nix_ammo_plasma 180
set g_balance_nix_ammo_fuel 0
set g_balance_nix_ammoincr_shells 2 // eh this will need figured out later I assume
set g_balance_nix_ammoincr_nails 6
set g_balance_nix_ammoincr_rockets 2
set g_balance_nix_ammoincr_cells 2
set g_balance_nix_ammoincr_plasma 2
set g_balance_nix_ammoincr_fuel 2
// }}}
// {{{ pickup items
set g_pickup_ammo_anyway 1
set g_pickup_weapons_anyway 1
set g_pickup_shells 15
set g_pickup_shells_weapon 15
set g_pickup_shells_max 60
set g_pickup_nails 80
set g_pickup_nails_weapon 80
set g_pickup_nails_max 320
set g_pickup_rockets 40
set g_pickup_rockets_weapon 40
set g_pickup_rockets_max 160
set g_pickup_cells 30
set g_pickup_cells_weapon 30
set g_pickup_cells_max 180
set g_pickup_plasma 30
set g_pickup_plasma_weapon 30
set g_pickup_plasma_max 180
set g_pickup_fuel 50
set g_pickup_fuel_weapon 50
set g_pickup_fuel_jetpack 100
set g_pickup_fuel_max 100
set g_pickup_armorsmall 5
set g_pickup_armorsmall_max 20
set g_pickup_armorsmall_anyway 0
set g_pickup_armormedium 25
set g_pickup_armormedium_max 200
set g_pickup_armormedium_anyway 1
set g_pickup_armorbig 50
set g_pickup_armorbig_max 200
set g_pickup_armorbig_anyway 1
set g_pickup_armorlarge 100
set g_pickup_armorlarge_max 200
set g_pickup_armorlarge_anyway 1
set g_pickup_healthsmall 5
set g_pickup_healthsmall_max 200
set g_pickup_healthsmall_anyway 1
set g_pickup_healthmedium 25
set g_pickup_healthmedium_max 200
set g_pickup_healthmedium_anyway 1
set g_pickup_healthlarge 50
set g_pickup_healthlarge_max 200
set g_pickup_healthlarge_anyway 1
set g_pickup_healthmega 100
set g_pickup_healthmega_max 200
set g_pickup_healthmega_anyway 0
set g_pickup_respawntime_short 15
set g_pickup_respawntime_medium 20
set g_pickup_respawntime_long 30
set g_pickup_respawntime_powerup 120
set g_pickup_respawntime_weapon 10
set g_pickup_respawntime_superweapon 120
set g_pickup_respawntime_ammo 10
set g_pickup_respawntimejitter_short 0
set g_pickup_respawntimejitter_medium 0
set g_pickup_respawntimejitter_long 0
set g_pickup_respawntimejitter_powerup 0
set g_pickup_respawntimejitter_weapon 0
set g_pickup_respawntimejitter_superweapon 10
set g_pickup_respawntimejitter_ammo 0
// }}}
// {{{ regen/rot
set g_balance_health_regen 0
set g_balance_health_regenlinear 100
set g_balance_pause_health_regen 2
set g_balance_pause_health_regen_spawn 0
set g_balance_health_rot 0
set g_balance_health_rotlinear 1
set g_balance_pause_health_rot 1
set g_balance_pause_health_rot_spawn 5
set g_balance_health_regenstable 100
set g_balance_health_rotstable 200
set g_balance_health_limit 999
set g_balance_armor_regen 0
set g_balance_armor_regenlinear 0
set g_balance_armor_rot 0
set g_balance_armor_rotlinear 1
set g_balance_pause_armor_rot 1
set g_balance_pause_armor_rot_spawn 5
set g_balance_armor_regenstable 100
set g_balance_armor_rotstable 0
set g_balance_armor_limit 999
set g_balance_armor_blockpercent 0.7
set g_balance_fuel_regen 0.1 "fuel regeneration (only applies if the player owns IT_FUEL_REGEN)"
set g_balance_fuel_regenlinear 0
set g_balance_pause_fuel_regen 2 // other than this, fuel uses the health regen counter
set g_balance_fuel_rot 0.05
set g_balance_fuel_rotlinear 0
set g_balance_pause_fuel_rot 5
set g_balance_pause_fuel_rot_spawn 10
set g_balance_fuel_regenstable 50
set g_balance_fuel_rotstable 100
set g_balance_fuel_limit 999
// }}}
// {{{ misc
set g_balance_selfdamagepercent 0.65
set g_weaponspeedfactor 1 "weapon projectile speed multiplier"
set g_weaponratefactor 1 "weapon fire rate multiplier"
set g_weapondamagefactor 1 "weapon damage multiplier"
set g_weaponforcefactor 1 "weapon force multiplier"
set g_weaponspreadfactor 1 "weapon spread multiplier"
set g_balance_firetransfer_time 0.9
set g_balance_firetransfer_damage 0.8
set g_throughfloor_damage 0.75
set g_throughfloor_force 0.75
set g_projectiles_damage -2
// possible values:
// -2: absolutely no damage to projectiles (no exceptions)
// -1: no damage other than the exceptions (electro combo, hagar join explode, ML mines)
// 0: only damage from contents (lava/slime) or exceptions
// 1: only self damage or damage from contents or exceptions
// 2: allow all damage to projectiles normally
set g_projectiles_keep_owner 0
set g_projectiles_newton_style 0
// possible values:
// 0: absolute velocity projectiles (like Quake)
// 1: relative velocity projectiles, "Newtonian" (like Tribes 2)
// 2: relative velocity projectiles, but aim is precorrected so projectiles hit the crosshair (note: strafe rockets then are SLOWER than ones shot while standing, happens in 1 too when aiming correctly which is hard)
set g_projectiles_newton_style_2_minfactor 1
set g_projectiles_newton_style_2_maxfactor 1.5
set g_projectiles_spread_style 7
// possible values:
// 0: forward + solid sphere (like Quake) - varies velocity
// 1: forward + flattened solid sphere
// 2: forward + solid circle
// 3: forward + normal distribution 3D - varies velocity
// 4: forward + normal distribution on a plane
// 5: forward + circle with 1-r falloff
// 6: forward + circle with 1-r^2 falloff
// 7: forward + circle with (1-r)(2-r) falloff
set g_balance_falldamage_deadminspeed 250
set g_balance_falldamage_minspeed 900
set g_balance_falldamage_factor 0.20
set g_balance_falldamage_maxdamage 40
set g_balance_damagepush_speedfactor 2.5
set g_balance_contents_damagerate 0.2 // ticrate interval for applying damage with playerdamage/projectiledamage
set g_balance_contents_drowndelay 10 // time under water before a player begins drowning
set g_balance_contents_playerdamage_drowning 20 // damage per second for while player is drowning
set g_balance_contents_playerdamage_lava 50 // damage per second for while player is inside lava
set g_balance_contents_playerdamage_slime 30 // damage per second for while player is inside slime
set g_balance_contents_projectiledamage 10000 // instantly kill projectiles upon touching lava/slime
set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone into a death trap"
// }}}
// {{{ powerups
set g_balance_powerup_invincible_takedamage 0.33 // only 1/3rd damage is taken
set g_balance_powerup_invincible_time 30
set g_balance_powerup_strength_damage 3
set g_balance_powerup_strength_force 3
set g_balance_powerup_strength_time 30
set g_balance_powerup_strength_selfdamage 1.5
set g_balance_powerup_strength_selfforce 1.5
set g_balance_superweapons_time 30
// }}}
// {{{ jetpack/hook
set g_jetpack_antigravity 0.8 "factor of gravity compensation of the jetpack"
set g_jetpack_acceleration_side 1200 "acceleration of the jetpack in xy direction"
set g_jetpack_acceleration_up 600 "acceleration of the jetpack in z direction (note: you have to factor in gravity here, if antigravity is not 1)"
set g_jetpack_maxspeed_side 1200 "max speed of the jetpack in xy direction"
set g_jetpack_maxspeed_up 600 "max speed of the jetpack in z direction"
set g_jetpack_fuel 8 "fuel per second for jetpack"
set g_jetpack_attenuation 2 "jetpack sound attenuation"
set g_grappling_hook_tarzan 2 // 2: can also pull players
set g_balance_grapplehook_speed_fly 1800
set g_balance_grapplehook_speed_pull 2000
set g_balance_grapplehook_force_rubber 2000
set g_balance_grapplehook_force_rubber_overstretch 1000
set g_balance_grapplehook_length_min 50
set g_balance_grapplehook_stretch 50
set g_balance_grapplehook_airfriction 0.2
set g_balance_grapplehook_health 50
set g_balance_grapplehook_damagedbycontents 1
set g_balance_grapplehook_refire 0.2
// }}}
// {{{ port-o-launch
set g_balance_portal_health 200 // these get recharged whenever the portal is used
set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
// }}}
exec bal-wep-overkill.cfg
......@@ -8110,7 +8110,7 @@ bounce 1.5
liquidfriction 4
velocityjitter 16 16 16
effect nade
effect nade_neutral
trailspacing 1
type smoke
color 0xFFFFFF 0xFFFFFF
......@@ -8120,7 +8120,7 @@ sizeincrease -1
alpha 100 100 250
//gravity -0.11
// fire
effect nade
effect nade_neutral
notunderwater
trailspacing 8
type smoke
......@@ -8130,7 +8130,7 @@ size 15 25
sizeincrease -10
alpha 30 30 150
// bubbles
effect nade
effect nade_neutral
underwater
trailspacing 16
type bubble
......@@ -8307,7 +8307,7 @@ tex 33 33
size 25 25
sizeincrease -30
effect nade_burn
effect nade_neutral_burn
trailspacing 1
type smoke
color 0xFFFFFF 0xFFFFFF
......@@ -8317,7 +8317,7 @@ sizeincrease -1
alpha 100 100 250
//gravity -0.11
// fire
effect nade_burn
effect nade_neutral_burn
notunderwater
trailspacing 64
type smoke
......@@ -8327,7 +8327,7 @@ size 45 25
sizeincrease -30
alpha 200 200 1000
// bubbles
effect nade_burn
effect nade_neutral_burn
underwater
trailspacing 16
type bubble
......@@ -8339,7 +8339,7 @@ gravity -0.125
bounce 1.5
liquidfriction 4
velocityjitter 16 16 16
effect nade_burn
effect nade_neutral_burn
trailspacing 16
type smoke
color 0xFFFFFF 0xFFFFFF
......@@ -8829,7 +8829,7 @@ originjitter 64 64 64
velocityjitter 324 324 324
rotate -180 180 -100 100
effect nade_explode
effect nade_neutral_explode
countabsolute 1
type decal
tex 8 16
......@@ -8840,7 +8840,7 @@ lightradius 300
lightradiusfade 1500
lightcolor 100 20 20
// shockwave
effect nade_explode
effect nade_neutral_explode
type smoke
countabsolute 1
tex 33 33
......@@ -8850,7 +8850,7 @@ color 0xff0000 0xffa2a2
alpha 80 80 650
velocitymultiplier 44
// fire
effect nade_explode
effect nade_neutral_explode
notunderwater
count 16
type smoke
......@@ -8864,7 +8864,7 @@ originjitter 50 50 50
velocityjitter 320 320 320
rotate -180 180 -9 9
// fire stretched
effect nade_explode
effect nade_neutral_explode
count 8
type spark
tex 48 55
......@@ -8876,7 +8876,7 @@ sizeincrease 40
velocityjitter 30 30 30
airfriction -9
//smoke
effect nade_explode
effect nade_neutral_explode
type smoke
count 32
blend alpha
......@@ -8892,7 +8892,7 @@ sizeincrease 50
airfriction 0.04
gravity 0.4
// underwater bubbles
effect nade_explode
effect nade_neutral_explode
underwater
count 32
type bubble
......@@ -8907,7 +8907,7 @@ originjitter 16 16 16
velocityjitter 196 196 196
rotate 0 0 0 0
// bouncing sparks
effect nade_explode
effect nade_neutral_explode
notunderwater
count 8
type spark
......@@ -8923,7 +8923,7 @@ velocityoffset 0 0 80
originjitter 16 16 16
velocityjitter 424 424 624
// notbouncing sparks
effect nade_explode
effect nade_neutral_explode
count 16
type spark
tex 40 40
......@@ -8937,7 +8937,7 @@ velocityoffset 0 0 80
originjitter 16 16 16
velocityjitter 424 424 624
// debris
effect nade_explode
effect nade_neutral_explode
notunderwater
count 8
type smoke
......
......@@ -18,7 +18,7 @@
"weaplast" "dernière utilisée"
"weapbest" "meilleure arme"
"reload" "recharger"
"weapon_group_1" "Laser"
"weapon_group_1" "Blaster"
"weapon_group_2" "Fusil"
"weapon_group_3" "Mitrailleuse / Arc"
"weapon_group_4" "Mortier / Poseur de Mines"
......@@ -26,7 +26,7 @@
"weapon_group_6" "Crylink / HLAC"
"weapon_group_7" "Vortex / Fusil de précision"
"weapon_group_8" "Hagar / Seeker"
"weapon_group_9" "Lance-roquettes / Fireball"
"weapon_group_9" "Devastator / Fireball"
"weapon_group_0" "Port-O-Launch / Grappin"
"" ""
"" "Vue"
......
......@@ -33,6 +33,33 @@ set g_instagib_invis_alpha 0.15
set g_instagib_speed_highspeed 1.5 "speed-multiplier that applies while you carry the invincibility powerup"
// ==========
// overkill
// ==========
set g_overkill 0 "enable overkill"
set g_overkill_100a_anyway 1
set g_overkill_100h_anyway 1
set g_overkill_powerups_replace 1
set g_overkill_superguns_respawn_time 20
set g_overkill_ammo_charge 1
set g_overkill_ammo_charge_notice 1
set g_overkill_ammo_charge_limit 1
set g_overkill_ammo_charge_rate 0.5
set g_overkill_ammo_charge_rate_vortex 0.5
set g_overkill_ammo_charge_rate_machinegun 0.5
set g_overkill_ammo_charge_rate_shotgun 0.5
set g_overkill_ammo_charge_rate_hmg 0.25
set g_overkill_ammo_charge_rate_rpc 1.5
set g_overkill_ammo_decharge 0.1
set g_overkill_ammo_decharge_machinegun 0.025
set g_overkill_ammo_decharge_shotgun 0.15
set g_overkill_ammo_decharge_vortex 0.2
set g_overkill_ammo_decharge_rpc 1
set g_overkill_ammo_decharge_hmg 0.01
// =========
// vampire
// =========
......
......@@ -1543,6 +1543,10 @@ void CSQC_UpdateView(float w, float h)
weapon_clipload = getstati(STAT_WEAPON_CLIPLOAD);
weapon_clipsize = getstati(STAT_WEAPON_CLIPSIZE);
float ok_ammo_charge, ok_ammo_chargepool;
ok_ammo_charge = getstatf(STAT_OK_AMMO_CHARGE);
ok_ammo_chargepool = getstatf(STAT_OK_AMMO_CHARGEPOOl);
float vortex_charge, vortex_chargepool;
vortex_charge = getstatf(STAT_VORTEX_CHARGE);
vortex_chargepool = getstatf(STAT_VORTEX_CHARGEPOOL);
......@@ -1588,8 +1592,14 @@ void CSQC_UpdateView(float w, float h)
ring_rgb = wcross_color;
ring_image = "gfx/crosshair_ring.tga";
}
if(autocvar_crosshair_ring_reload && weapon_clipsize) // forces there to be only an ammo ring
else if (ok_ammo_charge)
{
ring_value = ok_ammo_chargepool;
ring_alpha = autocvar_crosshair_ring_reload_alpha;
ring_rgb = wcross_color;
ring_image = "gfx/crosshair_ring.tga";
}
else if(autocvar_crosshair_ring_reload && weapon_clipsize) // forces there to be only an ammo ring
{
ring_value = bound(0, weapon_clipload / weapon_clipsize, 1);
ring_scale = autocvar_crosshair_ring_reload_size;
......
......@@ -454,4 +454,12 @@ string autocvar__cl_playermodel;
float autocvar_cl_deathglow;
float autocvar_developer_csqcentities;
float autocvar_g_jetpack_attenuation;
var string autocvar_crosshair_hmg = "";
var vector autocvar_crosshair_hmg_color = '0.2 1.0 0.2';
var float autocvar_crosshair_hmg_alpha = 1;
var float autocvar_crosshair_hmg_size = 1;
var string autocvar_crosshair_rpc = "";
var vector autocvar_crosshair_rpc_color = '0.2 1.0 0.2';
var float autocvar_crosshair_rpc_alpha = 1;
var float autocvar_crosshair_rpc_size = 1;
float autocvar_cl_nade_timer;
......@@ -309,6 +309,8 @@ void Ent_Projectile()
case PROJECTILE_BUMBLE_GUN: setmodel(self, "models/elaser.mdl");self.traileffect = particleeffectnum("TR_NEXUIZPLASMA"); break;
case PROJECTILE_BUMBLE_BEAM: setmodel(self, "models/elaser.mdl");self.traileffect = particleeffectnum("TR_NEXUIZPLASMA"); break;
case PROJECTILE_RPC: setmodel(self, "models/weapons/ok_rocket.md3");self.traileffect = particleeffectnum("TR_ROCKET"); break;
default:
if(Nade_IDFromProjectile(self.cnt) != 0) { setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum(Nade_TrailEffect(self.cnt, self.team)); break; }
error("Received invalid CSQC projectile, can't work with this!");
......@@ -334,6 +336,7 @@ void Ent_Projectile()
self.move_bounce_factor = g_balance_electro_secondary_bouncefactor;
self.move_bounce_stopspeed = g_balance_electro_secondary_bouncestop;
break;
case PROJECTILE_RPC:
case PROJECTILE_ROCKET:
loopsound(self, CH_SHOTS_SINGLE, "weapons/rocket_fly.wav", VOL_BASE, ATTEN_NORM);
self.mins = '-3 -3 -3';
......@@ -441,17 +444,19 @@ void Ent_Projectile()
if(Nade_IDFromProjectile(self.cnt) != 0)
{
float nade_type = Nade_IDFromProjectile(self.cnt);
self.mins = '-16 -16 -16';
self.maxs = '16 16 16';
self.colormod = Nade_Color(Nade_IDFromProjectile(self.cnt));
self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_PLAYERCLIP | DPCONTENTS_BOTCLIP;
self.colormod = Nade_Color(nade_type);
self.move_movetype = MOVETYPE_BOUNCE;
self.move_touch = func_null;
self.scale = 1.5;
self.avelocity = randomvec() * 720;
if(Nade_IDFromProjectile(self.cnt) == NADE_TYPE_TRANSLOCATE)
self.solid = SOLID_TRIGGER;
if(nade_type == NADE_TYPE_TRANSLOCATE || nade_type == NADE_TYPE_SPAWN)
self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_PLAYERCLIP | DPCONTENTS_BOTCLIP;
else
self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY;
}
setsize(self, self.mins, self.maxs);
......@@ -495,6 +500,7 @@ void Projectile_Precache()
precache_model("models/sphere/sphere.md3");
precache_model("models/weapons/v_ok_grenade.md3");
precache_model("models/weapons/ok_rocket.md3");
precache_sound("weapons/electro_fly.wav");
precache_sound("weapons/rocket_fly.wav");
......
......@@ -273,6 +273,8 @@ const float PROJECTILE_BUMBLE_BEAM = 31;
const float PROJECTILE_MAGE_SPIKE = 32;
const float PROJECTILE_SHAMBLER_LIGHTNING = 33;
const float PROJECTILE_RPC = 60;
const float SPECIES_HUMAN = 0;
const float SPECIES_ROBOT_SOLID = 1;
const float SPECIES_ALIEN = 2;
......
......@@ -1233,7 +1233,7 @@ float MapInfo_CurrentFeatures()
{
float req;
req = 0;
if(!(cvar("g_lms") || cvar("g_instagib") || cvar("g_nix") || cvar("g_weaponarena") || !cvar("g_pickup_items") || cvar("g_race") || cvar("g_cts") || cvar("g_nexball")))
if(!(cvar("g_lms") || cvar("g_instagib") || cvar("g_overkill") || cvar("g_nix") || cvar("g_weaponarena") || !cvar("g_pickup_items") || cvar("g_race") || cvar("g_cts") || cvar("g_nexball")))
req |= MAPINFO_FEATURE_WEAPONS;
return req;
}
......
......@@ -523,6 +523,8 @@ void Send_Notification_WOCOVA(
MSG_INFO_NOTIF(1, INFO_WEAPON_HAGAR_SUICIDE, 2, 1, "s1 s2loc spree_lost", "s1", "weaponhagar", _("^BG%s^K1 played with tiny Hagar rockets%s%s"), "") \
MSG_INFO_NOTIF(1, INFO_WEAPON_HLAC_MURDER, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponhlac", _("^BG%s%s^K1 was cut down with ^BG%s^K1's HLAC%s%s"), "") \
MSG_INFO_NOTIF(1, INFO_WEAPON_HLAC_SUICIDE, 2, 1, "s1 s2loc spree_lost", "s1", "weaponhlac", _("^BG%s^K1 got a little jumpy with their HLAC%s%s"), "") \
MSG_INFO_NOTIF(1, INFO_WEAPON_HMG_MURDER_SNIPE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponhmg", _("^BG%s%s^K1 was sniped by ^BG%s^K1's Heavy Machine Gun%s%s"), "") \
MSG_INFO_NOTIF(1, INFO_WEAPON_HMG_MURDER_SPRAY, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponhmg", _("^BG%s%s^K1 was torn to bits by ^BG%s^K1's Heavy Machine Gun%s%s"), "") \