From: unknown Date: Mon, 8 Nov 2010 00:26:42 +0000 (+0100) Subject: Support g_balance_nex_charge_rot_pause, balance tweaks. X-Git-Tag: xonotic-v0.1.0preview~153^2~2^2~12 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1414279ac60161d55e8761f515aababd2d0a259a;p=xonotic%2Fxonotic-data.pk3dir.git Support g_balance_nex_charge_rot_pause, balance tweaks. --- diff --git a/balancetZork.cfg b/balancetZork.cfg index 38b77306f..7879d7a24 100644 --- a/balancetZork.cfg +++ b/balancetZork.cfg @@ -55,52 +55,67 @@ set g_balance_nix_ammoincr_fuel 2 // {{{ pickup items set g_pickup_ammo_anyway 1 set g_pickup_weapons_anyway 1 + set g_pickup_shells 20 set g_pickup_shells_weapon 10 -set g_pickup_shells_max 45 -set g_pickup_nails 120 +set g_pickup_shells_max 50 + +set g_pickup_nails 60 set g_pickup_nails_weapon 60 set g_pickup_nails_max 300 + set g_pickup_rockets 25 set g_pickup_rockets_weapon 15 set g_pickup_rockets_max 150 + set g_pickup_cells 30 set g_pickup_cells_weapon 20 -set g_pickup_cells_max 200 +set g_pickup_cells_max 300 + set g_pickup_fuel 25 set g_pickup_fuel_weapon 15 set g_pickup_fuel_jetpack 50 set g_pickup_fuel_max 999 + set g_pickup_armorsmall 5 set g_pickup_armorsmall_max 999 set g_pickup_armorsmall_anyway 0 + set g_pickup_armormedium 25 -set g_pickup_armormedium_max 999 +set g_pickup_armormedium_max 100 set g_pickup_armormedium_anyway 0 + set g_pickup_armorbig 50 -set g_pickup_armorbig_max 999 +set g_pickup_armorbig_max 150 set g_pickup_armorbig_anyway 0 + set g_pickup_armorlarge 100 set g_pickup_armorlarge_max 999 set g_pickup_armorlarge_anyway 0 + set g_pickup_healthsmall 5 set g_pickup_healthsmall_max 999 set g_pickup_healthsmall_anyway 0 + set g_pickup_healthmedium 25 -set g_pickup_healthmedium_max 999 +set g_pickup_healthmedium_max 100 set g_pickup_healthmedium_anyway 0 + set g_pickup_healthlarge 50 -set g_pickup_healthlarge_max 999 +set g_pickup_healthlarge_max 150 set g_pickup_healthlarge_anyway 0 + set g_pickup_healthmega 100 set g_pickup_healthmega_max 999 set g_pickup_healthmega_anyway 0 + set g_pickup_respawntime_short 15 set g_pickup_respawntime_medium 20 set g_pickup_respawntime_long 30 set g_pickup_respawntime_powerup 120 -set g_pickup_respawntime_weapon 5 -set g_pickup_respawntime_ammo 25 +set g_pickup_respawntime_weapon 20 +set g_pickup_respawntime_ammo 15 + set g_pickup_respawntimejitter_short 0 set g_pickup_respawntimejitter_medium 0 set g_pickup_respawntimejitter_long 0 @@ -120,16 +135,16 @@ set g_balance_pause_health_rot 5 set g_balance_pause_health_rot_spawn 10 set g_balance_health_regenstable 100 set g_balance_health_rotstable 100 -set g_balance_health_limit 999 +set g_balance_health_limit 300 set g_balance_armor_regen 0 set g_balance_armor_regenlinear 0 -set g_balance_armor_rot 0.1 +set g_balance_armor_rot 0.05 set g_balance_armor_rotlinear 0 set g_balance_pause_armor_rot 5 set g_balance_pause_armor_rot_spawn 10 set g_balance_armor_regenstable 100 set g_balance_armor_rotstable 100 -set g_balance_armor_limit 999 +set g_balance_armor_limit 300 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 @@ -144,7 +159,7 @@ set g_balance_fuel_limit 999 // }}} // {{{ misc -set g_balance_selfdamagepercent 0.65 +set g_balance_selfdamagepercent 0.6 set g_balance_weaponswitchdelay 0.15 set g_weaponspeedfactor 1 "weapon projectile speed multiplier" set g_weaponratefactor 1 "weapon fire rate multiplier" @@ -184,7 +199,7 @@ set g_balance_falldamage_maxdamage 15 set g_balance_powerup_invincible_takedamage 0.3 set g_balance_powerup_invincible_time 30 set g_balance_powerup_strength_damage 3 -set g_balance_powerup_strength_force 4 +set g_balance_powerup_strength_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 @@ -212,11 +227,11 @@ set g_balance_grapplehook_health 130 // {{{ weapon properties // {{{ laser -set g_balance_laser_primary_damage 20 // dps 33, hope that's not too high +set g_balance_laser_primary_damage 20 set g_balance_laser_primary_edgedamage 20 -set g_balance_laser_primary_force 270 +set g_balance_laser_primary_force 240 set g_balance_laser_primary_radius 60 -set g_balance_laser_primary_speed 4000 +set g_balance_laser_primary_speed 9000 set g_balance_laser_primary_spread 0 set g_balance_laser_primary_refire 0.6 set g_balance_laser_primary_animtime 0.6 @@ -224,7 +239,7 @@ set g_balance_laser_primary_lifetime 5 set g_balance_laser_primary_shotangle 0 set g_balance_laser_primary_delay 0 set g_balance_laser_primary_gauntlet 0 -set g_balance_laser_primary_force_zscale 1 +set g_balance_laser_primary_force_zscale 1.4 set g_balance_laser_primary_force_velocitybias 0 set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists set g_balance_laser_secondary_damage 35 @@ -341,20 +356,20 @@ set g_balance_minelayer_remote_radius 200 set g_balance_minelayer_remote_force 300 // }}} // {{{ electro -set g_balance_electro_lightning 1 -set g_balance_electro_primary_damage 110 +set g_balance_electro_lightning 0 +set g_balance_electro_primary_damage 50 set g_balance_electro_primary_edgedamage 0 -set g_balance_electro_primary_force 425 -set g_balance_electro_primary_force_up 125 -set g_balance_electro_primary_radius 850 -set g_balance_electro_primary_comboradius 150 -set g_balance_electro_primary_speed 0 +set g_balance_electro_primary_force 200 +set g_balance_electro_primary_force_up 0 +set g_balance_electro_primary_radius 150 +set g_balance_electro_primary_comboradius 0 +set g_balance_electro_primary_speed 2000 set g_balance_electro_primary_spread 0 -set g_balance_electro_primary_lifetime 0 -set g_balance_electro_primary_refire 0.4 -set g_balance_electro_primary_animtime 0.03333333 -set g_balance_electro_primary_ammo 7 -set g_balance_electro_primary_range 800 +set g_balance_electro_primary_lifetime 30 +set g_balance_electro_primary_refire 0.5 +set g_balance_electro_primary_animtime 0.3 +set g_balance_electro_primary_ammo 2 +set g_balance_electro_primary_range 0 set g_balance_electro_primary_falloff_mindist 255 // 0.3 * radius set g_balance_electro_primary_falloff_maxdist 850 set g_balance_electro_primary_falloff_halflifedist 425 @@ -362,20 +377,21 @@ set g_balance_electro_primary_falloff_halflifedist 425 set g_balance_electro_secondary_damage 25 set g_balance_electro_secondary_edgedamage 0 set g_balance_electro_secondary_force 100 -set g_balance_electro_secondary_radius 100 +set g_balance_electro_secondary_radius 75 set g_balance_electro_secondary_speed 500 set g_balance_electro_secondary_speed_up 150 set g_balance_electro_secondary_speed_z 0 set g_balance_electro_secondary_spread 0.08 -set g_balance_electro_secondary_lifetime 3.5 +set g_balance_electro_secondary_lifetime 5 set g_balance_electro_secondary_refire 0.1 set g_balance_electro_secondary_refire2 2 set g_balance_electro_secondary_animtime 0.2 set g_balance_electro_secondary_ammo 2 set g_balance_electro_secondary_health 10 -set g_balance_electro_secondary_damageforcescale 4 +set g_balance_electro_secondary_damageforcescale 2 set g_balance_electro_secondary_count 3 -set g_balance_electro_combo_damage 60 + +set g_balance_electro_combo_damage 90 set g_balance_electro_combo_edgedamage 0 set g_balance_electro_combo_force 80 set g_balance_electro_combo_radius 250 @@ -451,7 +467,8 @@ set g_balance_nex_charge_mindmg 10 set g_balance_nex_charge_start 0 set g_balance_nex_charge_rate 0.35 set g_balance_nex_charge_limit 0.5 -set g_balance_nex_charge_rot_rate 0 +set g_balance_nex_charge_rot_rate 0.1 +set g_balance_nex_charge_rot_pause 1 // Dont rot down untill this long after release of charge button set g_balance_nex_charge_shot_multiplier 0 set g_balance_nex_charge_velocity_rate 0 set g_balance_nex_charge_minspeed 400 @@ -464,13 +481,13 @@ set g_balance_minstanex_ammo 10 // }}} // {{{ hagar set g_balance_hagar_primary_damage 30 -set g_balance_hagar_primary_edgedamage 15 -set g_balance_hagar_primary_force 50 -set g_balance_hagar_primary_radius 65 +set g_balance_hagar_primary_edgedamage 10 +set g_balance_hagar_primary_force 60 +set g_balance_hagar_primary_radius 50 set g_balance_hagar_primary_spread 0.010 set g_balance_hagar_primary_speed 3000 set g_balance_hagar_primary_lifetime 30 -set g_balance_hagar_primary_refire 0.15 +set g_balance_hagar_primary_refire 0.2 set g_balance_hagar_primary_ammo 1 set g_balance_hagar_secondary 1 set g_balance_hagar_secondary_damage 30 @@ -485,21 +502,21 @@ set g_balance_hagar_secondary_refire 0.15 set g_balance_hagar_secondary_ammo 1 // }}} // {{{ rocketlauncher // TODO -set g_balance_rocketlauncher_damage 110 +set g_balance_rocketlauncher_damage 120 set g_balance_rocketlauncher_edgedamage 25 set g_balance_rocketlauncher_force 350 -set g_balance_rocketlauncher_radius 125 -set g_balance_rocketlauncher_speed 1000 +set g_balance_rocketlauncher_radius 130 +set g_balance_rocketlauncher_speed 900 set g_balance_rocketlauncher_speedaccel 0 -set g_balance_rocketlauncher_speedstart 1000 -set g_balance_rocketlauncher_lifetime 5 -set g_balance_rocketlauncher_refire 1 +set g_balance_rocketlauncher_speedstart 900 +set g_balance_rocketlauncher_lifetime 9 +set g_balance_rocketlauncher_refire 1.2 set g_balance_rocketlauncher_animtime 0.4 set g_balance_rocketlauncher_ammo 3 set g_balance_rocketlauncher_health 10 set g_balance_rocketlauncher_damageforcescale 0 set g_balance_rocketlauncher_detonatedelay -1 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time -set g_balance_rocketlauncher_guiderate 45 // max degrees per second +set g_balance_rocketlauncher_guiderate 18 // max degrees per second set g_balance_rocketlauncher_guideratedelay 0.01 // immediate set g_balance_rocketlauncher_guidegoal 512 // goal distance for (non-laser) guiding (higher = less control, lower = erratic) set g_balance_rocketlauncher_guidedelay 0.15 // delay before guiding kicks in @@ -580,13 +597,13 @@ set g_balance_campingrifle_reloadtime 2 // matches reload anim set g_balance_campingrifle_auto_reload_after_changing_weapons 0 set g_balance_campingrifle_bursttime 0 set g_balance_campingrifle_primary_tracer 1 -set g_balance_campingrifle_primary_damage 75 -set g_balance_campingrifle_primary_headshotaddeddamage 75 +set g_balance_campingrifle_primary_damage 60 +set g_balance_campingrifle_primary_headshotaddeddamage 90 set g_balance_campingrifle_primary_spread 0 set g_balance_campingrifle_primary_force 2 set g_balance_campingrifle_primary_speed 40000 set g_balance_campingrifle_primary_lifetime 5 -set g_balance_campingrifle_primary_refire 1.5 +set g_balance_campingrifle_primary_refire 0.5 set g_balance_campingrifle_primary_animtime 0.6 set g_balance_campingrifle_primary_ammo 10 set g_balance_campingrifle_primary_bulletconstant 110 // 62.2qu @@ -621,7 +638,7 @@ set g_balance_tuba_force 40 // {{{ fireball set g_balance_fireball_primary_ammo 40 set g_balance_fireball_primary_animtime 0.15 -set g_balance_fireball_primary_bfgdamage 100 +set g_balance_fireball_primary_bfgdamage 150 set g_balance_fireball_primary_bfgforce 0 set g_balance_fireball_primary_bfgradius 1000 set g_balance_fireball_primary_damage 200 @@ -675,8 +692,8 @@ set g_balance_seeker_missile_accel 1.05 set g_balance_seeker_missile_ammo 2 set g_balance_seeker_missile_animtime 0.3 set g_balance_seeker_missile_count 4 -set g_balance_seeker_missile_damage 40 -set g_balance_seeker_missile_damageforcescale 4 +set g_balance_seeker_missile_damage 50 +set g_balance_seeker_missile_damageforcescale 2 set g_balance_seeker_missile_decel 0.9 set g_balance_seeker_missile_delay 0.25 set g_balance_seeker_missile_edgedamage 10 @@ -705,7 +722,7 @@ set g_balance_seeker_tag_animtime 0.3 set g_balance_seeker_tag_damageforcescale 4 set g_balance_seeker_tag_health 5 set g_balance_seeker_tag_lifetime 15 -set g_balance_seeker_tag_refire 0.7 +set g_balance_seeker_tag_refire 1 set g_balance_seeker_tag_speed 9000 set g_balance_seeker_tag_spread 0 // End new seeker diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 35eff19e6..4399beb29 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -2810,7 +2810,7 @@ void PlayerPreThink (void) player_regen(); // rot nex charge to the charge limit - if(cvar("g_balance_nex_charge_rot_rate") && self.nex_charge > cvar("g_balance_nex_charge_limit")) + if(cvar("g_balance_nex_charge_rot_rate") && self.nex_charge > cvar("g_balance_nex_charge_limit") && self.nex_charge_rottime < time) self.nex_charge = bound(cvar("g_balance_nex_charge_limit"), self.nex_charge - cvar("g_balance_nex_charge_rot_rate") * frametime / W_TICSPERFRAME, 1); if(frametime) diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index 45394eb79..fc01718ca 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -658,5 +658,6 @@ string deathmessage; .entity realowner; .float nex_charge; +.float nex_charge_rottime; float allowed_to_spawn; // boolean variable used by the clan arena code to determine if a player can spawn (after the round has ended) diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc index 493fd005b..d152a6e08 100644 --- a/qcsrc/server/w_nex.qc +++ b/qcsrc/server/w_nex.qc @@ -100,6 +100,7 @@ float w_nex(float req) { if(cvar("g_balance_nex_secondary_charge")) { + self.nex_charge_rottime = time + cvar("g_balance_nex_charge_rot_pause"); dt = frametime / W_TICSPERFRAME; if(self.nex_charge < 1) {