rever boxing hands

CafeFPS · May 8, 2023 · 09f5518 · 09f5518
1 parent eb5b7fe
commit 09f5518
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/vscripts/gamemodes/fs_1v1/_gamemode_1v1.nut b/vscripts/gamemodes/fs_1v1/_gamemode_1v1.nut
@@ -597,9 +597,9 @@ void function giveWeaponInRandomWeaponPool(entity player)
 
 	    GiveRandomPrimaryWeaponMetagame(player)
 		GiveRandomSecondaryWeaponMetagame(player)
-		player.GiveWeapon( "mp_weapon_melee_boxing_ring", WEAPON_INVENTORY_SLOT_PRIMARY_2, [] )
+		player.GiveWeapon( "mp_weapon_melee_survival", WEAPON_INVENTORY_SLOT_PRIMARY_2, [] )
 		if(!isPlayerInRestingList(player))
-	    	player.GiveOffhandWeapon( "melee_boxing_ring", OFFHAND_MELEE, [] )
+	    	player.GiveOffhandWeapon( "melee_pilot_emptyhanded", OFFHAND_MELEE, [] )
 
 		//hack to fix first reload
 		player.SetActiveWeaponBySlot(eActiveInventorySlot.mainHand, WEAPON_INVENTORY_SLOT_PRIMARY_1)
@@ -652,7 +652,7 @@ void function respawnInSoloMode(entity player, int respawnSlotIndex = -1) //复
 				TakeAllWeapons(player)
 				thread LoadCustomWeapon(player)
 			}
-			player.GiveWeapon( "mp_weapon_melee_boxing_ring", WEAPON_INVENTORY_SLOT_PRIMARY_2, [] )
+			player.GiveWeapon( "mp_weapon_melee_survival", WEAPON_INVENTORY_SLOT_PRIMARY_2, [] )
 		}
 		catch (erroree)
 		{

diff --git a/vscripts/gamemodes/fs_movementgym/_movement_gym.nut b/vscripts/gamemodes/fs_movementgym/_movement_gym.nut
@@ -481,8 +481,8 @@ function MovementGym_Hub() {
       //apply melee
 
         TakeAllWeapons(ent)
-        ent.GiveWeapon("mp_weapon_melee_boxing_ring", WEAPON_INVENTORY_SLOT_PRIMARY_2, [])
-        ent.GiveOffhandWeapon("melee_boxing_ring", OFFHAND_MELEE, [])
+        ent.GiveWeapon("mp_weapon_melee_survival", WEAPON_INVENTORY_SLOT_PRIMARY_2, [])
+        ent.GiveOffhandWeapon("melee_pilot_emptyhanded", OFFHAND_MELEE, [])
 
           ent.GiveOffhandWeapon("mp_ability_phase_walk", OFFHAND_TACTICAL)
           ent.SetPlayerNetBool("pingEnabled", false)
@@ -513,8 +513,8 @@ function MovementGym_Hub() {
       //apply melee
 
         TakeAllWeapons(ent)
-        ent.GiveWeapon("mp_weapon_melee_boxing_ring", WEAPON_INVENTORY_SLOT_PRIMARY_2, [])
-        ent.GiveOffhandWeapon("melee_boxing_ring", OFFHAND_MELEE, [])
+        ent.GiveWeapon("mp_weapon_melee_survival", WEAPON_INVENTORY_SLOT_PRIMARY_2, [])
+        ent.GiveOffhandWeapon("melee_pilot_emptyhanded", OFFHAND_MELEE, [])
 
           ent.GiveOffhandWeapon("mp_ability_phase_walk", OFFHAND_TACTICAL)
           ent.SetPlayerNetBool("pingEnabled", false)
@@ -636,8 +636,8 @@ function MovementGym_Hub_Buttons() {
       //apply melee
 
         TakeAllWeapons(user)
-        user.GiveWeapon("mp_weapon_melee_boxing_ring", WEAPON_INVENTORY_SLOT_PRIMARY_2, [])
-        user.GiveOffhandWeapon("melee_boxing_ring", OFFHAND_MELEE, [])
+        user.GiveWeapon("mp_weapon_melee_survival", WEAPON_INVENTORY_SLOT_PRIMARY_2, [])
+        user.GiveOffhandWeapon("melee_pilot_emptyhanded", OFFHAND_MELEE, [])
 
       user.SetPlayerNetBool("pingEnabled", false)
       Message(user, "Pathfinder Grapples", "You now recieved Grapple Tactical")
@@ -688,8 +688,8 @@ function MovementGym_Map2_Button(){
             //apply melee
 
         TakeAllWeapons(user)
-        user.GiveWeapon("mp_weapon_melee_boxing_ring", WEAPON_INVENTORY_SLOT_PRIMARY_2, [])
-        user.GiveOffhandWeapon("melee_boxing_ring", OFFHAND_MELEE, [])
+        user.GiveWeapon("mp_weapon_melee_survival", WEAPON_INVENTORY_SLOT_PRIMARY_2, [])
+        user.GiveOffhandWeapon("melee_pilot_emptyhanded", OFFHAND_MELEE, [])
 
       user.SetPlayerNetBool("pingEnabled", false)
       Message(user, "Map 2 by DEAFPS")