[added] Sport shop to the new shop system

locations/city_house_res_misc.qsrc

@@ -108,7 +108,7 @@ if $ARGS[0] = 'backy':
 	act 'Go inside': gt 'city_house_res_misc', 'hallw'
 
 	if sunWeather = 1:
-		if pcs_stam >=15 or (pcs_stam >= 10 and bookYog + obruch > 0):
+		if pcs_stam >=15 or (pcs_stam >= 10 and mc_inventory['book_yoga'] + mc_inventory['hula_hoop'] > 0):
 			if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich':
 				*nl
 				'You can do some exercises here.'

locations/dachamy.qsrc

@@ -22,7 +22,7 @@ end
 act 'Go into the house':gt 'dachain', 'start'
 
 if sunWeather = 1:
-	if pcs_stam >=15 or (pcs_stam >= 10 and bookYog + obruch > 0):
+	if pcs_stam >=15 or (pcs_stam >= 10 and mc_inventory['book_yoga'] + mc_inventory['hula_hoop'] > 0):
 		if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich':
 			*nl
 			'You can do some exercises here.'

locations/din_bad.qsrc

@@ -223,13 +223,13 @@ if $ARGS[0] = 'd_bag':
 	if bcream_have > 0:'<a href="exec:dynamic $use_bcream & gs ''din_bad'', ''d_bag''">Apply breast cream.</a> You have <b><<bcream_have>></b> cream left in your purse.'
 	if aphrodisiac_have > 0:'<a href="exec: gs ''drugs'', ''aphrodisiac'' & gs ''din_bad'', ''d_bag'' & *pl $aphrodisiac_msg & *pl $min_arousal_msg & killvar ''$min_arousal_msg''">Chew aphrodisiac gum.</a> You have <b><<aphrodisiac_have>></b> gum left in your purse.'
 
-	if refillable_bottle = 4: 
-		'You carry your sports water bottle in your purse. It''s still completely full. <a href="exec: refillable_bottle = 3 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
-	elseif refillable_bottle = 3:
-		'You carry your sports water bottle in your purse. It''s two-thirds full. <a href="exec: refillable_bottle = 2 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
-	elseif refillable_bottle = 2:
-		'You carry your sports water bottle in your purse. It''s one-third full. <a href="exec: refillable_bottle = 1 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'	
-	elseif refillable_bottle = 1:
+	if mc_inventory['refill_bottle'] = 4: 
+		'You carry your sports water bottle in your purse. It''s still completely full. <a href="exec: mc_inventory[''refill_bottle''] = 3 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
+	elseif mc_inventory['refill_bottle'] = 3:
+		'You carry your sports water bottle in your purse. It''s two-thirds full. <a href="exec: mc_inventory[''refill_bottle''] = 2 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
+	elseif mc_inventory['refill_bottle'] = 2:
+		'You carry your sports water bottle in your purse. It''s one-third full. <a href="exec: mc_inventory[''refill_bottle''] = 1 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'	
+	elseif mc_inventory['refill_bottle'] = 1:
 		'You carry your sports water bottle in your purse. It''s empty.'
 	end
 	if mc_inventory['food_water'] > 0: 'There''s a bottle of water in your purse. <a href="exec:mc_inventory[''food_water''] = 0 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'

locations/exercise.qsrc

@@ -12,7 +12,7 @@ $ARGS[2] and on are the stats to be affected by the workout NOTE: use the gs 'ex
 }
 
 if $ARGS[0] = 'start':
-	if (pcs_stam >=15 or pcs_stam >= 10 and bookYog + obruch > 0):
+	if (pcs_stam >=15 or pcs_stam >= 10 and mc_inventory['book_yoga'] + mc_inventory['hula_hoop'] > 0):
 		'There is enough space in the room to <a href="exec: gt ''exercise'', ''workout''">exercise</a>.'
 	else
 		'There is enough space in the room for a variety of exercises, but you don''t have the energy to work out now.'
@@ -150,49 +150,49 @@ if $ARGS[0] = 'manual':
 		act 'Do pushups for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'push'
 		act 'Do crunches for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'press'
 		act 'Do squats for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'butt'
-		if skak > 0 and $loc ! 'meadow':
+		if mc_inventory['skipping_rope'] > 0 and $loc ! 'meadow':
 			act 'Jump rope for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'rope'
 		end
