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

Fix ActionCroak

See merge request morningstar/Arcturus-Community!531
This commit is contained in:
Harmonic 2022-04-11 13:00:26 +00:00
commit 388c8ec812

View File

@ -21,8 +21,18 @@ public class ActionCroak extends PetAction {
Emulator.getThreading().run(new PetClearPosture(pet, RoomUnitStatus.CROAK, null, false), 2000); Emulator.getThreading().run(new PetClearPosture(pet, RoomUnitStatus.CROAK, null, false), 2000);
if (pet.getHappyness() > 80) if (pet.getHappyness() > 70)
pet.say(pet.getPetData().randomVocal(PetVocalsType.PLAYFUL)); pet.say(pet.getPetData().randomVocal(PetVocalsType.GENERIC_HAPPY));
else if (pet.getHappyness() < 30)
pet.say(pet.getPetData().randomVocal(PetVocalsType.GENERIC_SAD));
else if (pet.getLevelHunger() > 65)
pet.say(pet.getPetData().randomVocal(PetVocalsType.HUNGRY));
else if (pet.getLevelThirst() > 65)
pet.say(pet.getPetData().randomVocal(PetVocalsType.THIRSTY));
else if (pet.getEnergy() < 25)
pet.say(pet.getPetData().randomVocal(PetVocalsType.TIRED));
else if (pet.getTask() == PetTasks.NEST || pet.getTask() == PetTasks.DOWN)
pet.say(pet.getPetData().randomVocal(PetVocalsType.SLEEPING));
return true; return true;
} }