fix: fix prerequisite weapons

Picoseconds · Aug 1, 2020 · c2db126 · c2db126
1 parent 0c75a5b
commit c2db126
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/items/items.ts b/src/items/items.ts
@@ -130,6 +130,10 @@ function getPrerequisiteItem(item: ItemType) {
   return items[item].pre;
 }
 
+function getPrerequisiteWeapon(weapon: Weapons) {
+  return weapons[weapon].pre;
+}
+
 function getPlaceOffset(item: ItemType) {
   return items[item].placeOffset;
 }
@@ -147,4 +151,4 @@ function getGameObjID(item: ItemType) {
   return 0;
 }
 
-export { PrimaryWeapons, SecondaryWeapons, getHitTime, Weapons, getWeaponAttackDetails, getWeaponDamage, getItemCost, getPlaceable, getPlaceOffset, getScale, getGameObjID, getWeaponGatherAmount, getPrerequisiteItem, getGroupID };
+export { PrimaryWeapons, SecondaryWeapons, getHitTime, Weapons, getWeaponAttackDetails, getWeaponDamage, getItemCost, getPlaceable, getPlaceOffset, getScale, getGameObjID, getWeaponGatherAmount, getPrerequisiteItem, getGroupID, getPrerequisiteWeapon };
diff --git a/src/moomoo/Game.ts b/src/moomoo/Game.ts
@@ -14,7 +14,7 @@ import GameObject from "../gameobjects/GameObject";
 import { PacketType } from "../packets/PacketType";
 import FileAsync from 'lowdb/adapters/FileAsync';
 import { PacketFactory } from "../packets/PacketFactory";
-import { getWeaponDamage, getWeaponAttackDetails, getItemCost, getPlaceable, PrimaryWeapons, getWeaponGatherAmount, getPrerequisiteItem, getGroupID, Weapons } from "../items/items";
+import { getWeaponDamage, getWeaponAttackDetails, getItemCost, getPlaceable, PrimaryWeapons, getWeaponGatherAmount, getPrerequisiteItem, getGroupID, Weapons, getPrerequisiteWeapon } from "../items/items";
 import { gameObjectSizes, GameObjectType } from "../gameobjects/gameobjects";
 import { getUpgrades, getWeaponUpgrades } from './Upgrades';
 
@@ -888,7 +888,7 @@ export default class Game {
 
           if (item <= 15) {
             if (weaponUpgrades.includes(item)) {
-              let preItem = getPrerequisiteItem(item);
+              let preItem = getPrerequisiteWeapon(item);
 
               if (preItem) {
                 if (!(client.player.weapon == item - preItem || client.player.secondaryWeapon == item - preItem)) this.kickClient(client, "Kicked for hacks");