Merge branch 'master' of http://sig.projectdivar.com/sigonasr2/AdventuresInLestoria

Adventures in Lestoria/assets/config/items/ItemDatabase.txt

@@ -110,6 +110,71 @@ ItemDatabase
 		SellValue = 7
 		BuyValue = 10
 		UseSound = Consume Item
+	}
+		Health Potion
+	{
+		ItemScript = Restore
+		Description = Restores 75 health points.
+		HP Restore = 75
+		ItemCategory = Consumables
+		Cooldown Time = 5.0
+		Cast Time = 0.0
+		SellValue = 24
+		BuyValue = 35
+		UseSound = Consume Potion
+	}
+	Mana Potion
+	{
+		ItemScript = Restore
+		Description = Restores 60 mana points over the next 15 seconds.
+		MP Restore = 4,1,15
+		ItemCategory = Consumables
+		Cooldown Time = 5.0
+		Cast Time = 0.0
+		SellValue = 28
+		BuyValue = 40
+		UseSound = Consume Potion
+	}
+	Recovery Potion
+	{
+		ItemScript = Restore
+		Description = Recovers 90 health points over the next 15 seconds.
+		HP Restore = 18,3,15
+		ItemCategory = Consumables
+		Cooldown Time = 5.0
+		Cast Time = 0.0
+		SellValue = 29
+		UseSound = Consume Potion
+		Crafting
+		{
+			# When this crafting recipe is available.
+			AvailableChapter = 2
+
+			Item[0] = Yellow Slime Remains,1
+			Item[1] = Stone Heart,1
+				
+			Gold = 0
+		}
+	}
+	Elixir of the Wind
+	{
+		ItemScript = Buff
+		Description = Increase your Movement Speed by 25% for 30 seconds.
+		Move Spd % = 25%,30
+		ItemCategory = Consumables
+		Cooldown Time = 5.0
+		Cast Time = 0.0
+		SellValue = 30
+		UseSound = Consume Potion
+		Crafting
+		{
+			# When this crafting recipe is available.
+			AvailableChapter = 2
+
+			Item[0] = Hawk Feather,3
+				
+			Gold = 0
+		}
 	}
 	Green Slime Remains
 	{

Adventures in Lestoria/assets/config/shops/Chapter 2 Merchants.txt

@@ -8,6 +8,32 @@ Merchant
 			# Specify items this merchant sells. Add an optional quantity as a second argument. Not specifying a second argument will give the shop infinite supply.
 			Item[1] = Minor Health Potion
 			Item[2] = Minor Mana Potion
+			Item[3] = Bandages
+		}
+		Chapter2_B
+		{
+			DisplayName = Merchant
+			# Specify items this merchant sells. Add an optional quantity as a second argument. Not specifying a second argument will give the shop infinite supply.
+			Item[1] = Health Potion
+			Item[2] = Minor Mana Potion
+			Item[3] = Bandages
+			
+		}
+		Chapter2_C
+		{
+			DisplayName = Merchant
+			# Specify items this merchant sells. Add an optional quantity as a second argument. Not specifying a second argument will give the shop infinite supply.
+			Item[1] = Minor Health Potion
+			Item[2] = Mana Potion
+			Item[3] = Bandages
+		}
+		Chapter2_D
+		{
+			DisplayName = Merchant
+			# Specify items this merchant sells. Add an optional quantity as a second argument. Not specifying a second argument will give the shop infinite supply.
+			Item[1] = Health Potion
+			Item[2] = Mana Potion
+			Item[3] = Bandages
 		}
 	}
 }