Merge remote-tracking branch 'julzor/master'

locations/din_bad.qsrc

@@ -187,10 +187,12 @@ if $ARGS[0] = 'd_bag':
 	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 lubri > 0:'There''s a tube of lubricant in your purse, enough for <b><<lubri>></b> applications.'
-	if refillable_bottle = 3: 
-		'You carry your sports water bottle in your purse. It''s still completely full. <a href="exec: refillable_bottle = 2 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
+	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 half full. <a href="exec: refillable_bottle = 1 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
+		'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:
 		'You carry your sports water bottle in your purse. It''s empty.'
 	end

locations/gschool_chats3.qsrc

@@ -553,6 +553,7 @@ if $ARGS[0] = 'anushka':
 		end
 		act 'I would like that':
 			*clr & cla
+			meet_after_school = 1
 			npc_rel['A144'] += 1
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big144.jpg"></center>'
 			'"Yes I would like that." You tell her.'

locations/gschool_grounds.qsrc

@@ -230,6 +230,7 @@ if $ARGS[0] = 'main':
 		if LinaSlut > 0 and rand(1,10) < 3:'You see Lina, Dan and Vasily leaving the school together.'
 
 		if Enable_tablemap = 0:
+			if anushkaFirstvisit = 0 and meet_after_school = 1:'<a href="exec:gt ''anushka'', ''meet_after_school''">Anushka Konstantinov</a> is leaning against a tree just in front of the school.'
 			if LariskaHomeIn > 0:'<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a> impatiently walks back and fourth across the courtyard, as if she''s waiting for someone.'
 			if JuliaMilLernQW >= 1:'<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milova</a> is sitting somewhere on the school courtyard, reading a book.'
 			if NatashaQW > 0:'<a href="exec:minut += 1 & gt ''NatBelGo''">Natasha Belova</a> is standing in a corner.'
@@ -254,6 +255,7 @@ if $ARGS[0] = 'main':
 		else
 			!display friends in table if switch is on.
 			st_count=0 & $show_table=''
+			if anushkaFirstvisit = 0 and meet_after_school = 1:gs'show_table','<a href="exec:gt ''anushka'', ''meet_after_school''">Anushka Konstantinov</a>','5'
 			if LariskaHomeIn > 0:gs'show_table','<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a>','5'
 			if JuliaMilLernQW >= 1:gs'show_table','<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milov</a>','5'
 			if NatashaQW > 0:gs'show_table','<a href="exec:minut += 1 & gt ''NatBelGo''">Natasha Belova</a>','5'

locations/kit_din.qsrc

@@ -521,7 +521,7 @@ $fill_bottle = {
 		'You can fill your sports water bottle with filtrated tap water.'
 		act 'Fill your water bottle (0:01)':
 			minut += 1
-			refillable_bottle = 3
+			refillable_bottle = 4
 			gt $loc, $metka
 		end
 	end