Merge pull request #24001 from Vasyan2006/dairy-farm

Bugfixes for dairy farms.
Coolthulhu · Jun 15, 2018 · 63ff4d3 · 63ff4d3
2 parents 0c37294 + 595173f
commit 63ff4d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/data/json/overmap_specials.json b/data/json/overmap_specials.json
@@ -1728,7 +1728,7 @@
             { "point":[1,1,0], "overmap": "dairy_farm_SE"}
         ],
         "connections" : [
-            { "point" : [1,-1,0], "terrain" : "road" }
+            { "point" : [0,2,0], "terrain" : "road" }
         ],
         "locations" : [ "wilderness" ],
         "city_distance" : [5, 10],

diff --git a/src/monexamine.cpp b/src/monexamine.cpp
@@ -20,7 +20,7 @@ void monexamine::milk_source( monster &source_mon )
         debugmsg( "milked item must be a liquid" );
     } else {
 
-        const time_duration milk_per_day = 1_days / HOURS( milked_item.begin()->second );
+        const time_duration milk_per_day = 1_days / milked_item.begin()->second;
 
         if( !source_mon.has_effect( effect_milked ) ) {
             g->handle_liquid( milk, nullptr, 0, nullptr, nullptr, &source_mon );