fix: fixed secondary weapons

Picoseconds · Aug 1, 2020 · 1f41f1b · 1f41f1b
1 parent eaa7c85
commit 1f41f1b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/moomoo/Game.ts b/src/moomoo/Game.ts
@@ -427,7 +427,12 @@ export default class Game {
           for (let hitPlayer of hitPlayers) {
             if (hitPlayer.clanName == player.clanName && hitPlayer.clanName != null) continue;
 
-            let dmg = getWeaponDamage(player.weapon, player.weaponVariant);
+            let dmg = getWeaponDamage(
+              player.selectedWeapon,
+              player.selectedWeapon == player.weapon ?
+                player.primaryWeaponVariant :
+                player.secondaryWeaponVariant
+            );
 
             hitPlayer.health -= dmg;
             if (hitPlayer.health <= 0 && hitPlayer.client) {

diff --git a/src/moomoo/Player.ts b/src/moomoo/Player.ts
@@ -41,7 +41,8 @@ export default class Player extends Entity {
   public weapon: PrimaryWeapons = 0;
   public secondaryWeapon: SecondaryWeapons = -1;
   public selectedWeapon: Weapons = 0;
-  public weaponVariant = WeaponVariant.Normal;
+  public primaryWeaponVariant = WeaponVariant.Normal;
+  public secondaryWeaponVariant = WeaponVariant.Normal;
   public buildItem = -1;
   public items: ItemType[] = [ItemType.Apple, ItemType.WoodWall, ItemType.Spikes, ItemType.Windmill];
 
@@ -323,7 +324,11 @@ export default class Player extends Entity {
     this.dead = true;
     this.kills = 0;
     this.weapon = 0;
-    this.weaponVariant = WeaponVariant.Normal;
+    this.secondaryWeapon = -1;
+    this.primaryWeaponVariant = WeaponVariant.Normal;
+    this.secondaryWeaponVariant = WeaponVariant.Normal;
+    this.age = 1;
+    this.xp = 0;
     this.buildItem = -1;
     this.autoAttackOn = false;
     this.disableRotation = false;
@@ -360,7 +365,9 @@ export default class Player extends Entity {
       this.angle,
       this.buildItem,
       this.selectedWeapon,
-      this.weaponVariant,
+      this.selectedWeapon == this.weapon ?
+        this.primaryWeaponVariant :
+        this.secondaryWeaponVariant,
       this.clanName,
       this.isClanLeader ? 1 : 0,
       this.hatID,