From 0afba677911f6859bf83eae2d0fd8ce895f99ef2 Mon Sep 17 00:00:00 2001 From: Ledmitz Date: Wed, 22 May 2024 22:23:24 -0300 Subject: Miriam was being far too easy on players --- tools | 2 +- world/map/npc/006-1/miriam.txt | 46 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/tools b/tools index 5f4eb948..1dc56421 160000 --- a/tools +++ b/tools @@ -1 +1 @@ -Subproject commit 5f4eb9489c35b8a8ea91fa65989efa89353c53e7 +Subproject commit 1dc56421493df2b9016b0096998cd668a429ab9e diff --git a/world/map/npc/006-1/miriam.txt b/world/map/npc/006-1/miriam.txt index 179cb89d..2f5864d3 100644 --- a/world/map/npc/006-1/miriam.txt +++ b/world/map/npc/006-1/miriam.txt @@ -167,16 +167,52 @@ L_Prepared: goto L_slow; if (BaseLevel < 60) goto L_lowlevel; + //Shields if (countitem("SteelShield") > 0 - || countitem("WarlordHelmet") > 0 + || countitem("DragonShield") > 0 + //Head + || countitem("BromenalHelmet") > 0 + || countitem("BullHelmet") > 0 + || countitem("CandleHelmet") > 0 || countitem("CrusadeHelmet") > 0 - || countitem("WarlordPlate") > 0 - || countitem("KnightsHelmet") > 0 + || countitem("BlackCrusadeHelmet") > 0 + || countitem("DarkHelm") > 0 || countitem("InfantryHelmet") > 0 + || countitem("BlackInfantryHelmet") > 0 || countitem("ChainmailShirt") > 0 - || countitem("WarlordBoots") > 0 + || countitem("KnightsHelmet") > 0 + || countitem("OverlordsHelmet") > 0 + || countitem("PaladinsHelmet") > 0 + || countitem("TerraniteHead") > 0 + || countitem("TerraniteHelmet") > 0 + || countitem("WarlordHelmet") > 0 + || countitem("BlackWarlordHelmet") > 0 + //Chest + || countitem("ChainmailShirt") > 0 + || countitem("BlackChainmailShirt") > 0 + || countitem("GoldenPlatemail") > 0 || countitem("LightPlatemail") > 0 - || countitem("CandleHelmet") > 0) + || countitem("BlackLightPlatemail") > 0 + || countitem("RedArmor") > 0 + || countitem("SaviorArmor") > 0 + || countitem("BlackSaviorArmor") > 0 + || countitem("DarkBlueSaviorArmor") > 0 + || countitem("DarkGreenSaviorArmor") > 0 + || countitem("GreenSaviorArmor") > 0 + || countitem("LightBlueSaviorArmor") > 0 + || countitem("OrangeSaviorArmor") > 0 + || countitem("PinkSaviorArmor") > 0 + || countitem("PurpleSaviorArmor") > 0 + || countitem("RedSaviorArmor") > 0 + || countitem("YellowSaviorArmor") > 0 + || countitem("TerraniteChestArmor") > 0 + || countitem("WarlordPlate") > 0 + || countitem("BlackWarlordPlate") > 0 + || countitem("GoldenWarlordPlate") > 0 + //Legs + || countitem("TerraniteLegs") > 0 + //Feet + || countitem("WarlordBoots") > 0) goto L_heavymetal; goto L_offer; -- cgit v1.2.3-70-g09d2