From: Mario Date: Fri, 29 Jul 2016 23:38:09 +0000 (+1000) Subject: Allow shockwave outside of new toys mutator, apply experimental balance changes to... X-Git-Tag: xonotic-v0.8.2~700^2~4 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=66700dbeb7a54dec64b6a64779f609de2b036f6b;p=xonotic%2Fxonotic-data.pk3dir.git Allow shockwave outside of new toys mutator, apply experimental balance changes to balance-mario --- diff --git a/bal-wep-mario.cfg b/bal-wep-mario.cfg index ccaa679e0..0d46d0a65 100644 --- a/bal-wep-mario.cfg +++ b/bal-wep-mario.cfg @@ -2,7 +2,7 @@ set g_balance_blaster_primary_animtime 0.2 set g_balance_blaster_primary_damage 25 set g_balance_blaster_primary_delay 0 -set g_balance_blaster_primary_edgedamage 17 +set g_balance_blaster_primary_edgedamage 12.5 set g_balance_blaster_primary_force 300 set g_balance_blaster_primary_force_zscale 1.25 set g_balance_blaster_primary_lifetime 5 @@ -34,8 +34,8 @@ set g_balance_blaster_weaponthrowable 0 // {{{ #2: Shotgun set g_balance_shotgun_primary_ammo 1 set g_balance_shotgun_primary_animtime 0.2 -set g_balance_shotgun_primary_bullets 8 -set g_balance_shotgun_primary_damage 6 +set g_balance_shotgun_primary_bullets 12 +set g_balance_shotgun_primary_damage 4 set g_balance_shotgun_primary_force 15 set g_balance_shotgun_primary_refire 0.75 set g_balance_shotgun_primary_solidpenetration 3.8 @@ -43,7 +43,7 @@ set g_balance_shotgun_primary_spread 0.12 set g_balance_shotgun_reload_ammo 0 set g_balance_shotgun_reload_time 2 set g_balance_shotgun_secondary 1 -set g_balance_shotgun_secondary_animtime 1 +set g_balance_shotgun_secondary_animtime 1.15 set g_balance_shotgun_secondary_damage 70 set g_balance_shotgun_secondary_force 200 set g_balance_shotgun_secondary_melee_delay 0.25 @@ -61,7 +61,7 @@ set g_balance_shotgun_secondary_alt_refire 1.2 set g_balance_shotgun_switchdelay_drop 0.2 set g_balance_shotgun_switchdelay_raise 0.2 set g_balance_shotgun_weaponreplace "" -set g_balance_shotgun_weaponstart 1 +set g_balance_shotgun_weaponstart 0 set g_balance_shotgun_weaponstartoverride -1 set g_balance_shotgun_weaponthrowable 1 // }}} @@ -92,7 +92,7 @@ set g_balance_machinegun_sustained_refire 0.1 set g_balance_machinegun_sustained_spread 0.03 set g_balance_machinegun_switchdelay_drop 0.2 set g_balance_machinegun_switchdelay_raise 0.2 -set g_balance_machinegun_weaponreplace "" +set g_balance_machinegun_weaponreplace "arc" set g_balance_machinegun_weaponstart 0 set g_balance_machinegun_weaponstartoverride -1 set g_balance_machinegun_weaponthrowable 1 @@ -102,7 +102,7 @@ set g_balance_mortar_bouncefactor 0.5 set g_balance_mortar_bouncestop 0.075 set g_balance_mortar_primary_ammo 2 set g_balance_mortar_primary_animtime 0.3 -set g_balance_mortar_primary_damage 40 +set g_balance_mortar_primary_damage 55 set g_balance_mortar_primary_damageforcescale 0 set g_balance_mortar_primary_edgedamage 25 set g_balance_mortar_primary_force 250 @@ -192,8 +192,8 @@ set g_balance_electro_primary_edgedamage 20 set g_balance_electro_primary_force 200 set g_balance_electro_primary_lifetime 5 set g_balance_electro_primary_midaircombo_explode 1 -set g_balance_electro_primary_midaircombo_interval 0.3 -set g_balance_electro_primary_midaircombo_radius 150 +set g_balance_electro_primary_midaircombo_interval 0.1 +set g_balance_electro_primary_midaircombo_radius 0 set g_balance_electro_primary_radius 100 set g_balance_electro_primary_refire 0.6 set g_balance_electro_primary_speed 2500 @@ -218,9 +218,9 @@ set g_balance_electro_secondary_refire2 1.6 set g_balance_electro_secondary_speed 1000 set g_balance_electro_secondary_speed_up 200 set g_balance_electro_secondary_speed_z 0 -set g_balance_electro_secondary_spread 0.04 -set g_balance_electro_secondary_stick 0 -set g_balance_electro_secondary_touchexplode 0 +set g_balance_electro_secondary_spread 0 +set g_balance_electro_secondary_stick 1 +set g_balance_electro_secondary_touchexplode 1 set g_balance_electro_switchdelay_drop 0.2 set g_balance_electro_switchdelay_raise 0.2 set g_balance_electro_weaponreplace "" @@ -233,7 +233,7 @@ set g_balance_crylink_primary_ammo 3 set g_balance_crylink_primary_animtime 0.3 set g_balance_crylink_primary_bouncedamagefactor 0.5 set g_balance_crylink_primary_bounces 1 -set g_balance_crylink_primary_damage 8 +set g_balance_crylink_primary_damage 12 set g_balance_crylink_primary_edgedamage 6 set g_balance_crylink_primary_force -50 set g_balance_crylink_primary_joindelay 0.1 @@ -243,7 +243,7 @@ set g_balance_crylink_primary_joinexplode_edgedamage 0 set g_balance_crylink_primary_joinexplode_force 0 set g_balance_crylink_primary_joinexplode_radius 0 set g_balance_crylink_primary_joinspread 0.2 -set g_balance_crylink_primary_linkexplode 1 +set g_balance_crylink_primary_linkexplode 0 set g_balance_crylink_primary_middle_fadetime 5 set g_balance_crylink_primary_middle_lifetime 5 set g_balance_crylink_primary_other_fadetime 5 @@ -260,9 +260,9 @@ set g_balance_crylink_secondary_ammo 2 set g_balance_crylink_secondary_animtime 0.2 set g_balance_crylink_secondary_bouncedamagefactor 0.5 set g_balance_crylink_secondary_bounces 0 -set g_balance_crylink_secondary_damage 10 +set g_balance_crylink_secondary_damage 35 set g_balance_crylink_secondary_edgedamage 5 -set g_balance_crylink_secondary_force -200 +set g_balance_crylink_secondary_force -300 set g_balance_crylink_secondary_joindelay 0 set g_balance_crylink_secondary_joinexplode 0 set g_balance_crylink_secondary_joinexplode_damage 0 @@ -277,7 +277,7 @@ set g_balance_crylink_secondary_other_fadetime 5 set g_balance_crylink_secondary_other_lifetime 5 set g_balance_crylink_secondary_radius 100 set g_balance_crylink_secondary_refire 0.7 -set g_balance_crylink_secondary_shots 5 +set g_balance_crylink_secondary_shots 1 set g_balance_crylink_secondary_speed 3000 set g_balance_crylink_secondary_spread 0.01 set g_balance_crylink_secondary_spreadtype 1 @@ -289,11 +289,11 @@ set g_balance_crylink_weaponstartoverride -1 set g_balance_crylink_weaponthrowable 1 // }}} // {{{ #8: Vortex -set g_balance_vortex_charge 1 +set g_balance_vortex_charge 0 set g_balance_vortex_charge_animlimit 0.5 set g_balance_vortex_charge_limit 1 set g_balance_vortex_charge_maxspeed 800 -set g_balance_vortex_charge_mindmg 50 +set g_balance_vortex_charge_mindmg 40 set g_balance_vortex_charge_minspeed 400 set g_balance_vortex_charge_rate 0.6 set g_balance_vortex_charge_rot_pause 0 @@ -303,12 +303,12 @@ set g_balance_vortex_charge_start 0.5 set g_balance_vortex_charge_velocity_rate 0 set g_balance_vortex_primary_ammo 6 set g_balance_vortex_primary_animtime 0.4 -set g_balance_vortex_primary_damage 80 +set g_balance_vortex_primary_damage 70 set g_balance_vortex_primary_damagefalloff_forcehalflife 0 set g_balance_vortex_primary_damagefalloff_halflife 0 set g_balance_vortex_primary_damagefalloff_maxdist 0 set g_balance_vortex_primary_damagefalloff_mindist 0 -set g_balance_vortex_primary_force 450 +set g_balance_vortex_primary_force 400 set g_balance_vortex_primary_refire 1.5 set g_balance_vortex_reload_ammo 0 set g_balance_vortex_reload_time 2 @@ -325,8 +325,8 @@ set g_balance_vortex_secondary_damagefalloff_maxdist 0 set g_balance_vortex_secondary_damagefalloff_mindist 0 set g_balance_vortex_secondary_force 0 set g_balance_vortex_secondary_refire 0 -set g_balance_vortex_switchdelay_drop 0.2 -set g_balance_vortex_switchdelay_raise 0.2 +set g_balance_vortex_switchdelay_drop 0.25 +set g_balance_vortex_switchdelay_raise 0.25 set g_balance_vortex_weaponreplace "" set g_balance_vortex_weaponstart 0 set g_balance_vortex_weaponstartoverride -1 @@ -361,14 +361,14 @@ set g_balance_hagar_secondary_load_animtime 0.2 set g_balance_hagar_secondary_load_hold 4 set g_balance_hagar_secondary_load_linkexplode 0 set g_balance_hagar_secondary_load_max 4 -set g_balance_hagar_secondary_load_releasedeath 1 +set g_balance_hagar_secondary_load_releasedeath 0 set g_balance_hagar_secondary_load_speed 0.5 set g_balance_hagar_secondary_load_spread 0.075 set g_balance_hagar_secondary_load_spread_bias 0.5 set g_balance_hagar_secondary_radius 80 set g_balance_hagar_secondary_refire 0.5 set g_balance_hagar_secondary_speed 2000 -set g_balance_hagar_secondary_spread 0.05 +set g_balance_hagar_secondary_spread 0 set g_balance_hagar_switchdelay_drop 0.2 set g_balance_hagar_switchdelay_raise 0.2 set g_balance_hagar_weaponreplace "" @@ -383,7 +383,7 @@ set g_balance_devastator_damage 80 set g_balance_devastator_damageforcescale 1 set g_balance_devastator_detonatedelay 0.02 set g_balance_devastator_edgedamage 40 -set g_balance_devastator_force 450 +set g_balance_devastator_force 400 set g_balance_devastator_guidedelay 0.2 set g_balance_devastator_guidegoal 512 set g_balance_devastator_guiderate 90 @@ -391,21 +391,21 @@ set g_balance_devastator_guideratedelay 0.01 set g_balance_devastator_guidestop 0 set g_balance_devastator_health 30 set g_balance_devastator_lifetime 10 -set g_balance_devastator_radius 150 +set g_balance_devastator_radius 110 set g_balance_devastator_refire 1.1 set g_balance_devastator_reload_ammo 0 set g_balance_devastator_reload_time 2 set g_balance_devastator_remote_damage 70 set g_balance_devastator_remote_edgedamage 35 -set g_balance_devastator_remote_force 400 +set g_balance_devastator_remote_force 300 set g_balance_devastator_remote_jump_damage 70 set g_balance_devastator_remote_jump_radius 0 set g_balance_devastator_remote_jump_velocity_z_add 400 set g_balance_devastator_remote_jump_velocity_z_max 1500 set g_balance_devastator_remote_jump_velocity_z_min 400 -set g_balance_devastator_remote_radius 150 -set g_balance_devastator_speed 1200 -set g_balance_devastator_speedaccel 1200 +set g_balance_devastator_remote_radius 110 +set g_balance_devastator_speed 1300 +set g_balance_devastator_speedaccel 1300 set g_balance_devastator_speedstart 1000 set g_balance_devastator_switchdelay_drop 0.2 set g_balance_devastator_switchdelay_raise 0.2 @@ -434,6 +434,7 @@ set g_balance_porto_weaponthrowable 1 // {{{ #12: Vaporizer set g_balance_vaporizer_primary_ammo 10 set g_balance_vaporizer_primary_animtime 0.3 +set g_balance_vaporizer_primary_damage 150 set g_balance_vaporizer_primary_refire 1 set g_balance_vaporizer_reload_ammo 0 set g_balance_vaporizer_reload_time 0 @@ -675,23 +676,23 @@ set g_balance_seeker_weaponthrowable 1 // }}} // {{{ #19: Shockwave (MUTATOR WEAPON) set g_balance_shockwave_blast_animtime 0.3 -set g_balance_shockwave_blast_damage 20 +set g_balance_shockwave_blast_damage 40 set g_balance_shockwave_blast_distance 1000 set g_balance_shockwave_blast_edgedamage 0 -set g_balance_shockwave_blast_force 200 +set g_balance_shockwave_blast_force 15 set g_balance_shockwave_blast_force_forwardbias 50 -set g_balance_shockwave_blast_force_zscale 2 +set g_balance_shockwave_blast_force_zscale 1 set g_balance_shockwave_blast_jump_damage 20 set g_balance_shockwave_blast_jump_edgedamage 0 -set g_balance_shockwave_blast_jump_force 300 -set g_balance_shockwave_blast_jump_force_velocitybias 0 -set g_balance_shockwave_blast_jump_force_zscale 1.25 +set g_balance_shockwave_blast_jump_force 100 +set g_balance_shockwave_blast_jump_force_velocitybias 1 +set g_balance_shockwave_blast_jump_force_zscale 1 set g_balance_shockwave_blast_jump_multiplier_accuracy 0.5 set g_balance_shockwave_blast_jump_multiplier_distance 0.5 set g_balance_shockwave_blast_jump_multiplier_min 0 set g_balance_shockwave_blast_jump_radius 150 -set g_balance_shockwave_blast_multiplier_accuracy 0.5 -set g_balance_shockwave_blast_multiplier_distance 0.5 +set g_balance_shockwave_blast_multiplier_accuracy 0.45 +set g_balance_shockwave_blast_multiplier_distance 0.2 set g_balance_shockwave_blast_multiplier_min 0 set g_balance_shockwave_blast_refire 0.75 set g_balance_shockwave_blast_splash_damage 15 @@ -720,37 +721,50 @@ set g_balance_shockwave_melee_traces 10 set g_balance_shockwave_switchdelay_drop 0.2 set g_balance_shockwave_switchdelay_raise 0.2 set g_balance_shockwave_weaponreplace "" -set g_balance_shockwave_weaponstart 0 +set g_balance_shockwave_weaponstart 1 set g_balance_shockwave_weaponstartoverride -1 set g_balance_shockwave_weaponthrowable 0 // }}} // {{{ #20: Arc -set g_balance_arc_beam_ammo 4 -set g_balance_arc_beam_animtime 0.2 +set g_balance_arc_beam_ammo 6 +set g_balance_arc_beam_animtime 0.1 set g_balance_arc_beam_botaimlifetime 0 set g_balance_arc_beam_botaimspeed 0 -set g_balance_arc_beam_damage 115 +set g_balance_arc_beam_damage 100 set g_balance_arc_beam_degreespersegment 1 set g_balance_arc_beam_distancepersegment 0 set g_balance_arc_beam_falloff_halflifedist 0 set g_balance_arc_beam_falloff_maxdist 0 set g_balance_arc_beam_falloff_mindist 0 -set g_balance_arc_beam_force 900 -set g_balance_arc_beam_healing_amax 100 +set g_balance_arc_beam_force 600 +set g_balance_arc_beam_healing_amax 0 set g_balance_arc_beam_healing_aps 50 set g_balance_arc_beam_healing_hmax 150 set g_balance_arc_beam_healing_hps 50 set g_balance_arc_cooldown 2.5 +set g_balance_arc_cooldown_release 0 set g_balance_arc_overheat_max 5 set g_balance_arc_overheat_min 3 -set g_balance_arc_beam_heat 1 +set g_balance_arc_beam_heat 0 set g_balance_arc_burst_heat 5 set g_balance_arc_beam_maxangle 10 set g_balance_arc_beam_nonplayerdamage 80 set g_balance_arc_beam_range 1000 -set g_balance_arc_beam_refire 0.5 +set g_balance_arc_beam_refire 0.25 set g_balance_arc_beam_returnspeed 8 set g_balance_arc_beam_tightness 0.5 +set g_balance_arc_bolt 1 +set g_balance_arc_bolt_ammo 1 +set g_balance_arc_bolt_damage 25 +set g_balance_arc_bolt_damageforcescale 0 +set g_balance_arc_bolt_edgedamage 12.5 +set g_balance_arc_bolt_force 120 +set g_balance_arc_bolt_health 15 +set g_balance_arc_bolt_lifetime 5 +set g_balance_arc_bolt_radius 65 +set g_balance_arc_bolt_refire 0.16667 +set g_balance_arc_bolt_speed 2300 +set g_balance_arc_bolt_spread 0 set g_balance_arc_burst_ammo 15 set g_balance_arc_burst_damage 250 set g_balance_arc_burst_healing_aps 100 diff --git a/balance-mario.cfg b/balance-mario.cfg index 9995e5ec5..022d62eaa 100644 --- a/balance-mario.cfg +++ b/balance-mario.cfg @@ -2,8 +2,8 @@ g_mod_balance Mario // {{{ starting gear set g_balance_health_start 100 -set g_balance_armor_start 50 -set g_start_ammo_shells 20 +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 @@ -44,7 +44,7 @@ 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 15 set g_pickup_shells_weapon 15 set g_pickup_shells_max 60 set g_pickup_nails 80 @@ -138,7 +138,7 @@ set g_balance_fuel_limit 999 // }}} // {{{ misc -set g_balance_selfdamagepercent 0.5 +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" @@ -175,8 +175,8 @@ set g_projectiles_spread_style 7 // 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.07 -set g_balance_falldamage_maxdamage 250 +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 diff --git a/qcsrc/common/weapons/weapon/shockwave.qc b/qcsrc/common/weapons/weapon/shockwave.qc index d464da570..539ccfdb7 100644 --- a/qcsrc/common/weapons/weapon/shockwave.qc +++ b/qcsrc/common/weapons/weapon/shockwave.qc @@ -2,7 +2,7 @@ CLASS(Shockwave, Weapon) /* ammotype */ //ATTRIB(Shockwave, ammo_field, .int, ammo_none) /* impulse */ ATTRIB(Shockwave, impulse, int, 2) -/* flags */ ATTRIB(Shockwave, spawnflags, int, WEP_FLAG_NORMAL | WEP_TYPE_HITSCAN | WEP_FLAG_CANCLIMB | WEP_FLAG_MUTATORBLOCKED | WEP_TYPE_MELEE_SEC); +/* flags */ ATTRIB(Shockwave, spawnflags, int, WEP_FLAG_NORMAL | WEP_TYPE_HITSCAN | WEP_FLAG_CANCLIMB | WEP_TYPE_MELEE_SEC); /* rating */ ATTRIB(Shockwave, bot_pickupbasevalue, float, BOT_PICKUP_RATING_LOW); /* color */ ATTRIB(Shockwave, wpcolor, vector, '0.5 0.25 0'); /* modelname */ ATTRIB(Shockwave, mdl, string, "shotgun");