-		if bookYog > 0:
+		if mc_inventory['book_yoga'] > 0:
 			act 'Do yoga for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'yoga'
 		end
-		if obruch > 0 and $loc ! 'meadow':
+		if mc_inventory['hula_hoop'] > 0 and $loc ! 'meadow':
 			act 'Use your hula hoop for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'hula'
 		end
 		act 'Do pushups for 30 minutes': timemult = 2 & gs 'exercise', 'timestring' & gt  'exercise', 'push'
 		act 'Do crunches for 30 minutes': timemult = 2 & gs 'exercise', 'timestring' & gt  'exercise', 'press'
 		act 'Do squats for 30 minutes': timemult = 2 & gs 'exercise', 'timestring' & gt 'exercise', 'butt'
-		if skak > 0 and $loc ! 'meadow':
+		if mc_inventory['skipping_rope'] > 0 and $loc ! 'meadow':
 			act 'Jump rope for 30 minutes': timemult = 2 & gs 'exercise', 'timestring' & gt  'exercise', 'rope'
 		end
-		if bookYog > 0:
+		if mc_inventory['book_yoga'] > 0:
 			act 'Do yoga for 30 minutes': timemult = 2 & gs 'exercise', 'timestring' & gt  'exercise', 'yoga'
 		end
-		if obruch > 0 and $loc ! 'meadow':
+		if mc_inventory['hula_hoop'] > 0 and $loc ! 'meadow':
 			act 'Use your hula hoop for 30 minutes': timemult = 2 & gs 'exercise', 'timestring' & gt  'exercise', 'hula'
 		end
 		act 'Do pushups for 45 minutes': timemult = 3 & gs 'exercise', 'timestring' & gt  'exercise', 'push'
 		act 'Do crunches for 45 minutes': timemult = 3 & gs 'exercise', 'timestring' & gt  'exercise', 'press'
 		act 'Do squats for 45 minutes': timemult = 3 & gs 'exercise', 'timestring' & gt 'exercise', 'butt'
-		if skak > 0 and $loc ! 'meadow':
+		if mc_inventory['skipping_rope'] > 0 and $loc ! 'meadow':
 			act 'Jump rope for 45 minutes': timemult = 3 & gs 'exercise', 'timestring' & gt  'exercise', 'rope'
 		end
-		if bookYog > 0:
+		if mc_inventory['book_yoga'] > 0:
 			act 'Do yoga for 45 minutes': timemult = 3 & gs 'exercise', 'timestring' & gt  'exercise', 'yoga'
 		end
-		if obruch > 0 and $loc ! 'meadow':
+		if mc_inventory['hula_hoop'] > 0 and $loc ! 'meadow':
 			act 'Use your hula hoop for 45 minutes': timemult = 3 & gs 'exercise', 'timestring' & gt  'exercise', 'hula'
 		end
 		act 'Do pushups for 60 minutes': timemult = 4 & gs 'exercise', 'timestring' & gt  'exercise', 'push'
 		act 'Do crunches for 60 minutes': timemult = 4 & gs 'exercise', 'timestring' & gt  'exercise', 'press'
 		act 'Do squats for 60 minutes': timemult = 4 & gs 'exercise', 'timestring' & gt 'exercise', 'butt'
-		if skak > 0 and $loc ! 'meadow':
+		if mc_inventory['skipping_rope'] > 0 and $loc ! 'meadow':
 			act 'Jump rope for 60 minutes': timemult = 4 & gs 'exercise', 'timestring' & gt  'exercise', 'rope'
 		end
-		if bookYog > 0:
+		if mc_inventory['book_yoga'] > 0:
 			act 'Do yoga for 60 minutes': timemult = 4 & gs 'exercise', 'timestring' & gt  'exercise', 'yoga'
 		end
-		if obruch > 0 and $loc ! 'meadow':
+		if mc_inventory['hula_hoop'] > 0 and $loc ! 'meadow':
 			act 'Use your hula hoop for 60 minutes': timemult = 4 & gs 'exercise', 'timestring' & gt  'exercise', 'hula'
 		end
 	end
