From 8ac308da4f75b8129369ed99c800e1ae0042ceee Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sat, 4 Jun 2022 18:00:45 -0300 Subject: Maya will be the item combo NPC once her quest is finished --- db/re/item_combo_db.conf | 30 +++++++++------- npc/005-1/maya.txt | 89 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 12 deletions(-) diff --git a/db/re/item_combo_db.conf b/db/re/item_combo_db.conf index ecfb20279..d27161c01 100644 --- a/db/re/item_combo_db.conf +++ b/db/re/item_combo_db.conf @@ -154,7 +154,7 @@ combo_db: ( // Terranite Set // Allstats +1, Int. MDef +30% { - Items: ["TerraniteArmor", "TerraniteBoots", "TerraniteGloves", "TerranitePants", "TerraniteMask"] + Items: ["TerraniteArmor", "TerraniteBoots", "TerranitePants", "TerraniteMask"] Script: <" bonus bAllStats, 1; bonus bMdef2Rate, 30; @@ -170,12 +170,12 @@ combo_db: ( bonus bAllStats, 2; "> }, -{ - Items: ["LeatherShirt", "LeatherBoots", "LeatherGloves", "LeatherTrousers"] - Script: <" - bonus bAllStats, 2; - "> -}, +//{ +// Items: ["LeatherShirt", "LeatherBoots", "LeatherGloves", "LeatherTrousers"] +// Script: <" +// bonus bAllStats, 2; +// "> +//}, // Assassin Set // Allstats +1, Agi +5 @@ -188,12 +188,18 @@ combo_db: ( }, // Savior Set -// Allstats +3 +// Allstats +5 // Note: Gloves/Helmet replaced with Shield (2705) temporaly { - Items: ["SaviorArmor", "SaviorBoots", "SaviorPants", "SaviorShield"] + Items: ["SaviorArmor", "SaviorBoots", "SaviorPants", "SaviorHelmet", "SaviorShield"] Script: <" - bonus bAllStats, 3; + bonus bAllStats, 5; + "> +}, +{ + Items: ["SaviorArmor", "SaviorBoots", "SaviorPants", "SaviorHelmet", "Skypiercer"] + Script: <" + bonus bAllStats, 5; "> }, @@ -242,13 +248,13 @@ combo_db: ( // W. Boots + Cotton/Silk Gloves + Sorcerer Robe - Mage Set (+7 mp/2s) { - Items: ["WizardMoccasins", "CottonGloves", "SorcererRobe"] + Items: ["WitchBoots", "CottonGloves", "SorcererRobe"] Script: <" bonus2 bSPRegenRate, 7, 2000; "> }, { - Items: ["WizardMoccasins", "SilkGloves", "SorcererRobe"] + Items: ["WitchBoots", "SilkGloves", "SorcererRobe"] Script: <" bonus2 bSPRegenRate, 7, 2000; "> diff --git a/npc/005-1/maya.txt b/npc/005-1/maya.txt index 14cbe4027..d990abcfc 100644 --- a/npc/005-1/maya.txt +++ b/npc/005-1/maya.txt @@ -14,6 +14,7 @@ // 05 wolvern tooth +20k + 2000monster point ->claw pendant 005-1,49,47,0 script Maya NPC_RAIJIN_FEMALE_LEGION_ARTIS,{ + function itemCombo; .@maya = getq(CandorQuest_Maya); if (.@maya == 0) @@ -131,8 +132,96 @@ L_Quest2Completed: L_NextQuestPending: mesn; mesq l("Thanks again for the help. You have proven that you are resourceful. Come back again later."); + switch (getequipid(EQI_HEAD_MID)) { + case CreasedShirt: + itemCombo(l("Creased"), l("All Stats +1"), + CreasedShirt, CreasedBoots, CreasedGloves, CreasedShorts); + break; + case CandorShirt: + itemCombo(l("Candor"), l("All Stats +1, Max HP +1%"), + CandorShirt, CandorBoots, CandorGloves, CandorShorts, CandorHeadBand); + break; + case CottonShirt: + itemCombo(l("Cotton"), l("All Stats +1, Max HP +1%, Max MP +5%"), + CottonShirt, CottonBoots, CottonGloves, 0, + CottonShorts, CottonTrousers, CottonSkirt, MiniSkirt); + break; + case MinerTankTop: + itemCombo(l("Miner"), l("All Stats +1, Vit +2"), + MinerTankTop, MinerGloves, MinerHat, 0, + MinerKnife, Pickaxe); + break; + case WarlordPlate: + itemCombo(l("Warlord"), l("All Stats +1, Block +2%"), + WarlordPlate, WarlordBoots, WarlordGloves, WarlordPants, WarlordHelmet); + break; + case GoldenWarlordPlate: + itemCombo(l("Golden Warlord"), l("All Stats +1, Block +2%"), + GoldenWarlordPlate, WarlordBoots, WarlordGloves, WarlordPants, WarlordHelmet); + break; + case Chainmail: + itemCombo(l("Chainmail"), l("Block +1%"), + Chainmail, ChainmailSkirt); + break; + case GoldenChainmail: + itemCombo(l("Golden Chainmail"), l("Block +1%"), + GoldenChainmail, ChainmailSkirt); + break; + case TerraniteArmor: + itemCombo(l("Terranite"), l("All Stats +1, MDEF +30%"), + TerraniteArmor, TerraniteBoots, + TerranitePants, TerraniteMask); + break; + case LeatherShirt: + itemCombo(l("Leather"), l("All Stats +2"), + LeatherShirt, LeatherBoots, LeatherGloves, LeatherTrousers); + break; + case AssassinChest: + itemCombo(l("Assassin"), l("All Stats +1, Agi +5"), + AssassinChest, AssassinBoots, AssassinGloves, AssassinPants); + break; + case SaviorArmor: + itemCombo(l("Savior"), l("All Stats +5"), + SaviorArmor, SaviorBoots, SaviorPants, SaviorHelmet, 0, + SaviorShield, Skypiercer); + break; + case SilkRobe: + itemCombo(l("Silk"), l("Passive MP Regen"), + SilkRobe, CottonBoots, 0, + SilkGloves, CottonGloves); + break; + case SorcererRobe: + itemCombo(l("Sorcerer"), l("Passive MP Regen"), + SorcererRobe, 0, + CottonBoots, WizardMoccasins, WitchBoots, 0, + CottonGloves, SilkGloves); + break; + } close; +function itemCombo { + next; + mesn; + mesq l("I see you're trying to use the %s set, nice!", b(getarg(0))); + mesq l("This set grants the following effect when complete:"); + mesc getarg(1), 3; + next; + mesn; + mesq l("This set is composed by the following items:"); + mes ""; + for (.@i = 2; .@i < getargcount(); .@i++) { + if (getarg(.@i) <= 0) + mesc l("--- AND ANY OF ---"); + else + mesc l("* %s", getitemlink(getarg(.@i))),(countitem(getarg(.@i)) ? 3 : 9); + } + mes ""; + next; + mesn; + mesq l("To get the combo, you must fill all slots if one of the listed items. Usually any of the listed ones will do, but in rare cases it won't!"); + return; +} + L_Close: closedialog; goodbye; -- cgit v1.2.3-60-g2f50