Moved some items that Morri shouldn't have to Advari who should, fixe…

…d reference to a dish Morri no longer sells

npc/advari_stonebog.npc

@@ -59,11 +59,11 @@ itemShoes = 326
 -- Here are all items the NPCs is able to trade. They will be displayed inside
 -- the merchant dialog.
 
-sellItems = 258, 312, 126, 271, 72, 4337, 249, 290, 2493, 154, 201, 3567, 778, 772, 200, 2, 15, 80, 81, 302, 388, 1207, 199, 2494, 259, 728, 534, 3566, 779, 773, 2917, 291, 73, 355, 4259, 4263, 1209, 1210, 4282, 4294, 4818
+sellItems = 258, 312, 126, 271, 72, 4337, 249, 290, 2493, 154, 201, 3567, 778, 772, 200, 2, 15, 80, 81, 302, 388, 1207, 199, 2494, 259, 728, 534, 3566, 779, 773, 2917, 291, 73, 355, 4259, 4263, 1209, 1210, 4282, 4294, 4818, 307, 1150, 69, 2586, 2502, 469, 552, 553, 1151, 2934, 2940, 63, 2696, 4364, 2529, 4804, 431, 43, 4303, 4304, 4316, 4317
 -- flail, wooden shovel, sickle, scythe, fishing rod, fishing net
--- bundle of grain, cabbage, carrots, hop, onion, potato, sugarcane, tobacco, tomato, flour, apple, banana, berries, cherries, grapes, orange, tangerine, carrot seeds, grain, hop seeds, onion seeds, potato seeds, sugarcane seeds, tobacco seeds, tomato seeds, withered cabbage (seeds), trout, salmon, shrimp, floudner, horse mackerel, rose fish, crab, eel, fox meat, rat meat
-buySecondaryItems = 249, 290, 2493, 154, 201, 3567, 778, 772, 200, 2, 15, 80, 81, 302, 388, 1207, 199, 2494, 259, 728, 534, 3566, 779, 773, 2917, 291, 73, 355, 4259, 4263, 1209, 1210, 4282, 4267, 4261, 4266, 4257, 4294, 4318, 4320, 4296, 4298, 4818
--- bundle of grain, cabbage, carrots, hop, onion, potato, sugarcane, tobacco, tomato, flour, apple, banana, berries, cherries, grapes, orange, tangerine, carrot seeds, grain, hop seeds, onion seeds, potato seeds, sugarcane seeds, tobacco seeds, tomato seeds, withered cabbage (seeds), trout, salmon, shrimp, floudner, horse mackerel, rose fish, crab, eel, octopus, swordfish, lobster, fox meat, wolf meat, bear meat, raptor meat, dragon meat, rat meat
+-- bundle of grain, cabbage, carrots, hop, onion, potato, sugarcane, tobacco, tomato, flour, apple, banana, berries, cherries, grapes, orange, tangerine, carrot seeds, grain, hop seeds, onion seeds, potato seeds, sugarcane seeds, tobacco seeds, tomato seeds, withered cabbage (seeds), trout, salmon, shrimp, floudner, horse mackerel, rose fish, crab, eel, fox meat, rat meat, pork, brown egg, white egg, raw leather, fur, bottle of milk, lamp oil, deer meat, rabbit meat, chicken meat, lamb meat, raw steak, entrails, feathers, horn, honeycomb, wax, candles, firewasp honeycomb, pigeon egg, seagull egg, raptor egg, spider egg, dragon egg, bottle of sheep milk, bottle of deer milk, 
+buySecondaryItems = 249, 290, 2493, 154, 201, 3567, 778, 772, 200, 2, 15, 80, 81, 302, 388, 1207, 199, 2494, 259, 728, 534, 3566, 779, 773, 2917, 291, 73, 355, 4259, 4263, 1209, 1210, 4282, 4267, 4261, 4266, 4257, 4294, 4318, 4320, 4296, 4298, 4818, 307, 1150, 69, 2586, 2502, 469, 552, 553, 1151, 2934, 2940, 63, 2696, 4364, 2529, 4804, 431, 43, 4314, 4805, 4303, 4304, 4305, 4300, 738, 4316, 4317
+-- bundle of grain, cabbage, carrots, hop, onion, potato, sugarcane, tobacco, tomato, flour, apple, banana, berries, cherries, grapes, orange, tangerine, carrot seeds, grain, hop seeds, onion seeds, potato seeds, sugarcane seeds, tobacco seeds, tomato seeds, withered cabbage (seeds), trout, salmon, shrimp, floudner, horse mackerel, rose fish, crab, eel, octopus, swordfish, lobster, fox meat, wolf meat, bear meat, raptor meat, dragon meat, rat meat, pork, brown egg, white egg, raw leather, fur, bottle of milk, lamp oil, deer meat, rabbit meat, chicken meat, lamb meat, raw steak, entrails, feathers, horn, honeycomb, wax, candles, firewasp honeycomb, pigeon egg, seagull egg, raptor egg, spider egg, dragon egg, bottle of sheep milk, bottle of deer milk
 
 tradeNotEnoughMoneyMsg "Eindeutig zu teuer f�r dich.", "That's clearly too expensive for you."
 tradeFinishedMsg "Und ab daf�r.", "And off ye go."

