novice wand

base/magic.lua

@@ -52,15 +52,16 @@ M.priestSkills = {
                 Character.consecrateArmours
                 }
 
-M.wandIds = {323,2782,2783,2784,2785,3608}
+M.wandIds = {323,2782,2783,2784,2785,3608,4820}
 
 local wandList = {
     {id = 323, element = "Neutral"},
     {id = 2782, element = "Earth"},
     {id = 2783, element = "Fire"},
     {id = 2784, element = "Water"},
     {id = 2785, element = "Air"},
-    {id = 3608, element = "Spirit"}
+    {id = 3608, element = "Spirit"},
+    {id = 4820, element = "Novice"}
     }
 
 function M.getWand(user)
@@ -107,6 +108,8 @@ function M.checkElementBonus(user, element) --Return a number between 0.025 and
         return 0.1
     elseif wandElement == "Neutral" then
         return 0.05
+    elseif wandElement == "Novice" then
+        return 0
     else
         return 0.025
     end

craft/final/carving.lua

@@ -447,6 +447,11 @@ product:addIngredient(2528, 1) -- small handle
 
 catId = carving:addCategory("Wands", "Zauberstäbe")
 
+-- novice wand
+product = carving:addProduct(catId, 4820, 1)
+product:addIngredient(546, 2) -- naldor wood boards
+product:addIngredient(2527, 1) -- large ornamented handle
+
 -- wand
 product = carving:addProduct(catId, 323, 1)
 product:addIngredient(546, 7) -- naldor wood boards

item/wands.lua

@@ -41,6 +41,7 @@ local magicWands = {}
     magicWands[2784] = true
     magicWands[2785] = true
     magicWands[3608] = true
+    magicWands[4820] = true
 
 function M.enchantingSelection(user, wand, actionstate)
 

npc/laramir_silverwood.npc

@@ -63,11 +63,11 @@ itemShoes = 369
 -- Here are all items the NPCs is able to trade. They will be displayed inside
 -- the merchant dialog.
 
-sellItems = 2752, 2715, 9, 312, 74, 64, 237, 445, 1045, 2664, 230, 1521, 231, 1522, 2737, 1044, 226, 65, 1531, 2646, 2714, 2708, 70, 2525, 2530, 2548, 2572, 2584, 2528, 2541, 2561, 2566, 2567, 2570, 2585, 2527, 2544, 2549, 2573, 90, 532, 533, 335, 333, 2185, 391, 2717, 2719, 2744, 1059, 374, 2445, 17, 18, 917, 19, 20, 186, 2388, 1046, 1038, 1047, 1049, 1040, 1048, 77, 1042, 1090, 39, 40, 1528, 57, 1529, 76, 2031, 2935, 2952, 51, 72, 118, 121, 227, 258, 312, 429, 734, 2781, 323, 545, 546, 2543, 2716, 56, 3, 543, 544, 2560, 3786, 314, 463
+sellItems = 2752, 2715, 9, 312, 74, 64, 237, 445, 1045, 2664, 230, 1521, 231, 1522, 2737, 1044, 226, 65, 1531, 2646, 2714, 2708, 70, 2525, 2530, 2548, 2572, 2584, 2528, 2541, 2561, 2566, 2567, 2570, 2585, 2527, 2544, 2549, 2573, 90, 532, 533, 335, 333, 2185, 391, 2717, 2719, 2744, 1059, 374, 2445, 17, 18, 917, 19, 20, 186, 2388, 1046, 1038, 1047, 1049, 1040, 1048, 77, 1042, 1090, 39, 40, 1528, 57, 1529, 76, 2031, 2935, 2952, 51, 72, 118, 121, 227, 258, 312, 429, 734, 2781, 4820, 323, 545, 546, 2543, 2716, 56, 3, 543, 544, 2560, 3786, 314, 463
 -- carving tools, plane, saw, wooden shovel, hatchet 
