diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 852b28cb8c19d160f31e7d6d06b8edb6206e7d27..5b51f0d8412bffdafc105d8515fa9ec163f2f6a7 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -4216,7 +4216,7 @@ window.cashFormat = function(s) {
return "¤" + commaNum(Math.round(s * 100) / 100);
};
-window.foodFormat = function (s) {
+window.massFormat = function (s) {
if (!s) {
s = 0;
}
diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index 128f8fc613b3ff1fa3a59cac29cdbf980693c617..3d122019a3606f69537beae27e51ad9a16e3db7c 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -318,7 +318,7 @@
<</script>>
<br><br>
- $farmyardNameCaps <<if _profits > 0>>makes you @@.yellowgreen;<<print cashFormat(_profits)>>@@ and <</if>>produced @@.chocolate;<<print foodFormat(_foodWeek)>>@@ of food this week.
+ $farmyardNameCaps <<if _profits > 0>>makes you @@.yellowgreen;<<print cashFormat(_profits)>>@@ and <</if>>produced @@.chocolate;<<print massFormat(_foodWeek)>>@@ of food this week.
<<set $food += _foodWeek>>
diff --git a/src/facilities/farmyard/food/foodMarket.tw b/src/facilities/farmyard/food/foodMarket.tw
index d2c22eba7f769bf0a848b52f500cd226bd8a652c..610b0b8098420c74e45f4fb3e3d9e326921c9a1d 100644
--- a/src/facilities/farmyard/food/foodMarket.tw
+++ b/src/facilities/farmyard/food/foodMarket.tw
@@ -7,6 +7,50 @@
<br>
<<set _foodValue = $foodStored*$foodCost>> /* FIXME: currently costs 25 / kg, will need tweaking */
-The food market has @@.chocolate;<<print foodFormat($foodStored)>>@@ in storage, valued at a total of @@.yellowgreen;<<print cashFormat(_foodValue)>>.@@
+The food market has @@.chocolate;<<print massFormat($foodStored)>>@@ in storage, valued at a total of @@.yellowgreen;<<print cashFormat(_foodValue)>>.@@
-/* TODO: allow for the buying and selling of food */
\ No newline at end of file
+/* TODO: allow for the buying and selling of food */
+<br>
+<<link "Buy <<= massFormat(1)>>" "Manage Economy">><<set $cash -= ($foodCost*1), $foodStored += 1>><</link>>
+| <<link "<<= massFormat(10)>>" "Manage Economy">><<set $cash -= ($foodCost*10), $foodStored += 10>><</link>>
+| <<link "<<= massFormat(100)>>" "Manage Economy">><<set $cash -= ($foodCost*100), $foodStored += 100>><</link>>
+| <<link "<<= massFormat(1000)>>" "Manage Economy">><<set $cash -= ($foodCost*1000), $foodStored += 1000>><</link>>
+<<if $foodStored > 0>>
+ <br>
+ <<link "Sell <<= massFormat(1)>>" "Manage Economy">><<set $cash += ($foodCost*1), $foodStored -= 1>><</link>>
+<</if>>
+<<if $foodStored >= 10>>
+ | <<link "<<= massFormat(10)>>" "Manage Economy">><<set $cash += ($foodCost*10), $foodStored -= 10>><</link>>
+<</if>>
+<<if $foodStored >= 100>>
+ | <<link "<<= massFormat(100)>>" "Manage Economy">><<set $cash += ($foodCost*100), $foodStored -= 100>><</link>>
+<</if>>
+<<if $foodStored >= 1000>>
+ | <<link "<<= massFormat(1000)>>" "Manage Economy">><<set $cash += ($foodCost*1000), $foodStored -= 1000>><</link>>
+<</if>>
+<<if $food > 0>>
+ <br>
+ <<link "Store <<= massFormat(1)>>" "Manage Economy">><<set $foodStored += 1, $food -= 1>><</link>>
+<</if>>
+<<if $food >= 10>>
+ | <<link "<<= massFormat(10)>>" "Manage Economy">><<set $foodStored += 10, $food -= 10>><</link>>
+<</if>>
+<<if $food >= 100>>
+ | <<link "<<= massFormat(100)>>" "Manage Economy">><<set $foodStored += 100, $food -= 100>><</link>>
+<</if>>
+<<if $food >= 1000>>
+ | <<link "<<= massFormat(1000)>>" "Manage Economy">><<set $foodStored += 1000, $food -= 1000>><</link>>
+<</if>>
+<<if $foodStored > 0>>
+ <br>
+ <<link "Retrieve <<= massFormat(1)>>" "Manage Economy">><<set $food += 1, $foodStored -= 1>><</link>>
+<</if>>
+<<if $foodStored >= 10>>
+ | <<link "<<= massFormat(10)>>" "Manage Economy">><<set $food += 10, $foodStored -= 10>><</link>>
+<</if>>
+<<if $foodStored >= 100>>
+ | <<link "<<= massFormat(100)>>" "Manage Economy">><<set $food += 100, $foodStored -= 100>><</link>>
+<</if>>
+<<if $foodStored >= 1000>>
+ | <<link "<<= massFormat(1000)>>" "Manage Economy">><<set $food += 1000, $foodStored -= 1000>><</link>>
+<</if>>
diff --git a/src/facilities/farmyard/food/foodReport.tw b/src/facilities/farmyard/food/foodReport.tw
index 7a6b190f9dba9c1f9376762a242ecadc4e7bb6c8..f475c6db7a113bd23527b197ad09284468cae861 100644
--- a/src/facilities/farmyard/food/foodReport.tw
+++ b/src/facilities/farmyard/food/foodReport.tw
@@ -1,3 +1,3 @@
:: Food Report [nobr]
-$arcologies[0].name produced <<= foodFormat($foodLastWeek)>> of food this week. Blah blah write some more stuff here.
\ No newline at end of file
+$arcologies[0].name produced <<= massFormat($foodLastWeek)>> of food this week. Blah blah write some more stuff here.
\ No newline at end of file
diff --git a/src/facilities/farmyard/saWorkTheFarm.tw b/src/facilities/farmyard/saWorkTheFarm.tw
index c0286352c3f39da90c5afce1eb5f84e5580e0aaa..e4aafb861cd0e100ce2eaef9542b5b71b3b24a8a 100644
--- a/src/facilities/farmyard/saWorkTheFarm.tw
+++ b/src/facilities/farmyard/saWorkTheFarm.tw
@@ -82,7 +82,7 @@ works as a farmhand this week.
<</if>>
<<set $foodTotal += _food, $food += _food>>
-As a result, $he produces @@.chocolate;<<print foodFormat(_food)>>@@ of food over the week.
+As a result, $he produces @@.chocolate;<<print massFormat(_food)>>@@ of food over the week.
<<set _incomeStats.food += _food>>
/* CLOSE FOOD PRODUCTION */
diff --git a/src/js/utilJS.tw b/src/js/utilJS.tw
index 863f0bac42d4ddaea3cc4261f51996d209131991..45bcfc9646639f9283d7c78d5802e08af343fac4 100644
--- a/src/js/utilJS.tw
+++ b/src/js/utilJS.tw
@@ -491,11 +491,11 @@ window.cashFormat = function(s) {
return "¤" + commaNum(Math.round(s * 100) / 100);
};
-window.foodFormat = function(s) {
+window.massFormat = function(s) {
if(!s) { s = 0; }
- if(s > 1000) {
+ if(s >= 1000) {
s = commaNum(Math.trunc(s/1000))
- if(s !== 1) {
+ if(s != 1) {
return s+" tons";
} else {
return s+" ton";
diff --git a/src/pregmod/manageEconomy.tw b/src/pregmod/manageEconomy.tw
index d377e459d2698c255956a6ff8f6c876611b35b7d..1ce6567dc8a2fb3bae4434b80cf38563af424a72 100644
--- a/src/pregmod/manageEconomy.tw
+++ b/src/pregmod/manageEconomy.tw
@@ -219,6 +219,5 @@ Slave supply is
<br><br>
<<if $foodMarket > 0>>
-__Food Market__
-
+<<include "Food Market">>
<</if>>
\ No newline at end of file
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 163d1f6c498d257cac5e014c7e92e02f6e552352..384858a1701a14472410f44efa2a7bba3e9de6a5 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -267,7 +267,7 @@ __Special Arcology Upgrades__
<br><br>
-Your slaves have participated in approximately <<print commaNum($oralTotal+$vaginalTotal+$analTotal)>> sexual encounters: <<print commaNum($oralTotal)>> primarily oral, <<print commaNum($vaginalTotal)>> vanilla, <<print commaNum($mammaryTotal)>> mammary, <<print commaNum($analTotal)>> anal, and <<print commaNum($penetrativeTotal)>> with the slave penetrating another. They have produced about <<print commaNum($milkTotal)>> liters of marketable milk, <<if $seeDicks != 0>>about <<print commaNum($cumTotal)>> deciliters of marketable cum, <<print foodFormat($foodTotal)>> of edible food, <</if>>and have given birth <<print commaNum($birthsTotal)>> times.
+Your slaves have participated in approximately <<print commaNum($oralTotal+$vaginalTotal+$analTotal)>> sexual encounters: <<print commaNum($oralTotal)>> primarily oral, <<print commaNum($vaginalTotal)>> vanilla, <<print commaNum($mammaryTotal)>> mammary, <<print commaNum($analTotal)>> anal, and <<print commaNum($penetrativeTotal)>> with the slave penetrating another. They have produced about <<print commaNum($milkTotal)>> liters of marketable milk, <<if $seeDicks != 0>>about <<print commaNum($cumTotal)>> deciliters of marketable cum, <<print massFormat($foodTotal)>> of edible food, <</if>>and have given birth <<print commaNum($birthsTotal)>> times.
<<if $pitKillsTotal > 0>>$pitKillsTotal slaves have died in your fighting pit.<</if>>
<<if $fuckdollsSold > 0>>$fuckdollsSold mindbroken arcade slaves have been converted into Fuckdolls and sold.<</if>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index e6cff1e8f1c821c047bb05159ede42a869e21d4b..613b73a48864dc694785e5e56267bd041ef5708d 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -132,7 +132,7 @@
<<else>>
@@.red;Food@@
<</if>>
- | <<print foodFormat($food)>>
+ | <<print massFormat($food)>>
</span>
<br>
@@ -140,9 +140,9 @@
<<set _TFood2 = ($food-$foodLastWeek)>>
<span id="oldfood">
<<if _TFood2 < 0>>
- (@@.red;<<print foodFormat(_TFood2)>>@@
+ (@@.red;<<print massFormat(_TFood2)>>@@
<<else>>
- (@@.chocolate;+<<print foodFormat(_TFood2)>>@@
+ (@@.chocolate;+<<print massFormat(_TFood2)>>@@
<</if>>
</span>
since last week)
@@ -161,14 +161,14 @@
<<else>>
__@@.red;Food@@__
<</if>>
- | <<print foodFormat($food)>>
+ | <<print massFormat($food)>>
<</replace>>
<<set _TFood2 = ($food-$foodLastWeek)>>
<<replace "#oldfood">>
<<if _TFood2 < 0>>
- (@@.red;<<print foodFormat(_TFood2)>>@@
+ (@@.red;<<print massFormat(_TFood2)>>@@
<<else>>
- (@@.chocolate;+<<print foodFormat(_TFood2)>>@@
+ (@@.chocolate;+<<print massFormat(_TFood2)>>@@
<</if>>
<</replace>>
since last week)
@@ -186,7 +186,7 @@
<<else>>
@@.red;Food@@
<</if>>
- | <<print foodFormat($food)>>
+ | <<print massFormat($food)>>
</span>
<</if>>
<br>@@.link;Upkeep@@ |