npc/morri.npc

@@ -58,11 +58,11 @@ itemShoes = 53
 -- Here are all items the NPCs is able to trade. They will be displayed inside
 -- the merchant dialog.
 
-sellItems = 121, 227, 429, 51, 2495, 2031, 191, 453, 3568, 49, 3631, 3609, 454, 353, 303, 3051, 3573, 3715, 3716, 2459, 556, 1154, 2277, 2922, 3570, 2456, 2923, 2278, 2276, 3569, 307, 1150, 69, 2586, 2502, 469, 552, 553, 1151, 2934, 2940, 63, 2696, 4364, 306, 455, 3916, 4260, 4264, 3914, 3915, 4265, 3606, 3709, 3710, 3713, 3714, 2529, 4804, 431, 43, 4303, 4304, 4316, 4317, 4295, 4819
+sellItems = 121, 227, 429, 51, 2495, 2031, 191, 453, 3568, 49, 3631, 3609, 454, 353, 303, 3051, 3573, 3715, 3716, 2459, 556, 1154, 2277, 2922, 3570, 2456, 2923, 2278, 2276, 3569, 306, 455, 3916, 4260, 4264, 3914, 3915, 4265, 3606, 3709, 3710, 3713, 3714, 4295, 4819
 -- peel, cooking spoon, candle mould, bucket, pan, collection pan
