From 628d337ce5c81412bd7d39b6409c4697f2a4c043 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 1 Jun 2019 00:03:51 -0300
Subject: Minor ore-related fixes, major changes to Backsword and add Short
 Sword Craft Recipe

---
 db/craft_db.conf       | 45 +++++++++++++++++++++++++++++++++++++++++----
 db/re/mob_db.conf      | 11 +++++++----
 npc/012-5/nicholas.txt |  2 +-
 3 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/db/craft_db.conf b/db/craft_db.conf
index 2af567ff7..8cf076947 100644
--- a/db/craft_db.conf
+++ b/db/craft_db.conf
@@ -751,9 +751,9 @@ craft_db: (
 	SourceItems:
 	(
 		{
-			IronIngot: 20
-			TitaniumIngot: 9
-			Coal: 8
+			IronIngot: 18
+			TinIngot: 3
+			Coal: 20
 			EverburnPowder: 1
 		},
 	)
@@ -766,7 +766,7 @@ craft_db: (
 			PileOfAsh: 1
 		},
 		{
-			TitaniumIngot: 1
+			TinIngot: 1
 			PileOfAsh: 1
 		},
 		{
@@ -779,5 +779,42 @@ craft_db: (
 	Priority: 30
 },
 /****************************************************************************/
+{
+	Id: 55
+	Name: "CraftShortsword"
+	Flag: 16
+	ReturnCode: 3527
+    //ShortSword
+	SourceItems:
+	(
+		{
+			IronIngot: 24
+			TinIngot: 5
+			Coal: 24
+			EverburnPowder: 1
+		},
+	)
+	RequiredEquips: {
+			Knife: true
+	}
+	CreateItems:
+	(
+		{
+			PileOfAsh: 1
+		},
+		{
+			TinIngot: 1
+			PileOfAsh: 1
+		},
+		{
+			PileOfAsh: 2
+		},
+		{
+			PileOfAsh: 3
+		},
+	)
+	Priority: 40
+},
+/****************************************************************************/
 
 )
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 3f0743d70..6faf9263e 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -3294,10 +3294,11 @@ mob_db: (
 	Drops: {
 		CopperOre: 800
 		TreasureKey: 400
-		TitaniumOre: 200
+		TinOre: 200
 		IronOre: 150
-		PlatinumOre: 25
+		TitaniumOre: 20
 		CopperKey: 10
+		IridiumOre: 5
 	}
 	WeaponAttacks: {
 		All: 7500
@@ -3585,9 +3586,9 @@ mob_db: (
 	DamageMotion: 200
 	Drops: {
 		PresentBox: 1000
-		TitaniumOre: 90
+		TinOre: 90
 		SilverOre: 60
-		TinOre: 30
+		TitaniumOre: 30
 		Diamond: 11
 		SilverMirror: 3
 	}
@@ -6302,6 +6303,7 @@ mob_db: (
 		Topaz: 80
 		Emerald: 60
 		Diamond: 40
+		TitaniumOre: 30
 		Amethyst: 20
 		Sapphire: 10
 		Kanabo: 1
@@ -8461,6 +8463,7 @@ mob_db: (
 	AttackMotion: 672
 	DamageMotion: 200
 	Drops: {
+		TitaniumOre: 2500
 		Brainstem: 1700
 		StrangeCoin: 1000
 		BronzeGift: 500
diff --git a/npc/012-5/nicholas.txt b/npc/012-5/nicholas.txt
index 1c5d28077..460b28331 100644
--- a/npc/012-5/nicholas.txt
+++ b/npc/012-5/nicholas.txt
@@ -159,7 +159,7 @@ L_Weapon:
         blacksmith_create(CopperIngot, 18, TinIngot, 2, RealBronzeGladius, 500);
         break;
     case 6:
-        blacksmith_create(IronIngot, 22, TitaniumIngot, 9, Backsword, 4550);
+        blacksmith_create(IronIngot, 18, TinIngot, 4, Backsword, 4550);
         break;
     }
     goto L_Weapon;
-- 
cgit v1.2.3-60-g2f50