--- simple mage's staff, adepts's staff, mage's staff, elven mage's staff, battle staff, ornate mage's staff, master's staff, plate, soup bowl, wooden plate, javelin, bucket, fishing rod, rolling pin, peel, cooking spoon, flail, wooden shovel, candle mould, brick mould, dyeing rod, wand, wand of earth, wand of fire, wand of water, wand of air, wand of spirit, cherry wood boards, naldor wood boards, conifer wood boards, apple wood boards, bough, conifer wood, cherry wood, naldor wood, applewood, heartwood, potash, quill
-buySecondaryItems = 64, 237, 322, 445, 1045, 2664, 230, 1521, 231, 1522, 2737, 1044, 226, 1523, 1041, 1043, 1052, 65, 1531, 2646, 2714, 2708, 70, 2685, 2780, 2718, 2727, 2525, 2530, 2548, 2572, 2584, 2528, 2541, 2561, 2566, 2567, 2570, 2585, 2527, 2544, 2549, 2573, 90, 532, 533, 335, 332, 333, 2185, 391, 2717, 2719, 2744, 1059, 374, 2445, 17, 18, 917, 19, 20, 186, 2388, 2448, 95, 96, 916, 2284, 2447, 2439, 1046, 1038, 1047, 1049, 1040, 1048, 77, 1042, 1053, 1039, 1050, 1051, 1090, 39, 40, 1528, 57, 1529, 76, 209, 207, 208, 1530, 2031, 2935, 2952, 293, 51, 72, 118, 121, 227, 258, 312, 429, 734, 2781, 323, 2782, 2783, 2784, 2785, 3608, 545, 546, 2543, 2716, 56, 3, 543, 544, 2560, 3786, 314, 463
--- simple mage's staff, adepts's staff, mage's staff, elven mage's staff, battle staff, ornate mage's staff, master's staff, plate, soup bowl, wooden plate, javelin, bucket, fishing rod, rolling pin, peel, cooking spoon, flail, wooden shovel, candle mould, brick mould, dyeing rod, wand, wand of earth, wand of fire, wand of water, wand of air, wand of spirit, cherry wood boards, naldor wood boards, conifer wood boards, apple wood boards, bough, conifer wood, cherry wood, naldor wood, applewood, heartwood, potash, quill
+-- simple mage's staff, adepts's staff, mage's staff, elven mage's staff, battle staff, ornate mage's staff, master's staff, plate, soup bowl, wooden plate, javelin, bucket, fishing rod, rolling pin, peel, cooking spoon, flail, wooden shovel, candle mould, brick mould, dyeing rod, novice wand,  wand, wand of earth, wand of fire, wand of water, wand of air, wand of spirit, cherry wood boards, naldor wood boards, conifer wood boards, apple wood boards, bough, conifer wood, cherry wood, naldor wood, applewood, heartwood, potash, quill
+buySecondaryItems = 64, 237, 322, 445, 1045, 2664, 230, 1521, 231, 1522, 2737, 1044, 226, 1523, 1041, 1043, 1052, 65, 1531, 2646, 2714, 2708, 70, 2685, 2780, 2718, 2727, 2525, 2530, 2548, 2572, 2584, 2528, 2541, 2561, 2566, 2567, 2570, 2585, 2527, 2544, 2549, 2573, 90, 532, 533, 335, 332, 333, 2185, 391, 2717, 2719, 2744, 1059, 374, 2445, 17, 18, 917, 19, 20, 186, 2388, 2448, 95, 96, 916, 2284, 2447, 2439, 1046, 1038, 1047, 1049, 1040, 1048, 77, 1042, 1053, 1039, 1050, 1051, 1090, 39, 40, 1528, 57, 1529, 76, 209, 207, 208, 1530, 2031, 2935, 2952, 293, 51, 72, 118, 121, 227, 258, 312, 429, 734, 2781, 4820, 323, 2782, 2783, 2784, 2785, 3608, 545, 546, 2543, 2716, 56, 3, 543, 544, 2560, 3786, 314, 463
+-- simple mage's staff, adepts's staff, mage's staff, elven mage's staff, battle staff, ornate mage's staff, master's staff, plate, soup bowl, wooden plate, javelin, bucket, fishing rod, rolling pin, peel, cooking spoon, flail, wooden shovel, candle mould, brick mould, dyeing rod, novice wand, wand, wand of earth, wand of fire, wand of water, wand of air, wand of spirit, cherry wood boards, naldor wood boards, conifer wood boards, apple wood boards, bough, conifer wood, cherry wood, naldor wood, applewood, heartwood, potash, quill
 tradeNotEnoughMoneyMsg "Mein Freund, ich glaube du hast deine M�nzen nicht gez�hlt.", "My friend, I think you forgot to count your coins."
 tradeFinishedMsg "Komm wieder, mein Freund.", "Please come again, my friend."
 tradeFinishedWithoutTradingMsg "Bis zum n�chsten mal, mein Freund.", "Hope to see you again, my friend!"