--- bread roll, cookies, baked potato, bread, sausage on bread, banana bread, blackberry muffin, apple pie, cherry cake, egg salad sandwich, strawberry cake, nutbread, custard pie, elderberry pie, sausage, cheese, veggie hash, mystery meat, trout fillet dish, salmon dish, egg dish, meat dish, sausages dish, egg salad, steak dish, rabbit dish, lamb dish, venison dish, chicken dish, mushroom soup, onion soup, cabbage stew, mulligan, potato soup, fish soup, beer soup, goulash, chicken soup, pork, brown egg, white egg, raw leather, fur, bottle of milk, lamp oil, deer meat, rabbit meat, chicken meat, lamb meat, raw steak, entrails, feathers, horn, ham, smoked trout, smoked salmon, cooked shrimp, grilled flounder, smoked horse mackerel, smoked rose fish, cooked crab, grilled octopus, cooked lobster, grilled steak, smoked chicken, smoked rabbit, grilled lamb, grilled venison,mackerel salad, rosefish stew, rosefish dish, honeycomb, wax, candles, firewasp honeycomb, pigeon egg, seagull egg, raptor egg, spider egg, dragon egg, bottle of sheep milk, bottle of deer milk, grilled fox, grilled rat
-buySecondaryItems = 191, 453, 3568, 49, 3631, 3609, 454, 353, 303, 3571, 354, 3723, 1153, 3610, 3051, 3573, 3715, 3716, 2459, 556, 1154, 2277, 2922, 3570, 557, 555, 559, 554, 1155, 2456, 2923, 2278, 2276, 3569, 3572, 3712, 3711, 1152, 307, 1150, 69, 2586, 2502, 469, 552, 553, 1151, 2934, 2940, 63, 2696, 4364, 306, 455, 3916, 4260, 4264, 3914, 3915, 4265, 4262, 4258, 3606, 3709, 3710, 3713, 3714, 4205, 4206, 4207, 2529, 4804, 431, 43, 4314, 4805, 4303, 4304, 4305, 4300, 738, 4316, 4317, 4295, 4319, 4321, 4297, 4299, 4819
--- bread roll, cookies, baked potato, bread, sausage on bread, banana bread, blackberry muffin, apple pie, cherry cake, egg salad sandwich, strawberry cake, nutbread, custard pie, elderberry pie, sausage, cheese, veggie hash, mystery meat, trout fillet dish, salmon dish, egg dish, meat dish, sausages dish, egg salad, steak dish, rabbit dish, lamb dish, venison dish, chicken dish, mushroom soup, onion soup, cabbage stew, mulligan, potato soup, fish soup, beer soup, goulash, chicken soup, pork, brown egg, white egg, raw leather, fur, bottle of milk, lamp oil, deer meat, rabbit meat, chicken meat, lamb meat, raw steak, entrails, feathers, horn, ham, smoked trout, smoked salmon, cooked shrimp, grilled flounder, smoked horse mackerel, smoked rose fish, cooked crab, grilled octopus, cooked lobster, grilled steak, smoked chicken, smoked rabbit, grilled lamb, grilled venison,mackerel salad, rosefish stew, rosefish dish, honeycomb, wax, candles, firewasp honeycomb, pigeon egg, seagull egg, raptor egg, spider egg, dragon egg, bottle of sheep milk, bottle of deer milk, grilled fox, grilled wolf, grilled bear, grilled raptor, grilled dragon, grilled rat
+-- bread roll, cookies, baked potato, bread, sausage on bread, banana bread, blackberry muffin, apple pie, cherry cake, egg salad sandwich, strawberry cake, nutbread, custard pie, elderberry pie, sausage, cheese, veggie hash, mystery meat, trout fillet dish, salmon dish, egg dish, meat dish, sausages dish, egg salad, steak dish, rabbit dish, lamb dish, venison dish, chicken dish, mushroom soup, onion soup, cabbage stew, mulligan, potato soup, fish soup, beer soup, goulash, chicken soup, ham, smoked trout, smoked salmon, cooked shrimp, grilled flounder, smoked horse mackerel, smoked rose fish, cooked crab, grilled octopus, cooked lobster, grilled steak, smoked chicken, smoked rabbit, grilled lamb, grilled venison,mackerel salad, rosefish stew, rosefish dish, grilled fox, grilled rat
+buySecondaryItems = 191, 453, 3568, 49, 3631, 3609, 454, 353, 303, 3571, 354, 3723, 1153, 3610, 3051, 3573, 3715, 3716, 2459, 556, 1154, 2277, 2922, 3570, 557, 555, 559, 554, 1155, 2456, 2923, 2278, 2276, 3569, 3572, 3712, 3711, 1152, 306, 455, 3916, 4260, 4264, 3914, 3915, 4265, 4262, 4258, 3606, 3709, 3710, 3713, 3714, 4205, 4206, 4207, 4295, 4319, 4321, 4297, 4299, 4819
+-- bread roll, cookies, baked potato, bread, sausage on bread, banana bread, blackberry muffin, apple pie, cherry cake, egg salad sandwich, strawberry cake, nutbread, custard pie, elderberry pie, sausage, cheese, veggie hash, mystery meat, trout fillet dish, salmon dish, egg dish, meat dish, sausages dish, egg salad, steak dish, rabbit dish, lamb dish, venison dish, chicken dish, mushroom soup, onion soup, cabbage stew, mulligan, potato soup, fish soup, beer soup, goulash, chicken soup, ham, smoked trout, smoked salmon, cooked shrimp, grilled flounder, smoked horse mackerel, smoked rose fish, cooked crab, grilled octopus, cooked lobster, grilled steak, smoked chicken, smoked rabbit, grilled lamb, grilled venison,mackerel salad, rosefish stew, rosefish dish, grilled fox, grilled wolf, grilled bear, grilled raptor, grilled dragon, grilled rat
 tradeNotEnoughMoneyMsg "Du kannst dir das nicht leisten!", "You can not afford that!"
 tradeFinishedMsg "Danke, komm bald wieder!", "Thanks, come again!"
 tradeFinishedWithoutTradingMsg "Auf bald!", "Farewell!"
@@ -177,4 +177,4 @@ cycletext "#me h
 cycletext "#me fasst sich mit einer verzweifelt wirkenden Geste, beidh�ndig in den langen schwarzen Bart und zieht daran. Dabei gibt er ein lautes Grunzen von sich.", "#me pulls his long black beard with both hands despairingly and grunts loudly."
 cycletext "Essen! Feinste Gerichte aller Art! Tretet n�her und deckt Euch ein!", "Food! Finest dishes of every kind! Come closer, go ahead take a look and buy!"
 cycletext "Frisches Brot! Schmackhafte Kuchen! Unverw�stliche Kekse!", "Fresh bread! Tasty cakes! Indestructible cookies!"
-cycletext "Wurst mit Zwiebeln, Kohlsuppe, Hasenbraten! Bei mir k�nnt ihr alles kaufen!", "Sausages with onion, cabbage soup, rabbit dishes! You can find everything here!"
+cycletext "Wurst mit Zwiebeln, Kohlsuppe! Bei mir k�nnt ihr alles kaufen!", "Sausages with onion, cabbage soup! You can find everything here!"