diff --git a/ability_free_disruptor_heavy_hoovy_ability.sp b/ability_free_disruptor_heavy_hoovy_ability.sp index b1a3f4a6..e8f2a50f 100644 --- a/ability_free_disruptor_heavy_hoovy_ability.sp +++ b/ability_free_disruptor_heavy_hoovy_ability.sp @@ -140,7 +140,7 @@ public Action TF2_OnTakeDamage(int victim, int &attacker, int &inflictor, float if (tauntid != -1)SendVictimToSpace(victim); } - if(!TF2_IsPlayerInCondition(attacker, TFCond_RuneWarlock)) RequestFrame(StunPlayer, victim); + if(!TF2_IsPlayerInCondition(attacker, TFCond_RuneWarlock) && IsPlayerAlive(attacker)) RequestFrame(StunPlayer, victim); } diff --git a/berobot_dmg_handler.sp b/berobot_dmg_handler.sp index 414dd3ad..b1b0d713 100644 --- a/berobot_dmg_handler.sp +++ b/berobot_dmg_handler.sp @@ -350,6 +350,24 @@ public Action TF2_OnTakeDamage(int victim, int &attacker, int &inflictor, float } } + if(IsAnyRobot(attacker)) + { + switch (damagecustom) + { + case TF_CUSTOM_BASEBALL: + { + if(IsSandman(weapon)) + { + // SetHealingDebuff(victim, g_HealDebuff, 0.5, attacker); + DizzyTarget(victim); + return Plugin_Changed; + + } + + } + } + } + if(IsAnyRobot(victim) && !IsAnyRobot(attacker)) { diff --git a/berobot_handler.sp b/berobot_handler.sp index 8960c1f2..f280326f 100644 --- a/berobot_handler.sp +++ b/berobot_handler.sp @@ -2247,7 +2247,7 @@ void CalculateDamageModifier(int dmg_method) } float damage_bonus(float x) { - float base = Pow(2.75/ 1.0, 1.0 / 17.0); + float base = Pow(2.75/ 1.0, 1.0 / 10.0); return 1.0 * Pow(base, x); } diff --git a/cfg/robots/free_damage_grenades_demoman_raid.cfg b/cfg/robots/free_damage_grenades_demoman_raid.cfg index 2c181c57..e806ce48 100644 --- a/cfg/robots/free_damage_grenades_demoman_raid.cfg +++ b/cfg/robots/free_damage_grenades_demoman_raid.cfg @@ -2,7 +2,7 @@ { "model" "models/bots/demo_boss/bot_demo_boss.mdl" "class" "Demoman" - "shortdescription" "Rapid Short Range Iron Bomber" + "shortdescription" "Short Range Rapid Iron Bomber" "name" "Raid" "deathtip" "Short Circuit and Airblast are good ways to deal with this robot" "role" "Damage" @@ -52,7 +52,7 @@ "clip size bonus" "2.25" "killstreak tier" "1.0" "faster reload rate" "1.75" - "projectile speed decreased" "0.8" + "projectile speed decreased" "0.6" "hidden primary max ammo bonus" "3.0" "dmg penalty vs buildings" "0.5" } diff --git a/cfg/robots/paid_damage_grenades_demoman_zipbomb.cfg b/cfg/robots/paid_damage_grenades_demoman_zipbomb.cfg index 3671b0ac..8becd020 100644 --- a/cfg/robots/paid_damage_grenades_demoman_zipbomb.cfg +++ b/cfg/robots/paid_damage_grenades_demoman_zipbomb.cfg @@ -53,7 +53,7 @@ } "custom_attributes_weapon" { - "caber-throw" "caber_blast_damage=110.0 caber_blast_radius=176.0 caber_det_impact=1 caber_regen_time=0.5 caber_grenade_speed=2600.0" + "caber-throw" "caber_blast_damage=180.0 caber_blast_radius=150.0 caber_det_impact=1 caber_regen_time=4.0 caber_grenade_speed=1200.0" } } diff --git a/cfg/robots/paid_disruptor_pyro_astrobot.cfg b/cfg/robots/paid_disruptor_pyro_astrobot.cfg index 5464495d..48c31d0e 100644 --- a/cfg/robots/paid_disruptor_pyro_astrobot.cfg +++ b/cfg/robots/paid_disruptor_pyro_astrobot.cfg @@ -10,7 +10,7 @@ "tips" "25%%%% Faster Airblast\nAirblasts propel you backwards while airborne\nHeal 175 on extinguish" "health" "3000" "difficulty" "3" - "rc_cost" "0.5" + "rc_cost" "0.6" "sounds" { "death" "mvm/sentrybuster/mvm_sentrybuster_explode.wav" @@ -50,7 +50,6 @@ "attributes" { "restore health on kill" "10.0" - "dmg penalty vs players" "1.25" "maxammo primary increased" "2.5" "killstreak tier" "1.0" "airblast pushback scale" "1.6" @@ -60,7 +59,7 @@ "flame_speed" "3600.0" "extinguish restores health" "175.0" "airblast vertical pushback scale" "1.5" - "airblast cost increased" "4.0" + "airblast cost increased" "5.0" } } } diff --git a/cfg/robots/paid_disruptor_scout_bonkscout.cfg b/cfg/robots/paid_disruptor_scout_bonkscout.cfg index 308782e4..0d697256 100644 --- a/cfg/robots/paid_disruptor_scout_bonkscout.cfg +++ b/cfg/robots/paid_disruptor_scout_bonkscout.cfg @@ -9,7 +9,7 @@ "subclass" "Disruptor" "health" "1250" "difficulty" "3" - "rc_cost" "0.5" + "rc_cost" "0.6" "sounds" { "death" "mvm/sentrybuster/mvm_sentrybuster_explode.wav" @@ -27,10 +27,6 @@ "increased jump height" "1.25" "rage giving scale" "0.75" } - "custom_attributes_player" - { - "OnCondAdd-addcond" "oncond=14 duration=8.0 addcond=95" - } "remove_weapon_slots" { "slot" "0" @@ -68,10 +64,6 @@ "effect bar recharge rate increased" "0.2" "dmg penalty vs buildings" "0.8" } - "custom_attributes_weapon" - { - "OnCondAdd-addcond" "oncond=14 duration=8.0 addcond=95" - } } } diff --git a/cfg/robots/paid_disruptor_scout_fanscout.cfg b/cfg/robots/paid_disruptor_scout_fanscout.cfg index 9b687b3d..6f7fec62 100644 --- a/cfg/robots/paid_disruptor_scout_fanscout.cfg +++ b/cfg/robots/paid_disruptor_scout_fanscout.cfg @@ -9,7 +9,7 @@ "subclass" "Disruptor" "health" "2150" "difficulty" "2" - "rc_cost" "0.5" + "rc_cost" "0.6" "sounds" { "death" "mvm/sentrybuster/mvm_sentrybuster_explode.wav" diff --git a/cfg/robots/paid_disruptor_scout_hypescout.cfg b/cfg/robots/paid_disruptor_scout_hypescout.cfg index 520176ef..e2e77a1e 100644 --- a/cfg/robots/paid_disruptor_scout_hypescout.cfg +++ b/cfg/robots/paid_disruptor_scout_hypescout.cfg @@ -10,7 +10,7 @@ "tips" "Use the boost you gain on hit to close the gap to get in enemies face" "health" "2150" "difficulty" "2" - "rc_cost" "0.5" + "rc_cost" "0.6" "sounds" { "death" "mvm/sentrybuster/mvm_sentrybuster_explode.wav" diff --git a/cfg/robots/paid_healer_robovich.cfg b/cfg/robots/paid_healer_robovich.cfg index 8cbada59..f04bd493 100644 --- a/cfg/robots/paid_healer_robovich.cfg +++ b/cfg/robots/paid_healer_robovich.cfg @@ -1,6 +1,6 @@ "Robot" { - "model" "models/bots/heavy_boss/bot_heavy_boss.mdl" + "model" "models/bots/heavy/bot_heavy.mdl" "class" "Heavy" "shortdescription" "Rapid Sandvich tosser" "name" "RoboVich" @@ -8,7 +8,7 @@ "role" "Healer" "subclass" "Healer" "tips" "Throw sandwiches to teammates and punch stuff" - "health" "6000" + "health" "2000" "difficulty" "1" "rc_cost" "1" "sounds" @@ -16,24 +16,17 @@ "death" "mvm/sentrybuster/mvm_sentrybuster_explode.wav" "loop" "mvm/giant_heavy/giant_heavy_loop.wav" "spawn" "#mvm/giant_heavy/giant_heavy_entrance.wav" - "weaponsound" "2" - //Weapon sound uses robot weapon noises - //0 = NONE, 1 = ROCKETLAUNCHER, 2 = MINIGUN, 3 = FLAMETHROWER, 4 = GRENADELAUNCHER - //Below are custom paths if needed, this will work with custom files on the server - "gunfire" ")mvm/giant_heavy/giant_heavy_gunfire.wav" - "gunspin" ")mvm/giant_heavy/giant_heavy_gunspin.wav" - "windup" ")mvm/giant_heavy/giant_heavy_gunwindup.wav" - "winddown" ")mvm/giant_heavy/giant_heavy_gunwinddown.wav" } "player_attributes" { - "move speed penalty" "0.5" + "move speed penalty" "0.9" "damage force reduction" "0.5" "airblast vulnerability multiplier" "0.2" "aiming movespeed increased" "2.0" "ammo regen" "100.0" "cancel falling damage" "1.0" "rage giving scale" "0.75" + "head scale" "0.75" } "remove_weapon_slots" { diff --git a/cfg/robots/paid_sentry_buster_jetpack_pyro.cfg b/cfg/robots/paid_sentry_buster_jetpack_pyro.cfg index 7d4aec7a..c4f35897 100644 --- a/cfg/robots/paid_sentry_buster_jetpack_pyro.cfg +++ b/cfg/robots/paid_sentry_buster_jetpack_pyro.cfg @@ -21,9 +21,9 @@ "player_attributes" { "ammo regen" "100.0" - "move speed penalty" "0.9" + "move speed penalty" "1.1" "damage force reduction" "0.5" - "airblast vulnerability multiplier" "0.8" + "airblast vulnerability multiplier" "0.1" "boots falling stomp" "1.0" "override footstep sound set" "6.0" "rage giving scale" "0.75" diff --git a/cfg/robots/paid_tank_heavy_chief.cfg b/cfg/robots/paid_tank_heavy_chief.cfg index 7c647941..7db9a8f0 100644 --- a/cfg/robots/paid_tank_heavy_chief.cfg +++ b/cfg/robots/paid_tank_heavy_chief.cfg @@ -20,7 +20,7 @@ } "player_attributes" { - "move speed penalty" "0.7" + "move speed penalty" "0.75" "damage force reduction" "0.5" "airblast vulnerability multiplier" "0.5" "cancel falling damage" "1.0" @@ -50,7 +50,7 @@ "skin" "0" "attributes" { - "heal on kill" "500.0" + "heal on kill" "1500.0" "killstreak tier" "1.0" "dmg penalty vs players" "1.25" "melee range multiplier" "1.25" diff --git a/mm_attribute_caber_throw.sp b/mm_attribute_caber_throw.sp index d720e813..e8ff82ea 100644 --- a/mm_attribute_caber_throw.sp +++ b/mm_attribute_caber_throw.sp @@ -141,7 +141,7 @@ public void OnPlayerRunCmdPost(int clientId, int buttons) float timeLeft = CaberGrenade[weaponId].RegenTimer.GetTimeRemaining(); SetHudTextParams(-1.0, 0.65, HudRefreshRate, 255, 255, 255, 255); - ShowSyncHudText(clientId, HudSync, "Caber Cooldown: %.0fs", timeLeft); + ShowSyncHudText(clientId, HudSync, "Caber Cooldown: %.0fs", timeLeft+1.0); } if (CaberGrenade[weaponId].RegenTimer.Expired())