npc/lothar_piero.npc

@@ -65,11 +65,11 @@ itemShoes = 53
 -- Here are all items the NPCs is able to trade. They will be displayed inside
 -- the merchant dialog.
 
-sellItems = 2752, 2715, 9, 312, 74, 64, 237, 445, 1045, 2664, 230, 1521, 231, 1522, 2737, 1044, 226, 65, 1531, 2646, 2714, 2708, 70, 2525, 2530, 2548, 2572, 2584, 2528, 2541, 2561, 2566, 2567, 2570, 2585, 2527, 2544, 2549, 2573, 90, 532, 533, 335, 333, 2185, 391, 2717, 2719, 2744, 1059, 374, 2445, 17, 18, 917, 19, 20, 186, 2388, 1046, 1038, 1047, 1049, 1040, 1048, 77, 1042, 1090, 39, 40, 1528, 57, 1529, 76, 2031, 2935, 2952, 51, 72, 118, 121, 227, 258, 312, 429, 734, 2781, 323, 545, 546, 2543, 2716, 56, 3, 543, 544, 2560, 3786, 314, 463
+sellItems = 2752, 2715, 9, 312, 74, 64, 237, 445, 1045, 2664, 230, 1521, 231, 1522, 2737, 1044, 226, 65, 1531, 2646, 2714, 2708, 70, 2525, 2530, 2548, 2572, 2584, 2528, 2541, 2561, 2566, 2567, 2570, 2585, 2527, 2544, 2549, 2573, 90, 532, 533, 335, 333, 2185, 391, 2717, 2719, 2744, 1059, 374, 2445, 17, 18, 917, 19, 20, 186, 2388, 1046, 1038, 1047, 1049, 1040, 1048, 77, 1042, 1090, 39, 40, 1528, 57, 1529, 76, 2031, 2935, 2952, 51, 72, 118, 121, 227, 258, 312, 429, 734, 2781, 4820, 323, 545, 546, 2543, 2716, 56, 3, 543, 544, 2560, 3786, 314, 463
 -- carving tools, plane, saw, wooden shovel, hatchet 
