From 68ef63210f4de48e41715e879707fdcca9d0cb47 Mon Sep 17 00:00:00 2001 From: Elisa Stelling Date: Wed, 11 Dec 2019 11:29:35 +0100 Subject: [PATCH 1/2] kill update --- .../src/main/java/com/sap/tamagotchi/model/Owner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/Owner.java b/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/Owner.java index 99690df..2587886 100644 --- a/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/Owner.java +++ b/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/Owner.java @@ -54,7 +54,7 @@ public class Owner { if (devices != null) { Device first = devices.iterator().next(); Care care = new Care(); - care.setFeed(-1000); + care.setFeed(-100000); tamagotchiService.takeCare(first.getId(), care); } } From f62787de04f95fa13ed47373f235b039f30754f9 Mon Sep 17 00:00:00 2001 From: Tibor Tarnai Date: Wed, 11 Dec 2019 11:30:31 +0100 Subject: [PATCH 2/2] min health = 0 --- .../src/main/java/com/sap/tamagotchi/model/Device.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/Device.java b/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/Device.java index ac93b55..256f3a6 100644 --- a/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/Device.java +++ b/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/model/Device.java @@ -65,6 +65,8 @@ public class Device { healthScore += delta; if (healthScore > 150) healthScore /= 10; + } else { + healthScore = 0; } messages.add(new DeviceEvent(id, owner, color, born, healthScore, Instant.now())); }