Pet specific foods and special treats handling

Quackster · May 8, 2024 · eafa885 · eafa885
1 parent 974dce5
commit eafa885
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/...erver/src/main/java/org/alexdev/kepler/game/item/interactors/types/PetFoodInteractor.java b/...erver/src/main/java/org/alexdev/kepler/game/item/interactors/types/PetFoodInteractor.java
@@ -3,6 +3,7 @@
 import org.alexdev.kepler.game.entity.Entity;
 import org.alexdev.kepler.game.entity.EntityType;
 import org.alexdev.kepler.game.item.Item;
+import org.alexdev.kepler.game.item.base.ItemBehaviour;
 import org.alexdev.kepler.game.pathfinder.Position;
 import org.alexdev.kepler.game.pets.Pet;
 import org.alexdev.kepler.game.player.Player;

diff --git a/Kepler-Server/src/main/java/org/alexdev/kepler/game/room/tasks/PetTask.java b/Kepler-Server/src/main/java/org/alexdev/kepler/game/room/tasks/PetTask.java
@@ -182,7 +182,8 @@ private boolean tryEat() {
                         .filter(item -> (item.hasBehaviour(ItemBehaviour.PET_FOOD) ||
                                         (
                                                 (petType == PetType.CAT && item.hasBehaviour(ItemBehaviour.PET_CAT_FOOD)) ||
-                                                (petType == PetType.DOG && item.hasBehaviour(ItemBehaviour.PET_DOG_FOOD))
+                                                (petType == PetType.DOG && item.hasBehaviour(ItemBehaviour.PET_DOG_FOOD)) ||
+                                                (petType == PetType.CROC && item.hasBehaviour(ItemBehaviour.PET_CROC_FOOD))
                                         )) &&
                                         !item.getCustomData().equalsIgnoreCase("4") &&
                                         item.getTile().getOtherEntities(this.pet).isEmpty()).toList();
@@ -222,14 +223,21 @@ public void eatingComplete(boolean reapBenefits) {
 
             if (currentItem != null &&
                 currentItem.hasBehaviour(ItemBehaviour.PET_FOOD)) {
-
-                if (StringUtils.isNumeric(currentItem.getCustomData())) {
-                    int state = Integer.parseInt(currentItem.getCustomData()) + 1;
 
-                    if (state <= 4) {
-                        currentItem.setCustomData(String.valueOf(state));
-                        currentItem.updateStatus();
-                        currentItem.save();
+                if (currentItem.hasBehaviour(ItemBehaviour.PET_CAT_FOOD) ||
+                    currentItem.hasBehaviour(ItemBehaviour.PET_DOG_FOOD)) {
+
+                    this.room.getMapping().removeItem(currentItem);
+                    currentItem.delete();
+                } else {
+                    if (StringUtils.isNumeric(currentItem.getCustomData())) {
+                        int state = Integer.parseInt(currentItem.getCustomData()) + 1;
+
+                        if (state <= 4) {
+                            currentItem.setCustomData(String.valueOf(state));
+                            currentItem.updateStatus();
+                            currentItem.save();
+                        }
                     }
                 }
             }

diff --git a/tools/migrations/update.1.5.sql b/tools/migrations/update.1.5.sql
@@ -1,6 +1,7 @@
-UPDATE `items_definitions` SET `behaviour`='can_stand_on_top,requires_rights_for_interaction,pet_food', `interactor`='pet_food' WHERE  `sprite` IN ('petfood1','petfood2','petfood3','petfood4');
+UPDATE `items_definitions` SET `behaviour`='can_stand_on_top,requires_rights_for_interaction,pet_food', `interactor`='pet_food' WHERE  `sprite` IN ('petfood1','petfood2','petfood3');
 UPDATE `items_definitions` SET `behaviour`='can_stand_on_top,requires_rights_for_interaction,pet_cat_food', `interactor`='pet_food' WHERE  `sprite` IN ('goodie2');
 UPDATE `items_definitions` SET `behaviour`='can_stand_on_top,requires_rights_for_interaction,pet_dog_food', `interactor`='pet_food' WHERE  `sprite` IN ('goodie1');
+UPDATE `items_definitions` SET `behaviour`='can_stand_on_top,requires_rights_for_interaction,pet_croc_food', `interactor`='pet_food' WHERE  `sprite` IN ('petfood4');
 
 UPDATE `items_definitions` SET `behaviour`='can_stand_on_top,requires_rights_for_interaction,pet_water_bowl', `interactor`='pet_water_bowl' WHERE  `sprite` IN ('waterbowl*1','waterbowl*2','waterbowl*3','waterbowl*4', 'waterbowl*5');
 UPDATE `items_definitions` SET `behaviour`='can_stand_on_top,requires_rights_for_interaction,pet_toy', `interactor`='pet_toy' WHERE  `sprite` IN ('toy1', 'toy1*1', 'toy1*2', 'toy1*3', 'toy1*4');