Skip to content

Commit

Permalink
Fix for https://discord.com/channels/401855954272124940/1311208117106…
Browse files Browse the repository at this point in the history 
…774017
  • Loading branch information
@brightrim
brightrim committed Nov 27, 2024
1 parent 3862a1f commit 29f9a75
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion craft/repairs.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ local instruments = {Item.lute, Item.harp, Item.drum, Item.panpipe, Item.flute}

local smithedTools = {Item.scissors, Item.saw, Item.hammer, Item.shovel, Item.needle, Item.hatchet, Item.finesmithingHammer, Item.sickle, Item.scythe, Item.chisel, Item.tongs, Item.pan, Item.mortar, Item.pan, Item.rasp, Item.mould, Item.plane, Item.razorBlade, Item.armourersHammer, Item.pickaxe, Item.carvingTools, Item.cruciblePincers}

local woodenTools = {Item.fishingRod, Item.rollingPin, Item.peel, Item.cookingSpoon, Item.flail, Item.candleMould, Item.brickMould, Item.collectionPan, Item.dyeingRod, Item.woodenShovel}
local woodenTools = {Item.fishingRod, Item.rollingPin, Item.peel, Item.cookingSpoon, Item.flail, Item.candleMould, Item.brickMould, Item.collectionPan, Item.dyeingRod, Item.woodenShovel, Item.quill}

local woodenWeapons = {Item.woodenSword, Item.woodenDagger}

Expand Down
8 changes: 4 additions & 4 deletions npc/laramir_silverwood.npc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
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
-- 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
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
-- 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
-- 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
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!"
Expand Down
8 changes: 4 additions & 4 deletions npc/lothar_piero.npc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
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
-- 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
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
-- 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
-- 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
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."
Expand Down

0 comments on commit 29f9a75

Please sign in to comment.