X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=balanceFruit.cfg;h=ff9567877a252bfd598ac2897d39e9442a4fbf28;hb=e83706a920b62a30d5c15aed0ef6df77632ec73e;hp=8c7b4b652d105dc35606475ae471e07d25ada92a;hpb=e9918229a3c35fd1fa2a812a19c0a1c237bc6e0e;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/balanceFruit.cfg b/balanceFruit.cfg index 8c7b4b652..ff9567877 100644 --- a/balanceFruit.cfg +++ b/balanceFruit.cfg @@ -18,7 +18,7 @@ set g_start_weapon_fireball 0 "0 = never provide the weapon, 1 = always provide set g_start_weapon_seeker 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" set g_balance_health_start 125 set g_balance_armor_start 0 -set g_start_ammo_shells 20 +set g_start_ammo_shells 14 set g_start_ammo_nails 0 set g_start_ammo_rockets 0 set g_start_ammo_cells 0 @@ -32,10 +32,10 @@ set g_warmup_start_ammo_cells 50 "starting values when being in warmup-stage" set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage" set g_lms_start_health 250 set g_lms_start_armor 100 -set g_lms_start_ammo_shells 50 -set g_lms_start_ammo_nails 150 -set g_lms_start_ammo_rockets 50 -set g_lms_start_ammo_cells 50 +set g_lms_start_ammo_shells 30 +set g_lms_start_ammo_nails 300 +set g_lms_start_ammo_rockets 100 +set g_lms_start_ammo_cells 200 set g_lms_start_ammo_fuel 0 set g_balance_nix_roundtime 25 set g_balance_nix_incrtime 1.6 @@ -54,12 +54,12 @@ set g_balance_nix_ammoincr_fuel 2 // {{{ pickup items set g_pickup_ammo_anyway 1 set g_pickup_weapons_anyway 1 -set g_pickup_shells 15 -set g_pickup_shells_max 100 -set g_pickup_nails 150 +set g_pickup_shells 10 +set g_pickup_shells_max 30 +set g_pickup_nails 120 set g_pickup_nails_max 300 set g_pickup_rockets 15 -set g_pickup_rockets_max 200 +set g_pickup_rockets_max 150 set g_pickup_cells 25 set g_pickup_cells_max 200 set g_pickup_fuel 25 @@ -69,8 +69,8 @@ set g_pickup_armorsmall 5 set g_pickup_armorsmall_max 200 set g_pickup_armorsmall_anyway 1 set g_pickup_armormedium 25 -set g_pickup_armormedium_max 200 -set g_pickup_armormedium_anyway 1 +set g_pickup_armormedium_max 100 +set g_pickup_armormedium_anyway 0 set g_pickup_armorbig 50 set g_pickup_armorbig_max 200 set g_pickup_armorbig_anyway 1 @@ -206,17 +206,17 @@ set g_balance_grapplehook_health 130 // {{{ weapon properties // {{{ laser -set g_balance_laser_primary_damage 35 -set g_balance_laser_primary_edgedamage 10 -set g_balance_laser_primary_force 400 +set g_balance_laser_primary_damage 30 // dps 50, hope that's not too high +set g_balance_laser_primary_edgedamage 30 +set g_balance_laser_primary_force 235 set g_balance_laser_primary_radius 70 -set g_balance_laser_primary_speed 9000 +set g_balance_laser_primary_speed 2000 set g_balance_laser_primary_spread 0 -set g_balance_laser_primary_refire 0.7 -set g_balance_laser_primary_animtime 0.3 +set g_balance_laser_primary_refire 0.6 +set g_balance_laser_primary_animtime 0.6 set g_balance_laser_primary_lifetime 30 set g_balance_laser_primary_shotangle 0 -set g_balance_laser_primary_delay 0.03 +set g_balance_laser_primary_delay 0 set g_balance_laser_gauntlet 0 set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists set g_balance_laser_secondary_damage 35 @@ -241,25 +241,29 @@ set g_balance_shotgun_primary_animtime 0.4 set g_balance_shotgun_primary_ammo 1 set g_balance_shotgun_primary_speed 12000 set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu -set g_balance_shotgun_secondary 0 +set g_balance_shotgun_secondary 1 +set g_balance_shotgun_secondary_melee 1 +set g_balance_shotgun_secondary_melee_delay 0.35 // match the anim +set g_balance_shotgun_secondary_melee_range 60 +set g_balance_shotgun_secondary_melee_size 50 set g_balance_shotgun_secondary_bullets 6 // one more per shot than 15/3 (primary bullets/amount of shots = 3) -set g_balance_shotgun_secondary_damage 7 -set g_balance_shotgun_secondary_force 20 -set g_balance_shotgun_secondary_spread 0.20 -set g_balance_shotgun_secondary_refire 1.35 -set g_balance_shotgun_secondary_animtime 0.33 -set g_balance_shotgun_secondary_ammo 1 +set g_balance_shotgun_secondary_damage 90 +set g_balance_shotgun_secondary_force 150 +set g_balance_shotgun_secondary_spread 0 +set g_balance_shotgun_secondary_refire 1.1 +set g_balance_shotgun_secondary_animtime 1 +set g_balance_shotgun_secondary_ammo 0 set g_balance_shotgun_secondary_speed 12000 set g_balance_shotgun_secondary_bulletconstant 75 // 3.8qu // }}} // {{{ uzi set g_balance_uzi_first 1 -set g_balance_uzi_first_damage 18 +set g_balance_uzi_first_damage 17 set g_balance_uzi_first_force 35 set g_balance_uzi_first_spread 0.03 set g_balance_uzi_first_refire 0.2 set g_balance_uzi_first_ammo 2 -set g_balance_uzi_sustained_damage 8 +set g_balance_uzi_sustained_damage 7 set g_balance_uzi_sustained_force 7.5 set g_balance_uzi_sustained_spread 0.1 set g_balance_uzi_sustained_refire 0.075 @@ -292,7 +296,7 @@ set g_balance_grenadelauncher_secondary_speed 600 set g_balance_grenadelauncher_secondary_speed_up 0 set g_balance_grenadelauncher_secondary_speed_z 200 set g_balance_grenadelauncher_secondary_spread 0 -set g_balance_grenadelauncher_secondary_lifetime 1.5 +set g_balance_grenadelauncher_secondary_lifetime 2 set g_balance_grenadelauncher_secondary_refire 0.8 set g_balance_grenadelauncher_secondary_animtime 0.2 set g_balance_grenadelauncher_secondary_ammo 2 @@ -303,40 +307,39 @@ set g_balance_grenadelauncher_secondary_bouncestop 0.075 // }}} // {{{ electro // TODO set g_balance_electro_lightning 1 -set g_balance_electro_primary_damage 120 +set g_balance_electro_primary_damage 100 set g_balance_electro_primary_edgedamage 0 -set g_balance_electro_primary_force 780 -set g_balance_electro_primary_force_up 6000 +set g_balance_electro_primary_force 800 +set g_balance_electro_primary_force_up 125 set g_balance_electro_primary_radius 850 -set g_balance_electro_primary_comboradius 0 +set g_balance_electro_primary_comboradius 80 set g_balance_electro_primary_speed 0 set g_balance_electro_primary_spread 0 set g_balance_electro_primary_lifetime 0 -set g_balance_electro_primary_refire 0 -set g_balance_electro_primary_animtime 0 -set g_balance_electro_primary_ammo 40 +set g_balance_electro_primary_refire 0.03333333 +set g_balance_electro_primary_animtime 0.03333333 +set g_balance_electro_primary_ammo 6 set g_balance_electro_primary_range 800 -set g_balance_electro_primary_velocityfactor 45 -set g_balance_electro_secondary_damage 50 -set g_balance_electro_secondary_spread 0.05 -set g_balance_electro_secondary_edgedamage 0 -set g_balance_electro_secondary_force 200 -set g_balance_electro_secondary_radius 150 -set g_balance_electro_secondary_speed 900 -set g_balance_electro_secondary_speed_up 200 -set g_balance_electro_secondary_speed_z 0 +set g_balance_electro_secondary_damage 45 set g_balance_electro_secondary_spread 0 -set g_balance_electro_secondary_lifetime 5 -set g_balance_electro_secondary_refire 0.3 +set g_balance_electro_secondary_edgedamage 0 +set g_balance_electro_secondary_force 100 +set g_balance_electro_secondary_radius 100 +set g_balance_electro_secondary_speed 600 +set g_balance_electro_secondary_speed_up 0 +set g_balance_electro_secondary_speed_z 200 +set g_balance_electro_secondary_spread 0.08 +set g_balance_electro_secondary_lifetime 3.5 +set g_balance_electro_secondary_refire 0.7 set g_balance_electro_secondary_refire2 0 -set g_balance_electro_secondary_animtime 0.3 +set g_balance_electro_secondary_animtime 0.7 set g_balance_electro_secondary_ammo 2 -set g_balance_electro_secondary_health 5 +set g_balance_electro_secondary_health 10 set g_balance_electro_secondary_damageforcescale 4 -set g_balance_electro_secondary_count 1 -set g_balance_electro_combo_damage 80 +set g_balance_electro_secondary_count 3 +set g_balance_electro_combo_damage 45 set g_balance_electro_combo_edgedamage 0 -set g_balance_electro_combo_force 200 +set g_balance_electro_combo_force 150 set g_balance_electro_combo_radius 250 set g_balance_electro_combo_comboradius 0 set g_balance_electro_combo_speed 2000