Merge branch 'fix-pets-finally' into 'fix-pets-finally'

Add 3 commands

See merge request morningstar/Arcturus-Community!522

src/main/java/com/eu/habbo/habbohotel/pets/PetManager.java

@@ -52,6 +52,7 @@ public class PetManager {
             this.put(15, new ActionFollowLeft());
             this.put(16, new ActionFollowRight());
             this.put(17, new ActionPlayFootball());
+            this.put(21, new ActionDance());
             this.put(24, new ActionMoveForward());
             this.put(25, new ActionTurnLeft());
             this.put(26, new ActionTurnRight());
@@ -59,9 +60,11 @@ public class PetManager {
             this.put(28, new ActionCroak());
             this.put(29, new ActionDip());
             this.put(30, new ActionWave());
+            this.put(31, new ActionDance());
             this.put(35, new ActionWings());
             this.put(36, new ActionBreatheFire());
             this.put(38, new ActionTorch());
+            this.put(42, new ActionRingOfFire());
             this.put(43, new ActionEat());
             this.put(46, new ActionBreed());
 

src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionDance.java

@@ -0,0 +1,32 @@
+package com.eu.habbo.habbohotel.pets.actions;
+
+import com.eu.habbo.Emulator;
+import com.eu.habbo.habbohotel.pets.Pet;
+import com.eu.habbo.habbohotel.pets.PetAction;
+import com.eu.habbo.habbohotel.pets.PetVocalsType;
+import com.eu.habbo.habbohotel.rooms.RoomUnitStatus;
+import com.eu.habbo.habbohotel.users.Habbo;
+import com.eu.habbo.threading.runnables.PetClearPosture;
+
+public class ActionDance extends PetAction {
+    public ActionDance() {
+        super(null, true);
+
+        this.minimumActionDuration = 3000;
+        this.statusToSet.add(RoomUnitStatus.DANCE);
+}
+
+    // mambojambo works better than ur dancing skills
+    @Override
+    public boolean apply(Pet pet, Habbo habbo, String[] data) {
+        if (pet.getHappyness() < 50) {
+            pet.say(pet.getPetData().randomVocal(PetVocalsType.DISOBEY));
+            return false;
+        } else {
+            pet.say(pet.getPetData().randomVocal(PetVocalsType.GENERIC_NEUTRAL));
+        }
+
+        Emulator.getThreading().run(new PetClearPosture(pet, RoomUnitStatus.DANCE, null, false), this.minimumActionDuration);
+        return true;
+    }
+}

src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionRingOfFire.java

@@ -0,0 +1,32 @@
+package com.eu.habbo.habbohotel.pets.actions;
+
+import com.eu.habbo.Emulator;
+import com.eu.habbo.habbohotel.pets.Pet;
+import com.eu.habbo.habbohotel.pets.PetAction;
+import com.eu.habbo.habbohotel.pets.PetVocalsType;
+import com.eu.habbo.habbohotel.rooms.RoomUnitStatus;
+import com.eu.habbo.habbohotel.users.Habbo;
+import com.eu.habbo.threading.runnables.PetClearPosture;
+
+public class ActionRingOfFire extends PetAction {
+    public ActionRingOfFire() {
+        super(null, true);
+
+        this.minimumActionDuration = 2000;
+        this.statusToSet.add(RoomUnitStatus.RINGOFFIRE);
+    }
+
+    // TO-DO: Make it specifically for the toy tree. I dont have the skills for that
+    @Override
+    public boolean apply(Pet pet, Habbo habbo, String[] data) {
+        if (pet.getHappyness() < 50) {
+            pet.say(pet.getPetData().randomVocal(PetVocalsType.DISOBEY));
+            return false;
+        } else {
+            pet.say(pet.getPetData().randomVocal(PetVocalsType.GENERIC_NEUTRAL));
+        }
+
+        Emulator.getThreading().run(new PetClearPosture(pet, RoomUnitStatus.RINGOFFIRE, null, false), this.minimumActionDuration);
+        return true;
+    }
+}

src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnitStatus.java

@@ -42,6 +42,11 @@ public enum RoomUnitStatus {
     RELAX("rlx"),
     WINGS("wng", true),
     FLAME("flm"),
+    RINGOFFIRE("rng"), // ring of fire for dragon, toy undone
+    SWING("swg"), // same as roll but less energic, related to Dragon tree toy.
+    HANG("hg"), // hang, related to Dragon tree toy. just hangs under the branch
+    ROLL("rll"), // roll, related to Dragon tree toy. rolls around the branch
+
     RIP("rip"),
     GROW("grw"),
     GROW_1("grw1"),