fix teamporter

higps · Mar 13, 2024 · e53d30f · e53d30f
1 parent a1fa2b0
commit e53d30f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/berobot_dmg_handler.sp b/berobot_dmg_handler.sp
@@ -580,14 +580,14 @@ public Action TF2_OnTakeDamage(int victim, int &attacker, int &inflictor, float
                         TFTeam iTeam = view_as<TFTeam>(GetEntProp(victim, Prop_Send, "m_iTeamNum"));
                         // int attackerID = GetClientUserId(attacker);
                         // int victimID = GetClientUserId(victim);
-                        TFClassType iClassVictim = TF2_GetPlayerClass(victim);
+                        // TFClassType iClassVictim = TF2_GetPlayerClass(victim);
 
                         //TF2_DisguisePlayer(attackerID, iTeam, iClassVictim, victimID);
                         DataPack info = new DataPack();
                             info.Reset();
                             info.WriteCell(GetClientUserId(attacker));
                             info.WriteCell(iTeam);
-                            info.WriteCell(iClassVictim);
+                            info.WriteCell(TFClass_Spy);
                             info.WriteCell(GetClientUserId(victim));
 
                         RequestFrame(Disguiseframe, info);                  
@@ -1770,7 +1770,12 @@ public Action Event_post_inventory_application(Event event, const char[] name, b
 
             if (IsSpycicle(Weapon3))
             {
-                Format(chat_display, sizeof(chat_display), "%s\n{teamcolor}Spycicle:{orange}On Backstab: Slows enemy attack speed by -%0.0f%%%% for %0.0f seconds",chat_display, LessIsMore(g_spycicle_fire_speed_debuff), g_spycicle_fire_Speed_debuff_duration);
+                Format(chat_display, sizeof(chat_display), "%s\n{teamcolor}Spycicle: {orange}On Backstab: Slows enemy attack speed by -%0.0f%%%% for %0.0f seconds",chat_display, LessIsMore(g_spycicle_fire_speed_debuff), g_spycicle_fire_Speed_debuff_duration);
+            }
+
+            if (IsYer(Weapon3))
+            {
+                Format(chat_display, sizeof(chat_display), "%s\n{teamcolor}Your Eternal Reward: {orange}On Backstab: Disguise as enemy spy",chat_display);
             }
 
             if (IsEnforcer(Weapon1))

diff --git a/cfg/robots/free_tank_demoman_executer.cfg b/cfg/robots/free_tank_demoman_executer.cfg
@@ -49,7 +49,7 @@
         {
            "killstreak tier" "1.0"
            "dmg penalty vs players" "2.5"
-           "melee range multiplier" "1.25"
+           "melee range multiplier" "1.15"
            "dmg penalty vs buildings" "0.35"
         }
         "custom_attributes_weapon"

diff --git a/mm_attribute_teamporter.sp b/mm_attribute_teamporter.sp
@@ -446,7 +446,7 @@ public Action OnPlayerSpawn(Event event, const char[] name, bool dontBroadcast)
 
 	return Plugin_Continue;
 }
-// bool g_b_CanGetTeled[MAXPLAYERS + 1];
+bool g_b_touching_spawn[MAXPLAYERS + 1];
 
 public Action OnTouch(int client, int ent)
 {
@@ -465,6 +465,7 @@ public Action OnTouch(int client, int ent)
 				DrawHUD(client);
 				// PrintCenterText(client, "Touching Spawn Robo");
 				// g_b_CanGetTeled[client] = true;
+				g_b_touching_spawn[client] = true;
 			}
 			else if (!IsAnyRobot(client) && TF2_GetPlayerClass(client) == TFClass_Spy)
 			{
@@ -474,13 +475,18 @@ public Action OnTouch(int client, int ent)
 				{
 					UpdateCharge(client);
 					DrawHUD(client);
+					g_b_touching_spawn[client] = true;
 					// PrintCenterText(client, "Touching Enemy Spawn Spy");
 					// g_b_CanGetTeled[client] = true;
 				}
 			}
 
 
 
+		}
+		else
+		{
+			g_b_touching_spawn[client] = false;
 		}
 	}
 	return Plugin_Continue;