Fix bugs and add missing weapon recipes from Nicholas.

Even without the other stuff (eg. Quivers, armors, Short Sword, etc.), it's fine.

2 files changed, 78 insertions, 4 deletions

diff --git a/db/craft_db.conf b/db/craft_db.conf
index 02b56a23d..2af567ff7 100644
--- a/db/craft_db.conf
+++ b/db/craft_db.conf
@@ -657,8 +657,9 @@ craft_db: (
 	SourceItems:
 	(
 		{
-			WoodenLog: 25
+			WoodenLog: 20
 			RawLog: 5
+			SharpKnife: 1
 		},
 	)
 	RequiredEquips: {
@@ -670,7 +671,11 @@ craft_db: (
 			RawLog: 1
 		},
 		{
-			RawLog: 2
+			RustyKnife: 1
+			RawLog: 1
+		},
+		{
+			RustyKnife: 1
 		},
 	)
 	Priority: 10
@@ -686,7 +691,7 @@ craft_db: (
 	(
 		{
 			IronIngot: 8
-			Coal: 15
+			Coal: 12
 			EverburnPowder: 1
 		},
 	)
@@ -705,5 +710,74 @@ craft_db: (
 	Priority: 10
 },
 /****************************************************************************/
+{
+	Id: 53
+	Name: "CraftShortGladius"
+	Flag: 16
+	ReturnCode: 3502
+    //ShortGladius
+	SourceItems:
+	(
+		{
+			IronIngot: 12
+			Coal: 16
+			EverburnPowder: 1
+		},
+	)
+	RequiredEquips: {
+			Knife: true
+	}
+	CreateItems:
+	(
+		{
+			PileOfAsh: 1
+		},
+		{
+			PileOfAsh: 2
+		},
+		{
+			PileOfAsh: 3
+		},
+	)
+	Priority: 20
+},
+/****************************************************************************/
+{
+	Id: 54
+	Name: "CraftBacksword"
+	Flag: 16
+	ReturnCode: 3504
+    //ShortGladius
+	SourceItems:
+	(
+		{
+			IronIngot: 20
+			TitaniumIngot: 9
+			Coal: 8
+			EverburnPowder: 1
+		},
+	)
+	RequiredEquips: {
+			Knife: true
+	}
+	CreateItems:
+	(
+		{
+			PileOfAsh: 1
+		},
+		{
+			TitaniumIngot: 1
+			PileOfAsh: 1
+		},
+		{
+			PileOfAsh: 2
+		},
+		{
+			PileOfAsh: 3
+		},
+	)
+	Priority: 30
+},
+/****************************************************************************/
 
 )
diff --git a/npc/craft/smith.txt b/npc/craft/smith.txt
index 7753daeaf..5f3576161 100644
--- a/npc/craft/smith.txt
+++ b/npc/craft/smith.txt
@@ -39,7 +39,7 @@ function	script	SmithSystem	{
     } else {
         if (.scope == CRAFT_NPC) {
             usecraft .@craft;
-            .@it=getcraftcode(.@craft);
+            .@it=getcraftcode(.@entry);
             getitem(.@it, 1);
             .success=true;
         } else if (.knowledge[.@entry] || $@GM_OVERRIDE) {