--- deliantra/server/lib/jeweler.yaml	2006/09/08 16:51:44	1.4
+++ deliantra/server/lib/jeweler.yaml	2007/02/05 10:47:00	1.8
@@ -72,91 +72,91 @@
    resist_DISEASE       : [0.1, 0.1, 0.1, 0.6, 0.1]
 
 functions:
-   stat_potions:
-      - [2,   1000   ]
-      - [8,   10000  ]
-      - [24,  50000  ]
-      - [52,  120000 ]
-      - [90,  230000 ]
-      - [140, 350000 ]
-      - [200, 500000 ]
-      - [270, 700000 ]
+   stat_items:
+      - [2,   200    ]
+      - [8,   400    ]
+      - [24,  1000   ]
+      - [52,  3000   ]
+      - [90,  6000   ]
+      - [140, 10000  ]
+      - [200, 50000  ]
+      - [270, 100000 ]
       - [352, 900000 ]
-      - [444, 1150000]
-   spec_potions:
-      - [2,   1000]
-      - [8,   10000]
-      - [18,  30000]
-      - [32,  60000]
-      - [50,  100000]
-      - [72,  160000]
-      - [100, 230000]
-      - [120, 300000]
-      - [160, 400000]
-      - [200, 500000]
+      - [444, 1200000]
+   spec_items:
+      - [2,   200   ]
+      - [8,   300   ]
+      - [18,  500   ]
+      - [32,  800   ]
+      - [50,  1300  ]
+      - [72,  2100  ]
+      - [100, 3400  ]
+      - [120, 5500  ]
+      - [160, 8900  ]
+      - [200, 14400 ]
    attack_resist_diamonds :
 # 5%
-      - 10
+      - 100
 # 10%
       - 500
       - 1000
 # 20%
-      - 10000
-      - 20000
+      - 2000
+      - 4000
 # 30%
-      - 30000
-      - 50000
+      - 8000
+      - 9000
 # 40%
-      - 70000
-      - 90000
+      - 10000
+      - 16000
 # 50%
-      - 100000
-      - 140000
+      - 20000
+      - 23000
 # 60%
-      - 170000
-      - 200000
+      - 27000
+      - 30000
 # 70%
-      - 250000
-      - 300000
+      - 34000
+      - 36000
 # 80%
-      - 350000
-      - 450000
+      - 40000
+      - 42000
 # 90%
-      - 500000
-      - 1000000
+      - 45000
+      - 50000
 
    effect_resist_diamonds :
 # 5%
-      - 5
+      - 100
 # 10%
-      - 190
-      - 900
+      - 200
+      - 400
 # 20%
-      - 2000
-      - 4000
+      - 600
+      - 800
 # 30%
-      - 6000
-      - 9000
+      - 1000
+      - 2000
 # 40%
-      - 12000
-      - 15000
+      - 3000
+      - 4000
 # 50%
-      - 20000
-      - 25000
+      - 5000
+      - 6000
 # 60%
-      - 30000
-      - 35000
+      - 7000
+      - 8000
 # 70%
-      - 40000
-      - 45000
+      - 9000
+      - 10000
 # 80%
-      - 50000
-      - 55000
+      - 12000
+      - 15000
 # 90%
-      - 65000
-      - 85000
+      - 19000
+      - 22000
 # 100%
-      - 100000
+      - 25000
 
 conversions:
 # <outarch> = <sort-category>,<source-arch-value-multiplier>,<source-archname>,<xp-points for making one of this>
@@ -168,30 +168,35 @@
    amulet              : [mets_and_mins,2,largenugget,10]
 
 
+# plan match: [<sort-category>, <name>, <title>, <archname>, (<name2>, <title2>, ...)]
 plans:
-   stat_cha             : [,,potioncha]
-   stat_str             : [,,potionstr]
-   stat_wis             : [,,potionwis]
-   stat_int             : [,,potionint]
-   stat_dex             : [,,potiondex]
-   stat_con             : [,,potioncon]
-   stat_pow             : [,,potionpow]
-   spec_magic           : [magic power potion,,]
-   resist_PHYSICAL      :
-   resist_MAGIC         : [potion,of resist magic,,potion,of magic resistance]
-   resist_FIRE          :
-   resist_ELECTRICITY   : [potion,of shock resistance]
-   resist_COLD          :
-   resist_CONFUSION     : [potion,of resist confusion]
+   stat_cha             : [potions,,,potioncha]
+   stat_str             : [potions,,,potionstr]
+   stat_wis             : [potions,,,potionwis]
+   stat_int             : [potions,,,potionint]
+   stat_dex             : [potions,,,potiondex]
+   stat_con             : [potions,,,potioncon]
+   stat_pow             : [potions,,,potionpow]
+   spec_magic           : [potions,magic power potion,,,potion,of mystic power,]
+   spec_speed           : [potions,potion,of speed]
+   spec_regen           : [potions,potion,of recuperation]
+   spec_food            : [other,,,waybread]
+   spec_dam             : [potions,potion,of strength,potion_generic]
+   resist_PHYSICAL      : [potions,balm,of aethereality,,,,potion_invulnerability,,,potion_aethereality]
+   resist_MAGIC         : [potions,potion,of resist magic,,potion,of magic resistance]
+   resist_FIRE          : [potions,,,potion_cold,,,potion_cold2]
+   resist_ELECTRICITY   : [potions,potion,of shock resistance]
+   resist_COLD          : [potions,balm,of warmth]
+   resist_CONFUSION     : [potions,potion,of resist confusion]
    resist_ACID          :
-   resist_DRAIN         : [potion,of resist draining]
+   resist_DRAIN         : [potions,potion,of resist draining]
    resist_GHOSTHIT      :
-   resist_POISON        :
-   resist_SLOW          : [potion,of resist slow]
-   resist_PARALYZE      : [potion,of resist paralysis]
+   resist_POISON        : [potions,potion,of resist poison]
+   resist_SLOW          : [potions,potion,of resist slow]
+   resist_PARALYZE      : [potions,potion,of resist paralysis]
    resist_TURN_UNDEAD   :
    resist_FEAR          :
-   resist_DEPLETE       :
+   resist_DEPLETE       : [potions,,,potion_restoration]
    resist_DEATH         :
    resist_HOLYWORD      :
    resist_LIFE_STEALING :