--- simple mage's staff, adepts's staff, mage's staff, elven mage's staff, battle staff, ornate mage's staff, master's staff, plate, soup bowl, wooden plate, javelin, bucket, fishing rod, rolling pin, peel, cooking spoon, flail, wooden shovel, candle mould, brick mould, dyeing rod, wand, wand of earth, wand of fire, wand of water, wand of air, wand of spirit, cherry wood boards, naldor wood boards, conifer wood boards, apple wood boards, bough, conifer wood, cherry wood, naldor wood, applewood, heartwood, potash, quill
-buyPrimaryItems = 64, 237, 322, 445, 1045, 2664, 230, 1521, 231, 1522, 2737, 1044, 226, 1523, 1041, 1043, 1052, 65, 1531, 2646, 2714, 2708, 70, 2685, 2780, 2718, 2727, 2525, 2530, 2548, 2572, 2584, 2528, 2541, 2561, 2566, 2567, 2570, 2585, 2527, 2544, 2549, 2573, 90, 532, 533, 335, 332, 333, 2185, 391, 2717, 2719, 2744, 1059, 374, 2445, 17, 18, 917, 19, 20, 186, 2388, 2448, 95, 96, 916, 2284, 2447, 2439, 1046, 1038, 1047, 1049, 1040, 1048, 77, 1042, 1053, 1039, 1050, 1051, 1090, 39, 40, 1528, 57, 1529, 76, 209, 207, 208, 1530, 2031, 2935, 2952, 293, 51, 72, 118, 121, 227, 258, 312, 429, 734, 2781, 323, 2782, 2783, 2784, 2785, 3608, 545, 546, 2543, 2716, 56, 3, 543, 544, 2560, 3786, 314, 463
--- simple mage's staff, adepts's staff, mage's staff, elven mage's staff, battle staff, ornate mage's staff, master's staff, plate, soup bowl, wooden plate, javelin, bucket, fishing rod, rolling pin, peel, cooking spoon, flail, wooden shovel, candle mould, brick mould, dyeing rod, wand, wand of earth, wand of fire, wand of water, wand of air, wand of spirit, cherry wood boards, naldor wood boards, conifer wood boards, apple wood boards, bough, conifer wood, cherry wood, naldor wood, applewood, heartwood, potash, quill
+-- simple mage's staff, adepts's staff, mage's staff, elven mage's staff, battle staff, ornate mage's staff, master's staff, plate, soup bowl, wooden plate, javelin, bucket, fishing rod, rolling pin, peel, cooking spoon, flail, wooden shovel, candle mould, brick mould, dyeing rod, novice wand, wand, wand of earth, wand of fire, wand of water, wand of air, wand of spirit, cherry wood boards, naldor wood boards, conifer wood boards, apple wood boards, bough, conifer wood, cherry wood, naldor wood, applewood, heartwood, potash, quill
+buyPrimaryItems = 64, 237, 322, 445, 1045, 2664, 230, 1521, 231, 1522, 2737, 1044, 226, 1523, 1041, 1043, 1052, 65, 1531, 2646, 2714, 2708, 70, 2685, 2780, 2718, 2727, 2525, 2530, 2548, 2572, 2584, 2528, 2541, 2561, 2566, 2567, 2570, 2585, 2527, 2544, 2549, 2573, 90, 532, 533, 335, 332, 333, 2185, 391, 2717, 2719, 2744, 1059, 374, 2445, 17, 18, 917, 19, 20, 186, 2388, 2448, 95, 96, 916, 2284, 2447, 2439, 1046, 1038, 1047, 1049, 1040, 1048, 77, 1042, 1053, 1039, 1050, 1051, 1090, 39, 40, 1528, 57, 1529, 76, 209, 207, 208, 1530, 2031, 2935, 2952, 293, 51, 72, 118, 121, 227, 258, 312, 429, 734, 2781, 4820, 323, 2782, 2783, 2784, 2785, 3608, 545, 546, 2543, 2716, 56, 3, 543, 544, 2560, 3786, 314, 463
+-- simple mage's staff, adepts's staff, mage's staff, elven mage's staff, battle staff, ornate mage's staff, master's staff, plate, soup bowl, wooden plate, javelin, bucket, fishing rod, rolling pin, peel, cooking spoon, flail, wooden shovel, candle mould, brick mould, dyeing rod, novice wand, wand, wand of earth, wand of fire, wand of water, wand of air, wand of spirit, cherry wood boards, naldor wood boards, conifer wood boards, apple wood boards, bough, conifer wood, cherry wood, naldor wood, applewood, heartwood, potash, quill
 tradeNotEnoughMoneyMsg "Besorgt euch bitte das n�tige Kleingeld.", "Get the necessary change first."
 tradeFinishedMsg "Beehrt mich bald wieder!", "Please come again!"
 tradeFinishedWithoutTradingMsg "Auf bald! Und passt auf euch auf.", "Farewell! And watch yourself."