From 6af5f3b299c0f1f6dca4b23641995d25591d3c74 Mon Sep 17 00:00:00 2001
From: Vitaly Pronkin <pronvit@me.com>
Date: Mon, 26 Jun 2017 09:17:23 +1200
Subject: [PATCH] fixing getItemBaseValue() for cheese, sheets and instruments

---
 library/modules/Items.cpp | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/library/modules/Items.cpp b/library/modules/Items.cpp
index 79bed0f89..654345e34 100644
--- a/library/modules/Items.cpp
+++ b/library/modules/Items.cpp
@@ -1062,7 +1062,6 @@ int Items::getItemBaseValue(int16_t item_type, int16_t item_subtype, int16_t mat
     case item_type::CHAIN:
     case item_type::FLASK:
     case item_type::GOBLET:
-    case item_type::INSTRUMENT:
     case item_type::TOY:
     case item_type::CAGE:
     case item_type::BARREL:
@@ -1162,10 +1161,13 @@ int Items::getItemBaseValue(int16_t item_type, int16_t item_subtype, int16_t mat
     case item_type::MEAT:
     case item_type::PLANT:
     case item_type::PLANT_GROWTH:
-    case item_type::CHEESE:
         value = 2;
         break;
 
+    case item_type::CHEESE:
+        value = 10;
+        break;
+
     case item_type::FISH:
     case item_type::FISH_RAW:
     case item_type::EGG:
@@ -1222,6 +1224,10 @@ int Items::getItemBaseValue(int16_t item_type, int16_t item_subtype, int16_t mat
         value = 7;
         break;
 
+    case item_type::SHEET:
+        value = 5;
+        break;
+
     case item_type::PANTS:
         if (size_t(item_subtype) < world->raws.itemdefs.pants.size())
             value = world->raws.itemdefs.pants[item_subtype]->value;
@@ -1250,16 +1256,23 @@ int Items::getItemBaseValue(int16_t item_type, int16_t item_subtype, int16_t mat
     case item_type::FOOD:
         return 10;
 
-//  case item_type::ROCK:
-    default:
-        return 0;
-
     case item_type::TOOL:
         if (size_t(item_subtype) < world->raws.itemdefs.tools.size())
             value = world->raws.itemdefs.tools[item_subtype]->value;
         else
             value = 10;
         break;
+
+    case item_type::INSTRUMENT:
+        if (size_t(item_subtype) < world->raws.itemdefs.instruments.size())
+            value = world->raws.itemdefs.instruments[item_subtype]->value;
+        else
+            value = 10;
+        break;
+
+//  case item_type::ROCK:
+    default:
+        return 0;
     }
 
     MaterialInfo mat;