diff --git a/berobot_dmg_handler.sp b/berobot_dmg_handler.sp index b8bddd70..974cf85e 100644 --- a/berobot_dmg_handler.sp +++ b/berobot_dmg_handler.sp @@ -2621,7 +2621,7 @@ bool IsStockOrAllClassWeapon(int weapon){ { //If other allclass are added, add here - case 0,1,3,5,8,190,191,193,195,198,154,609,264,423,474,880,939,954,1013,1071,1123,1127,30758,660,30667: + case 0,1,3,5,8,190,191,193,195,198,609,264,423,474,880,939,954,1013,1071,1123,1127,30758,660,30667: { return true; } diff --git a/cfg/robots/boss_demoman_demopan.cfg b/cfg/robots/boss_demoman_demopan.cfg index a2235aa5..7cb328ba 100644 --- a/cfg/robots/boss_demoman_demopan.cfg +++ b/cfg/robots/boss_demoman_demopan.cfg @@ -4,7 +4,7 @@ "role" "ZBOSS" "class" "DemoMan" "subclass" "Melee" - "shortDescription" "Crit Pan + Chargin' Targe" + "shortdescription" "Crit Pan + Chargin' Targe" "deathtip" "Demopan is a master of horizontal movement\nUse high ground to your advantage" "difficulty" "2" "tips" "Pan deals massive damage\nUse charges to rush the enemy\nFull turn control" diff --git a/cfg/robots/paid_damage_rockets_soldier_artillery.cfg b/cfg/robots/paid_damage_rockets_soldier_artillery.cfg index 3cb629db..c44e47d9 100644 --- a/cfg/robots/paid_damage_rockets_soldier_artillery.cfg +++ b/cfg/robots/paid_damage_rockets_soldier_artillery.cfg @@ -49,6 +49,7 @@ "Blast radius increased" "1.45" "maxammo primary increased" "2.5" "killstreak tier" "1.0" + "clip size upgrade atomic" "4" "faster reload rate" "3.0" "fire rate bonus" "0.4" "Projectile speed increased" "0.85" diff --git a/free_damage_rockets_soldier_dewill.sp b/free_damage_rockets_soldier_dewill.sp index f7c84429..d2677b2c 100644 --- a/free_damage_rockets_soldier_dewill.sp +++ b/free_damage_rockets_soldier_dewill.sp @@ -110,10 +110,8 @@ MakeGiantSoldier(client) SetModel(client, GSOLDIER); int bonus_hp = 40 * GetCurrentHumanCount(); - RoboSetHealth(client,TFClass_Soldier, 3500 + bonus_hp, 1.5); - float OverHealRate = 1.5; - + RoboSetHealth(client,TFClass_Soldier, 3500 + bonus_hp, OverHealRate); float scale = 1.65; diff --git a/python_stuff/get_rc_df.ipynb b/python_stuff/get_rc_df.ipynb index dea06805..e4a820eb 100644 --- a/python_stuff/get_rc_df.ipynb +++ b/python_stuff/get_rc_df.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "code", - "execution_count": 37, + "execution_count": 81, "metadata": {}, "outputs": [ { @@ -113,7 +113,7 @@ }, { "cell_type": "code", - "execution_count": 38, + "execution_count": 82, "metadata": {}, "outputs": [ { @@ -286,7 +286,7 @@ }, { "cell_type": "code", - "execution_count": 39, + "execution_count": 83, "metadata": {}, "outputs": [], "source": [ @@ -295,7 +295,7 @@ }, { "cell_type": "code", - "execution_count": 40, + "execution_count": 84, "metadata": {}, "outputs": [], "source": [ @@ -304,7 +304,7 @@ }, { "cell_type": "code", - "execution_count": 41, + "execution_count": 85, "metadata": {}, "outputs": [], "source": [ @@ -316,7 +316,7 @@ }, { "cell_type": "code", - "execution_count": 42, + "execution_count": 86, "metadata": {}, "outputs": [ { @@ -348,33 +348,33 @@ "
\n", "94 rows × 3 columns
\n", + "115 rows × 3 columns
\n", "" ], "text/plain": [ - " Name Health Before Patch Health_Bonus_Per_Player Before Patch\n", - "0 Agro 3000 0.0\n", - "1 Lister 3000 0.0\n", - "2 Rocket Man 3500 0.0\n", - "3 Spitfire 2500 0.0\n", - "4 Wamo 3000 0.0\n", - ".. ... ... ...\n", - "89 MrPaladin 1200 0.0\n", - "90 StabbyStabby 1200 0.0\n", - "91 Trickster 2000 0.0\n", - "92 Warper 2000 0.0\n", - "93 Back Up 3800 50.0\n", + " Name Health Before Patch \\\n", + "0 Demopan 7500 \n", + "1 Nuker 5000 \n", + "2 Kommisar Krit 7500 \n", + "3 SkillTron 5000 \n", + "4 General Crits 5800 \n", + ".. ... ... \n", + "110 Hacked Slasher 5000 \n", + "111 Big Chief 5000 \n", + "112 Pancop 5000 \n", + "113 Sensor Armstrong 5000 \n", + "114 Back Up 3800 \n", "\n", - "[94 rows x 3 columns]" + " Health_Bonus_Per_Player Before Patch \n", + "0 50.0 \n", + "1 0.0 \n", + "2 100.0 \n", + "3 25.0 \n", + "4 75.0 \n", + ".. ... \n", + "110 350.0 \n", + "111 350.0 \n", + "112 350.0 \n", + "113 350.0 \n", + "114 50.0 \n", + "\n", + "[115 rows x 3 columns]" ] }, - "execution_count": 42, + "execution_count": 86, "metadata": {}, "output_type": "execute_result" } @@ -445,7 +458,7 @@ }, { "cell_type": "code", - "execution_count": 43, + "execution_count": 87, "metadata": {}, "outputs": [], "source": [ @@ -454,7 +467,7 @@ }, { "cell_type": "code", - "execution_count": 44, + "execution_count": 88, "metadata": {}, "outputs": [ { @@ -484,7 +497,6 @@ "115 rows × 8 columns
\n", "" ], "text/plain": [ - " Name Class Subclass Health RC Cost \\\n", - "0 ZOOMER Heavy ZOOMER 90000 50000.0 \n", - "1 Demopan DemoMan Melee 7500 50.0 \n", - "2 Nuker DemoMan Grenades 5000 50.0 \n", - "3 General Crits Soldier Rockets 5800 50.0 \n", - "4 Agro Pyro Flames 3000 0.0 \n", - "5 Rocket Man Pyro Flames 3500 0.0 \n", - "6 Spitfire Pyro Flames 2500 0.0 \n", - "7 Fire Wizard Pyro Flames 2750 0.0 \n", - "8 Carpet Bomber Demoman Grenades 3000 0.0 \n", - "9 Dreysidel Demoman Grenades 2700 0.0 \n", - "10 Raid Demoman Grenades 3800 0.0 \n", - "11 Big Joey Heavy Hitscan 5000 0.0 \n", - "12 B4nny Scout Hitscan 1250 0.0 \n", - "13 Funke Scout Melee 1250 0.0 \n", - "14 Robo-Knight Demoman Melee 2200 0.0 \n", - "15 Boxing Champ Heavy Melee 3000 0.0 \n", - "16 Centurion Pyro Melee 3250 0.0 \n", - "17 Fat Magic Sniper Melee 2250 0.0 \n", - "18 BazookaJoe2002 Soldier Rockets 3500 0.0 \n", - "19 Samureye Demoman Disruptor 2175 0.0 \n", - "20 Toofty Demoman Disruptor 1750 0.0 \n", - "21 Hoovy Heavy Disruptor 3000 0.0 \n", - "22 Elmaxo Soldier Disruptor 1600 0.0 \n", - "23 Tone Technician Soldier Disruptor 1600 0.0 \n", - "24 Barricade Engineer SingleClass 1250 0.0 \n", - "25 EXEcutioner Demoman Tank 5000 0.0 \n", - "26 Terminator Heavy Tank 3000 0.0 \n", - "27 Aero Pyro Flames 4000 12.0 \n", - "28 HeatSink Pyro Flames 3000 10.0 \n", - "29 Expl-Odin Demoman Grenades 3500 20.0 \n", - "30 Phase Bomber Demoman Grenades 3500 20.0 \n", - "31 Deflector MKII Heavy Hitscan 6000 20.0 \n", - "32 Firewall Heavy Hitscan 6000 30.0 \n", - "33 Backscatter Scout Hitscan 2000 20.0 \n", - "34 Archibolt Demoman Melee 3500 12.0 \n", - "35 FlyCharger Demoman Melee 3800 20.0 \n", - "36 Mafia Bank Heavy Melee 3000 12.0 \n", - "37 Black Knight Pyro Melee 2750 12.0 \n", - "38 Artillery Soldier Rockets 4000 25.0 \n", - "39 Buff Bot Soldier Rockets 3500 20.0 \n", - "40 Astrobot Pyro Disruptor 3000 10.0 \n", - "41 Fan Scout Scout Disruptor 2150 10.0 \n", - "42 Skymin Slash Medic Healer 1800 20.0 \n", - "43 RoboVich Heavy Healer 2000 12.0 \n", - "44 Pilgrim Pyro Sentry Buster 4500 12.0 \n", - "45 Black Shiv Spy Spy 2250 12.0 \n", - "46 MrPaladin Spy Spy 1200 15.0 \n", - "47 Hacked Slasher Demoman Tank 5000 12.0 \n", + " Name Class Subclass Health RC Cost \\\n", + "0 Demopan DemoMan Melee 7500 50.0 \n", + "1 Nuker DemoMan Grenades 5000 50.0 \n", + "2 Kommisar Krit Heavy Hitscan 7500 60.0 \n", + "3 SkillTron Pyro Flames 5000 50.0 \n", + "4 General Crits Soldier Rockets 5800 50.0 \n", + ".. ... ... ... ... ... \n", + "110 Hacked Slasher Demoman Tank 5000 12.0 \n", + "111 Big Chief Heavy Tank 5000 12.0 \n", + "112 Pancop Heavy Tank 5000 25.0 \n", + "113 Sensor Armstrong Heavy Tank 5000 25.0 \n", + "114 Back Up Soldier Tank 3500 20.0 \n", "\n", - " Health Bonus Per Player \\\n", - "0 250.0 \n", - "1 100.0 \n", - "2 100.0 \n", - "3 75.0 \n", - "4 28.0 \n", - "5 25.0 \n", - "6 20.0 \n", - "7 50.0 \n", - "8 60.0 \n", - "9 60.0 \n", - "10 60.0 \n", - "11 0.0 \n", - "12 40.0 \n", - "13 100.0 \n", - "14 100.0 \n", - "15 150.0 \n", - "16 60.0 \n", - "17 110.0 \n", - "18 40.0 \n", - "19 50.0 \n", - "20 50.0 \n", - "21 50.0 \n", - "22 60.0 \n", - "23 70.0 \n", - "24 60.0 \n", - "25 250.0 \n", - "26 0.0 \n", - "27 25.0 \n", - "28 175.0 \n", - "29 50.0 \n", - "30 100.0 \n", - "31 100.0 \n", - "32 0.0 \n", - "33 60.0 \n", - "34 175.0 \n", - "35 175.0 \n", - "36 200.0 \n", - "37 250.0 \n", - "38 60.0 \n", - "39 60.0 \n", - "40 15.0 \n", - "41 80.0 \n", - "42 60.0 \n", - "43 50.0 \n", - "44 100.0 \n", - "45 50.0 \n", - "46 50.0 \n", - "47 350.0 \n", + " Health Bonus Per Player Health Before Patch \\\n", + "0 100.0 7500 \n", + "1 100.0 5000 \n", + "2 100.0 7500 \n", + "3 100.0 5000 \n", + "4 75.0 5800 \n", + ".. ... ... \n", + "110 350.0 5000 \n", + "111 350.0 5000 \n", + "112 350.0 5000 \n", + "113 350.0 5000 \n", + "114 60.0 3800 \n", "\n", - " Combined Name Health Before Patch \\\n", - "0 ZOOMER NaN \n", - "1 Demopan, Kommisar Krit NaN \n", - "2 Nuker, SkillTron, Gotham Protector NaN \n", - "3 General Crits NaN \n", - "4 Agro, Lister, Wamo 3000.0 \n", - "5 Rocket Man 3500.0 \n", - "6 Spitfire 2500.0 \n", - "7 Fire Wizard, Volcanyro 2750.0 \n", - "8 Carpet Bomber 3300.0 \n", - "9 Dreysidel, LED, Mortar Mack, Solarlight 3000.0 \n", - "10 Raid, Blastinator 4500.0 \n", - "11 Big Joey, HiGPS, Riotcop, FireLord NaN \n", - "12 B4nny, Mecha Face 1250.0 \n", - "13 Funke, Bonk Scout 1250.0 \n", - "14 Robo-Knight 2500.0 \n", - "15 Boxing Champ 3000.0 \n", - "16 Centurion 3250.0 \n", - "17 Fat Magic 2250.0 \n", - "18 BazookaJoe2002, Dr GrordBot, Icebear, Ivory, S... 3800.0 \n", - "19 Samureye 2175.0 \n", - "20 Toofty, Kristianma 1750.0 \n", - "21 Hoovy, Laugh Extractor, Loch'n Larry 3000.0 \n", - "22 Elmaxo 2000.0 \n", - "23 Tone Technician 2000.0 \n", - "24 Barricade, Uncle Dane, Wrangler Bill, Zonical,... 1250.0 \n", - "25 EXEcutioner, Bearded Expense, Megaton NaN \n", - "26 Terminator 3000.0 \n", - "27 Aero 4000.0 \n", - "28 HeatSink 3000.0 \n", - "29 Expl-Odin, Quickler, Stickler, Zero G 4000.0 \n", - "30 Phase Bomber, ZIP Bomb 3500.0 \n", - "31 Deflector MKII NaN \n", - "32 Firewall, Rager, Shredder NaN \n", - "33 Backscatter, Hammerhead, Lazy Purple, Brainiac... 2000.0 \n", - "34 Archibolt 3500.0 \n", - "35 FlyCharger, Sultan 3800.0 \n", - "36 Mafia Bank, Equalizor 3500.0 \n", - "37 Black Knight 3000.0 \n", - "38 Artillery 4200.0 \n", - "39 Buff Bot, Captitan Concho, Cloaker, Gunslinger... 3800.0 \n", - "40 Astrobot 3000.0 \n", - "41 Fan Scout, Hype Scout 2150.0 \n", - "42 Skymin Slash, Blood Bandit, Quick-Shielder 1500.0 \n", - "43 RoboVich, Trickster, Warper 2000.0 \n", - "44 Pilgrim 4500.0 \n", - "45 Black Shiv 2250.0 \n", - "46 MrPaladin, StabbyStabby 1200.0 \n", - "47 Hacked Slasher, Big Chief, Pancop, Sensor Arms... NaN \n", + " Health Bonus Per Player Before Patch \n", + "0 50.0 \n", + "1 0.0 \n", + "2 100.0 \n", + "3 25.0 \n", + "4 75.0 \n", + ".. ... \n", + "110 350.0 \n", + "111 350.0 \n", + "112 350.0 \n", + "113 350.0 \n", + "114 50.0 \n", "\n", - " Health Bonus Per Player Before Patch \n", - "0 NaN \n", - "1 NaN \n", - "2 NaN \n", - "3 NaN \n", - "4 0.0 \n", - "5 0.0 \n", - "6 0.0 \n", - "7 0.0 \n", - "8 0.0 \n", - "9 0.0 \n", - "10 0.0 \n", - "11 NaN \n", - "12 0.0 \n", - "13 0.0 \n", - "14 0.0 \n", - "15 0.0 \n", - "16 0.0 \n", - "17 0.0 \n", - "18 0.0 \n", - "19 0.0 \n", - "20 0.0 \n", - "21 0.0 \n", - "22 0.0 \n", - "23 0.0 \n", - "24 0.0 \n", - "25 NaN \n", - "26 0.0 \n", - "27 0.0 \n", - "28 175.0 \n", - "29 0.0 \n", - "30 0.0 \n", - "31 NaN \n", - "32 NaN \n", - "33 0.0 \n", - "34 175.0 \n", - "35 175.0 \n", - "36 50.0 \n", - "37 175.0 \n", - "38 0.0 \n", - "39 0.0 \n", - "40 0.0 \n", - "41 0.0 \n", - "42 0.0 \n", - "43 0.0 \n", - "44 0.0 \n", - "45 0.0 \n", - "46 0.0 \n", - "47 NaN " + "[115 rows x 8 columns]" ] }, - "execution_count": 44, + "execution_count": 88, "metadata": {}, "output_type": "execute_result" } @@ -1286,7 +685,7 @@ }, { "cell_type": "code", - "execution_count": 45, + "execution_count": 89, "metadata": {}, "outputs": [], "source": [ @@ -1295,7 +694,7 @@ }, { "cell_type": "code", - "execution_count": 46, + "execution_count": 90, "metadata": {}, "outputs": [], "source": [ @@ -1316,7 +715,7 @@ }, { "cell_type": "code", - "execution_count": 47, + "execution_count": 91, "metadata": {}, "outputs": [], "source": [