Merge pull request #138 from cpurules/bugfix/pet-quests

Fix reported bugs in pet quests
This commit is contained in:
Ponk
2022-09-22 07:23:11 +02:00
committed by GitHub
2 changed files with 6 additions and 4 deletions

View File

@@ -69,8 +69,8 @@ function end(mode, type, selection) {
return;
}
var closeness = pet.getCloseness();
if (closeness < 1642) {
var tameness = pet.getTameness();
if (tameness < 1642) {
qm.sendOk("It looks like your pet is not grown enough to be evolved yet. Train it a bit more, util it reaches #blevel 15#k.");
qm.dispose();
return;
@@ -101,8 +101,9 @@ function end(mode, type, selection) {
//qm.gainItem(5000048 + rand);
qm.gainItem(5380000, -1);
qm.gainMeso(-10000);
qm.evolvePet(i, after);
qm.completeQuest();
// var petId = Pet.createPet(rand + 5000049, level, closeness, fullness);
// if (petId == -1) return;
// InventoryManipulator.addById(qm.getClient(), rand+5000049, 1, "", petId);

View File

@@ -50,7 +50,7 @@ function end(mode, type, selection) {
var petidx = -1;
var petItemid;
for (var i = 0; i < 3; i++) {
var pet = qm.getPlayer().getPet(pet);
var pet = qm.getPlayer().getPet(i);
if (pet != null) {
var id = pet.getItemId();
if (id >= 5000029 && id <= 5000033) {
@@ -95,6 +95,7 @@ function end(mode, type, selection) {
qm.gainMeso(-10000);
qm.gainItem(5380000, -1);
qm.evolvePet(petidx, after);
qm.completeQuest();
qm.sendOk("Woo! It worked again! #rYou may find your new pet under your 'CASH' inventory.\r #kIt used to be a #b#i" + id + "##t" + id + "##k, and now it's \r a#b #i" + after + "##t" + after + "##k! \r\n Come back with 10,000 mesos and another Rock of Evolution if you don't like it!\r\n\r\n#fUI/UIWindow.img/QuestIcon/4/0#\r\n#v" + after + "# #t" + after + "#");
} else if (status == 3) {