Merge branch 'main' of https://github.com/potato-tf/GG2Assets

.github/workflows/gg2.yml

@@ -100,7 +100,7 @@ jobs:
             rm -rf /tmp/deploy_key_eu
           } &
 
-          for i in "22 pterodactyl@us.potato.tf" "27040 pterodactyl@us.potato.tf" "3438 pterodactyl@us.potato.tf" "22 pterodactyl@usw2.potato.tf" "22 pterodactyl@usw3.potato.tf" "22 pterodactyl@sgp.potato.tf" "22 pterodactyl@eu2.potato.tf" "22 pterodactyl@eu3.potato.tf" "22 pterodactyl@eu4.potato.tf" "27035 pterodactyl@eu.potato.tf" "22 pterodactyl@10.243.40.231" "22 pterodactyl@aus.potato.tf"; do a=( $i );
+          for i in "22 pterodactyl@us.potato.tf" "22 pterodactyl@br.potato.tf" "27040 pterodactyl@us.potato.tf" "3438 pterodactyl@us.potato.tf" "22 pterodactyl@usw2.potato.tf" "22 pterodactyl@usw3.potato.tf" "22 pterodactyl@sgp.potato.tf" "22 pterodactyl@eu2.potato.tf" "22 pterodactyl@eu3.potato.tf" "22 pterodactyl@eu4.potato.tf" "27035 pterodactyl@eu.potato.tf" "22 pterodactyl@10.243.40.231" "22 pterodactyl@aus.potato.tf"; do a=( $i );
           {
             ssh -o StrictHostKeyChecking=no -p ${a[0]} ${a[1]} "touch /var/tf2server/tf/occupiedservers/wake; exit 0"
 

materials/undead_dread_overlays/weaponmod_shotgun.vmt

@@ -0,0 +1,6 @@
+"UnlitGeneric"
+{
+	"$translucent" 1
+	"$basetexture" "undead_dread_overlays/weaponmod_shotgun"
+	"$basetexturetransform" "center 0.5 0.5 scale 4.05 2.025 rotate 0 translate 0 0"
+}

scripts/population/custom_upgrades_scroob.pop

@@ -25,6 +25,286 @@ WaveSchedule
 		"Civilian.MVM_ExplosionDeath"	"Breakable.Metal"
 	}
 
