diff --git a/ability_boss_saxtron.sp b/ability_boss_saxtron.sp index 989e0c7e..c69d3f06 100644 --- a/ability_boss_saxtron.sp +++ b/ability_boss_saxtron.sp @@ -703,7 +703,7 @@ public Action:OnPlayerRunCmd(client, &buttons, &impulse, Float:vel[3], Float:ang // }( - if(IsJumping == 0 && ang[0] < -33.0 && !g_JumpCoolDown && (GetEntProp( client, Prop_Data, "m_afButtonReleased" ) & IN_ATTACK2)) + if(ang[0] < -33.0 && !g_JumpCoolDown && (GetEntProp( client, Prop_Data, "m_afButtonReleased" ) & IN_ATTACK2)) { // PrintToChatAll("Button released g_Sumperjumpcharge was %i", g_SuperJumpCharge); SuperJump(client, float(g_SuperJumpCharge), true); @@ -726,7 +726,7 @@ public void SuperJump(int client, float power, bool reset) g_SuperJumpCharge = 0; float vel[3]; GetEntPropVector(client, Prop_Data, "m_vecVelocity", vel); - vel[2] = 750 + power * 13.0; + vel[2] = 150 + power * 13.0; // if( g_bSuperCharge ) { // vel[2] += 2000.0; // g_bSuperCharge = false; @@ -778,7 +778,7 @@ public void WeighDown(int client, float power, bool reset) public void PerformStun(int client) { //Get our hero variables - float duration = 5.0; + float duration = 1.5; bool fullStun = false; float radius = 400.0; int iTeam = GetClientTeam(client); @@ -796,6 +796,7 @@ public void PerformStun(int client) // PrintToChatAll("%s",szVO); b_SaxtonSaid[client] = false; SaxtronSay(client, szVO); + TF2_AddCondition(client, TFCond_SpeedBuffAlly, 8.0); } public void ApplyRadialStun(int hero, int team, float flDuration, float flRadius, bool full) diff --git a/berobot_dmg_handler.sp b/berobot_dmg_handler.sp index 108d01ec..b3f95390 100644 --- a/berobot_dmg_handler.sp +++ b/berobot_dmg_handler.sp @@ -1474,6 +1474,18 @@ public Action Event_post_inventory_application(Event event, const char[] name, b Format(chat_display, sizeof(chat_display), "%s\n{teamcolor}Minigun deal {orange}-%0.00f %%%% damage{teamcolor} vs robots",chat_display, LessIsMore(stat1)); } + // if (IsStockMinigun(Weapon1)) + // { + // stat1 = 0.7; + // TF2Attrib_SetByName(Weapon1, "dmg from melee increased", stat1); + // Format(chat_display, sizeof(chat_display), "%s\n{teamcolor}Minigun: {orange}+%0.00f %%%% melee damage resistance while active",chat_display, LessIsMore(stat1)); + // } + + // if (IsBrassBeast(Weapon1)) + // { + // Format(chat_display, sizeof(chat_display), "%s\n{teamcolor}Brass Beast: {orange}Gain up to +15%%%% damage bonus on damage done. Decays when no damage is done",chat_display); + // TF2CustAttr_SetString(Weapon1, "damage increase mult on hit", "amount=0.001 max=0.15 decay_start=0.2 decay_per_second=0.01 reset_on_kill=0 show_on_hud=1"); + // } if (IsNatascha(Weapon1)) { @@ -1482,7 +1494,7 @@ public Action Event_post_inventory_application(Event event, const char[] name, b TF2Attrib_SetByName(Weapon1, "speed_boost_on_hit", stat1); TF2Attrib_SetByName(Weapon1, "aiming movespeed increased", stat2); - Format(chat_display, sizeof(chat_display), "%s\n{teamcolor}Heavy Natascha: {orange}+%0.0f second speed boost on hit +%0.0f %%%% faster movespeed while spun up{teamcolor}",chat_display, stat1, MoreIsMore(stat2)); + Format(chat_display, sizeof(chat_display), "%s\n{teamcolor}Natascha: {orange}+%0.0f second speed boost on hit +%0.0f %%%% faster movespeed while spun up{teamcolor}",chat_display, stat1, MoreIsMore(stat2)); } if (IsTomiSlav(Weapon1)) @@ -3170,7 +3182,36 @@ bool IsAnyMinigun(int weapon) switch(GetEntProp(weapon, Prop_Send, "m_iItemDefinitionIndex")) { - case 15, 202, 41, 298, 312, 424, 654, 793, 802, 811, 832, 850, 882, 891, 900, 909, 958, 967, 15004, 15020, 15026, 15031, 15040, 15055, 15086, 15087, 15088, 15098, 15099, 15123, 15124, 15125, 15147: + case 15, 202, 41, 298, 312, 424, 654, 793, 802, 811, 832, 882, 891, 900, 909, 958, 967, 15004, 15020, 15026, 15031, 15040, 15055, 15086, 15087, 15088, 15098, 15099, 15123, 15124, 15125, 15147: + { + return true; + } + } + return false; +} +bool IsStockMinigun(int weapon) +{ + if (weapon == -1 && weapon <= MaxClients) return false; + + switch(GetEntProp(weapon, Prop_Send, "m_iItemDefinitionIndex")) + { + + case 15, 202, 298, 654, 793, 802, 882, 891, 900, 909, 958, 967, 15004, 15020, 15026, 15031, 15040, 15055, 15086, 15087, 15088, 15098, 15099, 15123, 15124, 15125, 15147: + { + return true; + } + } + return false; +} + +bool IsBrassBeast(int weapon) +{ + if (weapon == -1 && weapon <= MaxClients) return false; + + switch(GetEntProp(weapon, Prop_Send, "m_iItemDefinitionIndex")) + { + //Brass Beast + case 312: { return true; } diff --git a/cfg/robots/boss_soldier_saxtron_hale.cfg b/cfg/robots/boss_soldier_saxtron_hale.cfg index b9288e48..9cf2a387 100644 --- a/cfg/robots/boss_soldier_saxtron_hale.cfg +++ b/cfg/robots/boss_soldier_saxtron_hale.cfg @@ -58,7 +58,7 @@ "warpaint_id" "0" "attributes" { - "dmg penalty vs players" "1.75" + "dmg penalty vs players" "2.0" "fire rate bonus" "0.85" "killstreak tier" "1.0" "mod weapon blocks healing" "1.0" diff --git a/cfg/robots/free_healer_medic_arrayseven.cfg b/cfg/robots/free_healer_medic_arrayseven.cfg index 5fe46758..372ef62b 100644 --- a/cfg/robots/free_healer_medic_arrayseven.cfg +++ b/cfg/robots/free_healer_medic_arrayseven.cfg @@ -53,7 +53,6 @@ "overheal penalty" "0.01" "ubercharge rate penalty" "0.75" "heal rate bonus" "2.0" - "dmg penalty vs buildings" "0.5" } } "tf_weapon_syringegun_medic" @@ -67,7 +66,8 @@ { "health drain" "0.0" "killstreak tier" "1.0" - "damage bonus" "1.15" + "dmg penalty vs players" "1.2" + "dmg penalty vs buildings" "0.5" } } } diff --git a/cfg/robots/free_sniper_huntsbot.cfg b/cfg/robots/free_sniper_huntsbot.cfg index a4f5031b..0b1da8e9 100644 --- a/cfg/robots/free_sniper_huntsbot.cfg +++ b/cfg/robots/free_sniper_huntsbot.cfg @@ -49,10 +49,10 @@ "skin" "0" "attributes" { - "dmg penalty vs players" "1.35" "killstreak tier" "1.0" "dmg penalty vs buildings" "0.5" "projectile penetration" "1.0" + "faster reload rate" "0.6" } } "tf_weapon_club" @@ -72,16 +72,16 @@ "cosmetics" { - "ArcherSterling" + "LarrikinRobin" { - "itemindex" "30874" + "itemindex" "314" "paint" "0.0" "style" "-1.0" "scale" "0.75" } - "GuiltenGuardian" + "GloriousGambeson" { - "itemindex" "30857" + "itemindex" "31360" "paint" "0.0" "style" "-1.0" "scale" "1.0"