From edf3a89db881ad27994baf0ba6da5a8d144faf8f Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Wed, 29 Jul 2020 06:00:45 -0300 Subject: Moggun pet. Also, add all pets and their food to Jesusaves Grimorium --- db/re/pet_db.conf | 4 ++-- npc/017-1/pet_detective.txt | 5 +++++ npc/items/books.txt | 49 ++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 53 insertions(+), 5 deletions(-) diff --git a/db/re/pet_db.conf b/db/re/pet_db.conf index ba1a31678..a7f32afe9 100644 --- a/db/re/pet_db.conf +++ b/db/re/pet_db.conf @@ -267,7 +267,7 @@ pet_db:( Name: "Baby Yeti" TamingItem: "IceGladius" EggItem: "MoggunEgg" - FoodItem: "GoldPieces" // TODO + FoodItem: "MoubooSteak" FoodEffectiveness: 100 HungerDelay: 120 Intimacy: { @@ -283,7 +283,7 @@ pet_db:( DefendRate: 500 ChangeTargetRate: 850 PetScript: <" petloot 3; "> - EquipScript: <" bonus bAspdRate, -50; "> // TODO + EquipScript: <" bonus bDef, 5; "> }, // TODO: What's the difference from AnimalBones and Bone ? { diff --git a/npc/017-1/pet_detective.txt b/npc/017-1/pet_detective.txt index 293500df7..2e7c2da63 100644 --- a/npc/017-1/pet_detective.txt +++ b/npc/017-1/pet_detective.txt @@ -67,6 +67,7 @@ L_Menu: rif(PDQ_CheckGHQ(Fluffy) >= 10000 && !countitem(FluffyEgg), l("Commmon Fluffy")), rif(PDQ_CheckGHQ(Duck) >= 10000 && !countitem(DuckEgg), l("Duck")), rif(PDQ_CheckGHQ(Bat) >= 10000 && !countitem(BatEgg), l("Bat")), + rif(PDQ_CheckGHQ(Moggun) >= 10000 && !countitem(MoggunEgg), l("Moggun")), rif(#LOGIN_ALLTIME >= 12 && !countitem(PiouEgg), l("Piou")), l("Nothing at the moment."); @@ -93,6 +94,10 @@ L_Menu: .stock-=1; break; case 6: + if (PDQ_InnerSwitch(Moggun, WhiteFur, 120)) + .stock-=1; + break; + case 7: if (PDQ_InnerSwitch(Piou, PiouFeathers, 80)) .stock-=1; break; diff --git a/npc/items/books.txt b/npc/items/books.txt index 49951e5b6..2dcf4c032 100644 --- a/npc/items/books.txt +++ b/npc/items/books.txt @@ -183,8 +183,9 @@ OnInit: rif2(3, MAGIC_LVL, l("Ch 3 — Status Ailments")), rif2(4, true, l("Open Fishing Book")), rif2(5, true, l("Open Petcaring Book")), - rif2(6, CRAFTQUEST, l("Open Recipe Book")), - rif2(7, true, l("Read Rules")), + rif2(6, getq(LoFQuest_Pets), l("List of Unlocked Pets and Food")), + rif2(7, CRAFTQUEST, l("Open Recipe Book")), + rif2(8, true, l("Read Rules")), l("Close"); mes ""; @@ -240,11 +241,53 @@ OnInit: PetcaringBook(); break; case 6: + mesf(".:: %s ::.", l("Grand Hunter Quest")); + if (PDQ_CheckGHQ(Maggot) >= 10000) + mesf("%s - %s", + getmonsterlink(Maggot), getitemlink(BugLeg)); + if (PDQ_CheckGHQ(ForestMushroom) >= 10000) + mesf("%s - %s", + getmonsterlink(ForestMushroom), getitemlink(Moss)); + if (PDQ_CheckGHQ(Fluffy) >= 10000) + mesf("%s - %s", + getmonsterlink(Fluffy), getitemlink(LettuceLeaf)); + if (PDQ_CheckGHQ(Duck) >= 10000) + mesf("%s - %s", + getmonsterlink(Duck), getitemlink(CherryCake)); + if (PDQ_CheckGHQ(Bat) >= 10000) + mesf("%s - %s", + getmonsterlink(Bat), getitemlink(RoastedMaggot)); + if (PDQ_CheckGHQ(Moggun) >= 10000) + mesf("%s - %s", + getmonsterlink(Moggun), getitemlink(MoubooSteak)); + if (#LOGIN_ALLTIME >= 6) + mesf("%s - %s", + getmonsterlink(Piou), getitemlink(Piberries)); + next; + mesf(".:: %s ::.", l("Special Event Pets")); + if (countitem(Ratte)) + mesf("%s - %s", + getmonsterlink(Ratto), getitemlink(Cheese)); + if (countitem(BhopEgg)) + mesf("%s - %s", + getmonsterlink(BhopFluffy), getitemlink(Aquada)); + if (countitem(DoggyDog)) + mesf("%s - %s", + getmonsterlink(Toto), getitemlink(AnimalBones)); + if (countitem(CattyCat)) + mesf("%s - %s", + getmonsterlink(WhiteCat), getitemlink(Milk)); + if (countitem(BlackyCat)) + mesf("%s - %s", + getmonsterlink(BlackCat), getitemlink(Mashmallow)); + next; + break; + case 7: closeclientdialog; doevent("#RecipeBook::OnUse"); end; break; - case 7: + case 8: GameRules(); break; default: -- cgit v1.2.3-60-g2f50