@@ -274,9 +274,9 @@ if $ARGS[0] = 'matrix':
 	'<center><table border=0 cellspacing=0 cellpadding=10 width=1000><TH>Exercise</TH><TH>None</TH><TH>15 mins</TH><TH>30 mins</TH><TH>45 mins</TH><TH>60 mins</TH>'
 	gs 'exercise', 'matrixdata', 0, 'Push ups'
 	gs 'exercise', 'matrixdata', 1, 'Crunches'
-	if skak > 0 and $loc ! 'meadow': gs 'exercise', 'matrixdata', 2, 'Jump rope'
-	if bookYog > 0: gs 'exercise', 'matrixdata', 3, 'Yoga'
-	if obruch > 0 and $loc ! 'meadow': gs 'exercise', 'matrixdata', 4, 'Hula hoop'
+	if mc_inventory['skipping_rope'] > 0 and $loc ! 'meadow': gs 'exercise', 'matrixdata', 2, 'Jump rope'
+	if mc_inventory['book_yoga'] > 0: gs 'exercise', 'matrixdata', 3, 'Yoga'
+	if mc_inventory['hula_hoop'] > 0 and $loc ! 'meadow': gs 'exercise', 'matrixdata', 4, 'Hula hoop'
 	gs 'exercise', 'matrixdata', 5, 'Squats'
 
 	'</center></table>'

locations/katja_lake.qsrc

@@ -310,7 +310,7 @@ if $ARGS[0] ='winter_activities':
 		gt 'katja_lake','playing_in_snow'
 	elseif dummy = 2:
 		gt 'katja_lake','hockey_match'
-	elseif dummy >= 3 and konki = 0:
+	elseif dummy >= 3 and mc_inventory['ice_skates'] = 0:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.winter.jpg"></center>'
 		'It''s winter, and most activities on the lake are limited, if you had skates, Katja and you, could use them on the ice covered waters, but at the moment, it''s seems that you can only look at the frozen waters, is better to look for something else to do.'
 

locations/kiosk.qsrc

@@ -123,7 +123,7 @@ if $ARGS[0] = 'counter':
 	else
 		''
 	end	
-
+!! the Umbrella needs a bag requirement
     gs 'item_cart', 'shoppping_aisle', 'kiosk'
     gs 'stat'
     gs 'themes', 'outdoors'

locations/kit_din.qsrc

