summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2013-08-14 13:20:01 -0700
committerJared Adams <jaxad0127@gmail.com>2013-08-14 13:20:01 -0700
commit858d07156d0849dbae8e3dd94b3e69a8ac602448 (patch)
tree9806cd90116c2c9e4ad774fc8eccbf6db489f274
parent83414a5abed34c8e7982f29ad834d94037df2798 (diff)
parent9b0523da74783bf5002cea86aa73facdd4ea5fdc (diff)
downloadserverdata-858d07156d0849dbae8e3dd94b3e69a8ac602448.tar.gz
serverdata-858d07156d0849dbae8e3dd94b3e69a8ac602448.tar.bz2
serverdata-858d07156d0849dbae8e3dd94b3e69a8ac602448.tar.xz
serverdata-858d07156d0849dbae8e3dd94b3e69a8ac602448.zip
Merge pull request #22 from tux9th/master
Miriam Heavy metal items additions: Approved by wombatism.
-rw-r--r--world/map/npc/032-1/miriam.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/world/map/npc/032-1/miriam.txt b/world/map/npc/032-1/miriam.txt
index f812454f..f0527388 100644
--- a/world/map/npc/032-1/miriam.txt
+++ b/world/map/npc/032-1/miriam.txt
@@ -157,7 +157,10 @@ L_teach:
|| countitem("WarlordPlate") > 0
|| countitem("KnightsHelmet") > 0
|| countitem("InfantryHelmet") > 0
- || countitem("ChainmailShirt") > 0)
+ || countitem("ChainmailShirt") > 0
+ || countitem("WarlordBoots") > 0
+ || countitem("LightPlatemail") > 0
+ || countitem("CandleHelmet") > 0)
goto L_heavymetal;
goto L_offer;