Merge pull request #7 from YLaup/master

Scoreboard functionality rewritten to work like Habbo.
Sledmore · Jul 7, 2018 · 003c4d6 · 003c4d6
2 parents 283b756 + 839a2a7
commit 003c4d6
Showing 1 changed file with 25 additions and 25 deletions.
diff --git a/HabboHotel/Items/Interactor/InteractorScoreboard.cs b/HabboHotel/Items/Interactor/InteractorScoreboard.cs
@@ -19,49 +19,49 @@ public void OnTrigger(GameClient Session, Item Item, int Request, bool HasRights
                 return;
             }
 
-            int OldValue = 0;
+            // Request 1 - Decrease value with red button
+            // Request 2 - Increase value with green button
+            // Request 3 - Reset with UI/Wired/Double click
 
-            if (!int.TryParse(Item.ExtraData, out OldValue))
+            // Find out what number we are on right now
+            if (!int.TryParse(Item.ExtraData, out int OldValue))
             {
+                OldValue = 0;
             }
 
+            // Decrease value with red button
+            if (OldValue >= 0 && OldValue <= 99 && Request == 1)
+            {
+                if (OldValue > 0)
+                    OldValue--;
+                else if (OldValue == 0)
+                    OldValue = 99;
+            }
 
-            if (Request == 1)
+            // Increase value with green button
+            if (OldValue >= 0 && OldValue <= 99 && Request == 2)
             {
-                if (Item.pendingReset && OldValue > 0)
-                {
+                if (OldValue < 99)
+                    OldValue++;
+                else if (OldValue == 99)
                     OldValue = 0;
-                    Item.pendingReset = false;
-                }
-                else
-                {
-                    OldValue = OldValue + 60;
-                    Item.UpdateNeeded = false;
-                }
             }
-            else if (Request == 2)
+
+            // Reset with UI/Wired/Double click
+            if (Request == 3)
             {
-                Item.UpdateNeeded = !Item.UpdateNeeded;
+                OldValue = 0;
                 Item.pendingReset = true;
             }
 
-
             Item.ExtraData = OldValue.ToString();
             Item.UpdateState();
         }
 
         public void OnWiredTrigger(Item Item)
         {
-            int OldValue = 0;
-
-            if (!int.TryParse(Item.ExtraData, out OldValue))
-            {
-            }
-
-            OldValue = OldValue + 60;
-            Item.UpdateNeeded = false;
-
-            Item.ExtraData = OldValue.ToString();
+            // Always reset scoreboard on Wired trigger
+            Item.ExtraData = "0";
             Item.UpdateState();
         }
     }