@@ -531,12 +531,12 @@ $driwater = {
 }
 
 $fill_bottle = {
-	if refillable_bottle > 0 and refillable_bottle < 4:
+	if mc_inventory['refill_bottle'] > 0 and mc_inventory['refill_bottle'] < 4:
 		*nl
 		'You can fill your sports water bottle with filtrated tap water.'
 		act 'Fill your water bottle (0:01)':
 			minut += 1
-			refillable_bottle = 4
+			mc_inventory['refill_bottle'] = 4
 			gt $loc, $loc_arg
 		end
 	end

locations/meadow.qsrc

@@ -75,7 +75,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	end
 
 	if sunWeather = 1:
-		if pcs_stam >= 15 or (pcs_stam >= 10 and bookYog + obruch > 0):
+		if pcs_stam >= 15 or (pcs_stam >= 10 and mc_inventory['book_yoga'] + mc_inventory['hula_hoop'] > 0):
 			if $clothingworntype ! 'danilovich_outfits':
 				*nl
 				'Your meadow would be a perfect place to workout if you were wearing exercise clothes'

locations/nichBedroomServant.qsrc

@@ -37,9 +37,9 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 		$komp = '.'
 	end
 	'A luxurious <a href="exec:gt ''divan'', ''start''">leather sofa</a> is also part of the ensemble. Mounted on the wall opposite the sofa is a big flat <a href="exec:gt ''TV'', ''start''">TV</a>. Under the window, you see a brand-new <a href="exec:gt ''nichBedroomServant'', ''desk''">desk</a><<$komp>>'
-	if obruch > 0:'<br>Your hula hoop stands in a corner of the room. '
-	if skak > 0:'Your jump rope is sitting on a shelf. '
-	if bookYog > 0:'A yoga mat is rolled up in a corner next to the wardrobe. '
+	if mc_inventory['hula_hoop'] > 0:'<br>Your hula hoop stands in a corner of the room. '
+	if mc_inventory['skipping_rope'] > 0:'Your jump rope is sitting on a shelf. '
+	if mc_inventory['book_yoga'] > 0:'A yoga mat is rolled up in a corner next to the wardrobe. '
 
 	if mishka > 0:'On one of the shelves, you''ve placed your <<mishka>> teddy bear'+iif(mishka = 1, '', 's')+'.'
 	gs 'music_actions', 'music_icon'

locations/pav_lake.qsrc

@@ -198,7 +198,7 @@ if $ARGS[0] = '':
 				act 'Continue': gt 'pav_lake'
 			end
 			act 'Ski around the lake (30 mins)': gt 'pav_lake', 'ski'
-		elseif pcs_ski_owned > 0 and hour >= 8 and hour <= 17 and konki_cloth = 0:
+		elseif mc_inventory['ski'] > 0 and hour >= 8 and hour <= 17 and konki_cloth = 0:
 			act 'Put your skis on':
 				*clr & cla
 				menu_off = 1
@@ -222,7 +222,7 @@ if $ARGS[0] = '':
 				act 'Continue': gt 'pav_lake'
 			end
 			act'Skate on the ice rink': gt 'pav_lake', 'skating_start'
-		elseif konki > 0 and hour >= 8 and hour <= 17 and pcs_ski_worn = 0:
+		elseif mc_inventory['ice_skates'] > 0 and hour >= 8 and hour <= 17 and pcs_ski_worn = 0:
 			act 'Put your skates on':
 				*clr & cla
 				menu_off = 1

locations/pav_shared_apt.qsrc

@@ -735,9 +735,9 @@ if $ARGS[0] = 'pcsRoom':
 
 	act 'Sit on the sofa bed':gt 'pav_shared_apt', 'sofabed'
 
-	if obruch > 0: '<br>A hula hoop stands in corner of the room. '
-	if skak > 0: 'A jump rope lies on a shelf. '
-	if bookYog > 0: 'A yoga mat is rolled up in a corner. '
+	if mc_inventory['hula_hoop'] > 0: '<br>A hula hoop stands in corner of the room. '
+	if mc_inventory['skipping_rope'] > 0: 'A jump rope lies on a shelf. '
+	if mc_inventory['book_yoga'] > 0: 'A yoga mat is rolled up in a corner. '
 	gs 'exercise', 'start'
 	*nl
 

locations/saveupdater.qsrc

@@ -2041,11 +2041,15 @@ if temp_current_save_version < 00090003:
 	if extradildo > 0:		 mc_inventory['dildo_huge']		= extradildo	  &killvar'extradildo'
 	if superdildo > 0:		 mc_inventory['dildo_enormous']	= superdildo	  &killvar'superdildo'
 	if maddildo > 0:		 mc_inventory['dildo_gigantic']	= maddildo		  &killvar'maddildo'
-end
-	
-
-! 
+	if skak > 0:			 mc_inventory['skipping_rope']  = skak			  &killvar'skak'
+	if obruch > 0:			 mc_inventory['hula_hoop'] 		= obruch		  &killvar'obruch'
+	if bookyog > 0:			 mc_inventory['book_yoga'] 		= bookyog		  &killvar'bookyog'
+	if konki > 0:			 mc_inventory['ice_skates'] 	= konki			  &killvar'konki'
+	if pcs_ski_owned > 0:	 mc_inventory['ski'] 			= pcs_ski_owned	  &killvar'pcs_ski_owned'
+	if refillable_bottle > 0:mc_inventory['refill_bottle']  = refillable_bottle	&killvar'refillable_bottle'
 
+	
+end
 
 killvar 'temp_current_save_version'
 gs 'saveg'

locations/shop.qsrc

@@ -467,13 +467,13 @@ if $shoplocation = 'clothing':
 
 		act 'View underwear': $shoplocation = 'underwear' & gt 'shop'
 
-		if konki ! 1:
+		if mc_inventory['ice_skates'] ! 1:
 			'A pair of ice-skates are available for 3000 <b>₽</b>.'
 			if money >= 3000:
 				act 'Buy ice skates (3000 <b>₽</b>)':
 					*clr & cla
 					money -= 3000
-					konki = 1
+					mc_inventory['ice_skates'] = 1
 
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/konki_shop.jpg"></center>'
 					'You buy a pair of ice skates.'
@@ -482,13 +482,13 @@ if $shoplocation = 'clothing':
 				end
 			end
 		end
-		if pcs_ski_owned ! 1:
+		if mc_inventory['ski'] ! 1:
 			'A pair of skis and poles are available for 4000 <b>₽</b>.'
 			if money >= 4000:
 				act 'Buy skis (4000 <b>₽</b>)':
 					*clr & cla
 					money -= 4000
-					konki = 1
+					mc_inventory['ice_skates'] = 1
 
 					'<center><img <<$set_imgh>> src="images/pc/activities/ski_buy.jpg"></center>'
 					'You buy a pair of skis and poles.'

locations/sitr.qsrc

@@ -46,9 +46,9 @@ if stol = 1: $stol = 'a new <a href="exec:gt ''stol'', ''start''">table</a>'
 
 '<<$zal>>. <<$divan>> sits next to the <<$zal2>>. In front of the sofa is <<$TV>>, while <<$stol>> sits in front of the window. <<$komp>>'
 if mishka > 0: iif(mishka = 1, 'Your teddy bear is', 'Your <<mishka>> teddy bears are') + 'sitting on a shelf.'
-if obruch > 0: '<br>Your hula hoop stands in a corner of the room.'
-if skak > 0: 'Your jump rope is on a shelf. '
-if bookYog > 0: 'Your yoga mat is rolled up in a corner.'
+if mc_inventory['hula_hoop'] > 0: '<br>Your hula hoop stands in a corner of the room.'
+if mc_inventory['skipping_rope'] > 0: 'Your jump rope is on a shelf. '
+if mc_inventory['book_yoga'] > 0: 'Your yoga mat is rolled up in a corner.'
 
 *nl
 !gs'husb' - do not delete!

locations/sitr2x.qsrc

@@ -39,9 +39,9 @@ end
 
 'modern <a href="exec:gt ''stol'',''stolPar''">desk</a>' + iif($komp = '', '.', $komp)
 
-if obruch > 0:'Your hula hoop stands in a corner.'
-if skak > 0:'Your jump rope is on a shelf.'
-if bookYog > 0:'Your book on yoga and your yoga mat are in the cabinet.'
+if mc_inventory['hula_hoop'] > 0:'Your hula hoop stands in a corner.'
+if mc_inventory['skipping_rope'] > 0:'Your jump rope is on a shelf.'
+if mc_inventory['book_yoga'] > 0:'Your book on yoga and your yoga mat are in the cabinet.'
 
 if mishka > 0:iif(mishka = 1, 'Your teddy bear is', 'Your <<mishka>> teddy bears are') + 'sitting on a shelf.'
 if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to the sofa.'

locations/sportShop.qsrc

@@ -1,6 +1,8 @@
 # sportShop
 !2022/06/20
 if $ARGS[0] = 'start' or $ARGS[0] = '':
+	$loc_s = 'sportShop'
+	$args_s= 'start'
 	killvar 'clothingfilter'
     $location_type = 'public_indoors'
 	cls
@@ -12,9 +14,9 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	*nl
 	'As soon as you enter, a high energy song with a thumping baseline fills your eardrums, making you feel pumped and awake. The store is sleek and professional, the walls and floors advertising all different kinds of sporting equipment and attire. The room is filled with beautifully fit people shopping, their bodies varying from big and muscular to lean and trim. If they don''t inspire you to want to work out, the posters advertising past and present famous athletes are motivating as hell.'
 	*nl
-	if refillable_bottle = 0 and money >= 1000 and bag > 0: 
-		'You could buy a high-quality <a href="exec:minut += 5 & money -= 1000 & refillable_bottle = 1 & gt ''sportShop'', ''start''">water bottle (1000 <b>₽</b>)</a> that you can carry around in your purse.'
-	elseif refillable_bottle = 0 and (money < 1000 or bag = 0):
+	if mc_inventory['refill_bottle'] = 0 and money >= 1000 and bag > 0: 
+		'You could buy a high-quality <a href="exec:minut += 5 & money -= 1000 & mc_inventory[''refill_bottle''] = 1 & gt ''sportShop'', ''start''">water bottle (1000 <b>₽</b>)</a> that you can carry around in your purse.'
+	elseif mc_inventory['refill_bottle'] = 0 and (money < 1000 or bag = 0):
 		'The shop sells high-quality water bottles for 1,000 <b>₽</b>. You could carry one around in '+iif(bag > 0, 'your', 'a')+' purse.'
 	end
 	
@@ -41,14 +43,9 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		'A tall muscular man stands next to the counter, showing a perfect smile. "Welcome, do you need any assistance in selecting equipment or tips how to improve your workout?"'
 	end
 
-	*pl '<center><table align="center" width=80%>'
-	*p func ('$single_stock_item', 1, 'Skipping Rope', 500, 'skak', 'sportshop', 'start')
-	*p func ('$single_stock_item', 1, 'Hula Hoop', 1500, 'obruch', 'sportshop', 'start')
-	*P func ('$single_stock_item', 1, 'Book on Yoga', 1500, 'bookyog', 'sportshop', 'start')
-	*p func ('$single_stock_item', 1, 'Ice Skates', 3000, 'konki', 'sportshop', 'start')
-	*p func ('$single_stock_item', 1, 'Skis', 4000, 'pcs_ski_owned', 'sportshop', 'start')
-	*p func ('$single_stock_item', 1, 'Refillable Water Bottle', 1000, 'refillable_bottle', 'sportshop', 'start')		
-	*p '</table></center>'
+    gs 'item_cart', 'shoppping_aisle', 'sports'
+    gs 'stat'
+    gs 'themes', 'indoors'
 end
 
 if $ARGS[0] = 'clo':

locations/stat_display.qsrc

@@ -1081,13 +1081,13 @@ if cheatStatusIcons = 0:
 		$statusIconBarTab += '<td><a href="exec: $stat_hunger_msg"><img title="Your sandwich has to wait until you can spare a minute." height = <<set_siconht>> src="images/system/icons/status/need_food.png"></a></td>'
 	end
 
-	if cheatNoDrink = 0 and $stat_thirst_msg ! '' and mc_inventory['food_water'] = 0 and refillable_bottle < 2:
+	if cheatNoDrink = 0 and $stat_thirst_msg ! '' and mc_inventory['food_water'] = 0 and mc_inventory['refill_bottle'] < 2:
 		$statusIconBarTab += '<td><a href="exec:msg $stat_thirst_msg"><img title="<<$stat_thirst_tooltip>>" height = <<set_siconht>> src="images/system/icons/status/need_drink.png"></a></td>'
-	elseif cheatNoDrink = 0 and $stat_thirst_msg ! '' and refillable_bottle > 1 and menu_off = 0:
-		$statusIconBarTab += '<td><a href="exec: refillable_bottle -= 1 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat''"><img title="Click to drink from your refillable water bottle." height = <<set_siconht>> src="images/system/icons/status/need_drink.png"></a></td>'
+	elseif cheatNoDrink = 0 and $stat_thirst_msg ! '' and mc_inventory['refill_bottle'] > 1 and menu_off = 0:
+		$statusIconBarTab += '<td><a href="exec: mc_inventory[''refill_bottle''] -= 1 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat''"><img title="Click to drink from your refillable water bottle." height = <<set_siconht>> src="images/system/icons/status/need_drink.png"></a></td>'
 	elseif cheatNoDrink = 0 and $stat_thirst_msg ! '' and mc_inventory['food_water'] > 0 and menu_off = 0:
 		$statusIconBarTab += '<td><a href="exec: bottle = 0 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat''"><img title="Click to drink from your water bottle." height = <<set_siconht>> src="images/system/icons/status/need_drink.png"></a></td>'
-	elseif cheatNoDrink = 0 and $stat_thirst_msg ! '' and (mc_inventory['food_water'] > 0 or refillable_bottle > 1) and menu_off = 1:
+	elseif cheatNoDrink = 0 and $stat_thirst_msg ! '' and (mc_inventory['food_water'] > 0 or mc_inventory['refill_bottle'] > 1) and menu_off = 1:
 		$statusIconBarTab += '<td><a href="exec:msg $stat_thirst_msg"><img title="Your water bottle has to wait until you can spare a minute." height = <<set_siconht>> src="images/system/icons/status/need_drink.png"></a></td>'
 	end