+
+	ItemAttributes
+	{		
+		SimilarToItem "Rocket Jumper"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "The Splendid Screen"
+		Classname "tf_weapon_grenadelauncher"
+		ItemName "The Loch-n-Load"
+		ItemName "The Iron Bomber"
+		ItemName "The Loose Cannon"
+		SimilarToItem "The Eyelander"
+		SimilarToItem "The Scottish Handshake"
+		SimilarToItem "The Half-Zatoichi"
+		SimilarToItem "The Ullapool Caber"
+		SimilarToItem "Nessie's Nine Iron"
+		SimilarToItem "The Pain Train"
+		SimilarToItem "The Persian Persuader"
+		SimilarToItem "The Claidheamohmor"
+		SimilarToItem "The Horseless Headless Horseman's Headtaker"
+		SimilarToItem "TF_WEAPON_BOTTLE"
+		SimilarToItem "The Scotsman's Skullcutter"
+		ItemName "the direct hit"
+		ItemName "The Air Strike"
+		SimilarToItem "Upgradeable TF_WEAPON_SHOTGUN_PRIMARY"
+		SimilarToItem "The Reserve Shooter"
+		SimilarToItem "Panic Attack Shotgun"	
+		SimilarToItem "The Righteous Bison"		
+		ItemName "The Mantreads"
+		ItemName "The Market Gardener"
+		SimilarToItem "TF_WEAPON_PISTOL"
+		ItemName "The Cow mangler 5000"
+		ClassName TF_WEAPON_SHOTGUN_PRIMARY
+		ItemName "The Pomson 6000"
+		SimilarToItem "The Gunslinger" 
+		SimilarToItem "The Frontier Justice"
+		SimilarToItem "The Flare Gun"
+		SimilarToItem "The Manmelter"
+		SimilarToItem "The Machina"
+		SimilarToItem "The Flying Guillotine"
+		SimilarToItem "The Dalokohs Bar"
+		SimilarToItem "Tomislav"
+		ItemName "The Huo Long Heatmaker"
+		SimilarToItem "The Backburner"
+		ItemName "The Axtinguisher"
+		SimilarToItem "TF_WEAPON_INVIS"
+		SimilarToItem "The Cloak and Dagger"
+		SimilarToItem "The Big Earner"
+		SimilarToItem "L'Etranger"
+		SimilarToItem "TF_WEAPON_ROCKETLAUNCHER"
+		SimilarToItem "The Original"	
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "TF_WEAPON_ROCKETLAUNCHER"	
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "L'Etranger"	
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "The Big Earner"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "The Cloak and Dagger"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "TF_WEAPON_INVIS"
+		"special item description" "Has custom upgrades"
+	}	
+	ItemAttributes
+	{
+		ItemName "The Axtinguisher"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "The Backburner"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		ItemName "The Huo Long Heatmaker"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "Tomislav"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "Tomislav"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "The Dalokohs Bar"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "The Flying Guillotine"
+		"special item description" "Has custom upgrades"
+	}	
+	ItemAttributes
+	{
+		SimilarToItem "The Machina"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "The Manmelter"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "The Flare Gun"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "The Frontier Justice"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "The Gunslinger" 
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		ItemName "The Pomson 6000"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		ClassName TF_WEAPON_SHOTGUN_PRIMARY
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		ItemName "The Cow mangler 5000"
+		"special item description" "Has custom upgrades"
+	}	
+	ItemAttributes
+	{
+		SimilarToItem "TF_WEAPON_PISTOL"
+		"special item description" "Has custom upgrades"
+	}	
+	ItemAttributes
+	{
+		ItemName "The Market Gardener"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{	
+		ItemName "The Mantreads"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "The Righteous Bison"		
+		"special item description" "Has custom upgrades"
+	}	
+	ItemAttributes
+	{
+		SimilarToItem "Panic Attack Shotgun"		
+		"special item description" "Has custom upgrades"
+	}	
+	ItemAttributes
+	{
+		SimilarToItem "The Reserve Shooter"	
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "Upgradeable TF_WEAPON_SHOTGUN_PRIMARY"	
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		ItemName "The Air Strike"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		ItemName "the direct hit"	
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "The Scotsman's Skullcutter"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "TF_WEAPON_BOTTLE"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "The Horseless Headless Horseman's Headtaker"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "The Claidheamohmor"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "The Persian Persuader"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "The Pain Train"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "Nessie's Nine Iron"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "The Ullapool Caber"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "The Half-Zatoichi"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "The Scottish Handshake"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "The Eyelander"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		ItemName "The Loose Cannon"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		ItemName "The Iron Bomber"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		ItemName "The Loch-n-Load"
+		"special item description" "Has custom upgrades"
+	}	
+	ItemAttributes
+	{
+		Classname "tf_weapon_grenadelauncher"
+		"special item description" "Has custom upgrades"
+	}
+	ItemAttributes
+	{
+		SimilarToItem "The Splendid Screen"
+		"special item description" "Has custom upgrades"
+	}	
 	CustomWeapon
 	{
 			"SHRAPNEL_GUN"
@@ -157,10 +437,10 @@ WaveSchedule
 			"paintkit_proto_def_index" 414
 			"set_item_texture_wear" 0
 			"fire rate bonus" 0.65
-			"damage penalty" 0.75
+			"damage penalty" 0.65
 			"add cond when active" 114
 			"max health additive penalty" -25
-			"special item description 2" "On kill by knife or spawned bot, victim explodes into an allied spy bot that will live for 25 seconds"
+			"special item description 2" "On kill by knife or spawned bot, victim explodes into an allied spy bot that will live for 14 seconds"
 			"special item description 4" "While active, see teammate outlines through walls. Useful for finding enemy spies and tracking your bots"
 		}
 	}
@@ -1344,7 +1624,7 @@ WaveSchedule
 			{
 				Name "Explosive Axtinguish"
 				Attribute "tool needs giftwrap"
-				Description "On hit with burning enemy, hit all enemies within a 300 hammer unit radius. Acts identically to hits with the weapon"
+				Description "On hit with burning enemy, every enemy within a 300hu radius of the victim will also be hit. Pulling out the axtinguisher right before a crit flare hits a victim will trigger this effect at range"
 				Cap 1
 				Increment 1
 				Cost 200

scripts/population/mvm_bloodlust_b6_adv_reanimation.pop

@@ -1,4 +1,4 @@
-#base base_restricts.pop
+//#base base_restricts.pop
 // Halloween 666 on such a tiny map
 // by Spectλtor™ : https://steamcommunity.com/id/ImNotSpecNotes/
 // 感谢好时光服务器协助我测试的CNTF2社区成员们。
@@ -613,7 +613,7 @@ WaveSchedule
 				"damage force reduction" 0.4
 				"airblast vulnerability multiplier" 0.4
 				"override footstep sound set" 3
-				"Projectile speed increased" 0.9
+				"Projectile speed increased" 0.65 // nerfed from 0.9 -> 0.65, which is good.
 			}
         }
         T_TFBot_Giant_Soldier_Backup_Spammer
@@ -648,7 +648,7 @@ WaveSchedule
 				"damage force reduction" 0.4
 				"airblast vulnerability multiplier" 0.4
 				"override footstep sound set" 3
-				"Projectile speed increased" 0.9
+				"Projectile speed increased" 0.65
 			}
         }
         T_TFBot_Giant_Soldier_Conch_Spammer
@@ -683,7 +683,7 @@ WaveSchedule
 				"damage force reduction" 0.4
 				"airblast vulnerability multiplier" 0.4
 				"override footstep sound set" 3
-				"Projectile speed increased" 0.9
+				"Projectile speed increased" 0.65
 			}
         }
         T_TFBot_Giant_Pyro_Armoured