51 次代碼提交 8bdfc6c10e ... ad0bd004c8

作者 SHA1 備註 提交日期
  julzor ad0bd004c8 [fixed] alko reduction below 0 makes inhibition jump 4 年之前
  julzor 9c65e22579 [fixed] cheerleading triggering when not a cheerleader 4 年之前
  julzor 3f66628a47 [fixed] artem while mesec > 0 and moved decline option to the top 4 年之前
  julzor 4b1e528395 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 年之前
  julzor e713ed48d7 [fixed] missing cla in artemEV 4 年之前
  julzor eada2f4f6e [fixed] missing menu_off = 1 in katjaEV 4 年之前
  KevinSmarts 3da4703346 Merge remote-tracking branch 'slanon/master' 4 年之前
  KevinSmarts 44b1aff04b Merge remote-tracking branch 'Sicaa/master' 4 年之前
  slanon 8d01d1fa11 [fixes] location for 'gs' so the intended values get set 4 年之前
  Sicaa 77e3a24b6f [added] Cheerleading events by Vengeance_11 & the cheerleading skill 4 年之前
  Sicaa 444664b291 [added] option to decline drinking with Anya and her friends 4 年之前
  Sicaa ee16f79969 [added] further explainations for skill creation in stat_sklattrib_lvlset + [fixed] performance skill attribute line 4 年之前
  julzor 069145979c [added] daystart timers to gaptek to prevent the player from seeing the same message ten times in a row 4 年之前
  KevinSmarts ace1450262 [fixed] errant zero spotted by Koshea Waters 4 年之前
  Sicaa 8330308d5e [fixed] word order in the dimka NY party invitation actions. 4 年之前
  Sicaa c8ac1a07a4 [fixed] being late to school flag not resetting, dimka NY party invitation potentially vanishing if random event fires in gschool_grounds, workaround for imageless scene in artemEv 4 年之前
  KevinSmarts 263590a870 Merge remote-tracking branch 'Iron_Jack/master' 4 年之前
  KevinSmarts 857d122c56 Merge remote-tracking branch 'Sicaa/master' 4 年之前
  KevinSmarts 3b6a761bb5 Merge remote-tracking branch 'slanon/master' 4 年之前
  richard_butte e5138d50a4 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife into gadukino_fixes 4 年之前
  KevinSmarts 79178a91fc [changed] Range for Anya's random butt images increased 4 年之前
  Sicaa 49198ce013 [added] $location_type to the school files + [fixed] a pcs_mood boost in gschool_lessons2 4 年之前
  slanon 80f2a72a63 [fixes] variable name 4 年之前
  KevinSmarts e99a0defd1 [Fixed] Reduced buying times when purchasing items for Aunt Luda 4 年之前
  KevinSmarts dbd4a2a2a3 Merge remote-tracking branch 'Sicaa/master' 4 年之前
  Sicaa b45ae93ae4 [fixed] wrong image calls in artemEv - by Nutluck 4 年之前
  sovietmercader 7081010670 [fixed] npc_body array in the npcstatics 4 年之前
  KevinSmarts 9b5fd5f3b4 Merge remote-tracking branch 'Sicaa/master' 4 年之前
  KevinSmarts 863bb42123 Merge remote-tracking branch 'julzor/master' 4 年之前
  Sicaa 995e2bbceb [added] end of content message to the repeatable BDSM scenes + some cleanup & readability changes 4 年之前
  Sicaa 2d55ac2804 [fixed] changed naked yoga image call back to mp4 due to missing images 4 年之前
  Sicaa 56f794684d [fixed] sistersleep progression + adjusted sisterLesb values in other files 4 年之前
  KevinSmarts 187bf4d03a Merge remote-tracking branch 'julzor/master' 4 年之前
  julzor 65fd89c162 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 年之前
  julzor baca9bd7fd [fixed] errors in kuhrpar and resolved all the comments 4 年之前
  KevinSmarts 330fdb3d6c [fixed] typo 4 年之前
  KevinSmarts 7e4301755d [fixed] typo 4 年之前
  KevinSmarts e76f06ab26 [fied] Typo 4 年之前
  KevinSmarts f8b71d7d93 [text edit] Text edits from MidnightMoose 4 年之前
  richard_butte c985bd198f Changed the way chore disappointment works a bit, and finished adding grandpa's. Added disappointment talk. Also cleaned up a few minor things. 4 年之前
  richard_butte 7ef8d8ea6e Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife into gadukino_fixes 4 年之前
  richard_butte 925573856b Fixed something in stat_display, added grandma's chore disappointments to cikl. Need to change it and add grandpa's still 4 年之前
  richard_butte 446e731b56 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife into gadukino_fixes 4 年之前
  richard_butte 178216c26f Overhaul to the way grandparent chores work. Most chores must now be 'turned in' before they are considered complete. Also added guide text to stat_display, and made it to where not helping your grandparents for 3+ days will negatively affect your allowance. 4 年之前
  richard_butte b668363aaf Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife into gadukino_fixes 4 年之前
  richard_butte 8f9d2f458b Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife into gadukino_fixes 4 年之前
  richard_butte 4e49ddaa6c Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife into gadukino_fixes 4 年之前
  richard_butte 05cf313f83 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife into gadukino_fixes 4 年之前
  richard_butte 38b331eded Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife into gadukino_fixes 4 年之前
  richard_butte ed07a6a88a Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife into gadukino_fixes 4 年之前
  richard_butte df707e71b8 More states for chore variables. New chores for grandparents. Chores must be "turned in" when complete. Rearranged some conversation flow with grandparents. Changed Grandpa's mushroom/berry chore to not be automatically completed as soon as walking in the house. 4 年之前
共有 60 個文件被更改,包括 2462 次插入617 次删除
  1. 1 0
      glife.qproj
  2. 1 0
      locations/Cheatmenu_din.qsrc
  3. 2 2
      locations/HotelHole.qsrc
  4. 114 109
      locations/HotelWork.qsrc
  5. 2 2
      locations/ParChurch2.qsrc
  6. 1 1
      locations/_attributes_fetish.qsrc
  7. 1 1
      locations/anushapt.qsrc
  8. 41 37
      locations/artemEv.qsrc
  9. 1 1
      locations/artemhome.qsrc
  10. 2 2
      locations/bed2.qsrc
  11. 4 4
      locations/beverage.qsrc
  12. 122 2
      locations/cikl.qsrc
  13. 1 1
      locations/dimaHome.qsrc
  14. 1 1
      locations/dvor.qsrc
  15. 1 1
      locations/exercise.qsrc
  16. 3 3
      locations/foto_models.qsrc
  17. 6 4
      locations/gaddvor.qsrc
  18. 153 75
      locations/gadfield.qsrc
  19. 5 10
      locations/gadgarden.qsrc
  20. 743 85
      locations/gadhouse.qsrc
  21. 18 0
      locations/gadmarket.qsrc
  22. 6 8
      locations/gadriver.qsrc
  23. 25 33
      locations/gadsarai.qsrc
  24. 28 8
      locations/gaptek.qsrc
  25. 229 26
      locations/grandmahelp.qsrc
  26. 68 35
      locations/grandpahelp.qsrc
  27. 1 0
      locations/gschool_boys_bathroom.qsrc
  28. 2 1
      locations/gschool_break.qsrc
  29. 449 0
      locations/gschool_cheerleading.qsrc
  30. 6 0
      locations/gschool_events.qsrc
  31. 42 3
      locations/gschool_gossip.qsrc
  32. 14 5
      locations/gschool_grounds.qsrc
  33. 10 0
      locations/gschool_lessons.qsrc
  34. 1 1
      locations/gschool_lessons2.qsrc
  35. 1 0
      locations/gschool_lessons4.qsrc
  36. 10 3
      locations/gschool_lunch.qsrc
  37. 1 0
      locations/gschool_socialchg.qsrc
  38. 1 0
      locations/katjaEv.qsrc
  39. 1 1
      locations/kiosk.qsrc
  40. 5 6
      locations/koncepod.qsrc
  41. 3 3
      locations/koncepod1.qsrc
  42. 7 11
      locations/kuhrPar.qsrc
  43. 9 9
      locations/liam.qsrc
  44. 3 3
      locations/liamelkafe.qsrc
  45. 19 20
      locations/liames.qsrc
  46. 1 1
      locations/natbelapt.qsrc
  47. 14 14
      locations/npcstatic1.qsrc
  48. 7 7
      locations/npcstatic3.qsrc
  49. 1 0
      locations/obj_din.qsrc
  50. 7 8
      locations/parks.qsrc
  51. 1 1
      locations/pavResidential.qsrc
  52. 4 2
      locations/preSYS2.qsrc
  53. 3 3
      locations/saveupdater.qsrc
  54. 6 0
      locations/sister.qsrc
  55. 3 3
      locations/sister_chat.qsrc
  56. 73 50
      locations/sistersleep.qsrc
  57. 157 1
      locations/stat_display.qsrc
  58. 1 0
      locations/stat_sklattrib.qsrc
  59. 12 2
      locations/stat_sklattrib_lvlset.qsrc
  60. 8 8
      locations/street_event.qsrc

+ 1 - 0
glife.qproj

@@ -655,6 +655,7 @@
 		<Location name="bbgamein"/>
 		<Location name="bbgameout"/>
 		<Location name="fbgameout"/>
+		<Location name="gschool_cheerleading"/>
 	</Folder>
 	<Folder name="Shared_appartment">
 		<Location name="pavSharedApt"/>

+ 1 - 0
locations/Cheatmenu_din.qsrc

@@ -1114,6 +1114,7 @@ $cheatmenu['stats'] = {
 	*p 'Modern Dance (<<danc_lvl>>) - Total (<<pcs_danc>>): ' & dynamic $cheatmenu['printStatLinks'], 'danc', 'Modern Dancing'
 	*p 'Erotic Dance (<<dancero_lvl>>) - Total (<<pcs_dancero>>): ' & dynamic $cheatmenu['printStatLinks'], 'dancero', 'Erotic Dancing'
 	*p 'Pole Dance (<<dancpol_lvl>>) - Total (<<pcs_dancpol>>): ' & dynamic $cheatmenu['printStatLinks'], 'dancpol', 'Pole Dancing'
+	*p 'Cheerleading (<<cheer_lvl>>) - Total (<<pcs_cheer>>): ' & dynamic $cheatmenu['printStatLinks'], 'cheer', 'Cheerleading'
 	*nl
 	*pl'<b>Sport:</b>'
 	*p 'Running (<<run_lvl>>) - Total (<<pcs_run>>): ' & dynamic $cheatmenu['printStatLinks'], 'run', 'Running'

+ 2 - 2
locations/HotelHole.qsrc

@@ -337,7 +337,7 @@ if $ARGS[0] = 'Pavlin' :
 			'"<<$pcs_firstname>>, I got a guy who is willing to pay a LOT of money for a threesome with a set of twins. Do you happen to know a pair of twins who''d be down to make some quick cash?" <<$npc_nickname[''A217'']>> asks, looking hopeful.'
 			'You think for a moment before responding. "No I don''t. However, a lot of people say my sister and I look alike. Maybe if I wear my hair like hers and we put on enough make up we could pass as twins."'
 			'"That''s a great idea! Do you think she would be willing to do this?" <<$npc_nickname[''A217'']>> asks, suddenly very excited at the prospect.'
-			if sisterLesb < 2:
+			if sisterLesb < 5:
 				'"What? No, I was just saying we look alike, I wouldn''t dare propose an idea like this to her."'
 				'"THEN WHY BRING HER UP, YOU STUPID CUNT?" <<$npc_nickname[''A217'']>>''s excitement quickly dissolves to rage as he raises his hand up, ready to strike.'
 				'You brace for the hit, closing your eyes tightly. The slap never comes however, and you open your eyes to see <<$npc_nickname[''A217'']>> has backed off. You''re confused at first, but notice that the people in the lobby are looking at the two of your after his little outburst.'
@@ -346,7 +346,7 @@ if $ARGS[0] = 'Pavlin' :
 				'You probably shouldn''t bring up this topic anymore... unless you have a more positive response to this request.'
 				TwinJourQW = 1
 				act 'Back to lobby': gt 'HotelHole'
-			elseif sisterLesb => 2:
+			elseif sisterLesb => 5:
 				'You feel a tingling in your loins just thinking about your sister and, without thinking, you blurt out: "Of course she will!"'
 				'"That''s fantastic <<$pcs_firstname>>, Once you are ready bring her over and I''ll introduce you to the client."'
 				'Realizing the commitment you just made, worry begins to seep into you. You hope your sister is really up for it, because you fear how <<$npc_nickname[''A217'']>> will react if you can''t deliver.'

+ 114 - 109
locations/HotelWork.qsrc

@@ -2,7 +2,7 @@
 
 if $ARGS[0] = 'hotcouple':
 	hcday = daystart
-	gs'stat'
+	gs 'stat'
 	'You go up to the room and knock on the door.'
 	'Uliana opens the door and invites you in the room.'
 	'She leads you to the bed and you sit down on it.'
@@ -23,7 +23,7 @@ if $ARGS[0] = 'hotcouple':
 		'You both start undressing while Motya joins you on the bed.'
 		'He sits behind you and starts massaging your shoulders'
 		'He is quite adept at this and you feel the stress flowing right out of you.'
-		pcs_mood +=10
+		pcs_mood += 10
 		gs 'arousal', 'massage', 10
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/hotcouple2.jpg"></center>'
 		'"You can just relax. We will take good care of you" he says.'
@@ -61,19 +61,19 @@ if $ARGS[0] = 'hotcouple':
 						*clr & cla
 						gs 'willpower', 'sex', 'resist'
 						gs 'willpower', 'pay', 'resist'
-						gs'stat'
+						gs 'stat'
 						'"No problem honey, this evening is all about what you want."'
 						'"Do you want him to come all over your face?"'
 						'"Yeah sure, that is fine."'
 						'You lay down on your back.'
-						act 'Finish':gt 'HotelWork', 'hotcoupfin'
+						act 'Finish': gt 'HotelWork', 'hotcoupfin'
 					end
 				else
 					act 'No, I want to save myself (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 				act 'Yes' :
 					*clr & cla
-					gs'stat'
+					gs 'stat'
 					'You lie down on the bed and spread your legs. Uliana takes Motya''s cock in her hand and guides it towards your pussy.'
 					'"Just relax Honey, he will be very gentle." she said while giving you a little smile.'
 					'<left><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/hotcouple6.jpg"></left>'
@@ -83,11 +83,11 @@ if $ARGS[0] = 'hotcouple':
 					'You could feel every inch of his <<dick>> cm dick inside you now. He gave you a little wink and then started moving again.'
 					'While he was fucking you Uliana gently rubbed against your clit while kissing her husband.'
 					'After a few minutes you all changed positions.'
-					act 'Continue':gt 'HotelWork', 'hotcoupledoggy'
+					act 'Continue': gt 'HotelWork', 'hotcoupledoggy'
 				end
 			else
 				'"Well darling I have bad news and good news. The bad news is that you won''t be able to fuck a virgin this time. The good news is that she is definitely ready to accept your beautiful dick" Uliana said while she put her fingers, soaked with your juices, in Motya''s mouth.'
-				act 'Continue':gt 'HotelWork', 'hotcoupledoggy'
+				act 'Continue': gt 'HotelWork', 'hotcoupledoggy'
 			end
 		end
 	end
@@ -101,7 +101,7 @@ if $ARGS[0] = 'hotcoupledoggy':
 	gs 'arousal', 'vaginal', 10
 	gs 'arousal', 'kiss', 5, 'lesbian'
 	gs 'stat'
-	act 'Continue':gt 'HotelWork', 'hotcoupfin'
+	act 'Continue': gt 'HotelWork', 'hotcoupfin'
 end
 if $ARGS[0] = 'hotcoupfin':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/hotcouple8.jpg"></center>'
@@ -114,10 +114,10 @@ if $ARGS[0] = 'hotcoupfin':
 	'Uliana and Motya both wave you goodbye and tell you that you are always welcome to repeat this experience.'
 	guy += 1
 	girl += 1
-	gs 'cum_call','face', $npclastgenerated, 1,'','',10
+	gs 'cum_call', 'face', $npclastgenerated, 1, '', '', 10
 	gs 'arousal', 'end'
 	gs 'stat'
-	act'Back to the lobby':gt 'hotelhole'
+	act 'Back to the lobby': gt 'hotelhole'
 end
 
 if $ARGS[0] = 'firsthotelprosevent':
@@ -179,7 +179,7 @@ if $ARGS[0] = 'firsthotelprosevent':
 			gs 'stat'
 			act 'Big finish':
 				*clr & cla
-				gs'stat'
+				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/hotel_threesome5.jpg"></center>'
 				'"Time for the big finish, bitch." Pavlin declares.'
 				' '
@@ -188,9 +188,9 @@ if $ARGS[0] = 'firsthotelprosevent':
 				'Thick strands of gooey seed coat your face as you look up at the two domineering men. You listen to their heavy, masculine breathing for a few moments before you suddenly remember the reason you''re there.'
 				act 'About the money...':
 					*clr & cla
-					gs 'cum_call','mouth', 'black guy'
+					gs 'cum_call', 'mouth', 'black guy'
 					gs 'boyStat', 'A217'
-					gs 'cum_call','face',$boy, 1
+					gs 'cum_call', 'face', $boy, 1
 					guy += 2
 					slutty += 1
 					pav_prostitute += 1
@@ -207,7 +207,7 @@ if $ARGS[0] = 'firsthotelprosevent':
 						'You angrily put the money away, quickly dress yourself, and stomp out of the room in a rage.'
 						money += 1500
 						pavhotprosQW = 4
-						act'Back to the lobby':gt 'hotelhole'
+						act 'Back to the lobby': gt 'hotelhole'
 					elseif prosmoneyhot = 1:
 						'You shyly look at Pavlin and ask, "So can I have my money back now?"'
 						' '
@@ -218,7 +218,7 @@ if $ARGS[0] = 'firsthotelprosevent':
 						'You reluctantly put the money away, defeated and depressed, before dressing and leaving the room.'
 						pavhotprosQW = 5
 						money += 500
-						act'Back to the lobby':gt 'hotelhole'
+						act 'Back to the lobby': gt 'hotelhole'
 					elseif prosmoneyhot = 2:
 						'You look at Pavlin and ask: "So about my money...?"'
 						' '
@@ -228,7 +228,7 @@ if $ARGS[0] = 'firsthotelprosevent':
 						'You pull the sticky bills off of your head and reluctantly put the money away. Tears begin streaming down your cheeks as you get dressed and leave the room, feeling cheap and used.'
 						pavhotprosQW = 6
 						money += 200
-						act'Back to the lobby':gt 'hotelhole'
+						act 'Back to the lobby': gt 'hotelhole'
 					end
 				end
 			end
@@ -243,7 +243,7 @@ if $ARGS[0] = 'maid':
 	$menu_arg = 'maid'
 	menu_off = 0
 	$location_type = 'event'
-	gs'stat'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.corr.jpg"></center>'
 	'You check your planning, and go to the next room on your list.'
 	if hour >= 19:
@@ -254,7 +254,7 @@ if $ARGS[0] = 'maid':
 			maid_cloth = 0
 			maidtime += 1
 			'After several hours of hard work, you finish your maid shift. You return to the locker room and take off the skimpy maid uniform, putting your own clothes back on. Leaving the uniform in a neat pile on the table, you grab your things and go to the hotel lobby.'
-			act'Continue':gt 'hotelhole'
+			act 'Continue': gt 'hotelhole'
 		end
 		if threesomewatched > 0 and threesometojoin = 1:
 			maid_cloth = 0
@@ -262,21 +262,21 @@ if $ARGS[0] = 'maid':
 			'After several hours of hard work, you finish your maid shift. You walk past the room of the guys who took your money last time and are wondering if you should take them up on their offer.'
 			if slutty = 0 and money > 3000:
 				'You count the money you have on you right now and decide you''ll get by for another day without having to sell your body.'
-				act'Continue':gt 'hotelhole'
+				act 'Continue': gt 'hotelhole'
 			end
 			if slutty > 0 or money <= 3000:
 				gs 'willpower', 'prostitution', 'resist'
 				if will_cost <= pcs_willpwr:
-					act'Shake your head and go back to the lobby (<<will_cost>> Willpower)':
+					act 'Shake your head and go back to the lobby (<<will_cost>> Willpower)':
 						gs 'willpower', 'prostitution', 'resist'
 						gs 'willpower', 'pay', 'resist'
 						threesomewatched = 0
 						gt 'hotelhole'
 					end
 				else
-					act'Shake your head and go back to the lobby (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					act 'Shake your head and go back to the lobby (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-				act'Knock on the door.':
+				act 'Knock on the door.':
 					menu_off = 0
 					*clr & cla
 					gs 'stat'
@@ -303,7 +303,7 @@ if $ARGS[0] = 'maid':
 							'"Ok then, girl, have it your way. Come on in"'
 							prosmoneyhot = 0
 
-							act 'Enter the room':gt 'HotelWork','firsthotelprosevent'
+							act 'Enter the room': gt 'HotelWork', 'firsthotelprosevent'
 						end
 					else
 						act 'Yes, but I want double my money back (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -320,7 +320,7 @@ if $ARGS[0] = 'maid':
 							'"Just bring that tight ass in here and have some fun with us. I promise you''ll get what you''re after." The devious look on his face gives you second thoughts, but you enter the room anyways, feeling completely out of options.'
 							prosmoneyhot = 1
 
-							act 'Enter the room':gt 'HotelWork','firsthotelprosevent'
+							act 'Enter the room': gt 'HotelWork', 'firsthotelprosevent'
 						end
 					else
 						act 'Yes, but I want all my money back (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -332,7 +332,7 @@ if $ARGS[0] = 'maid':
 						'"Just bring that tight ass in here and have some fun with us. I promise you''ll get what you''re after." The devious look on his face gives you second thoughts, but you enter the room anyways, feeling completely out of options.'
 						prosmoneyhot = 2
 
-						act 'Enter the room':gt 'HotelWork','firsthotelprosevent'
+						act 'Enter the room': gt 'HotelWork', 'firsthotelprosevent'
 					end
 				end
 			end
@@ -346,7 +346,7 @@ if $ARGS[0] = 'maid':
 			'After several hours of hard work, you finish your maid shift. You return to the locker room and take off the skimpy maid uniform, putting your own clothes back on. Leaving the uniform in a neat pile on the table, you grab your things and make your way to the hotel lobby. On you way to the lobby you pass the room where the 2 men were enjoying themselves with a girl. You try to resist the urge to peep again.'
 			gs 'willpower', 'voyeur', 'resist'
 			if will_cost <= pcs_willpwr:
-				act'Walk past the door and go to the lobby (<<will_cost>> Willpower)':
+				act 'Walk past the door and go to the lobby (<<will_cost>> Willpower)':
 					gs 'willpower', 'voyeur', 'resist'
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
@@ -356,9 +356,9 @@ if $ARGS[0] = 'maid':
 					gt 'hotelhole'
 				end
 			else
-				act'Walk past the door and go to the lobby (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				act 'Walk past the door and go to the lobby (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-			act'Peep through the keyhole':
+			act 'Peep through the keyhole':
 				menu_off = 0
 				*clr & cla
 				'<center><video autoplay loop src="images/shared/sex/vag/doggy/kotovsex12.mp4"></video></center>'
@@ -406,7 +406,7 @@ if $ARGS[0] = 'maid':
 						threesometojoin = 0
 						pavhotprosQW = 2
 
-						act'Continue':gt 'hotelhole'
+						act 'Continue': gt 'hotelhole'
 					else	
 						if montake = 0:
 							money -= 1000
@@ -459,7 +459,7 @@ if $ARGS[0] = 'maid':
 									'One of the men steps off the bed and walks to you, "Ok whore, show''s over." He grips your arm like a vice and pushes you out the door.'
 									'"If you want your money back, maybe next time you''ll think about joining the show instead of just watching." says the man before closing the door in your face. You think about pounding on the door and demanding you money back from the thief, but decide not to push your luck.'
 
-									act 'Go to the lobby':gt 'hotelhole'
+									act 'Go to the lobby': gt 'hotelhole'
 								end
 							else
 								act 'Continue to watch in silence (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -492,7 +492,7 @@ if $ARGS[0] = 'maid':
 								'One of the men steps off the bed and walks to you, "Ok whore, show''s over." He grips your arm like a vice and pushes you out the door.'
 								'"If you want your money back, maybe next time you''ll think about joining the show instead of just watching." says the man before closing the door in your face. You think about pounding on the door and demanding you money back from the thief, but decide not to push your luck.'
 
-								act 'Go to the lobby':gt 'hotelhole'
+								act 'Go to the lobby': gt 'hotelhole'
 							end
 						end
 					end
@@ -502,11 +502,11 @@ if $ARGS[0] = 'maid':
 	end
 
 	if hour < 19:
-		act'Enter the room':
+		act 'Enter the room':
 			menu_off = 0
 			*clr & cla
 			pcs_mood -= 3
-			gs'stat'
+			gs 'stat'
 			
 			:new_maid_event
 			if soniaPS = 5 and maidcheck_sonia ! daystart:
@@ -536,7 +536,7 @@ if $ARGS[0] = 'maid':
 
 				if chai > 0:money += chai & 'While you''re cleaning the room, you find some money underneath a pillow. Looks like someone left you a <<chai>> <b>₽</b> tip!' & chai=0
 
-				act'Continue':gt 'hotelwork', 'maid'
+				act 'Continue': gt 'hotelwork', 'maid'
 			elseif maidrand <= 15:
 				if maidcheck_1 = daystart: jump 'new_maid_event'
 				maidcheck_1 = daystart
@@ -559,7 +559,7 @@ if $ARGS[0] = 'maid':
 					act 'No, this is none of my business':
 						cla
 						if maidstat < 100:maidstat+=1
-						act'Continue':gt 'hotelwork', 'maid'
+						act 'Continue': gt 'hotelwork', 'maid'
 					end
 					act 'Yeah, let''s see what'' s on these pictures':
 						*clr & cla
@@ -571,10 +571,10 @@ if $ARGS[0] = 'maid':
 						'You wonder what would happen if you went to the lobby around midnight?'
 						resepseen = 1
 						observ_exp += rand(0,3)
-						act'Place the pictures back and continue your maid work ':gt 'hotelwork', 'maid'
+						act 'Place the pictures back and continue your maid work ': gt 'hotelwork', 'maid'
 					end
 				else
-					act'Continue':gt 'hotelwork', 'maid'
+					act 'Continue': gt 'hotelwork', 'maid'
 				end
 			elseif maidrand <= 20:
 				if maidcheck_2 = daystart: jump 'new_maid_event'
@@ -594,7 +594,7 @@ if $ARGS[0] = 'maid':
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/children.jpg"></center>'
 							'You let the children play around for an hour while you relax on a bench.'
 							'You take the children back to the parent''s room and continue your work.'
-							act'Continue':gt 'hotelwork', 'maid'
+							act 'Continue': gt 'hotelwork', 'maid'
 						end
 						if childrenplayground = 1:
 							pcs_mood += 10
@@ -604,7 +604,7 @@ if $ARGS[0] = 'maid':
 							'When it is time to leave you call out to the children but they are nowhere to be found. Then you notice them next to an ice cream truck happily eating some ice cream. You had to use half the money you received from their father to pay for it.'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/children3.jpg"></center>'
 							'You take the children back to the parent''s room and continue your work'
-							act'Continue':gt 'hotelwork', 'maid'
+							act 'Continue': gt 'hotelwork', 'maid'
 						end
 					end
 				else
@@ -613,9 +613,9 @@ if $ARGS[0] = 'maid':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/children2.jpg"></center>'
 						'There is not much to do here to entertain these children so you have to listen to them screaming at each other for an hour, giving you a terrible headache.'
 						'You take the children back to the parent''s room and continue your work'
-						gs 'pain', 2,'head','ache'
+						gs 'pain', 2,'head', 'ache'
 						pcs_mood -= 5
-						act'Continue':gt 'hotelwork', 'maid'
+						act 'Continue': gt 'hotelwork', 'maid'
 					end
 				end
 			elseif maidrand <= 35:
@@ -626,7 +626,7 @@ if $ARGS[0] = 'maid':
 
 				if chai > 0:money += chai &'While you move to pick up a tray, you find some money tucked under a plate. Looks like someone left you a <<chai>> <b>₽</b> tip!'&chai=0
 
-				act'Continue':gt 'hotelwork', 'maid'
+				act 'Continue': gt 'hotelwork', 'maid'
 			elseif maidrand <= 40:
 				if maidcheck_3 = daystart: jump 'new_maid_event'
 				maidcheck_3 = daystart
@@ -641,11 +641,11 @@ if $ARGS[0] = 'maid':
 				'You felt sorry for the man but there was not much more you could do for him'
 				'Just when you were about to leave the room you notice that the man is sitting on the edge of the bed and is on the verge of tears. He doesn''t know what to do now.'
 
-				act'Leave the room':gt 'hotelwork', 'maid'
+				act 'Leave the room': gt 'hotelwork', 'maid'
 				
 				gs 'willpower', 'hj', 'self'
 				if will_cost <= pcs_willpwr:
-					act'Try to cheer up the man with your hands (<<will_cost>> Willpower)':
+					act 'Try to cheer up the man with your hands (<<will_cost>> Willpower)':
 						*clr & cla
 						gs 'willpower', 'hj', 'self'
 						gs 'willpower', 'pay', 'self'
@@ -671,15 +671,15 @@ if $ARGS[0] = 'maid':
 							'You give him a little smile and he smiles back at you. You are happy you were able to cheer him up. Then you stand up, go wash your hands in the bathroom and leave the room to continue your work.'							
 						end
 
-						act'Continue':gt 'hotelwork', 'maid'
+						act 'Continue': gt 'hotelwork', 'maid'
 					end
 				else
-					act'Try to cheer up the man with your hands (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					act 'Try to cheer up the man with your hands (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 				
 				gs 'willpower', 'bj', 'self'
 				if will_cost <= pcs_willpwr:
-					act'Try to cheer up the man with your mouth (<<will_cost>> Willpower)':
+					act 'Try to cheer up the man with your mouth (<<will_cost>> Willpower)':
 						*clr & cla
 						gs 'willpower', 'bj', 'self'
 						gs 'willpower', 'pay', 'self'
@@ -694,7 +694,7 @@ if $ARGS[0] = 'maid':
 							pcs_mood -= 5
 							gs 'stat'
 
-							act'Continue':gt 'hotelwork', 'maid'
+							act 'Continue': gt 'hotelwork', 'maid'
 						elseif stat['bj'] => 5:
 							'You move to the bed and crawled on it. You grab the man by the hip and turn him towards you. Then you moved your head down to his crotch and take his flacid penis in your hand. You place your mouth over the man''s penis and slowly start sucking on it. The man groans a little bit and you feel his dick becoming harder in your mouth.'
 							'The man watches you but doesn''t say anything'
@@ -710,7 +710,7 @@ if $ARGS[0] = 'maid':
 								if will_cost <= pcs_willpwr:
 									act 'Swallow his load (<<will_cost>> Willpower)':
 										cla
-										gs 'cum_call','mouth', $npclastgenerated,0
+										gs 'cum_call', 'mouth', $npclastgenerated, 1
 										swallow += 1
 										pcs_mood += 10
 										gs 'willpower', 'swallow', 'self'
@@ -720,20 +720,20 @@ if $ARGS[0] = 'maid':
 										'You swallow the man''s sperm diligently.'
 										'You give him a little smile and he smiles back at you. You are happy you were able to cheer him up. Then you stand up to leave the room and continue your work.'
 										
-										act'Continue':gt 'hotelwork', 'maid'
+										act 'Continue': gt 'hotelwork', 'maid'
 									end
 								else
 									act 'Swallow his load (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 								end
 								act 'Spit it out':
 									cla
-									gs 'cum_call','mouth', $npclastgenerated,0,'','',10
+									gs 'cum_call', 'mouth', $npclastgenerated, 1, '', '', 10
 									pcs_mood += 10
 									gs 'stat'
 
 									'After the man spent his load in your mouth you stand up, go to the bathroom and spit out the load in the toilet. You move back in to the room and you give him a little smile, he smiles back at you. You are happy you were able to cheer him up. Then you leave the room to continue your work.'
 
-									act'Continue':gt 'hotelwork', 'maid'
+									act 'Continue': gt 'hotelwork', 'maid'
 								end
 							end
 							gs 'willpower', 'cum_outside', 'self'
@@ -750,7 +750,7 @@ if $ARGS[0] = 'maid':
 									'You quickly move your head back and suddenly the cock starts spurting jets of sperm on to your face.'
 									'You give the man a little smile and he smiles back at you. You are happy you were able to cheer him up. Then you stand up to leave the room and continue your work.'
 
-									act'Continue':gt 'hotelwork', 'maid'
+									act 'Continue': gt 'hotelwork', 'maid'
 								end
 							else
 								act 'Take his cock out of your mouth (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -758,7 +758,7 @@ if $ARGS[0] = 'maid':
 						end
 					end
 				else
-					act'Try to cheer up the man with your mouth (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					act 'Try to cheer up the man with your mouth (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			elseif maidrand <= 60:
 				minut += 35
@@ -767,18 +767,18 @@ if $ARGS[0] = 'maid':
 				'You thoroughly clean the room, making sure you wipe all the dust off the furniture.'
 				if chai > 0: money += chai & 'You find <<chai>> <b>₽</b> in a jar on the table. Looks like someone left you a tip!' & chai = 0
 
-				act'Continue':gt'hotelwork','maid'
+				act 'Continue': gt 'hotelwork', 'maid'
 			elseif maidrand <= 70:
 				minut+=45
-				gs'stat'
+				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/work/maid.work3,'+rand(0,4)+'.jpg"></center>'
 				'You spend most of the next 45 minutes on your knees, thoroughly washing the floors of the room after you cleaned the rest quickly.'
 				if chai > 0: money += chai & 'You find <<chai>> <b>₽</b> in a jar on the table. Looks like someone left you a tip!' & chai = 0
 
-				act'Continue':gt'hotelwork','maid'
+				act 'Continue': gt 'hotelwork', 'maid'
 			elseif maidrand <= 75:
 				minut += 10
-				gs'stat'
+				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/work/maid.event0.jpg"></center>'
 				'You knock on the door. Just when you were about to open it yourself, a girl opens the door. She''s naked, except for a pair of sexy stockings!'
 				'You embarrassedly mumble some apologies while you try not to look at her: "Oops! I erm... sorry miss. I will come back later."'
@@ -794,10 +794,10 @@ if $ARGS[0] = 'maid':
 						chai=0
 						cla
 
-						act'Continue':gt'hotelwork','maid'
+						act 'Continue': gt 'hotelwork', 'maid'
 					end
 				else
-					act'Keep walking':gt'hotelwork','maid'
+					act 'Keep walking': gt 'hotelwork', 'maid'
 				end
 			elseif maidrand <= 85:
 				'<center><video autoplay loop src="images/locations/pavlovsk/hotel/sex/1,'+rand(0,7)+'.mp4"></video></center>'
@@ -807,24 +807,24 @@ if $ARGS[0] = 'maid':
 				
 				gs 'willpower', 'voyeur', 'resist'
 				if will_cost <= pcs_willpwr:
-					act'Get back to work (<<will_cost>> Willpower)':
+					act 'Get back to work (<<will_cost>> Willpower)':
 						gs 'willpower', 'voyeur', 'resist'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt'hotelwork','maid'
+						gt 'hotelwork', 'maid'
 					end
 				else
-					act'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					act 'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 				
-				act'Watch them for a while':
+				act 'Watch them for a while':
 					cla
 					'Making sure you don''t make a sound, you put your things away and watch them for a while, softly fondling yourself through your clothes. It feels great, and the couple on the bed look like they''re having a great time as well. Even though you want to keep watching them, you realize you have to get back to work before you''re missed.'
 
 					gs 'arousal', 'voyeur_sex', 10
 					gs 'arousal', 'end'
 					gs 'stat'
-					act'Get back to work':gt'hotelwork','maid'
+					act 'Get back to work': gt 'hotelwork', 'maid'
 				end
 			elseif maidrand <= 95:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/maid.event3,'+rand(0,7)+'.jpg"></center>'
@@ -834,17 +834,17 @@ if $ARGS[0] = 'maid':
 
 				gs 'willpower', 'voyeur', 'resist'
 				if will_cost <= pcs_willpwr:
-					act'Get back to work (<<will_cost>> Willpower)':
+					act 'Get back to work (<<will_cost>> Willpower)':
 						gs 'willpower', 'voyeur', 'resist'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt'hotelwork','maid'
+						gt 'hotelwork', 'maid'
 					end
 				else
-					act'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					act 'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 
-				act'Watch them for a while':
+				act 'Watch them for a while':
 					cla
 					'You decide to watch them for a while longer, and idly begin to fondle yourself through your clothes. The men are quite demanding, commanding the girl around like she''s their plaything. They continuously talk her down, using degrading language. She obediently does everything they order her to do, but gets spanked once when she''s not quick enough. In the corner of the room, you see some coils of rope and several cuffs sticking out of an opened bag. It looks like she''s in for a long night...'
 					'You''d love to keep watching and see what else they have in store for her, but you realize you really have to get back to work before you''re missed.'
@@ -852,7 +852,7 @@ if $ARGS[0] = 'maid':
 					gs 'arousal', 'voyeur_sex', 10
 					gs 'arousal', 'end'
 					gs 'stat'
-					act'Get back to work':gt'hotelwork','maid'
+					act 'Get back to work': gt 'hotelwork', 'maid'
 				end
 			elseif maidrand <= 100:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/maid.event4,'+rand(0,6)+'.jpg"></center>'
@@ -863,17 +863,17 @@ if $ARGS[0] = 'maid':
 
 				gs 'willpower', 'voyeur', 'resist'
 				if will_cost <= pcs_willpwr:
-					act'Get back to work (<<will_cost>> Willpower)':
+					act 'Get back to work (<<will_cost>> Willpower)':
 						gs 'willpower', 'voyeur', 'resist'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt'hotelwork','maid'
+						gt 'hotelwork', 'maid'
 					end
 				else
-					act'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					act 'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 
-				act'Watch them for a while':
+				act 'Watch them for a while':
 					cla
 					'You decide to watch them for a while longer, and idly begin to fondle yourself through the clothes. You notice they''re quite rough with the girl, and sometimes she''s struggling a bit.'
 					'Should you say something to the manager? Then again... how would you explain watching them? You decide against it, figuring the girl will probably be okay.'
@@ -881,7 +881,7 @@ if $ARGS[0] = 'maid':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act'Get back to work':gt'hotelwork','maid'
+					act 'Get back to work': gt 'hotelwork', 'maid'
 				end
 			elseif maidrand <= 110:	
 				if maidcheck_4 = daystart: jump 'new_maid_event'
@@ -889,15 +889,15 @@ if $ARGS[0] = 'maid':
 
 				gs 'willpower', 'voyeur', 'resist'
 				if will_cost <= pcs_willpwr:
-					act'Get back to work (<<will_cost>> Willpower)':
+					act 'Get back to work (<<will_cost>> Willpower)':
 						gs 'arousal', 'end'
 						gs 'willpower', 'voyeur', 'resist'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt'hotelwork','maid'
+						gt 'hotelwork', 'maid'
 					end
 				else
-					act'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					act 'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 
 				if IgorevnaBDSM = 0:
@@ -912,7 +912,7 @@ if $ARGS[0] = 'maid':
 					gs 'arousal', 'voyeur', 10
 					gs 'stat'
 					
-					act'Watch them for a while':
+					act 'Watch them for a while':
 						*clr & cla
 						IgorevnaBDSM += 1
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/2.jpg"></center>'
@@ -958,7 +958,7 @@ if $ARGS[0] = 'maid':
 								gs 'arousal', 'end'
 								gs 'stat'
 
-								act'Get back to work':gt'hotelwork','maid'
+								act 'Get back to work': gt 'hotelwork', 'maid'
 							end
 						end
 					end
@@ -1041,7 +1041,7 @@ if $ARGS[0] = 'maid':
 					gs 'arousal', 'voyeur', 3
 					gs 'stat'
 
-					act'Keep on watching':
+					act 'Keep on watching':
 						*clr & cla
 						IgorevnaBDSM += 1
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/10.jpg"></center>'
@@ -1082,7 +1082,7 @@ if $ARGS[0] = 'maid':
 								gs 'arousal', 'end'
 								gs 'stat'
 
-								act'Get back to work':gt'hotelwork','maid'
+								act 'Get back to work': gt 'hotelwork', 'maid'
 							end
 						end
 					end
@@ -1176,7 +1176,7 @@ if $ARGS[0] = 'maid':
 					gs 'arousal', 'voyeur', 3
 					gs 'stat'
 
-					act'Watch them for a while':
+					act 'Watch them for a while':
 						*clr & cla
 						IgorevnaBDSM += 1
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/18.jpg"></center>'
@@ -1254,26 +1254,31 @@ if $ARGS[0] = 'maid':
 										'The brunette looks at you, "I see. You are worried about your work. Don''t worry I won''t tattletale on you. Let us agree on something, if you want to talk, come and visit me in this room, at 20:00."'
 										'You quickly nod not wanting to push your luck. "I''m sure we''ll have a lot to discuss. As you may have noticed I need to head back to business. Feel free to visit whenever you want, I''ll be here. Now, if you''ll excuse me..." she closes the door and locks it.'
 										'You are not sure what to make of it, you can visit her whenever you want. But does she have any ulterior motives...'
-									end	
+									end
+									*nl
 									!! End of content message
 									'<br><b>This is currently the end of this event chain.</b><br> If you have any ideas about expanding it, we''re always open for contributions!'
 									gs 'stat'
 
-									act'Get back to work':gt'hotelwork','maid'
+									act 'Get back to work': gt 'hotelwork', 'maid'
 								end
 							end
 						end
 					end
-				elseif IgorevnaBDSM >= 5:				
+				elseif IgorevnaBDSM >= 5:
+					cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/'+rand(21,24)+'.jpg"></center>'
 					!!Needs more text
 					'You can''t stop yourself from peeping.'
+					*nl
+					!! End of content message
+					'<br><b>This is currently the end of this event chain.</b><br> If you have any ideas about expanding it, we''re always open for contributions!'
 					
 					gs 'arousal', 'voyeur', 10
 					gs 'arousal', 'end'
 					gs 'stat'
 					
-					act 'Get back to work': gt'hotelwork','maid'
+					act 'Get back to work': gt 'hotelwork', 'maid'
 				end
 			elseif maidrand <= 120:
 				maidcheck_sonia = daystart
@@ -1282,10 +1287,10 @@ if $ARGS[0] = 'maid':
 				gs 'arousal', 'voyeur_sex', 5
 				gs 'stat'
 
-				act'Get back to work':gt'hotelwork','maid'
+				act 'Get back to work': gt 'hotelwork', 'maid'
 
 				if hotel_rand1 <= 60:
-					act'Keep watching':
+					act 'Keep watching':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.boy.cum0,'+rand(0,4)+'.jpg"></center>'
 						'The man doesn''t last very long, and within minutes shoots his hot ropes of jizz all over Sonia''s face. She lets it sit for a minute so he can admire his handiwork, before greedily wiping it towards her mouth and lapping it up. When you get up to leave, you see the man give Sonia some money.'
@@ -1293,17 +1298,17 @@ if $ARGS[0] = 'maid':
 						gs 'arousal', 'end'
 						gs 'stat'
 
-						act'Get back to work':gt'hotelwork','maid'
+						act 'Get back to work': gt 'hotelwork', 'maid'
 					end
 				else
-					act'Keep watching':
+					act 'Keep watching':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.boy1,'+rand(0,3)+'.jpg"></center>'
 						'After a few minutes of Sonia enthusiastically sucking his dick and licking his balls, the guy decides he wants to fuck her now. He spreads Sonia''s legs and slides his cock into her in one fluent motion. Sonia moans eagerly, and begins to buck her hips against him.'
 						gs 'arousal', 'voyeur_sex', 5
 						gs 'stat'
 
-						act'Further':
+						act 'Further':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.boy.cum0,'+rand(0,4)+'.jpg"></center>'
 							'The man doesn''t last very long, and within minutes he tells Sonia to get on her knees before him. Seconds later, he shoots his hot ropes of jizz all over her face. She lets it sit for a minute so he can admire his handiwork, before greedily wiping it towards her mouth and lapping it up. When you get up to leave, you see the man give Sonia some money.'
@@ -1311,7 +1316,7 @@ if $ARGS[0] = 'maid':
 							gs 'arousal', 'end'
 							gs 'stat'
 
-							act'Get back to work':gt'hotelwork','maid'
+							act 'Get back to work': gt 'hotelwork', 'maid'
 						end
 					end
 				end
@@ -1325,18 +1330,18 @@ if $ARGS[0] = 'maid':
 
 				gs 'willpower', 'voyeur', 'resist'
 				if will_cost <= pcs_willpwr:
-					act'Get back to work (<<will_cost>> Willpower)':
+					act 'Get back to work (<<will_cost>> Willpower)':
 						gs 'willpower', 'voyeur', 'resist'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt'hotelwork','maid'
+						gt 'hotelwork', 'maid'
 					end
 				else
-					act'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					act 'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 
 				if hotel_rand1 <= 60:
-					act'Keep watching':
+					act 'Keep watching':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.boy.nigga.cum0,0.jpg"></center>'
 						'The black man doesn''t last very long, and within minutes shoots his hot ropes of jizz all over Sonia''s face. She lets it sit for a minute so he can admire his handiwork, before greedily wiping it towards her mouth and lapping it up. When you get up to leave, you see the man give Sonia some money.'
@@ -1344,17 +1349,17 @@ if $ARGS[0] = 'maid':
 						gs 'arousal', 'end'
 						gs 'stat'
 
-						act'Get back to work':gt'hotelwork','maid'
+						act 'Get back to work': gt 'hotelwork', 'maid'
 					end
 				else
-					act'Keep watching':
+					act 'Keep watching':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.boy.nigga1,'+rand(0,5)+'.jpg"></center>'
 						'After a few minutes of Sonia enthusiastically sucking his dick and licking his balls, the black guy decides he wants to fuck her now. He spreads Sonia''s legs and slides his cock into her in one fluent motion. You can see her pussy lips stretch around his huge cock as Sonia moans loudly, trying to hold him back for a second so she can get used to the size.'
 						gs 'arousal', 'voyeur_sex', 5
 						gs 'stat'
 
-						act'Keep watching':
+						act 'Keep watching':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.boy.nigga.cum0,0.jpg"></center>'
 							'The black man fucks her for a good while, and just when you thought you should probably get back to work he tells Sonia to get on her knees before him. Seconds later, he shoots his hot ropes of jizz all over her face. She lets it sit for a minute so he can admire his handiwork, before greedily wiping it towards her mouth and lapping it up. When you get up to leave, you see the man give Sonia some money.'
@@ -1362,7 +1367,7 @@ if $ARGS[0] = 'maid':
 							gs 'arousal', 'end'
 							gs 'stat'
 
-							act'Get back to work':gt'hotelwork','maid'
+							act 'Get back to work': gt 'hotelwork', 'maid'
 						end
 					end
 				end
@@ -1375,18 +1380,18 @@ if $ARGS[0] = 'maid':
 
 				gs 'willpower', 'voyeur', 'resist'
 				if will_cost <= pcs_willpwr:
-					act'Get back to work (<<will_cost>> Willpower)':
+					act 'Get back to work (<<will_cost>> Willpower)':
 						gs 'willpower', 'voyeur', 'resist'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt'hotelwork','maid'
+						gt 'hotelwork', 'maid'
 					end
 				else
-					act'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					act 'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 
 				if hotel_rand1 <= 60:
-					act'Keep watching':
+					act 'Keep watching':
 						*clr & cla
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/sonia/sex/sonia.cum0,'+rand(0,1)+'.mp4"></video></center>'
 						'Sonia must''ve been doing a really good job. Within minutes, both of them moan and quickly begin to jerk themselves off, shooting thick ropes of jizz all over her face. She lets it sit for a minute so they can admire their handiwork, before greedily wiping it towards her mouth and lapping it up. When you get up to leave, you see one of the men give Sonia some money.'
@@ -1394,17 +1399,17 @@ if $ARGS[0] = 'maid':
 						gs 'arousal', 'end'
 						gs 'stat'
 
-						act'Get back to work':gt'hotelwork','maid'
+						act 'Get back to work': gt 'hotelwork', 'maid'
 					end
 				else
-					act'Keep watching':
+					act 'Keep watching':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.two.nigga1,'+rand(0,3)+'.jpg"></center>'
 						'After a few minutes, the black guys pull Sonia''s mouth away from their dicks for a second, ignoring her pleas to have them back. One of the men starts to fuck her pussy, while the other stuffs her mouth again with his dick. You''re somewhat amazed at how easily Sonia takes their huge dicks in her pussy... she must''ve had a lot of practise with them already. After a few minutes of giving Sonia a thorough fucking, the black guys tell her to get on her knees.'
 						gs 'arousal', 'voyeur_sex', 3
 						gs 'stat'
 
-						act'Keep watching':
+						act 'Keep watching':
 							*clr & cla
 							'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/sonia/sex/sonia.cum0,'+rand(0,1)+'.mp4"></video></center>'
 							'Sonia does as they says, and seconds later the first jet of sperm already hits her face. She licks some of it up, but waits patiently for the other guy to also add his cum to her face. You quickly pull away from the door when you see her looking in your general direction... that was close! You quickly gather your things and leave, before she gets the idea to look if anyone was watching her.'
@@ -1412,7 +1417,7 @@ if $ARGS[0] = 'maid':
 							gs 'arousal', 'end'
 							gs 'stat'
 
-							act'Get back to work':gt'hotelwork','maid'
+							act 'Get back to work': gt 'hotelwork', 'maid'
 						end
 					end
 				end

+ 2 - 2
locations/ParChurch2.qsrc

@@ -125,7 +125,7 @@ if $ARGS[0] = 'confession':
 		end
 	end
 	
-	if sisterLesb ! 0 or seepornofut ! 0: act 'Confess a secret about incest': gt 'ParChurch2', 'secrets'
+	if sisterLesb > 3 or seepornofut ! 0: act 'Confess a secret about incest': gt 'ParChurch2', 'secrets'
 	if lesbian = 0:
 		act 'Wanting to have sex with a girl':
 			*clr & cla
@@ -611,7 +611,7 @@ if $ARGS[0] = 'secrets':
 	'"Father, this is very hard for me to tell you." you began hesitantly.'
 	'"Go on, my dear." Father Kirill says gently, "Remember, our Lord already knows what you have done. All you need do is acknowledge the sin by speaking it."'
 	'Steeling your nerve, you decided to tell him about...'
-	if sisterLesb ! 0:
+	if sisterLesb > 3:
 		act 'Tell him about having sex with your sister':
 			*clr & cla
 			confK += 1

+ 1 - 1
locations/_attributes_fetish.qsrc

@@ -390,7 +390,7 @@ elseif ARGS[1] = 72:
 	CloOnePiece = 1
 elseif ARGS[1] = 73:
 	CloQuality = 4
-	CloThinness = 60
+	CloThinness = 6
 	CloBimbo = 1
 	CloBra = 2
 	CloPanties = 1

+ 1 - 1
locations/anushapt.qsrc

@@ -1036,7 +1036,7 @@ if $ARGS[0] = 'snack':
 	menu_off = 1
 	*clr & cla
 	minut += 15
-	alko -= 1
+	if alko > 0: alko -= 1
 	pcs_health += 20
 	pcs_mood += 20
 	fat += 6

+ 41 - 37
locations/artemEv.qsrc

@@ -118,7 +118,6 @@ if $ARGS[0] = 'learn':
 				if artemslut <= 2:
 					'Artem stands up and unbuttons his pants, pulling his stiff erection from his pants.'
 					'He looks at you expectantly: "Time for my payment, today I want a blowjob."'
-					act 'Suck him off': gt 'artemEv', 'slut_bj'
 					gs 'willpower', 'exhib', 'resist'
 					if will_cost <= pcs_willpwr:
 						act '"No way!" (<<will_cost>> Willpower)':
@@ -136,10 +135,10 @@ if $ARGS[0] = 'learn':
 					else
 						act '"No way!" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
+					act 'Suck him off': gt 'artemEv', 'slut_bj'
 				elseif artemslut <= 4:
 					'Artem stands up and unbuttons his pants, pulling his stiff erection from his pants.'
 					'He looks at you expectantly: "If you still want my help, I want more, I want to fuck you."'
-					act 'Let him fuck you': gt 'artemEv', 'slut_fuck'
 					gs 'willpower', 'exhib', 'resist'
 					if will_cost <= pcs_willpwr:
 						act '"No way!" (<<will_cost>> Willpower)':
@@ -157,10 +156,10 @@ if $ARGS[0] = 'learn':
 					else
 						act '"No way!" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
+					act 'Let him fuck you': gt 'artemEv', 'slut_fuck'
 				else
 					'Artem stands up and unbuttons his pants, pulling his stiff erection from his pants.'
 					'He looks at you expectantly: "I seen something in a porno I want to try, I want to stick it in your ass now."'
-					act 'Let him fuck your ass': gt 'artemEv', 'slut_anal'
 					gs 'willpower', 'exhib', 'resist'
 					if will_cost <= pcs_willpwr:
 						act '"No way!" (<<will_cost>> Willpower)':
@@ -178,13 +177,13 @@ if $ARGS[0] = 'learn':
 					else
 						act '"No way!" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
+					act 'Let him fuck your ass': gt 'artemEv', 'slut_anal'
 				end
 			elseif artemsex >= 5:
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj1.jpg"></center>'
 				'Artem stands up and unbuttons his pants, pulling his stiff erection from his pants.'
 				'He looks at you expectantly: "I seen something in a porno I want to try, I want to stick it in your ass now."'
-				act 'Let him fuck your ass': gt 'artemEv', 'slut_anal'
 				gs 'willpower', 'exhib', 'resist'
 				if will_cost <= pcs_willpwr:
 					act '"No way!" (<<will_cost>> Willpower)':
@@ -201,16 +200,15 @@ if $ARGS[0] = 'learn':
 				else
 					act '"No way!" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
+				act 'Let him fuck your ass': gt 'artemEv', 'slut_anal'
 			elseif artembj >= 5:
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj1.jpg"></center>'
 				'Artem stands up and unbuttons his pants, pulling his stiff erection from his pants.'
 				'He looks at you expectantly: "If you still want my help, I want more, I want to fuck you."'
-				act 'Let him fuck you': gt 'artemEv', 'slut_fuck'
 				if mesec > 0:
 					'You shake your head and quickly tell him: "Sorry Artem... it''s that time of the month, we can''t."'
 					'He blushes a moment and then smiles a little. "That''s ok I can just fuck your ass then <<$pcs_nickname>>."'
-					gs 'arousal', 'bj', 1
 					gs 'stat'
 					act 'Agree to have anal sex instead': gt 'artemEv', 'slut_anal'
 					gs 'willpower', 'exhib', 'resist'
@@ -229,40 +227,33 @@ if $ARGS[0] = 'learn':
 					else
 						act '"No way!" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
-				end
-				gs 'willpower', 'exhib', 'resist'
-				if will_cost <= pcs_willpwr:
-					act '"No way!" (<<will_cost>> Willpower)':
-						*clr & cla
-						gs 'willpower', 'pay', 'resist'
-						npc_rel['A2'] -= 25
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj1.jpg"></center>'
-						'You decline, and he''s very offended by that: "Look <<$pcs_nickname>>, you''ve already sucked my dick. Meanwhile, you...  fuck pretty much everyone who asks! But now I can''t fuck you? That''s so not fair! We''re done... find someone else to help you. Good luck, with that attitude."'
-						'You can tell Artem is seriously offended by your refusal, and won''t help you any further. Hopefully someone else can help you with your homework.'
-						act 'Refuse': gt 'artemEv', 'finalrefuse'
-						act 'Let him fuck you': gt 'artemEv', 'slut_fuck'
-					end
 				else
-					act '"No way!" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					gs 'willpower', 'exhib', 'resist'
+					if will_cost <= pcs_willpwr:
+						act '"No way!" (<<will_cost>> Willpower)':
+							*clr & cla
+							gs 'willpower', 'pay', 'resist'
+							npc_rel['A2'] -= 25
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj1.jpg"></center>'
+							'You decline, and he''s very offended by that: "Look <<$pcs_nickname>>, you''ve already sucked my dick. Meanwhile, you...  fuck pretty much everyone who asks! But now I can''t fuck you? That''s so not fair! We''re done... find someone else to help you. Good luck, with that attitude."'
+							'You can tell Artem is seriously offended by your refusal, and won''t help you any further. Hopefully someone else can help you with your homework.'
+							act 'Refuse': gt 'artemEv', 'finalrefuse'
+							act 'Let him fuck you': gt 'artemEv', 'slut_fuck'
+						end
+					else
+						act '"No way!" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+					act 'Let him fuck you': gt 'artemEv', 'slut_fuck'
 				end
 			elseif artemStripSee < 3:
+				cla
 				if artemStripSee = 0:
 					'Artem says a little shyly: "You know... I''ve never seen a girl naked before. Only on pictures. Maybe you could..."'
 				else
 					'Artem says a little shyly: "I enjoyed seeing your naked last time, I want you to strip for me again but can you make a bit more of a show of it this time?"'
 				end
-				act 'Agree to strip':
-					*clr & cla
-					artemStripSee += 1
-					gs 'fame', 'pav', 'sex', 1
-					minut += 5
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/strip1.jpg"></center>'
-					'You give him a serious look when you say. "You want me to get naked for you?"'
-					'You see him visible swallow but then he nods. "Yes I do, I think it  is the least you can do for me."'
-					'You think it over for a moment and then figure why not, it isn''t like a boy has never seen you naked before. "Ok fine." With those words he grins hugely. You start stripping out of your clothes slowly teasing him as you do, you might as well have some fun with this.'
-					act 'Start stripping': gt 'artemEv', 'striptease'
-				end
+
 				gs 'willpower', 'exhib', 'resist'
 				if will_cost <= pcs_willpwr:
 					act '"No way!" (<<will_cost>> Willpower)':
@@ -290,12 +281,22 @@ if $ARGS[0] = 'learn':
 				else
 					act '"No way!" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
+				act 'Agree to strip':
+					*clr & cla
+					artemStripSee += 1
+					gs 'fame', 'pav', 'sex', 1
+					minut += 5
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/strip1.jpg"></center>'
+					'You give him a serious look when you say. "You want me to get naked for you?"'
+					'You see him visible swallow but then he nods. "Yes I do, I think it  is the least you can do for me."'
+					'You think it over for a moment and then figure why not, it isn''t like a boy has never seen you naked before. "Ok fine." With those words he grins hugely. You start stripping out of your clothes slowly teasing him as you do, you might as well have some fun with this.'
+					act 'Start stripping': gt 'artemEv', 'striptease'
+				end
 			else
 				cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj1.jpg"></center>'
 				'Artem stands up and unbuttons his pants, pulling his stiff erection from his pants.'
 				'He looks at you expectantly: "If you want my help, I want your mouth."'
-				act 'Suck him off': gt 'artemEv', 'slut_bj'
 				gs 'willpower', 'exhib', 'resist'
 				if will_cost <= pcs_willpwr:
 					act '"No way!" (<<will_cost>> Willpower)':
@@ -312,6 +313,7 @@ if $ARGS[0] = 'learn':
 				else
 					act '"No way!" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
+				act 'Suck him off': gt 'artemEv', 'slut_bj'
 			end
 		end
 	else
@@ -775,16 +777,18 @@ if $ARGS[0] = 'cum_surprise':
 		'As you are riding him, getting lost in your own pleasure you glance down at his face and see him tense up and you realize that he is cumming too late. You can feel his cum shooting into you. As you lift yourself up, you can feel his cum oozing out of your pussy.'
 		'Then it hits him and he suddenly looks alarmed as he realizes he just came inside of you. "Oh my god, I am so sorry <<$pcs_nickname>>, I didn''t mean to do that."'
 		'You smile to him as you get off him. "It''s ok, don''t worry about it." He looks relieved obviously thinking your are on birth control.'
-		act 'Continue': gt 'artemEv', 'after_sex', 'cp'
+		act 'Continue': gs 'artemEv', 'after_sex', 'cp'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/firstfacial.jpg"></center>'
 		'As you are riding him, getting lost in your own pleasure you glance down at his face and see him tenses up, before he warns you: "<<$pcs_nickname>>... I''m going to cum..."'
 		'You quickly climb off him and he rolls up to his knees. You start jerking his cock, with it pointed right at your face. Just as a stream of his sperm hits you in the face, you keep jerking him off. Causing several more streams of cum to land on your face, once the last of his cum has been drained you stop jerking him off and open your eyes.'
-		act 'Continue': gt 'artemEv', 'after_sex', 'facial'
+		act 'Continue': gs 'artemEv', 'after_sex', 'facial'
 	end
 end
 
 if $ARGS[0] = 'after_sex':
+	cla
+	*nl
 	if artemsex = 1:
 		'You run your hand over his chest and smile at him: "So... you''re a man now..."'
 		'Artem is not sure what to say, and mutters: "<<$pcs_nickname>>... I... I love you..."'
@@ -974,7 +978,7 @@ if $ARGS[0] = 'slut_anal':
 	gs 'stat'
 	act 'Get on your hands and knees':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/slutfuck1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/slutanal1.jpg"></center>'
 		'Once you are on fours he grabs some lotion and rubs it on your asshole, then rubs some all along his dick. He scoots up behind you and you feel the tip of his dick pressing against your anus, the pressure keeps building up, in his haste it takes several tries as he keeps letting it slip and miss, until the head of his dick suddenly pops into your ass. You hiss in pain as he moans in pleasure. "<<$pcs_nickname>> your ass is tighter than I was expecting."'
 		'You nod and look back over your shoulder at him. "Yes, just go slow and easy ok?"'
 		'He snorts. "Like you don''t get your ass pounded every day, everyone know sluts love it or they wouldn''t do it." Then he starts fucking your ass with hard, fast strokes, he grabs ahold of your hips so you can''t pull away.'
@@ -983,7 +987,7 @@ if $ARGS[0] = 'slut_anal':
 		act 'Get butt fucked':
 			*clr & cla
 			gs 'boyStat', 'A2'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/slutfuck2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/slutanal2.jpg"></center>'
 			'He scoots a little closer to you as he fucks your butt until his <<dick>>cm <<$dick_girth>> cock is balls deep up your ass. Once he can he just fucks you as hard and fast as he can, he obviously doesn''t care if you are enjoying it, he is just doing what feels best for him. So it turns out nice guy Artem is no different than any other guy, all he cares about is getting it stuck in and doesn''t give a shit about the girl. Still a good hard fucking is always fun so you make the best of things and focus on enjoying it.'
 			gs 'arousal', 'anal', 5, 'sub'
 			gs 'stat'

+ 1 - 1
locations/artemhome.qsrc

@@ -564,7 +564,7 @@ if $ARGS[0] = 'snack':
 	menu_off = 1
 	*clr & cla
 	minut += 15
-	alko -= 1
+	if alko > 0: alko -= 1
 	pcs_health += 20
 	pcs_mood += 20
 	fat += 6

+ 2 - 2
locations/bed2.qsrc

@@ -395,7 +395,7 @@ if $ARGS[0] = 'wake_horny':
 		end
 		'Maybe you should just get up.'
 	end
-	if $loc = 'bedrPar' and SisterLesb = 5 and hour < 6:
+	if $loc = 'bedrPar' and sisterLesb = 6 and hour < 6:
 		*nl
 		'Or... you could wake up Anya and see if your dearest sister would be willing to help you with that.'
 	elseif $loc = 'FedorEv4':
@@ -426,7 +426,7 @@ if $ARGS[0] = 'wake_horny':
 		end
 	end
 
-	if $loc = 'bedrPar' and SisterLesb = 5 and hour < 6:
+	if $loc = 'bedrPar' and sisterLesb = 6 and hour < 6:
 		act 'Wake Anya and see if she''s in the mood': strip_here = 0 & InSleep = 0 & gt 'sistersleep', 'sister_sleep'
 	elseif $loc = 'FedorEv4':
 		act 'Wake Fedor and see if he''s in the mood': strip_here = 0 & InSleep = 0 & gt 'FedorEv4', 'Bedroom 1'

+ 4 - 4
locations/beverage.qsrc

@@ -35,7 +35,7 @@ end
 if $ARGS[0] = 'bev_jui':
 	*clr & cla
 	frost = 1
-	alko -= 1
+	if alko > 0: alko -= 1
 	minut += 10
 	fat += 3
 	money -= val($_drink['<<args[1]>>,price'])
@@ -96,7 +96,7 @@ end
 if $ARGS[0] = 'bev_wat':
 	*clr & cla
 	frost = 1
-	alko -= 1
+	if alko > 0: alko -= 1
 	minut += 1
 	money -= val($_drink['<<args[1]>>,price'])
 	pcs_health += 10
@@ -124,7 +124,7 @@ end
 if $ARGS[0] = 'bev_cof':
 	*clr & cla
 	frost = 0
-	alko -= 1
+	if alko > 0: alko -= 1
 	minut += 10
 	money -= val($_drink['<<args[1]>>,price'])
 	pcs_health += 5
@@ -154,7 +154,7 @@ end
 if $ARGS[0] = 'bev_tea':
 	*clr & cla
 	frost = 0
-	alko -= 1
+	if alko > 0: alko -= 1
 	minut += 10
 	money -= val($_drink['<<args[1]>>,price'])
 	pcs_health += 10

+ 122 - 2
locations/cikl.qsrc

@@ -1377,6 +1377,9 @@ if storyline = 1:
 				killvar 'switch_rand'
 			end
 			
+			!! Resetting the late flag
+			if late = 1: late = 0
+			
 			!!Maximum increase for grupvalues is 7/8
 			if oldgrupvalue_set = 0:
 				oldgrupvalue_set = 1
@@ -1492,12 +1495,129 @@ gs 'body_shape', 'basebeautycalc'
 !! vovan, from 1.2.5
 hunters_check = 0
 mushroom_pickers = 0
-grandpaQW['chore_bathe_horse'] = 0
-grandpaQW['chore_bale_hay'] = 0
 mira_go_river = 0
 forestpicnic = 0
 if Mira_no > 0: Mira_no -= 1
 if Mira_no < 0: Mira_no = 0
+
+!! new grandparent chore stuff, for 0.8.0
+if gadstay = 1:
+	if daystart > (grandmaQW['last_day_helped'] + 3) and daystart > (grandpaQW['last_day_helped'] + 3):
+		if (daystart - grandmaQW['last_day_helped']) <= (daystart - grandpaQW['last_day_helped']):
+			'You haven''t helped your grandparents with any chores in <<daystart - grandmaQW[''last_day_helped'']>> days. You should help out more regularly to stay on your grandparents'' good side.'
+		else
+			'You haven''t helped your grandparents with any chores in <<daystart - grandpaQW[''last_day_helped'']>> days. You should help out more regularly to stay on your grandparents'' good side.'
+		end
+		grandmaQW['help_amount'] -= 1
+	end
+end
+
+!! disappointing grandma
+if grandmaQW['chore_clean_floor'] = 1 or grandmaQW['chore_clean_floor'] = 2:
+	grandmaQW['chore_clean_floor'] = 0
+	grandmaQW['disappointment'] = 1
+elseif grandmaQW['chore_wash_clothes'] = 1 or grandmaQW['chore_wash_clothes'] = 2:
+	grandmaQW['chore_wash_clothes'] = 0
+	grandmaQW['disappointment'] = 1
+elseif grandmaQW['chore_milk_cow'] = 1 or grandmaQW['chore_milk_cow'] = 2:
+	grandmaQW['chore_milk_cow'] = 0
+	grandmaQW['disappointment'] = 1
+elseif grandmaQW['chore_groceries'] = 1 or grandmaQW['chore_groceries'] = 2:
+	grandmaQW['chore_groceries'] = 0
+	grandmaQW['disappointment'] = 1
+elseif grandmaQW['chore_can_mushrooms'] = 1 or grandmaQW['chore_can_mushrooms'] = 2:
+	grandmaQW['chore_can_mushrooms'] = 0
+	grandmaQW['disappointment'] = 1
+elseif grandmaQW['chore_can_berries'] = 1 or grandmaQW['chore_can_berries'] = 2:
+	grandmaQW['chore_can_berries'] = 0
+	grandmaQW['disappointment'] = 1
+elseif grandmaQW['chore_can_veggies'] = 1 or grandmaQW['chore_can_veggies'] = 2:
+	grandmaQW['chore_can_veggies'] = 0
+	grandmaQW['disappointment'] = 1
+elseif grandmaQW['chore_feed_chickens'] = 1 or grandmaQW['chore_feed_chickens'] = 2:
+	grandmaQW['chore_feed_chickens'] = 0
+	grandmaQW['disappointment'] = 1
+elseif grandmaQW['chore_work_in_garden'] = 1 or grandmaQW['chore_work_in_garden'] = 2:
+	grandmaQW['chore_work_in_garden'] = 0
+	grandmaQW['disappointment'] = 1
+elseif grandmaQW['chore_water_garden'] = 1 or grandmaQW['chore_water_garden'] = 2:
+	grandmaQW['chore_water_garden'] = 0
+	grandmaQW['disappointment'] = 1
+elseif grandmaQW['chore_collect_strawberries'] = 1 or grandmaQW['chore_collect_strawberries'] = 2:
+	grandmaQW['chore_collect_strawberries'] = 0
+	grandmaQW['disappointment'] = 1
+elseif grandmaQW['chore_collect_fruit'] = 1 or grandmaQW['chore_collect_fruit'] = 2:
+	grandmaQW['chore_collect_fruit'] = 0
+	grandmaQW['disappointment'] = 1
+elseif grandmaQW['chore_harvest_garden'] = 1 or grandmaQW['chore_harvest_garden'] = 2:
+	grandmaQW['chore_harvest_garden'] = 0
+	grandmaQW['disappointment'] = 1
+elseif grandmaQW['chore_gather_mushrooms'] = 1 or grandmaQW['chore_gather_mushrooms'] = 2:
+	grandmaQW['chore_gather_mushrooms'] = 0
+	grandmaQW['chore_mushroom_quantity'] = 0
+	grandmaQW['disappointment'] = 1
+elseif grandmaQW['chore_gather_berries'] = 1 or grandmaQW['chore_gather_berries'] = 2:
+	grandmaQW['chore_gather_berries'] = 0
+	grandmaQW['chore_berry_quantity'] = 0
+	grandmaQW['disappointment'] = 1
+elseif grandmaQW['chore_gather_both'] = 1 or grandmaQW['chore_gather_both'] = 2:
+	grandmaQW['chore_gather_both'] = 0
+	grandmaQW['chore_mushroom_quantity'] = 0
+	grandmaQW['chore_berry_quantity'] = 0
+	grandmaQW['disappointment'] = 1
+end
+
+!!disappointing grandpa
+if grandpaQW['chore_fetch_firewood'] = 1 or grandpaQW['chore_fetch_firewood'] = 2:
+	grandpaQW['chore_fetch_firewood'] = 0
+	grandpaQW['disappointment'] = 1
+elseif grandpaQW['chore_feed_horse'] = 1 or grandpaQW['chore_feed_horse'] = 2:
+	grandpaQW['chore_feed_horse'] = 0
+	grandpaQW['disappointment'] = 1
+elseif grandpaQW['chore_feed_cow'] = 1 or grandpaQW['chore_feed_cow'] = 2:
+	grandpaQW['chore_feed_cow'] = 0
+	grandpaQW['disappointment'] = 1
+elseif grandpaQW['chore_clean_yard'] = 1 or grandpaQW['chore_clean_yard'] = 2:
+	grandpaQW['chore_clean_yard'] = 0
+	grandpaQW['disappointment'] = 1
+elseif grandpaQW['chore_feed_boar'] = 1 or grandpaQW['chore_feed_boar'] = 2:
+	grandpaQW['chore_feed_boar'] = 0
+	grandpaQW['disappointment'] = 1
+elseif grandpaQW['chore_bathe_horse'] = 1 or grandpaQW['chore_bathe_horse'] = 2:
+	grandpaQW['chore_bathe_horse'] = 0
+	grandpaQW['chore_bathe_horse_prog'] = 0
+	grandpaQW['disappointment'] = 1
+elseif grandpaQW['chore_brush_horse'] = 1 or grandpaQW['chore_brush_horse'] = 2:
+	grandpaQW['chore_brush_horse'] = 0
+	grandpaQW['disappointment'] = 1
+elseif grandpaQW['chore_lead_horse_to_field'] = 1 or grandpaQW['chore_lead_horse_to_field'] = 2:
+	grandpaQW['chore_lead_horse_to_field'] = 0
+	grandpaQW['disappointment'] = 1
+elseif grandpaQW['chore_herd_cattle'] = 1 or grandpaQW['chore_herd_cattle'] = 2:
+	grandpaQW['chore_herd_cattle'] = 0
+	grandpaQW['disappointment'] = 1
+elseif grandpaQW['chore_lead_cow_to_field'] = 1 or grandpaQW['chore_lead_cow_to_field'] = 2:
+	grandpaQW['chore_lead_cow_to_field'] = 0
+	grandpaQW['disappointment'] = 1
+elseif grandpaQW['chore_gather_mushrooms'] = 1 or grandpaQW['chore_gather_mushrooms'] = 2:
+	grandpaQW['chore_gather_mushrooms'] = 0
+	grandpaQW['chore_mushroom_quantity'] = 0
+	grandpaQW['disappointment'] = 1
+elseif grandpaQW['chore_gather_berries'] = 1 or grandpaQW['chore_gather_berries'] = 2:
+	grandpaQW['chore_gather_berries'] = 0
+	grandpaQW['chore_berry_quantity'] = 0
+	grandpaQW['disappointment'] = 1
+elseif grandpaQW['chore_gather_both'] = 1 or grandpaQW['chore_gather_both'] = 2:
+	grandpaQW['chore_gather_both'] = 0
+	grandpaQW['chore_mushroom_quantity'] = 0
+	grandpaQW['chore_berry_quantity'] = 0
+	grandpaQW['disappointment'] = 1
+elseif grandpaQW['chore_bale_hay'] = 1 or grandpaQW['chore_bale_hay'] = 2:
+	grandpaQW['chore_bale_hay'] = 0
+	grandpaQW['disappointment'] = 1
+end
+!! end of new grandparent chore stuff, for 0.8.0
+
 if catout ! 0: catout = 0
 if feedcat ! 0: feedcat = 0
 

+ 1 - 1
locations/dimaHome.qsrc

@@ -415,7 +415,7 @@ if $ARGS[0] = 'kitchen1':
 		act 'He has?':
 			*clr & cla
 			frost = 0
-			alko -= 1
+			if alko > 0: alko -= 1
 			minut += 10
 			pcs_health += 10
 			pcs_mood += 20

+ 1 - 1
locations/dvor.qsrc

@@ -4,7 +4,7 @@ menu_off = 1
 $location_type = 'public_outdoors'
 set minut += 5
 gs 'stat'
-'<center><B>Vacant house</B></center>'
+'<center><B>Vacant House</B></center>'
 '<center><img <<$set_imgh>> src="images/locations/oldtown/dvor1.jpg" ></center>'
 
 act 'Go to town center':gt 'liam' & minut += 5

+ 1 - 1
locations/exercise.qsrc

@@ -385,7 +385,7 @@ if $ARGS[0] = 'yoga':
 	elseif $pantyworntype ! 'none':
 		'<center><video autoplay loop src="images/pc/activities/yoga_underwear.mp4"></video></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/pc/activities/yoga_naked<<rand(1,2)>>.jpg"></center>'
+		'<center><video autoplay loop src="images/pc/activities/yoga_naked.mp4"></video></center>'
 	end
 
 	'You spend <<$timestring>> minutes stretching and straining your muscles in various poses, improving your will and flexibility.'

+ 3 - 3
locations/foto_models.qsrc

@@ -481,7 +481,7 @@ if $ARGS[0] = 'mari_chat':
 					'Mari smiles at you. "That''s sounds nice."'
 					'You think of your siblings and smile. "Yeah. It is."'
 
-				elseif sisterLesb >= 5:
+				elseif sisterLesb >= 6:
                     '    "Yeah, I''ve got two. My sister who''s about the same age as you are and my adorable little brother. I love them both so much!"'
                     '    Mari smiles at you. "You sound close."'
                     '    Your mind wanders back to your sister and how you sometimes wake her up in the middle of the night to fool around with her. "You could say that..."'
@@ -491,13 +491,13 @@ if $ARGS[0] = 'mari_chat':
                     '    Mari smiles at you. "You sound close."'
                     '    You think of your siblings and smile, "Yeah. We are."'
 
-				elseif sisterLesb >= 5 and brotherSex < 7:
+				elseif sisterLesb >= 6 and brotherSex < 7:
 					'"Yeah, I''ve got two. My sister who''s about the same age as you are and my adorable little brother. I love them both so much!"'
 					'Mari smiles at you. "You sound close."'
 					'Your mind wanders back to your siblings and how you''ve fooled around with both of them separately.'
 					'"You could say that..."'
 
-				elseif sisterLesb >= 5:
+				elseif sisterLesb >= 6:
 					'"Yeah, I''ve got two. My sister who''s about the same age as you are and my adorable little brother. I love them both so much!"'
 					'Mari smiles at you. "You sound close."'
 					'Your mind wanders back to your siblings and how you''ve fooled around with your sister and even had full fledged intercourse with your brother. Your thoughts wander to the memory of the last time his cock was inside you and it causes you to blush.'

+ 6 - 4
locations/gaddvor.qsrc

@@ -71,13 +71,16 @@ if $ARGS[0]='':
 					'Armed with a shovel, you begin clearing the yard of snow. You''re pleased with yourself seeing the courtyard is free of snow. You return the shovel to the shed and continue on with your business.'
 				end
 				minut += 60
-				grandpaQW['chore_clean_yard'] = 0
-				grandmaQW['help_amount'] += 1
+				grandpaQW['chore_clean_yard'] = 2
 				if month >= 4 and month <= 10:
 					fat -= rand(1,3)
+					pcs_stam -= 5
+					gs 'sweat', 'add', 10
 				else
 					stren_exp += 1
 					fat -= rand(1,5)
+					pcs_stam -= 10
+					gs 'sweat', 'add', 5
 				end
 				gs'stat'
 
@@ -140,8 +143,7 @@ if $ARGS[0] = 'chickens':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/chickens2.jpg"></center>'
 			'You decide to feed the chickens. You pick up a bucket full of bird''s seed and grain mix and toss it on the ground. They immediately rush over and start to greedily eat. You watch them for a bit before you go about your business.'
 			minut += 30
-			grandmaQW['help_amount'] += 1
-			grandmaQW['chore_feed_chickens'] = 0
+			grandmaQW['chore_feed_chickens'] = 2
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 

+ 153 - 75
locations/gadfield.qsrc

@@ -44,14 +44,14 @@ if $ARGS[0] = 'field':
 	if flowerday ! daystart and grigory_flower = 10: gt 'grigory', 'flower6'
 	if flowerday ! daystart and grigory_flower > 10: gt 'grigory', 'flower8'
 	if hour >= 9 and hour <= 19 and week < 6:'Grandfather''s horse <a href="exec: gt ''gadfield'',''horse''">Desperado</a> is grazing the field.'
-	if hour >= 9 and hour <= 19 and grandpaQW['chore_herd_cattle'] = 0:'You see <a href="exec: gt ''gadfield'',''cow''">a herd of cows</a> in the middle of the field.'
-	if hour >= 6 and hour <= 20 and grandpaQW['chore_herd_cattle'] = 1:'You notice <a href="exec: gt ''gadfield'',''cow''">a herd of cows</a>.'
+	if hour >= 9 and hour <= 19 and grandpaQW['chore_herd_cattle'] = 0:'You notice a large <a href="exec: gt ''gadfield'',''cow''">herd of cows</a> in the middle of the field.'
+	if hour >= 6 and hour <= 20 and grandpaQW['chore_herd_cattle'] = 1:'You see the <a href="exec: gt ''gadfield'',''cow''">herd of cows</a> out in the middle of the field.'
 	if hour >= 7 and hour <= 20 and grandpaQW['chore_bale_hay'] = 1:'You see a crowd of people working on the field.'
 
 	act 'Head back to the road':minut += 10 & gt'gadroad'
 	
-	if hour >= 7 and hour <= 20 and grandpaQW['chore_bale_hay'] = 1:
-		act 'Go to the hayfield':
+	if hour >= 7 and hour <= 13 and grandpaQW['chore_bale_hay'] = 1:
+		act 'Spend the day helping to bale hay (6:00)':
 			gs 'food', 'm_meal'
 			*clr & cla
 			menu_off = 1
@@ -59,21 +59,16 @@ if $ARGS[0] = 'field':
 			if npc_rel['A60'] >= 15:
 				npc_rel['A60'] += 1
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/haying_time_mira.jpg"></center>'
-				'Most of the village has shown up to help out with the hay. You and Mira also partake in the activities. You are really enjoying yourself, especially considering you''re spending time, sitting on the fresh cut hay, talking to Mira.'
+				'Most of the village has shown up to help out with the hay. Mira is there too, and you both partake in the activities. You are really enjoying yourself, and working alongside Mira makes the day fly by. By the end of the day, you are both exhausted, but smiling.'
 			else
-				fat -= 5
-				stren_exp += 1
-				agil_exp += 1
-				vital_exp += 1
-				gs 'sweat', 'add', 20
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/haying_time.jpg"></center>'
-				'Almost all of the villagers have shown up to help out with the fresh cut hay. You decide to join them.'
+				'Almost all of the villagers have shown up to help out with the fresh cut hay. You spend most of the day working hard and sweating as you help gather the fresh-cut hay. It is difficult, but you get a great workout and end the day feeling exhausted, but quite satisfied.'
 			end
 
-			minut += 360
-			grandmaQW['help_amount'] += 1
-			grandpaQW['chore_bale_hay'] = 0
-			hndiwrk_exp += rand(0,2)
+			gs 'exercise', 'tier1', 360, 'stren_exp', 'vital_exp'
+			if sunWeather = 1:pcs_tan += 1
+			grandpaQW['chore_bale_hay'] = 2
+			hndiwrk_exp += rand(0,8)
 			gs 'stat'
 
 			act 'Continue':gt'gadfield','field'
@@ -129,7 +124,7 @@ if $ARGS[0] = 'cow':
 	temp = rand(1,5)
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow.jpg"></center>'
-	'The cow herd is standing in the middle of the field.'
+	'The cattle herd is standing in the middle of the field. Some of the cows are munching on grass, others are just staring idly around.'
 	if mira = 1: MiraLoc = 41 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is standing next to you.'
 
 	if grandpaQW['chore_herd_cattle'] = 0:act 'Leave them be':gt'gadfield','field'
@@ -140,7 +135,7 @@ if $ARGS[0] = 'cow':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_field.jpg"></center>'
 			'Seeing the cow herd on the field, you decide to help your grandfather bring the cows home...'
 			minut += 60
-			grandmaQW['help_amount'] += rand(0,1)
+			grandmaQW['help_amount'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -153,8 +148,8 @@ if $ARGS[0] = 'cow':
 				*clr & cla
 				menu_off = 1
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_wait.jpg"></center>'
-				if grandpaQW['chore_herd_cattle_experience'] = 0:'Some time flies by while waiting for the locals to finish their gathering.'
-				if grandpaQW['chore_herd_cattle_experience'] = 1:'Some time flies by while waiting for the locals and their children to finish their gathering.'
+				if grandpaQW['chore_herd_cattle_experience'] = 0:'Some time flies by while waiting for the locals to finish bringing their cows to the field.'
+				if grandpaQW['chore_herd_cattle_experience'] = 1:'Some time flies by while waiting for the locals and their children to finish bringing their cows to the field.'
 
 				if hour >= 9:minut += 20
 				if hour < 9:minut += 60
@@ -169,12 +164,20 @@ if $ARGS[0] = 'cow':
 				*clr & cla
 				menu_off = 1
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow'+rand(1,4)+'.jpg"></center>'
-				'You manage to herd all the cows within the hour. Instead of letting your grandfather do all the work, you roll up the sleeves and do most of the work.'
+				'You spend an hour herding the cows, watching out for any stragglers and driving them back to the herd. Instead of letting your grandfather do all the work, you roll up the sleeves and try to do most of the work yourself.'
 
 				minut += 60
-				if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
+				if temper >= 25 and sunWeather = 1:
+					pcs_hydra -= 12
+					pcs_stam -= 8
+					gs 'sweat', 'add', 10
+				else
+					pcs_hydra -= 6
+					gs 'sweat', 'add', 5
+					pcs_stam -= 5
+				end
 				grandpaQW['chore_herd_cattle_experience'] = 1
-				grandmaQW['help_amount'] += 1
+				if rand(0,1) = 1:grandmaQW['help_amount'] += rand(0,1)
 				hndiwrk_exp += rand(0,3)
 				gs 'stat'
 
@@ -186,7 +189,7 @@ if $ARGS[0] = 'cow':
 					*clr & cla
 					menu_off = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_run.jpg"></center>'
-					'Since you have nothing to do, you run intervals across the field for an hour.'
+					'Since the cows are all behaving, you decide to spend some time jogging around the field.'
 
 					frost = 0
 					minut += 60
@@ -194,7 +197,14 @@ if $ARGS[0] = 'cow':
 					run_exp += 1
 					gs 'sweat', 'add', 10
 					pcs_mood += 5
-					if temper >= 25 and sunWeather = 1:pcs_hydra -= 24
+					pcs_stam -= 8
+					if temper >= 25 and sunWeather = 1:
+						pcs_hydra -= 24
+						gs 'sweat', 'add', 12
+					else
+						pcs_hydra -= 18
+						gs 'sweat', 'add', 10
+					end
 					gs 'stat'
 
 					act 'Continue':gt'gadfield','cow'
@@ -205,11 +215,11 @@ if $ARGS[0] = 'cow':
 					*clr & cla
 					menu_off = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_sun.jpg"></center>'
-					'It''s really warm outside so you decide to sunbathe for an hour.'
+					'It''s sunny and warm outside, and since the cows are behaving, you decide to work on your tan for an hour.'
 					minut += 60
 					pcs_mood += 10
 					pcs_tan += 1
-					gs 'sweat', 'add', 10
+					gs 'sweat', 'add', 5
 					gs 'stat'
 
 					act 'Continue':gt'gadfield','cow'
@@ -219,7 +229,7 @@ if $ARGS[0] = 'cow':
 						*clr & cla
 						menu_off = 1
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_lying.jpg"></center>'
-						'You lie down on the grass and doze off for an hour.'
+						'You feel drowsy watching the cows stand around, so you lie down on the grass. You doze off and wake up about an hour later.'
 
 						minut += 60
 						pcs_mood += 10
@@ -234,12 +244,20 @@ if $ARGS[0] = 'cow':
 					*clr & cla
 					menu_off = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_flowers.jpg"></center>'
-					'You spend an hour wandering the field, picking flowers.'
+					'Keeping one eyes on the cattle, you spend an hour wandering the field, picking flowers.'
 					minut += 60
 					pcs_mood += 20
-					if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
+					pcs_stam -= 4
+					if temper >= 25 and sunWeather = 1:
+						pcs_hydra -= 8
+						gs 'sweat', 'add', 5
+					else
+						pcs_hydra -= 5
+						gs 'sweat', 'add', 3
+					end
 					gs 'stat'
 
+
 					act 'Continue':gt'gadfield','cow'
 				end
 				act 'Read a book (1:00)':
@@ -247,7 +265,7 @@ if $ARGS[0] = 'cow':
 					menu_off = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_book'+rand(1,2)+'.jpg"></center>'
 					minut += 60
-					if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
+					if temper >= 25 and sunWeather = 1:pcs_hydra -= 6
 					if pcs_nerd > 0:
 						lastread = totminut
 						lastreadday = daystart
@@ -272,9 +290,17 @@ if $ARGS[0] = 'cow':
 			*clr & cla
 			menu_off = 1
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_go.jpg"></center>'
-			'Looking at his watch, grandpa turns to you and says "The time is around lunchtime so it''s time to take the herd to the watering hole." You begin to gather the cows and lead them to the river.'
+			'Looking at his watch, Grandpa turns to you and says, "It''s about lunchtime, which means it''s time to take the herd to the watering hole." You begin to gather the cows and lead them to the river.'
 
-			if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
+			if temper >= 25 and sunWeather = 1:
+				pcs_hydra -= 12
+				pcs_stam -= 8
+				gs 'sweat', 'add', 10
+			else
+				pcs_hydra -= 6
+				gs 'sweat', 'add', 5
+				pcs_stam -= 5
+			end
 			grandmaQW['help_amount'] += 1
 			minut += 60
 			hndiwrk_exp += rand(0,3)
@@ -300,7 +326,7 @@ if grandpaQW['chore_herd_cattle'] = 1 and npc_rel['A60'] >= 15 and mira = 0 and
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/mira2.jpg"></center>'
 	'While keeping an eye on the cow herd, you see Mira in the distance, approaching. You happily wave to her.'
-	'" - Hi, <<$pcs_nickname>>. I wanted to visit you and brought water with me," she says nearing you. " - Have you missed me?"'
+	'"Hi, <<$pcs_nickname>>. I wanted to visit you and brought water with me," she says nearing you. "Have you missed me?"'
 	minut += 5
 	npc_rel['A60'] += 1
 	mira = 1
@@ -324,10 +350,10 @@ if $ARGS[0] = 'cow2':
 	'<center><H4>River</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_river.jpg"></center>'
 
-	'The cow herd is standing by the river.'
+	'The cattle herd is near the river. Some of the cows are munching on grass, some are drinking from the river, and some are just standing or lying around.'
 
 	if mira = 1: MiraLoc = 42 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is sitting next to you.'
-	if temper >= 15 and sunWeather = 1:'- "You can go for a swim while there is time, <<$pcs_nickname>>. I''ll keep an eye on the herd," said your grandfather.'
+	if temper >= 15 and sunWeather = 1:'"You can go for a swim if you want, <<$pcs_nickname>>. I''ll keep an eye on the herd," says your grandfather.'
 
 	if grandpaQW['chore_herd_cattle'] = 1:
 		if hour < 16:
@@ -335,11 +361,20 @@ if $ARGS[0] = 'cow2':
 				*clr & cla
 				menu_off = 1
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow'+rand(1,4)+'.jpg"></center>'
-				'You manage to herd all the cows within the hour. Instead of letting your grandfather do all the work, you roll up the sleeves and do most of the work.'
+				'You spend an hour herding the cows, watching out for any stragglers and driving them back to the herd. Instead of letting your grandfather do all the work, you roll up the sleeves and try to do most of the work yourself.'
+
 				minut += 60
-				if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
-				grandmaQW['help_amount'] += 1
+				if temper >= 25 and sunWeather = 1:
+					pcs_hydra -= 12
+					pcs_stam -= 8
+					gs 'sweat', 'add', 10
+				else
+					pcs_hydra -= 6
+					gs 'sweat', 'add', 5
+					pcs_stam -= 5
+				end
 				grandpaQW['chore_herd_cattle_experience'] = 1
+				if rand(0,1) = 1:grandmaQW['help_amount'] += rand(0,1)
 				hndiwrk_exp += rand(0,3)
 				gs 'stat'
 
@@ -350,11 +385,11 @@ if $ARGS[0] = 'cow2':
 					*clr & cla
 					menu_off = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_river.jpg"></center>'
-					'You take a quick swim, cooling off your body.'
+					'You spend a few minutes spashing around in the river, which feels cool and refreshing.'
 					if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 					minut += 15
 					cumspclnt = 4 & gs 'cum_cleanup'
-					pcs_sweat = 10 + rand(0,4)
+					pcs_stam -= 3
 					pcs_mood += 5
 					if willday_swim ! daystart: willday_swim = daystart & pcs_willpwr += 1
 					if pcs_stren < 30:stren_exp += 1
@@ -366,7 +401,7 @@ if $ARGS[0] = 'cow2':
 					*clr & cla
 					menu_off = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_sun.jpg"></center>'
-					'You lie down to sunbathe, while grandpa looks after the herd.'
+					'You lie down to sunbathe by the river, while Grandpa looks after the herd.'
 					minut += 30
 					gs 'sweat', 'add', 10
 					pcs_mood += 5
@@ -405,10 +440,19 @@ if $ARGS[0] = 'cow2':
 			*clr & cla
 			menu_off = 1
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_go.jpg"></center>'
-			'Looking at his watch, grandpa says that it''s time to drive the herd back on the field, but now closer to the forest. The two of you begin to gather the scattered herd and head toward the forest.'
-			grandmaQW['help_amount'] += 1
-			if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
+			'Looking at his watch, Grandpa says that it''s time to drive the herd over near the forest. The two of you begin to gather the herd and drive them toward the forest.'
+			
 			minut += 60
+			if temper >= 25 and sunWeather = 1:
+				pcs_hydra -= 12
+				pcs_stam -= 8
+				gs 'sweat', 'add', 10
+			else
+				pcs_hydra -= 6
+				gs 'sweat', 'add', 5
+				pcs_stam -= 5
+			end
+			if rand(0,1) = 1:grandmaQW['help_amount'] += rand(0,1)
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -432,7 +476,7 @@ if $ARGS[0] = 'cow3':
 	'<center><H4>Field near the forest</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_forest.jpg"></center>'
 
-	'The cow herd is standing on a field near the forest.'
+	'The cattle herd is grazing in a field near the forest.'
 
 	if mira = 1: MiraLoc = 43 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is sitting next to you.'
 
@@ -442,81 +486,107 @@ if $ARGS[0] = 'cow3':
 				*clr & cla
 				menu_off = 1
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow'+rand(1,4)+'.jpg"></center>'
-				'You manage to herd all the cows within the hour. Instead of letting your grandfather do all the work, you roll up the sleeves and do most of the work.'
+				'You spend an hour herding the cows, watching out for any stragglers and driving them back to the herd. Instead of letting your grandfather do all the work, you roll up the sleeves and try to do most of the work yourself.'
+
 				minut += 60
-				if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
-				grandmaQW['help_amount'] += 1
+				if temper >= 25 and sunWeather = 1:
+					pcs_hydra -= 12
+					pcs_stam -= 8
+					gs 'sweat', 'add', 10
+				else
+					pcs_hydra -= 6
+					gs 'sweat', 'add', 5
+					pcs_stam -= 5
+				end
 				grandpaQW['chore_herd_cattle_experience'] = 1
+				if rand(0,1) = 1:grandmaQW['help_amount'] += rand(0,1)
 				hndiwrk_exp += rand(0,3)
 				gs 'stat'
 
 				act 'Continue':gt'gadfield','cow3'
 			end
 			if mira = 0:
-				act 'Take a run (1:00)':
+				act 'Take a run on the field (1:00)':
 					*clr & cla
 					menu_off = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_run.jpg"></center>'
-					'Since you have nothing to do, you run intervals across the field for an hour.'
+					'Since the cows are all behaving, you decide to spend some time jogging around the field.'
+
 					frost = 0
 					minut += 60
 					fat -= 5
 					run_exp += 1
 					gs 'sweat', 'add', 10
 					pcs_mood += 5
-					if temper >= 25 and sunWeather = 1:pcs_hydra -= 24
+					pcs_stam -= 8
+					if temper >= 25 and sunWeather = 1:
+						pcs_hydra -= 24
+						gs 'sweat', 'add', 12
+					else
+						pcs_hydra -= 18
+						gs 'sweat', 'add', 10
+					end
 					gs 'stat'
 
-					act 'Continue':gt'gadfield','cow3'
+					act 'Continue':gt'gadfield','cow'
 				end
 			end
 			if temper >= 15 and sunWeather = 1 and mira = 0:
-				act 'Pick flowers (1:00)':
-					*clr & cla
-					menu_off = 1
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_flowers.jpg"></center>'
-					'You spent an hour wandering around the field, picking flowers.'
-					minut += 60
-					pcs_mood += 20
-					if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
-					gs 'stat'
-
-					act 'Continue':gt'gadfield','cow3'
-				end
 				act 'Tan (1:00)':
 					*clr & cla
 					menu_off = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_sun.jpg"></center>'
-					'You sunbathe for an hour.'
+					'It''s sunny and warm outside, and since the cows are behaving, you decide to work on your tan for an hour.'
 					minut += 60
 					pcs_mood += 10
 					pcs_tan += 1
-					gs 'sweat', 'add', 10
+					gs 'sweat', 'add', 5
 					gs 'stat'
 
-					act 'Continue':gt'gadfield','cow3'
+					act 'Continue':gt'gadfield','cow'
 				end
 				if pcs_sleep < 40:
-					act 'Nap on the grass (1:00)':
+					act 'Take a nap (1:00)':
 						*clr & cla
 						menu_off = 1
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_lying.jpg"></center>'
-						'You lie down on the grass and doze off for an hour.'
+						'You feel drowsy watching the cows stand around, so you lie down on the grass. You doze off and wake up about an hour later.'
+
 						minut += 60
 						pcs_mood += 10
 						pcs_sleep+= 9
 						if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
 						gs 'stat'
 
-						act 'Continue':gt'gadfield','cow3'
+						act 'Continue':gt'gadfield','cow'
 					end
 				end
+				act 'Pick flowers (1:00)':
+					*clr & cla
+					menu_off = 1
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_flowers.jpg"></center>'
+					'Keeping one eyes on the cattle, you spend an hour wandering the field, picking flowers.'
+					minut += 60
+					pcs_mood += 20
+					pcs_stam -= 4
+					if temper >= 25 and sunWeather = 1:
+						pcs_hydra -= 8
+						gs 'sweat', 'add', 5
+					else
+						pcs_hydra -= 5
+						gs 'sweat', 'add', 3
+					end
+					gs 'stat'
+
+
+					act 'Continue':gt'gadfield','cow'
+				end
 				act 'Read a book (1:00)':
 					*clr & cla
 					menu_off = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_book'+rand(1,2)+'.jpg"></center>'
 					minut += 60
-					if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
+					if temper >= 25 and sunWeather = 1:pcs_hydra -= 6
 					if pcs_nerd > 0:
 						lastread = totminut
 						lastreadday = daystart
@@ -525,7 +595,7 @@ if $ARGS[0] = 'cow3':
 						pcs_mood = 100
 						if pcs_stren > 1: stren_deg -= 1
 						if pcs_vital > 5: vital_deg -= 1
-						'You start reading a book you brought with you. You are so engrossed in the story you forget about the time.'
+						 'You start reading a book you brought with you. You are so engrossed in the story you forget about the time.'
 					else
 						blizoruk += 1
 						pcs_mood += 10
@@ -542,13 +612,21 @@ if $ARGS[0] = 'cow3':
 			menu_off = 1
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_go_home.jpg"></center>'
-			'Looking at his watch, grandpa says that it is late and time to drive the herd home. You hurry and gather up the cows and drive them towards the village.'
+			'As sunset approaches, Grandpa says that it is late and time to drive the herd home. You hurry and gather up the cows and drive them back towards the village.'
 
-			if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
+			if temper >= 25 and sunWeather = 1:
+				pcs_hydra -= 12
+				pcs_stam -= 8
+				gs 'sweat', 'add', 10
+			else
+				pcs_hydra -= 6
+				gs 'sweat', 'add', 5
+				pcs_stam -= 5
+			end
 			minut += 60
 			mira = 0
 			grandpaQW['chore_herd_cattle'] = 0
-			grandmaQW['help_amount'] += 1
+			grandmaQW['help_amount'] += 2
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 

+ 5 - 10
locations/gadgarden.qsrc

@@ -43,8 +43,7 @@ if $ARGS[0] = 'garden':
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			grandmaQW['chore_work_in_garden'] = 0
-			grandmaQW['help_amount'] += 3
+			grandmaQW['chore_work_in_garden'] = 2
 			stren_exp += 1
 			fat -= rand(1,5)
 			hndiwrk_exp += rand(3,9)
@@ -63,8 +62,7 @@ if $ARGS[0] = 'garden':
 			menu_off = 1
 			gs 'sweat', 'add', 10
 			minut += 60
-			grandmaQW['chore_water_garden'] = 0
-			grandmaQW['help_amount'] += 1
+			grandmaQW['chore_water_garden'] = 2
 			vital_exp += 1
 			fat -= rand(1,2)
 			hndiwrk_exp += rand(0,3)
@@ -83,8 +81,7 @@ if $ARGS[0] = 'garden':
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			grandmaQW['chore_harvest_garden'] = 0
-			grandmaQW['help_amount'] += 3
+			grandmaQW['chore_harvest_garden'] = 2
 			stren_exp += 1
 			fat -= rand(1,3)
 			hndiwrk_exp += rand(3,9)
@@ -153,8 +150,7 @@ if $ARGS[0] = 'strawberry':
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			grandmaQW['chore_collect_strawberries'] = 0
-			grandmaQW['help_amount'] += 5
+			grandmaQW['chore_collect_strawberries'] = 2
 			agil_exp += 1
 			fat -= 1
 			hndiwrk_exp += rand(3,9)
@@ -219,8 +215,7 @@ if $ARGS[0] = 'fruit_garden':
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			grandmaQW['chore_collect_fruit'] = 0
-			grandmaQW['help_amount'] += 5
+			grandmaQW['chore_collect_fruit'] = 2
 			agil_exp += 1
 			fat -= rand(1,3)
 			hndiwrk_exp += rand(3,9)

+ 743 - 85
locations/gadhouse.qsrc

@@ -6,19 +6,33 @@
 !! -------------------------
 !! grandmaQW['chore_type']						Variable for storage of the rand() that picks which chore to assign.
 !!
-!! grandmaQW['chore_clean_floor']				0/1 - is the "clean the floor" quest active?
-!! grandmaQW['chore_collect_fruit']				0/1 - is the "collect fruit" quest active?
-!! grandmaQW['chore_collect_strawberries']		0/1 - is the "collect strawberries" quest active?
-!! grandmaQW['chore_feed_chickens']				0/1 - is the "feed the chickens" quest active?
-!! grandmaQW['chore_harvest_garden']			0/1 - is the "harvest veggies from the garden" quest active?
-!! grandmaQW['chore_milk_cow']					0/1 - is the "milk the cow" quest active?
-!! grandmaQW['chore_wash_clothes']				0/1 - is the "wash Grandpa's clothes" quest active?
-!! grandmaQW['chore_water_garden']				0/1 - is the "water the garden" quest active?
-!! grandmaQW['chore_work_in_garden']			0/1 - is the "work in the garden" quest active?
-!! 
+!! For all of the Grandma chores where 0/1/2/3 are possible values:
+!! 0 = not active
+!! 1 = assigned but not done yet
+!! 2 = done but not turned in/reported yet
+!! 3 = not done in time, triggers Grandma disappointment. cikl takes any chore in state 1 or 2 and turns it into state 3.
+!!
+!! grandmaQW['chore_clean_floor']				0/1/2/3 - is the "clean the floor" quest active?
+!! grandmaQW['chore_collect_fruit']				0/1/2/3 - is the "collect fruit" quest active?
+!! grandmaQW['chore_collect_strawberries']		0/1/2/3 - is the "collect strawberries" quest active?
+!! grandmaQW['chore_feed_chickens']				0/1/2/3 - is the "feed the chickens" quest active?
+!! grandmaQW['chore_harvest_garden']			0/1/2/3 - is the "harvest veggies from the garden" quest active?
+!! grandmaQW['chore_milk_cow']					0/1/2/3 - is the "milk the cow" quest active?
+!! grandmaQW['chore_wash_clothes']				0/1/2/3 - is the "wash Grandpa's clothes" quest active?
+!! grandmaQW['chore_water_garden']				0/1/2/3 - is the "water the garden" quest active?
+!! grandmaQW['chore_work_in_garden']			0/1/2/3 - is the "work in the garden" quest active?
+!! grandmaQW['chore_mushrooms_given']			How many kg of mushrooms has Sveta collected for Grandma? Used with chore_can_mushrooms.
+!! grandmaQW['chore_berries_given']				How many kg of berries has Sveta collected for Grandma? Used with chore_can_berries.
+!! grandmaQW['chore_harvest_done']				Has Sveta harvested veggies from the garden? Used with chore_can_veggies.
+!! grandmaQW['chore_gather_mushrooms']			0/1/2/3 - is the "gather mushrooms" quest active?
+!! grandmaQW['chore_gather_berries']			0/1/2/3 - is the "gather berries" quest active?
+!! grandmaQW['chore_gather_both']				0/1/2/3 - is the "gather mushrooms and berries" quest active?
+!! grandmaQW['chore_mushroom_quantity']			How many kg of mushrooms does Grandma want?
+!! grandmaQW['chore_berry_quantity']			How many kg of berries does Grandma want?
+
 !! Other Variables - Grandma
 !! -------------------------
-!! grandmaQW['help_amount']						Semi-abstract representation of how helpful Sveta has been. Longer, more arduous tasks get more points.
+!! grandmaQW['help_amount']						Semi-abstract representation of how helpful Sveta has been. Longer, more arduous tasks get more points. Affects monthly allowance.
 !! grandmaQW['last_day_asked_for_story']		The most recent day Sveta asked Grandma to tell her a story. Checked against daystart (i.e. was it today?)
 !! grandmaQW['last_day_helped']					The most recent day Sveta asked Grandma if she could help her with anything.
 !! grandmaQW['last_day_talked']					The most recent day Sveta chatted with Grandma.
@@ -26,7 +40,8 @@
 !! grandmaQW['last_month_paid']					The most recent month Grandma paid Sveta for her help (i.e. was it the current month?)
 !! grandmaQW['nudity_trouble']					Semi-abstract representation of how annoyed Grandma is by Svetas exhibitionism. At 10 she reprimands Sveta (no effect).
 !! grandmaQW['talked_about_gadukino']			0/1 - has Sveta asked Grandma about Gadukino? Makes the "Ask about Gadukino" option a one-time thing.
-!! 
+!! grandmaQW['disappointment']					0/1 - marks if you failed a chore and Grandma is disappointed in you. Causes a lecture and -1 to help_amount
+!!
 !! ------------------------------------------------------------------------ 
 !! 
 !! Quest Variables - Grandpa
@@ -35,6 +50,7 @@
 !! 
 !! grandpaQW['chore_bale_hay']					0/1 - is the "bale hay in the field" quest active?
 !! grandpaQW['chore_bathe_horse']				0/1 - is the "bathe the horse in the river" quest active?
+!! grandpaQW['chore_bathe_horse_prog']			0/1/2 - progress of "bathe the horse in the river" quest
 !! grandpaQW['chore_brush_horse']				0/1 - is the "brush the horse" quest active?
 !! grandpaQW['chore_clean_yard']				0/1 - is the "clean the yard" quest active?
 !! grandpaQW['chore_feed_boar']					0/1 - is the "feed the pig" quest active?
@@ -46,9 +62,11 @@
 !! grandpaQW['chore_lead_cow_to_field']			0/1 - is the "just take the cow to the field and drop it off there" quest active?
 !! grandpaQW['chore_lead_horse_to_field']		0/1 - is the "take the horse to the field" quest active?
 !! 
-!! grandpaQW['chore_gather_from_forest']		Variable storage for the type of "gather mushrooms/berries from the forest" quest. Possible values: '', 'mushroom', 'berry', 'both'
-!! grandpaQW['chore_mushroom_quantity']			How many kg of mushrooms does Grandpa want? Used with chore_gather_from_forest.
-!! grandpaQW['chore_berry_quantity']			How many kg of berries does Grandpa want? Used with chore_gather_from_forest.
+!! grandpaQW['chore_gather_mushrooms']			0/1 - is the "gather mushrooms" quest active?
+!! grandpaQW['chore_gather_berries']			0/1 - is the "gather berries" quest active?
+!! grandpaQW['chore_gather_both']				0/1 - is the "gather mushrooms and berries" quest active?
+!! grandpaQW['chore_mushroom_quantity']			How many kg of mushrooms does Grandpa want?
+!! grandpaQW['chore_berry_quantity']			How many kg of berries does Grandpa want?
 !! 
 !! 
 !! Other Variables - Grandpa
@@ -57,6 +75,7 @@
 !! grandpaQW['last_day_talked']					The most recent day Sveta chatted with Grandpa.
 !! grandpaQW['last_hour_talked']				The most recent hour Sveta chatted with Grandpa. Checked against hour, allows for several chats through the day.
 !! grandpaQW['talked_about_forest']				0/1 - has Sveta asked Grandpa about the forest? Makes the "Ask about forest" option a one-time thing.
+!! grandmaQW['disappointment']					0/1 - marks if you failed a chore and Grandpa is disappointed in you. Causes a lecture and -1 to help_amount
 !!
 !! VARIABLE LIST FOR GRANDPARENTS AND THEIR CHORES - END
 
@@ -103,61 +122,6 @@ if $ARGS[0] = 'start':
 		grandmaQW['help_amount'] = 0
 		act 'Continue': gt 'gadhouse', 'start'
 
-	elseif $grandpaQW['chore_gather_from_forest'] = 'mushroom' and boletus >= grandpaQW['chore_mushroom_quantity'] and hour >= 6 and hour < 22:
-		*clr & cla
-		grandmaQW['help_amount'] += 1
-		boletus -= grandpaQW['chore_mushroom_quantity']
-		minut += 5
-		$grandpaQW['chore_gather_from_forest'] = ''
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
-		'Upon entering the house you immediately walk up to grandpa.'
-		'"Grandpa, here are the mushrooms!"'
-		'"Thank you <<$pcs_nickname>>, you''ve made an old man very happy," your grandfather replies with a smile. "The mushrooms are in a part of the forest that is difficult to reach."'
-		'"I can still go and gather more mushrooms, if you want?"'
-		'"There''s no need <<$pcs_nickname>>." - said your grandpa. "But if I need some help, I''ll be sure to let you know."'
-		'You kiss your grandfather on the cheek and get on with your day.'
-
-		act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & gt 'gadhouse', 'start'
-
-	elseif $grandpaQW['chore_gather_from_forest'] = 'both' and boletus >= grandpaQW['chore_mushroom_quantity'] and bilberry >= grandpaQW['chore_berry_quantity'] and hour >= 6 and hour < 22:
-		*clr & cla
-		grandmaQW['help_amount'] += 1
-		boletus -= grandpaQW['chore_mushroom_quantity']
-		bilberry -= grandpaQW['chore_berry_quantity']
-		minut += 5
-		$grandpaQW['chore_gather_from_forest'] = ''
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
-		'Upon entering the house you immediately walk up to grandpa.'
-		'"Grandpa, here are the mushrooms and berries!"'
-		'"Oh, thank you <<$pcs_nickname>>." you grandpa replied.'
-		'"If you want, I can go out for an another run."'
-		'"You don''t need to do that <<$pcs_nickname>>," your grandpa said. "But I''ll be sure to let you know if something comes up."'
-		'You give your grandpa a smooch on the cheek and go on with your day.'
-
-		act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
-
-	elseif $grandpaQW['chore_gather_from_forest'] = 'berry' and bilberry >= grandpaQW['chore_berry_quantity'] and hour >= 6 and hour < 22:
-		*clr & cla
-		grandmaQW['help_amount'] += 1
-		bilberry -= grandpaQW['chore_berry_quantity']
-		minut += 5
-		$grandpaQW['chore_gather_from_forest'] = ''
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
-		'Upon entering the house you immediately walk up to grandpa.'
-		'"Grandpa, here are the berries!"'
-		'"Oh, thank you, nicely done," grandpa replied. "It''s hard for your grandmother to gather the berries, and the berries are needed so she can make jam for the winter."'
-		'"If you need some more berries I''ll be glad to go out and gather some more."'
-		'"There''s no need <<$pcs_nickname>>," your grandpa said. "But if your grandma need some more berries, I''ll let you know."'
-		'You kiss your grandfather on the cheek, you go on with your business.'
-
-		act 'Continue': grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
-
 	elseif mira_temp = 1 and hour >= 9 and hour <= 19 and npc_rel['A60'] >= 15 and Mira_no = 0 and sunWeather = 0 and mira_guestday ! daystart and (npc_QW['A63'] < 13 or miragopQW >= 10 or mirasex > 1):
 		*clr & cla
 		mira_guestday = daystart
@@ -269,7 +233,7 @@ if $ARGS[0] = 'main':
 		if staygad ! daystart and home_owned[2] = 1: gs 'gadukino_event', 'go_home'
 	end
 
-	 if $clothingworntype ! 'nude':
+	if $clothingworntype ! 'nude':
 		act 'Go outside':minut += 1 & gt 'gaddvor'
 	elseif $clothingworntype = 'nude':
 		act 'Go outside naked':
@@ -279,7 +243,7 @@ if $ARGS[0] = 'main':
 			inhib_exp += rand(0,2)
 			grandmaQW['nudity_trouble'] += rand(1,3)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
-			'It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in almost getting caught'
+			'It''s certainly risky leaving the house like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in almost getting caught'
 			gs 'arousal', 'flash', 10, 'exhibitionism'
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -304,8 +268,7 @@ if $ARGS[0] = 'main':
 		act 'Clean the floor for Grandma (1:00)':
 			*clr & cla
 			minut += 60
-			grandmaQW['chore_clean_floor'] = 0
-			grandmaQW['help_amount'] += 1
+			grandmaQW['chore_clean_floor'] = 2
 			gs'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
@@ -319,14 +282,13 @@ if $ARGS[0] = 'main':
 		act 'Wash Grandpa''s clothes for Grandma (1:00)':
 			*clr & cla
 			minut += 60
-			grandmaQW['chore_wash_clothes'] = 0
-			grandmaQW['help_amount'] += 1
+			grandmaQW['chore_wash_clothes'] = 2
 			gs'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
 			'You pick up your grandfather''s dirty clothes and take them with you outside, where you soak them in the metal basin for an hour.'
 			
-			act 'Hang the Laundry':
+			act 'Hang the laundry':
 				*clr & cla
 				minut += 10
 				gs'stat'
@@ -337,7 +299,9 @@ if $ARGS[0] = 'main':
 			end    
 		end
 	end
-
+	
+	if (hour >= 6 and hour < 10) or (hour >= 12 and hour < 20): act 'Talk to Grandma':gt 'gadhouse','grandma'
+	if (hour >= 6 and hour < 13) or (hour >= 15 and hour < 20): act 'Talk to Grandpa':gt 'gadhouse','grandpa'
 	act 'Prepare a full meal (0:30)':gs 'food', 'm_meal'
 	act 'Prepare a light meal (0:25)':gs 'food', 's_meal'
 	act 'Have a snack (0:15)':gs 'food', 'snack'
@@ -401,6 +365,30 @@ if $ARGS[0] = 'main':
 end
 
 if $ARGS[0] = 'grandma':
+	!!Grandma is disappointed in you for failing to do a chore you promised
+	if grandmaQW['disappointment'] = 1:
+		*clr & cla
+		menu_off = 1
+		minut += 5
+		gs 'stat'
+		grandmaQW['disappointment'] = 0
+		grandmaQW['help_amount'] -= 1
+		pcs_mood -= 5
+		
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+		'Grandma frowns at you as you approach her. "<<$pcs_nickname>>, you said you would help me yesterday, and you did not."'
+		'You cringe a little as you remember what you told her you would do. "I''m sorry Grandma, I forgot all about it..."'
+		'"I am an old woman, child. It is difficult for me to do many of the things I once could. But I can still do them if I know I have to."'
+		'You look at the ground, feeling guilty, as she continues: "But it is even harder for me if I expected help and did not receive it."'
+		'"Sorry, Grandma," you mumble again.'
+		'She softens a little, finally. "It''s okay child," she says. "But it makes it harder for me to give you your allowance for sweets if you cannot follow through on your promises."'
+		'"Yes, ma''am," you nod.'
+		'"All right child," she says, patting your shoulder softly. "Go on now, I am sure you have things to do."'
+		
+		act 'Continue':gt 'gadhouse', 'start'
+		exit
+	end
+	
 	*clr & cla
 	menu_off = 1
 	minut += 2
@@ -416,11 +404,387 @@ if $ARGS[0] = 'grandma':
 		act 'Maybe you should get dressed before talking to her':gt 'gadhouse', 'start'
 	else
 		act 'Leave her alone':gt 'gadhouse', 'start'
+
+		if grandmaQW['chore_can_mushrooms'] = 1:
+			act 'Help Grandma can mushrooms (2:00)':
+				*clr & cla
+				minut += 45
+				gs'stat'
+
+				grandmaQW['chore_mushrooms_given'] -= 6
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_mushrooms.jpg"></center>'
+				'You tell Grandma you are ready to help her can mushrooms now.'
+				'She smiles and gives you a basket of mushrooms. You spend a while cleaning them, washing them, and cutting them up, in preparation for canning.'
+				act 'Continue':
+					*clr & cla
+					minut += 60
+					gs'stat'
+
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canning.jpg"></center>'
+					'Once they are prepared, you help put them in glass jars. Once they are all ready, Grandma places the jars in her canner and boils them for an hour.'
+					act 'Continue':
+						*clr & cla
+						minut += 15
+						gs'stat'
+						
+						grandmaQW['chore_can_mushrooms'] = 0
+						grandmaQW['help_amount'] += 2
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_mushrooms.jpg"></center>'
+						'Finally, you help Grandma take them out of the canner and set them aside to cool.'
+						'"Thank you, <<$pcs_nickname>>," she says. "It is important to save food up for the hard winter months. Sure, now you can just walk to the store and get whatever you want, but it wasn''t always that way!"'
+						act 'Finish':gt 'gadhouse','start'
+					end
+				end
+			end
+		end
+
+		if grandmaQW['chore_can_berries'] = 1:
+			act 'Help Grandma can berries (2:00)':
+				*clr & cla
+				minut += 45
+				gs'stat'
+
+				grandmaQW['chore_berries_given'] -= 5
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_berries.jpg"></center>'
+				'Grandma gives you a basket of berries and you spend a while cleaning them, removing stems, and picking out any shriveled or bad ones.'
+				act 'Continue':
+					*clr & cla
+					minut += 60
+					gs'stat'
+
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canning.jpg"></center>'
+					'Once they are prepared, you help pour them into glass jars. Once they are all ready, Grandma places the jars in her canner and boils them for an hour.'
+					act 'Continue':
+						*clr & cla
+						minut += 15
+						gs'stat'
+
+						grandmaQW['chore_can_berries'] = 0
+						grandmaQW['help_amount'] += 2
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_berries.jpg"></center>'
+						'Finally, you help Grandma take them out of the canner and set them aside to cool.'
+						'"There, now we will have berries for the winter," she says. "I think your grandfather could live off of these berries alone! He will be very grateful that you helped me."'
+						act 'Finish':gt 'gadhouse','start'
+					end
+				end
+			end
+		end
+		
+		if grandmaQW['chore_can_veggies'] = 1:
+			act 'Help Grandma can veggies (3:00)':
+				*clr & cla
+				minut += 75
+				gs'stat'
+
+				grandmaQW['chore_harvest_done'] = 0
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_veggies.jpg"></center>'
+				'You and Grandma spend some time sorting out all of the different vegetables from the garden. Once they are sorted you begin cleaning them, cutting them up, removing stems and leaves, and preparing them for canning.'
+				act 'Continue':
+					*clr & cla
+					minut += 90
+					gs'stat'
+
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canning.jpg"></center>'
+					'It is a tedious process, but eventually you finish, and help Grandma put them all in jars. You stand by while she boils the jars, helping her remove them from the canner when needed and replacing them with others.'
+					act 'Continue':
+						*clr & cla
+						minut += 15
+						gs'stat'
+
+						grandmaQW['chore_can_veggies'] = 0
+						grandmaQW['help_amount'] += 3
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_veggies.jpg"></center>'
+						'Finally, you help Grandma take the last of the jars out of the canner and set them aside to cool.'
+						'"You know <<$pcs_nickname>>, if you know how to can your own food, you can survive years of poor harvests," she says.'
+						'"Your grandfather and I had many hard times when we were younger, but saving our crops when we could kept us from starving to death in the bad times. You would do well to remember that, young lady!"'
+						act 'Finish':gt 'gadhouse','start'
+					end
+				end
+			end
+		end
+
 		
 		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to her about the flowers': gt 'grigory', 'flower4'
 
+	!! ask for chore from Grandma
 		if grandmaQW['last_day_helped'] ! daystart: act 'Offer to help out': grandmaQW['last_day_helped'] = daystart & gt'grandmahelp', 'start'
 
+	!!---------------------- turning in grandma chores START
+
+		if grandmaQW['chore_clean_floor'] = 2:
+			act 'Tell her you cleaned the floor':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 2
+				grandmaQW['chore_clean_floor'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'"Grandma, the floors are all clean!" you say proudly.'
+				'"Thank you child," your grandmother says, "You have saved my hands and knees a great deal of aching."'
+				'You give her a warm smile and continue on with your day.'
+				
+				act 'Continue': gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_wash_clothes'] = 2:
+			act 'Tell her you washed the clothes':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 2
+				grandmaQW['chore_wash_clothes'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'"Grandma, I finished washing Grandpa''s dirty clothes," you tell her.'
+				'"Thank you <<$pcs_nickname>>. I have no idea how that man gets so dirty!"'
+				'You and your grandmother share a laugh, and you give her a hug before moving on.'
+				
+				act 'Continue': gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_milk_cow'] = 2:
+			act 'Tell her you milked the cow':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 2
+				grandmaQW['chore_milk_cow'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'"Grandma, I milked Dawn and put the milk away," you tell her.'
+				'"Thank you <<$pcs_nickname>>. She''s such a sweet thing, isn''t she?" your grandmother asks fondly.'
+				'"Um, yes, she is very nice for a cow," you say, smiling. "She''s the nicest cow I know."'
+				'Grandma nods sagely at that, and you grin and continue on with your day.'
+				
+				act 'Continue': gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_groceries'] = 2:
+			act 'Give her the groceries':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 2
+				grandmaQW['chore_groceries'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'You show Grandma your sacks of groceries and tell her the grocer will be by later.'
+				'"Thank you <<$pcs_nickname>>. He''s a nice young man. I''ve known him since he was a child, you know."'
+				'"Yes he''s very nice," you say, "but where do you want me to put this stuff?"'
+				'"Oh yes, yes," she says, as if she forgot you were standing there with arms full of groceries. "Just put them in the kitchen, little one, I will put them away in a minute."'
+				'You lug the bags into the kitchen and heft them up on the table, before coming back to Grandma.'
+				'"Anything else you need, Grandma?" you ask.'
+				'"No, that is all, <<$pcs_nickname>>," she says, and gives you a gentle pat on the back.'
+				
+				act 'Continue': gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_feed_chickens'] = 2:
+			act 'Tell her you fed the chickens':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 2
+				grandmaQW['chore_feed_chickens'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'"I fed the chickens, Grandma," you tell her.'
+				'"Good, thank you, <<$pcs_nickname>>," she says. "A fat chicken is a happy chicken, and happy chickens lay the best eggs."'
+				'She nods to herself as if she had said something very wise.'
+				'"Um, well, I''m happy to help, Grandma," you say, and give her a quick hug.'
+				
+				act 'Continue': gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_work_in_garden'] = 2:
+			act 'Tell her you worked in the garden':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 4
+				grandmaQW['chore_work_in_garden'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'"I finished working in the garden, Grandma."'
+				'"Good, thank you, <<$pcs_nickname>>," she says. "Did you pull out all the weeds?"'
+				'"Yes I did," you say, "and I watered all the plants, and I checked for pests, and everything."'
+				'"Good, good," she nods. "It is very important to take care of your garden, <<$pcs_nickname>>. It is how we provide for ourselves when no one else will."'
+				'You nod at her advice, and she smiles.'
+				'"You know, you remind me very much of your mother," she says. "She and Luda were always talking about the garden when they were your age."'
+				if npc_QW['A29'] < 2:
+					'"Really?" you ask, trying to picture your mother working in the old garden.'
+					'"Oh yes, yes," Grandma says. "Your mother especially. Every day Natasha would say, ''Luda, Luda, I have to go to the garden,'' and Luda would say, ''But sister, you were just in the garden yesterday!''"'
+					'She purses her lips for a moment and continues, "She wasn''t very good at gardening though, I''m afraid. As much time as she seemed to spend there, I would still find weeds and pests all the time."'
+				else
+					'You struggle to contain your laughter. "Oh yeah, <<$npc_nickname[''A29'']>> has told me all about the ''garden'', Grandma. Like mother, like daughter, I guess!"'
+					'Grandma nods. "Yes, I suppose that is true. She wasn''t much of a gardener though - I always found weeds and pests, no matter how much time she spent there."'
+				end
+				'You grin to yourself, thinking of how <<$npc_nickname[''A29'']>> must have been at your age.'
+				'"Anyway," she continues, "thank you for doing that for me, <<$pcs_nickname>>. My old bones complain when I do it."'
+				'She gives you a peck on the cheek and sends you on your way.'
+				
+				act 'Continue': gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_water_garden'] = 2:
+			act 'Tell her you watered the garden':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 2
+				grandmaQW['chore_water_garden'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'"I watered all the plants in the garden, Grandma," you tell her.'
+				'"Thank you, <<$pcs_nickname>>," she says. "A healthy plant is always thirsty. You should have some water too, if you want to be a healthy girl."'
+				'"Maybe I will. Is there anything else you need?"'
+				'"No, sweet child. That is enough for today," she says, and gives you a gentle pat on the arm.'
+				
+				act 'Continue': gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_collect_strawberries'] = 2:
+			act 'Give her the strawberries you picked':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 2
+				grandmaQW['chore_collect_strawberries'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'You walk up to Grandma and give her the basket of strawberries.'
+				'"I picked all the strawberries I could find, Grandma," you say.'
+				'"Oh <<$pcs_nickname>>," she exclaims, "don''t these just look wonderful? They are plump and juicy this year."'
+				'You smile and say, "They taste pretty good too!"'
+				'Your grandmother gives you a rueful look and says, "I don''t remember asking you to eat the strawberries, child."'
+				'She cannot hold the charade, though, and breaks into a smile. "I never could resist eating a few fresh off the plant either."'
+				
+				act 'Continue': gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_collect_fruit'] = 2:
+			act 'Give her the fruit you collected':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 2
+				grandmaQW['chore_collect_fruit'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'You walk up to Grandma and give her the basket of fruit.'
+				'"I gathered all the fruits I could reach," you say.'
+				'"Thank you, <<$pcs_nickname>>," she says. "I cannot reach or bend like I used to, so you have done me a great favor."'
+				'You smile and hug your grandmother, and go on about your day.'
+				
+				act 'Continue': gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_harvest_garden'] = 2:
+			act 'Give her the vegetables from the garden':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 2
+				grandmaQW['chore_harvest_garden'] = 0
+				grandmaQW['chore_harvest_done'] = 1
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'You bring the baskets of vegetables from the garden into the kitchen and set them on the table, then go back to your grandmother.'
+				'"I think I got everything I could out of the garden, Grandma," you tell her. "There was so much!"'
+				'"Yes child," she says. "We have been blessed with a healthy garden this year. There were many times in the past we were not so lucky."'
+				'Your smile falters a bit, unsure of how to take that.'
+				'"Oh don''t worry yourself, little <<$pcs_nickname>>," she says, cupping your cheek with her hand. "Forgive an old woman of her wistful ways. We are lucky to have such a kind granddaughter to help us bring in the harvest."'
+				'You place your youthful hand over her wizened old one and smile at her. "I am happy to help, Grandma. Is there anything else you need?"'
+				'"No, child, you have done more than your fair share today. Soon we will have to preserve these vegetables to keep them from spoiling, but for now you can rest."'
+				
+				act 'Continue': gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_gather_mushrooms'] = 2 and boletus >= grandmaQW['chore_mushroom_quantity'] and hour >= 6 and hour < 20:
+			act 'Give Grandma the mushrooms she asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 3
+				boletus -= grandmaQW['chore_mushroom_quantity']
+				grandmaQW['chore_mushrooms_given'] += grandmaQW['chore_mushroom_quantity']
+				minut += 5
+				grandmaQW['chore_gather_mushrooms'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'You bring the basket of mushrooms to your grandmother and say, "Grandma, here are the mushrooms you wanted!"'
+				'She smiles and takes them from you. "Thank you my sweet girl."'
+				'"Do you think that will be enough?"'
+				'She laughs. "Oh, with your grandfather around, it is never enough!"'
+				'"I can get more, if you want me to."'
+				'"No need for that, little one," she clucks. "You''ve done enough for one day."'
+				'You give her a quick hug in response, and carry on.'
+				
+				act 'Continue': grandmaQW['chore_mushroom_quantity'] = 0 & gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_gather_berries'] = 2 and bilberry >= grandmaQW['chore_berry_quantity'] and hour >= 6 and hour < 20:
+			act 'Give Grandma the berries she asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 3
+				bilberry -= grandmaQW['chore_berry_quantity']
+				grandmaQW['chore_berries_given'] += grandmaQW['chore_berry_quantity']
+				minut += 5
+				grandmaQW['chore_gather_berries'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'You walk over to Grandma and set the heavy basket of berries on the ground next to her.'
+				'"Grandma, I got all the berries!"'
+				'"Oh, thank you, <<$pcs_nickname>>," Grandma replied. "Those look perfect. Be a dear and set them in the kitchen, please?"'
+				'You heft the basket up and carry it in the kitchen. Walking back over to Grandma, you ask, "Do you think that will be enough for the winter?"'
+				'"Oh no dear," your Grandma says, "the winter is long and cold and you must gather as much as you can, while you can."'
+				'Seeing the dismayed look on your face, she adds, "But that is enough for today! I know it is harder work than it seems. You can rest now, child."'
+				'Relieved, you give your grandmother a peck on the cheek and move on.'
+
+				act 'Continue': grandmaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'grandma'
+			end
+		end
+
+		if grandmaQW['chore_gather_both'] = 2 and boletus >= grandmaQW['chore_mushroom_quantity'] and bilberry >= grandmaQW['chore_berry_quantity'] and hour >= 6 and hour < 20:
+			act 'Give Grandma the mushrooms and berries she asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 3
+				boletus -= grandmaQW['chore_mushroom_quantity']
+				bilberry -= grandmaQW['chore_berry_quantity']
+				grandmaQW['chore_mushrooms_given'] += grandmaQW['chore_mushroom_quantity']
+				grandmaQW['chore_berries_given'] += grandmaQW['chore_berry_quantity']
+				minut += 5
+				grandmaQW['chore_gather_both'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'You bring your basket, heavy with mushrooms and berries from the forest, over to your grandmother.'
+				'"Grandma, here are the mushrooms and berries, just like you asked!"'
+				'"Oh, thank you very much, <<$pcs_nickname>>," your Grandma replied.'
+				'"Do I need to go out on another run, or do you think that''s enough?"'
+				'"Well, little one," your Grandma says, "There is a difference between enough, and enough for today."'
+				'"Oh..." you say, unsure of what to make of her response.'
+				'She smiles gently and pats your head. "You''ve done enough for today, child."'
+				'You smile back awkwardly, still a little unsure, but give your Grandma a smooch on the cheek and go on with your day.'
+
+				act 'Continue': grandmaQW['chore_mushroom_quantity'] = 0 & grandmaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'grandma'
+			end
+		end
+
+	!!---------------------- turning in grandma chores END
+
 		if grandmaQW['talked_about_gadukino'] = 0:
 			act 'Ask about the village (0:10)':
 				*clr & cla
@@ -531,6 +895,35 @@ if $ARGS[0] = 'grandma':
 end
 
 if $ARGS[0]='grandpa':
+
+	!!Grandpa is disappointed in you for failing to do a chore you promised
+	if grandpaQW['disappointment'] = 1:
+		*clr & cla
+		menu_off = 1
+		minut += 5
+		gs 'stat'
+		grandpaQW['disappointment'] = 0
+		grandmaQW['help_amount'] -= 1
+		pcs_mood -= 5
+		
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa.jpg"></center>'
+		'Your grandfather scowls at you as you approach him.'
+		'<br>"<<$pcs_firstname>>. I am disappointed in you," he says flatly.'
+		'"What? Why?" you ask, taken aback a bit by his demeanor.'
+		'"Yesterday I asked you to help me, and you agreed. And here we are, today, and I find that you did not."'
+		'"Oh n-no, Grandpa," you stutter, "I forgot all about it! I''m sorry!"'
+		'"Quiet, child. I wasn''t done speaking. You promised to help and did not, which means you lied."'
+		'<br>You stare at him, crestfallen.'
+		'<br>"And I don''t want your apologies. A <<$pcs_lastname>> keeps their word, or their word is worth nothing."'
+		'Your eyes tear up a bit as your grandfather berates you. "Yes, sir," you mumble quietly.'
+		'"I would rather you tell me flat-out if you do not want to help, <<$pcs_firstname>>. At least that makes you honest, even if lazy."'
+		'"Grandpa, I honestly just forg-" you begin, but he cuts you off.'
+		'"Hush, child. I don''t care for excuses. Now go on, some of us have work to do."'
+		'<br>You silently turn and walk away, feeling guilty.'
+		
+		act 'Continue':gt 'gadhouse', 'start'
+		exit
+	end
 	*clr & cla
 	menu_off = 1
 	minut += 2
@@ -549,16 +942,281 @@ if $ARGS[0]='grandpa':
 		
 		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to him about the flowers': gt 'grigory', 'flower3'
 
-		if $grandpaQW['chore_gather_from_forest'] = 'mushroom':
-			'You promise to bring grandpa <<grandpaQW[''chore_mushroom_quantity'']>> kg of mushrooms.'
-		elseif $grandpaQW['chore_gather_from_forest'] = 'berry':
-			'You promise to bring grandpa <<grandpaQW[''chore_berry_quantity'']>> kg of berries.'
-		elseif $grandpaQW['chore_gather_from_forest'] = 'both':
-			'You promise to bring grandpa <<grandpaQW[''chore_mushroom_quantity'']>> kg mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kg of berries.'
+		if grandpaQW['chore_gather_mushrooms'] = 1:
+			'You promised to bring grandpa <<grandpaQW[''chore_mushroom_quantity'']>> kg of mushrooms.'
+		elseif grandpaQW['chore_gather_berries'] = 1:
+			'You promised to bring grandpa <<grandpaQW[''chore_berry_quantity'']>> kg of berries.'
+		elseif grandpaQW['chore_gather_both'] = 1:
+			'You promised to bring grandpa <<grandpaQW[''chore_mushroom_quantity'']>> kg mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kg of berries.'
 		end
 
-
+	!! ask for chore from Grandpa
 		if grandpaQW['last_day_helped'] ! daystart:act 'Offer to help':grandpaQW['last_day_helped'] = daystart & gt'grandpahelp', 'start'
+
+	!!---------------------- turning in grandpa chores START
+
+		if grandpaQW['chore_fetch_firewood'] = 2:
+			act 'Tell him you got the firewood':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 5
+				grandpaQW['chore_fetch_firewood'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'"I''ve brought in some firewood, Grandpa," you say to your grandfather.'
+				'"Thank you very much, <<$pcs_nickname>>," he replies with a smile. "Just set down it over there."'
+				'You put down the heavy wood gratefully. "Is there anything else you need?"'
+				'"No, that is all I have for you today," he says.'
+
+				act 'Continue': gt 'gadhouse', 'grandpa'
+			end
+		end
+
+		if grandpaQW['chore_feed_horse'] = 2:
+			act 'Tell him you fed Desperado':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 5
+				grandpaQW['chore_feed_horse'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'"I fed the horse, Grandpa."'
+				'"Thank you <<$pcs_nickname>>," he says. "It is very important to make sure a horse is well fed. They are hard workers and deserve their meals."'
+				'You smile in agreement. "I am sure Desperado is a very hard worker."'
+				'"He may not be the young stallion he once was," your grandfather says, "but he is a trusted friend."'
+				'He obviously cares a great deal about his horse.'
+
+				act 'Continue': gt 'gadhouse', 'grandpa'
+			end
+		end
+
+		if grandpaQW['chore_feed_cow'] = 2:
+			act 'Tell him you fed Dawn':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 5
+				grandpaQW['chore_feed_cow'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'You tell your grandfather, "I fed Dawn her hay, Grandpa."'
+				'"Very good, <<$pcs_nickname>>," he says. "I presume she acted like we were starving her to death?"'
+				'"Well, she was definitely excited," you say with a laugh.'
+				'"She always is when it comes to eating," he says.'
+
+				act 'Continue': gt 'gadhouse', 'grandpa'
+			end
+		end
+
+		if grandpaQW['chore_clean_yard'] = 2:
+			act 'Tell him you cleaned up the yard':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 5
+				grandpaQW['chore_clean_yard'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'"I finished cleaning the yard, Grandpa," you say as you stretch your sore arms.'
+				'"Very good," he says. "It is more work than it seems, isn''t it?"'
+				'"Yes sir, it is," you agree. "Is there anything else you need me to do?"'
+				'"No, that is all for today, <<$pcs_nickname>>."'
+
+				act 'Continue': gt 'gadhouse', 'grandpa'
+			end
+		end
+
+		if grandpaQW['chore_brush_horse'] = 2:
+			act 'Tell him you finished grooming Desperado':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 5
+				grandpaQW['chore_brush_horse'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'"I brushed the horse, Grandpa," you tell your grandfather.'
+				'"You scrubbed him down with the curry brush?" he asks.'
+				'"Yes sir, I did," you say.'
+				'"Even his belly?"'
+				'"Yes, even his belly."'
+				'"And did you wash his face and comb his mane and tail?"'
+				'"Ugh, yes Grandpa, I did everything just like you showed me when I was a kid."'
+				'"Don''t sass me, <<$pcs_firstname>>," you grandfather says with a scowl. "Properly brushing a horse is very important for their health."'
+				'The rebuke stings a little. "Sorry, Grandpa."'
+				'His face softens when he sees he upset you. "...No, child, I''m sorry. You did me a favor and here I am berating you for it. Thank you for brushing the horse, <<$pcs_nickname>>."'
+				'"It''s okay Grandpa. I know Desperado is important to you," you say.'
+				'He smiles and rubs your shoulder. "Thank you again. You may rest now, there is nothing else to do today."'
+
+				act 'Continue': gt 'gadhouse', 'grandpa'
+			end
+		end
+
+		if grandpaQW['chore_feed_boar'] = 2:
+			act 'Tell him you fed Nickle':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 5
+				grandpaQW['chore_feed_boar'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'You walk up to your grandfather and tell him, "I fed the pig, Grandpa."'
+				'"Thank you <<$pcs_nickname>>," he says.'
+				'"You''re welcome! Is there anything else you need?"'
+				'"No, you can take the rest of the day off, granddaughter."'
+
+				act 'Continue': gt 'gadhouse', 'grandpa'
+			end
+		end
+
+		if grandpaQW['chore_lead_horse_to_field'] = 2:
+			act 'Tell him you took Desperado to the field':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 5
+				grandpaQW['chore_lead_horse_to_field'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'"Hey Grandpa, I took Desperado out to the field."'
+				'"Good, good," he says. "Horses need freedom to run."'
+				'You nod. "He seemed pretty happy to be able to run around."'
+				'Your grandfather smiles at that. "Thank you <<$pcs_nickname>>. You can rest for now."'
+
+				act 'Continue': gt 'gadhouse', 'grandpa'
+			end
+		end
+
+		if grandpaQW['chore_lead_cow_to_field'] = 2:
+			act 'Tell him you took Dawn to the field':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 5
+				grandpaQW['chore_lead_cow_to_field'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'"Hi Grandpa!" you say. "I took Dawn out to the field."'
+				'"Were the others there?" he asks.'
+				'You nod. "Yes, sir. I asked them to drive her home later - they seemed fine with that."'
+				'"Yes, here in the country we all must help one another. Soon it will be our turn to watch the cattle."'
+				'"All of them? For the whole village? Just us?" you ask incredulously.'
+				'"No child, there will be a few others with us. But don''t look so surprised - it does not take many people to herd cows."'
+				'You think of the stories you have heard of a few herders driving thousands of cattle. "Hmm, I guess that''s true..."'
+				'Your grandfather smiles and ruffles your hair. "But that is not a problem for today. Go and take the rest of the day off."'
+
+				act 'Continue': gt 'gadhouse', 'grandpa'
+			end
+		end
+
+		if grandpaQW['chore_bathe_horse'] = 2:
+			act 'Tell him you bathed Desperado':
+				*clr & cla
+				grandmaQW['help_amount'] += 2
+				minut += 5
+				grandpaQW['chore_bathe_horse'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'You walk up to your grandfather and tell him, "I gave Desperado a bath in the river, Grandpa."'
+				'"Thank you <<$pcs_nickname>>," he says. "Grooming him is all well and good, but sometimes it''s not enough."'
+				'"You''re welcome! It was actually a lot of fun. Is there anything else you need?"'
+				'"No, you can take the rest of the day off, granddaughter."'
+
+				act 'Continue': gt 'gadhouse', 'grandpa'
+			end
+		end
+
+		if grandpaQW['chore_gather_mushrooms'] = 2 and boletus >= grandpaQW['chore_mushroom_quantity'] and hour >= 6 and hour < 20:
+			act 'Give him the mushrooms he asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 3
+				boletus -= grandpaQW['chore_mushroom_quantity']
+				minut += 5
+				grandpaQW['chore_gather_mushrooms'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'You walk up to Grandpa with your basket.'
+				'"Grandpa, here are the mushrooms!"'
+				'"Thank you <<$pcs_nickname>>, you''ve made an old man very happy," your grandfather replies with a smile. "The mushrooms are in a part of the forest that is difficult to reach."'
+				'"I can still go and gather more mushrooms, if you want?"'
+				'"There''s no need <<$pcs_nickname>>," said your grandfather. "But if I need some help, I''ll be sure to let you know."'
+				'You kiss your grandfather on the cheek and get on with your day.'
+
+				act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & gt 'gadhouse', 'start'
+			end
+		end
+		
+		if grandpaQW['chore_gather_berries'] = 2 and bilberry >= grandpaQW['chore_berry_quantity'] and hour >= 6 and hour < 20:
+			act 'Give him the berries he asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 3
+				bilberry -= grandpaQW['chore_berry_quantity']
+				minut += 5
+				grandpaQW['chore_gather_berries'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'You walk up to Grandpa with your basket.'
+				'"Grandpa, here are the berries!"'
+				'"Oh, thank you, nicely done," Grandpa replied. "It''s hard for your grandmother to gather the berries, and she needs them so she can make jam for the winter."'
+				'"If you need some more berries I''ll be glad to go out and gather more."'
+				'"There''s no need <<$pcs_nickname>>," your grandfather said. "But if your grandma needs some more berries, I''ll let you know."'
+				'You kiss your grandfather on the cheek, you go on with your business.'
+
+				act 'Continue': grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
+			end
+		end
+
+		if grandpaQW['chore_gather_both'] = 2 and boletus >= grandpaQW['chore_mushroom_quantity'] and bilberry >= grandpaQW['chore_berry_quantity'] and hour >= 6 and hour < 20:
+			act 'Give him the mushrooms and berries he asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 3
+				boletus -= grandpaQW['chore_mushroom_quantity']
+				bilberry -= grandpaQW['chore_berry_quantity']
+				minut += 5
+				grandpaQW['chore_gather_both'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'You walk up to Grandpa with your basket.'
+				'"Grandpa, here are the mushrooms and berries!"'
+				'"Oh, thank you <<$pcs_nickname>>," your grandfather replied.'
+				'"If you want, I can go out for another run."'
+				'"You don''t need to do that, <<$pcs_nickname>>," your grandfather said. "But I''ll be sure to let you know if something comes up."'
+				'You give him a smooch on the cheek and go on with your day.'
+
+				act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
+			end
+		end
+		
+		if grandpaQW['chore_bale_hay'] = 2:
+			act 'Tell him you helped the townspeople bale hay':
+				*clr & cla
+				grandmaQW['help_amount'] += 3
+				minut += 5
+				grandpaQW['chore_bale_hay'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'"I spent all day helping with the hay, Grandpa," you tell him, stretching your sore muscles.'
+				'He smiles proudly at you and says, "Yes, I was there too, <<$pcs_nickname>>. I saw you working hard."'
+				'"That was a lot of work!" you exclaim. "I''m completely exhausted."'
+				'"Yes, yes it is," he says. "I am worn out myself. I won''t be able to do it much longer, but you are still young and strong. I am very proud that my granddaughter is such a hard worker."'
+				'Maybe it''s just the exhaustion, but your eyes tear up slightly at that. Your grandfather is usually pretty sparing with his praise.'
+				'"Thank you, Grandpa," you say, giving him a tight hug, which he returns with surprising strength for his age.'
+				'After a few moments he lets go, and tells you, "Go and get some rest, child. You have earned it."'
+
+				act 'Continue': gt 'gadhouse', 'grandpa'
+			end
+		end
+
+	!!---------------------- turning in grandpa chores END
+
 		if grandpaQW['talked_about_forest'] = 0:
 			act 'Ask about the forest (0:10)':
 				*clr & cla

+ 18 - 0
locations/gadmarket.qsrc

@@ -42,6 +42,24 @@ killvar '$gadmarkettab'
 gs 'stat'
 
 act 'Leave the market': minut += 5 & gt 'gadukino'
+if grandmaQW['chore_groceries'] = 1:
+	act 'Gather the things on Grandma''s list (0:30)':
+		*clr & cla
+		minut += 30
+		gs 'stat'
+		
+		grandmaQW['chore_groceries'] = 2
+		grandmaQW['help_amount'] += 1
+		
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/market.jpg"></center>'
+		'You take out the list Grandma gave you and begin browsing the shelves for the items she needs. After about half an hour you have gotten everything on the list.'
+		*nl
+		'You take your basket of goods up to the teller and explain that you are getting these things for your grandmother.'
+		'"Of course! Go ahead and take these on home to her. Tell her I will be by this evening to pick up her payment. I know it''s hard for her to get out any more..."'
+		
+		act 'Thank him and take the groceries back to the house (0:15)':minut += 15 & gt 'gadhouse','start'
+	end
+end
 
 --- gadmarket ---------------------------------
 

+ 6 - 8
locations/gadriver.qsrc

@@ -498,7 +498,7 @@ if $ARGS[0] = 'gadbitch':
 				end
 			end
 		end
-		if grandpaQW['chore_bathe_horse'] = 2:
+		if grandpaQW['chore_bathe_horse_prog'] = 1:
 			act 'Look at Desperado':
 				*clr & cla
 				
@@ -516,8 +516,7 @@ if $ARGS[0] = 'gadbitch':
 						pcs_mood += 5
 						if pcs_inhib < 50 or $clothingworntype = 'nude': inhib_exp += rand(1,3)
 						hndiwrk_exp += rand(1,3)
-						grandmaQW['help_amount'] += 1
-						grandpaQW['chore_bathe_horse'] = 3
+						grandpaQW['chore_bathe_horse_prog'] = 2
 						gs 'stat'
 						
 						if $clothingworntype = 'nude':
@@ -546,8 +545,7 @@ if $ARGS[0] = 'gadbitch':
 							pcs_mood += 5
 							if pcs_inhib < 50 or $clothingworntype = 'nude': inhib_exp += rand(1,3)
 							hndiwrk_exp += rand(1,3)
-							grandmaQW['help_amount'] += 1
-							grandpaQW['chore_bathe_horse'] = 3
+							grandpaQW['chore_bathe_horse_prog'] = 2
 							gs 'stat'
 							
 							if $clothingworntype = 'nude':
@@ -573,7 +571,7 @@ if $ARGS[0] = 'gadbitch':
 				end
 			end
 		end
-		if grandpaQW['chore_bathe_horse'] = 3:
+		if grandpaQW['chore_bathe_horse_prog'] = 2:
 			act 'Lead Desperado back home':
 				if $clothingworntype = 'swimwear':
 					cla
@@ -586,8 +584,8 @@ if $ARGS[0] = 'gadbitch':
 				else
 					minut += 30
 					hndiwrk_exp += rand(0,3)
-					grandmaQW['help_amount'] += rand(0,1)
-					grandpaQW['chore_bathe_horse'] = 0
+					grandpaQW['chore_bathe_horse'] = 2
+					grandpaQW['chore_bathe_horse_prog'] = 0
 					gs 'stat'
 					
 					gt'gadsarai'

+ 25 - 33
locations/gadsarai.qsrc

@@ -49,22 +49,20 @@ if $ARGS[0] = '':
 	act 'Go back to the yard':minut += 1 & gt 'gaddvor'
 	
 	if grandpaQW['chore_fetch_firewood'] = 1:
-		act 'Fetch firewood for Grandpa (0:20)':
+		act 'Gather firewood for Grandpa (0:10)':
 			*clr & cla
 			if month >= 4 and month <= 10:
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood.jpg"></center>'
 			else
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood_winter.jpg"></center>'
 			end
-			'You decide to grab the firewood that your grandfather asked for, loading up as much as you can carry and walking back to the house.'
-			'"I''ve brought some firewood grandfather," you said to your grandfather.'
-			'"Thank you very much, <<$pcs_nickname>>," he replies with a smile. "There is no more work for today."'
-			grandpaQW['chore_fetch_firewood'] = 0
-			minut += 20
+			'You decide to grab the firewood that your grandfather asked for, loading up as much as you can carry.'
+			grandpaQW['chore_fetch_firewood'] = 2
+			minut += 10
 			grandmaQW['help_amount'] += 1
 			gs'stat'
 
-			act 'Continue':gt 'gadhouse', 'start'
+			act 'Continue':gt 'gadsarai'
 		end
 	end
 	
@@ -182,22 +180,21 @@ if $ARGS[0] = 'boar':
 
 	'<center><H4>The barn</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/boar.jpg"></center>'
-	'One of your grandparents dearest possessions, the boar Nickle.'
+	'One of your grandparents'' dearest possessions: the boar, Nickle.'
 
 	act 'Leave':minut += 5 & gt 'gadsarai'
 
 	if grandpaQW['chore_feed_boar'] = 1:
-		act 'Feed the boar':
+		act 'Feed the hog':
 			cla
 			*clr
 			minut += 30
-			grandmaQW['help_amount'] += 1
-			grandpaQW['chore_feed_boar'] = 0
+			grandpaQW['chore_feed_boar'] = 2
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_boar.jpg"></center>'
-			'You fed Nickle and went on about your business.'
+			'You grab the feed bag and fill Nickle''s trough. You stand there and watch for a few minutes as he eats like a... well, like a pig.'
 
 			act 'Finish':gt 'gadsarai','boar'
 		end
@@ -220,15 +217,14 @@ if $ARGS[0] = 'cow':
 			cla
 			*clr
 			minut += 30
-			grandmaQW['chore_milk_cow'] = 0
-			grandmaQW['help_amount'] += 1
+			grandmaQW['chore_milk_cow'] = 2
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/milk_cow.jpg"></center>'
 			'You start milking Dawn, improving for each time you do it.'
 
-			act 'Finish':gt 'gadsarai','cow'
+			act 'Continue':gt 'gadsarai','cow'
 		end
 	end
 	if grandpaQW['chore_feed_cow'] = 1:
@@ -236,15 +232,14 @@ if $ARGS[0] = 'cow':
 			cla
 			*clr
 			minut += 30
-			grandpaQW['chore_feed_cow'] = 0
-			grandmaQW['help_amount'] += 1
+			grandpaQW['chore_feed_cow'] = 2
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_cow.jpg"></center>'
-			'You fed Dawn and continued on with your day.'
+			'Dawn is obviously excited about feeding time, shaking her head and doing little cow tippy-taps with her feet. You dump a sizable amount of hay in her trough and watch as she digs in.'
 
-			act 'Finish':gt 'gadsarai','cow'
+			act 'Continue':gt 'gadsarai','cow'
 		end
 	end
 	if grandpaQW['chore_lead_cow_to_field'] = 1 or grandpaQW['chore_herd_cattle'] = 1:
@@ -252,14 +247,13 @@ if $ARGS[0] = 'cow':
 			cla
 			*clr
 			minut += 60
-			grandmaQW['help_amount'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_field.jpg"></center>'
 			if grandpaQW['chore_lead_cow_to_field'] = 1:
 				'You lead Dawn to the field, where you let the shepherds take over.'
-				grandpaQW['chore_lead_cow_to_field'] = 0
+				grandpaQW['chore_lead_cow_to_field'] = 2
 			end
 			if grandpaQW['chore_herd_cattle'] = 1:'You lead Dawn to the field, where you grandfather awaits you. It''s his turn to keep an eye on the cows.'
 
@@ -284,15 +278,15 @@ if $ARGS[0] = 'horse':
 			cla
 			*clr
 			minut += 30
-			grandpaQW['chore_feed_horse'] = 0
-			grandmaQW['help_amount'] += 1
+			grandpaQW['chore_feed_horse'] = 2
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_horse.jpg"></center>'
-			'You fed Desperado and went on about your business.'
+			'You grab a sack of grain and fill Desperado''s feed bucket. You hang the bucket from his stall and gently pat his nose as he begins to eat.'
+			'You watch him eat for a little while before moving on.'
 
-			act 'Finish':gt 'gadsarai','horse'
+			act 'Continue':gt 'gadsarai','horse'
 		end
 	end
 	if grandpaQW['chore_lead_horse_to_field'] = 1:
@@ -300,13 +294,12 @@ if $ARGS[0] = 'horse':
 			cla
 			*clr
 			minut += 60
-			grandpaQW['chore_lead_horse_to_field'] = 0
-			grandmaQW['help_amount'] += 1
+			grandpaQW['chore_lead_horse_to_field'] = 2
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
-			'You took Desperado by the bridle and led it to the field. There, you let it run free in the paddock area, and went on with your business.'
+			'You take Desperado by the bridle and lead him to the field. There, you let him free in the paddock area, and watch him run about for a bit before moving on.'
 
 			act 'Continue':gt'gadfield','field'
 		end
@@ -316,12 +309,12 @@ if $ARGS[0] = 'horse':
 			cla
 			*clr
 			minut += 30
-			grandpaQW['chore_bathe_horse'] = 2
+			grandpaQW['chore_bathe_horse_prog'] = 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
-			'You took Desperado by the bridle and led it to the river.'
+			'You take Desperado by the bridle and lead him to the river.'
 
 			act 'Continue':gt'gadriver', 'gadbitch'
 		end
@@ -331,13 +324,12 @@ if $ARGS[0] = 'horse':
 			cla
 			*clr
 			minut += 60
-			grandpaQW['chore_brush_horse'] = 0
-			grandmaQW['help_amount'] += 1
+			grandpaQW['chore_brush_horse'] = 2
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/comb_horse.jpg"></center>'
-			'You groom Desperado for an hour. When finished, you''re satisfied with the result. Desperado is looking as healthy as ever.'
+			'You spend about an hour cleaning and brushing Desperado, scrubbing his coat and brushing his mane and tail. You are satisfied with the result - he is looking as clean and healthy as ever.'
 
 			act 'Continue':gt 'gadsarai','horse'
 		end

+ 28 - 8
locations/gaptek.qsrc

@@ -117,6 +117,11 @@ end
 if $ARGS[0] = 'buy_condoms':
 	menu_off = 1
 	*clr & cla
+	if gaptek_timers['condom'] = daystart:
+		gt 'gaptek', 'start'
+	else
+		gaptek_timers['condom'] = daystart
+	end
 	gs 'stat'
 	'<center><B><font color="maroon">Pharmacy</font></B></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_aunt_1.jpg"></center>'
@@ -124,7 +129,7 @@ if $ARGS[0] = 'buy_condoms':
 	'"Hi <<$pcs_nickname>>, are you looking for something?"'
 	if gaptekfirstcondom = 0:
 		gaptekfirstcondom = 1
-		minut += 5
+		minut += 2
 		if pav_slut > 75:
 			'You take a deep breath and say: "Erm... yes aunt. I need some ''stuff''," putting extra emphasis on the word, while looking at the condoms.'
 			'"What you mean is condoms so you can have sex with boys." She says with a smile.'
@@ -146,7 +151,7 @@ if $ARGS[0] = 'buy_condoms':
 			'Your aunt gives you a odd smile. "You might be surprised dear, but anyways I promise this is our little secret." Reassured she won''t tell your <<$npc_nickname[''A29'']>>, you pick out the things you need, after that she rings up your purchase and hands you the bag. "Here you go <<$pcs_nickname>>. Don''t use them all at once!" She adds with a wink, you just take your purchase.'
 		end
 	else
-		minut += rand(5, 15)
+		minut += rand(2, 5)
 		'You wait until the last customer leaves the pharmacy, and quickly dart over to the counter.'
 		if pcs_inhib < 50:
 			'"Hi Aunt Luda, I need some more condoms." You tell her slightly blushing.'
@@ -165,6 +170,11 @@ end
 if $ARGS[0] = 'buy_birth_control':
 	menu_off = 1
 	*clr & cla
+	if gaptek_timers['birth_control'] = daystart:
+		gt 'gaptek', 'start'
+	else
+		gaptek_timers['birth_control'] = daystart
+	end
 	gs 'stat'
 	'<center><B><font color="maroon">Pharmacy</font></B></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_aunt_1.jpg"></center>'
@@ -172,7 +182,7 @@ if $ARGS[0] = 'buy_birth_control':
 	'"Hi <<$pcs_nickname>>, are you looking for something?"'
 	if gaptekfirstbirthcontrol = 0:
 		gaptekfirstbirthcontrol = 1
-		minut += 5
+		minut += 2
 		if pav_slut > 75:
 			'You take a deep breath and say: "Erm... yes aunt. I need some ''stuff''," putting extra emphasis on the word, while looking at the birth control pills.'
 			'"What you mean is birth control pills so you can have sex with boys, without using a condom." She says with a smile.'
@@ -194,7 +204,7 @@ if $ARGS[0] = 'buy_birth_control':
 			'Your aunt gives you a odd smile. "You might be surprised dear, but anyways I promise this is our little secret." Reassured she won''t tell your <<$npc_nickname[''A29'']>>, you pick out the things you need, after that she rings up your purchase and hands you the bag. "Here you go <<$pcs_nickname>>. Don''t use it all at once!" She adds with a wink, you just take your purchase.'
 		end
 	else
-		minut += rand(5, 15)
+		minut += rand(2, 5)
 		'You wait until the last customer leaves the pharmacy, and quickly dart over to the counter.'
 		if pcs_inhib < 50:
 			'"Hi Aunt Luda, I need some more birth control pills." You say as your face heats up.'
@@ -217,6 +227,11 @@ end
 if $ARGS[0] = 'buy_preg_test':
 	menu_off = 1
 	*clr & cla
+	if gaptek_timers['preg_test'] = daystart:
+		gt 'gaptek', 'start'
+	else
+		gaptek_timers['preg_test'] = daystart
+	end
 	gs 'stat'
 	'<center><B><font color="maroon">Pharmacy</font></B></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_aunt_1.jpg"></center>'
@@ -224,7 +239,7 @@ if $ARGS[0] = 'buy_preg_test':
 	'"Hi <<$pcs_nickname>>, are you looking for something?"'
 	if gaptekfirstpregtest = 0:
 		gaptekfirstpregtest = 1
-		minut += 5
+		minut += 2
 		prezikcount += 5
 		if pav_slut > 75:
 			'You take a deep breath and say: "Erm... yes aunt. I need some ''stuff''," putting extra emphasis on the word, while looking at the pregnancy tests.'
@@ -250,7 +265,7 @@ if $ARGS[0] = 'buy_preg_test':
 		'You gulp, nodding and taking the bag. "Thank you, Aunt Luda."'
 		'"No problem <<$pcs_nickname>>, but do try to be careful okay?"'
 	else
-		minut += rand(5, 15)
+		minut += rand(2, 5)
 		prezikcount += 5
 		if pcs_inhib < 50:
 			'"Hi Aunt Luda, I need another pregnancy test." You tell her slightly blushing.'
@@ -269,6 +284,11 @@ end
 if $ARGS[0] = 'buy_lube':
 	menu_off = 1
 	*clr & cla
+	if gaptek_timers['lube'] = daystart:
+		gt 'gaptek', 'start'
+	else
+		gaptek_timers['lube'] = daystart
+	end
 	gs 'stat'
 	'<center><B><font color="maroon">Pharmacy</font></B></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_aunt_1.jpg"></center>'
@@ -276,7 +296,7 @@ if $ARGS[0] = 'buy_lube':
 	'"Hi <<$pcs_nickname>>, are you looking for something?"'
 	if gaptekfirstlube = 0:
 		gaptekfirstlube = 1
-		minut += 5
+		minut += 2
 		if pav_slut > 75:
 			'You pretend to look at the goods positioned on the shelves, while you consider how to best approach your aunt. Your aunt notices you staring at the shelves, and comes from behind the counter when she''s done helping her last customer.'
 			'"Hi <<$pcs_nickname>>, are you looking for something?"'
@@ -303,7 +323,7 @@ if $ARGS[0] = 'buy_lube':
 			'Your aunt gives you a odd smile. "You might be surprised dear, but anyways I promise this is our little secret." Reassured she won''t tell your <<$npc_nickname[''A29'']>>, you pick out the things you need, after that she rings up your purchase and hands you the bag. "Here you go <<$pcs_nickname>>. Don''t use it all at once!" She adds with a wink, you just take your purchase.'
 		end
 	else
-		minut += rand(5, 15)
+		minut += rand(2, 5)
 		'You wait until the last customer leaves the pharmacy, and quickly dart over to the counter.'
 		if pcs_inhib < 50:
 			'"Hi Aunt Luda, I need some more lube." You tell her slightly blushing.'

+ 229 - 26
locations/grandmahelp.qsrc

@@ -11,11 +11,11 @@ frost = 0
 
 if $ARGS[0] = 'start':
 	if month <= 4 or month >= 10:
-		grandmaQW['chore_type'] = rand(0,2)
+		grandmaQW['chore_type'] = rand(0,6)
 	elseif month = 5 or month = 6:
-		grandmaQW['chore_type'] = rand(0,5)
+		grandmaQW['chore_type'] = rand(0,9)
 	else
-		grandmaQW['chore_type'] = rand(0,6)
+		grandmaQW['chore_type'] = rand(0,13)
 	end
 
 	if grandmaQW['chore_type'] = 0: 
@@ -25,13 +25,27 @@ if $ARGS[0] = 'start':
 	elseif grandmaQW['chore_type'] = 2 and hour < 9 and hour > 20:
 		gt 'grandmahelp', 'milkcows'
 	elseif grandmaQW['chore_type'] = 3:
+		gt 'grandmahelp', 'groceries'
+	elseif grandmaQW['chore_type'] = 4 and grandmaQW['chore_mushrooms_given'] >= 6:
+		gt 'grandmahelp', 'can_mushrooms'
+	elseif grandmaQW['chore_type'] = 5 and grandmaQW['chore_berries_given'] >= 5:
+		gt 'grandmahelp', 'can_berries'
+	elseif grandmaQW['chore_type'] = 6 and grandmaQW['chore_harvest_done'] = 1:
+		gt 'grandmahelp', 'can_veggies'
+	elseif grandmaQW['chore_type'] = 7:
 		gt 'grandmahelp', 'feedchickens'
-	elseif grandmaQW['chore_type'] = 4 and sunWeather = 1:
+	elseif grandmaQW['chore_type'] = 8 and sunWeather = 1:
 		gt 'grandmahelp', 'checkplants'
-	elseif grandmaQW['chore_type'] = 5 and sunWeather = 1:
+	elseif grandmaQW['chore_type'] = 9 and sunWeather = 1:
 		gt 'grandmahelp', 'waterplants'
-	elseif grandmaQW['chore_type'] = 6 and sunWeather = 1:
+	elseif grandmaQW['chore_type'] = 10 and sunWeather = 1:
 		gt 'grandmahelp', 'harvest'
+	elseif grandmaQW['chore_type'] = 11:
+		gt 'grandmahelp', 'pickforest_mushrooms'
+	elseif grandmaQW['chore_type'] = 12:
+		gt 'grandmahelp', 'pickforest_berries'
+	elseif grandmaQW['chore_type'] = 13:
+		gt 'grandmahelp', 'pickforest_both'
 	else
 		'"There is nothing to do today <<$pcs_nickname>>, take the day off.'
 		act 'Continue':gt 'gadhouse', 'grandma'
@@ -46,7 +60,7 @@ if $ARGS[0] = 'cleanfloor':
 	act 'Agree and start cleaning (1:00)':
 		*clr & cla
 		minut += 60
-		grandmaQW['chore_clean_floor'] = 0
+		grandmaQW['chore_clean_floor'] = 2
 		grandmaQW['help_amount'] += 1
 		gs'stat'
 
@@ -65,7 +79,7 @@ if $ARGS[0] = 'washclothes':
 	act 'Agree and start washing (1:00)':
 		*clr & cla
 		minut += 60
-		grandmaQW['chore_wash_clothes'] = 0
+		grandmaQW['chore_wash_clothes'] = 2
 		grandmaQW['help_amount'] += 1
 		gs'stat'
 
@@ -84,23 +98,6 @@ if $ARGS[0] = 'washclothes':
 	end
 end
 
-if $ARGS[0] = 'feedchickens':
-	'"Of course <<$pcs_nickname>>, would you be kind and feed the chickens?"'
-	
-	grandmaQW['chore_feed_chickens'] = 1
-	act 'Tell her you will do it in a little while':gt 'gadhouse', 'grandma'
-	act 'Agree and go to the yard (0:10)':
-		*clr & cla
-		minut += 10
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_chickens.jpg"></center>'
-		'You take the grain mix for the chickens with you and walk over to the yard.'
-
-		act 'Continue':gt'gaddvor','chickens'
-	end
-end
-
 if $ARGS[0] = 'milkcows':
 	' "<<$pcs_nickname>>, go to the barn and milk the cows."'
 
@@ -118,6 +115,147 @@ if $ARGS[0] = 'milkcows':
 	end	
 end
 
+if $ARGS[0] = 'groceries':
+	'"Oh yes, <<$pcs_nickname>>. I was going to go down to the store today to buy some groceries, but my knees are aching. Do you think you could go down there and get them for me? I have a list of what we need and the grocer will come by later to collect the money."'
+	
+	grandmaQW['chore_groceries'] = 1
+	act 'Tell her you will go to the store later':gt 'gadhouse', 'grandma'
+	act 'Agree and go to the store (0:15)':
+		*clr & cla
+		minut += 15
+		gs'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/izba.jpg"></center>'
+		'Your grandmother shuffles around looking for her list for a few minutes, finally finding it and giving it to you. You grab a basket and set out for the store.'
+		act 'Continue':gt 'gadmarket'
+	end
+end
+
+if $ARGS[0] = 'can_mushrooms':
+	'"I need to get some of these mushrooms canned, <<$pcs_nickname>>, so we can store them. Can you please help me prepare them?"'
+	
+	grandmaQW['chore_can_mushrooms'] = 1
+	act 'Tell her you will help her in a little while':gt 'gadhouse', 'grandma'
+	act 'Agree to help her right now (2:00)':
+		*clr & cla
+		minut += 45
+		gs'stat'
+
+		grandmaQW['chore_mushrooms_given'] -= 6
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_mushrooms.jpg"></center>'
+		'Grandma gives you a basket of mushrooms and you spend a while cleaning them, washing them, and cutting them up, in preparation for canning.'
+		act 'Continue':
+			*clr & cla
+			minut += 60
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canning.jpg"></center>'
+			'Once they are prepared, you help put them in glass jars. Once they are all ready, Grandma places the jars in her canner and boils them for an hour.'
+			act 'Continue':
+				*clr & cla
+				minut += 15
+				gs'stat'
+
+				grandmaQW['chore_can_mushrooms'] = 0
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_mushrooms.jpg"></center>'
+				'Finally, you help Grandma take them out of the canner and set them aside to cool.'
+				'"Thank you, <<$pcs_nickname>>," she says. "It is important to save food up for the hard winter months. Sure, now you can just walk to the store and get whatever you want, but it wasn''t always that way!"'
+				act 'Finish':gt 'gadhouse','start'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'can_berries':
+	'"It is time to can these berries, <<$pcs_nickname>>. Can you please help me? My fingers aren''t as spry as they used to be."'
+	
+	grandmaQW['chore_can_berries'] = 1
+	act 'Tell her you will help her in a little while':gt 'gadhouse', 'grandma'
+	act 'Agree to help her right now (2:00)':
+		*clr & cla
+		minut += 45
+		gs'stat'
+
+		grandmaQW['chore_berries_given'] -= 5
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_berries.jpg"></center>'
+		'Grandma gives you a basket of berries and you spend a while cleaning them, removing stems, and picking out any shriveled or bad ones.'
+		act 'Continue':
+			*clr & cla
+			minut += 60
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canning.jpg"></center>'
+			'Once they are prepared, you help pour them into glass jars. Once they are all ready, Grandma places the jars in her canner and boils them for an hour.'
+			act 'Continue':
+				*clr & cla
+				minut += 15
+				gs'stat'
+
+				grandmaQW['chore_can_berries'] = 0
+				grandmaQW['help_amount'] += 2
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_berries.jpg"></center>'
+				'Finally, you help Grandma take them out of the canner and set them aside to cool.'
+				'"There, now we will have berries for the winter," she says. "I think your grandfather could live off of these berries alone! He will be very grateful that you helped me."'
+				act 'Finish':gt 'gadhouse','start'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'can_veggies':
+	'"We have had good luck with the garden this year, <<$pcs_nickname>>. But now we need to can these vegetables before they spoil. Can you help me please?"'
+	
+	grandmaQW['chore_can_veggies'] = 1
+	act 'Tell her you will help her in a little while':gt 'gadhouse', 'grandma'
+	act 'Agree to help her right now (3:00)':
+		*clr & cla
+		minut += 75
+		gs'stat'
+
+		grandmaQW['chore_harvest_done'] = 0
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_veggies.jpg"></center>'
+		'You and Grandma spend some time sorting out all of the different vegetables from the garden. Once they are sorted you begin cleaning them, cutting them up, removing stems and leaves, and preparing them for canning.'
+		act 'Continue':
+			*clr & cla
+			minut += 90
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canning.jpg"></center>'
+			'It is a tedious process, but eventually you finish, and help Grandma put them all in jars. You stand by while she boils the jars, helping her remove them from the canner when needed and replacing them with others.'
+			act 'Continue':
+				*clr & cla
+				minut += 15
+				gs'stat'
+
+				grandmaQW['chore_can_veggies'] = 0
+				grandmaQW['help_amount'] += 3
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_veggies.jpg"></center>'
+				'Finally, you help Grandma take the last of the jars out of the canner and set them aside to cool.'
+				'"You know <<$pcs_nickname>>, if you know how to can your own food, you can survive years of poor harvests," she says.'
+				'"Your grandfather and I had many hard times when we were younger, but saving our crops during the good times kept us from starving to death in the bad times. You would do well to remember that, young lady!"'
+				act 'Finish':gt 'gadhouse','start'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'feedchickens':
+	'"Of course <<$pcs_nickname>>, would you be kind and feed the chickens?"'
+	
+	grandmaQW['chore_feed_chickens'] = 1
+	act 'Tell her you will do it in a little while':gt 'gadhouse', 'grandma'
+	act 'Agree and go to the yard (0:10)':
+		*clr & cla
+		minut += 10
+		gs'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_chickens.jpg"></center>'
+		'You take the grain mix for the chickens with you and walk over to the yard.'
+
+		act 'Continue':gt'gaddvor','chickens'
+	end
+end
+
 if $ARGS[0] = 'checkplants':
 	'"<<$pcs_nickname>>, can you please go work in the garden?"'
 
@@ -131,7 +269,7 @@ if $ARGS[0] = 'checkplants':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 		'You go to the garden.'
 
-		act 'Further':gt'gadgarden','garden'
+		act 'Continue':gt'gadgarden','garden'
 	end
 end
 
@@ -201,5 +339,70 @@ if $ARGS[0] = 'harvest':
 	end
 end
 
+if $ARGS[0] = 'pickforest_mushrooms':
+	grandmaQW['chore_gather_mushrooms'] = 1
+	grandmaQW['chore_mushroom_quantity'] = rand(3,5)
+	'"<<$pcs_nickname>>, it''s mushroom season. Would you mind going into the forest to pick some for us?"'
+	'"How much do we need, Grandma?", you ask.'
+	'"Oh, I would say you should be able to find at least <<grandmaQW[''chore_mushroom_quantity'']>> kilos," Grandma replies.'
+
+	act 'Tell her you will go get some soon':gt 'gadhouse', 'grandma'
+	act 'Agree and go to the forest (1:00)':
+		*clr & cla
+		if hour >= 6 and hour < 22:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_night.jpg"></center>'
+		end
+		'You decide that now is as good a time as any to do it. You grab a basket and head out, walking to the forest.'
+		minut += 60
+		act 'Continue': gt 'gadforest', '1'
+	end	
+end
+
+if $ARGS[0] = 'pickforest_berries':
+	grandmaQW['chore_gather_berries'] = 1
+	grandmaQW['chore_berry_quantity'] = rand(3,5)
+	'"<<$pcs_nickname>>, the wild berries are ripe for picking. We should gather them now while we can."'
+	'"How much do you want, Grandma?" you ask.'
+	'"<<grandmaQW[''chore_berry_quantity'']>> kilos will be a good start," Grandma replies.'
+	
+	act 'Tell her you will go get some soon':gt 'gadhouse', 'grandma'
+	act 'Agree and go to the forest (1:00)':
+		*clr & cla
+		if hour >= 6 and hour < 22:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_night.jpg"></center>'
+		end
+		'You decide that now is as good a time as any to do it. You grab a basket and head out, walking to the forest.'
+		minut += 60
+		act 'Continue': gt 'gadforest', '1'
+	end		
+end
+
+if $ARGS[0] = 'pickforest_both':
+	grandmaQW['chore_gather_both'] = 1
+	grandmaQW['chore_mushroom_quantity'] = rand(1,2)
+	grandmaQW['chore_berry_quantity'] = rand(2,3)
+	'"This is the time of year that the forest provides us its gifts, <<$pcs_nickname>>. Can you go and harvest some mushrooms and berries for us?"'
+	'"How much of each should I get?" you ask.'
+	'"If you could, try to find <<grandmaQW[''chore_mushroom_quantity'']>> kilos of mushrooms and <<grandmaQW[''chore_berry_quantity'']>> kilos of berries," Grandma replies. "It is important to stock up while we can."'
+	
+	act 'Tell her you will go get some soon':gt 'gadhouse', 'grandma'
+	act 'Agree and go to the forest (1:00)':
+		*clr & cla
+		if hour >= 6 and hour < 22:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_night.jpg"></center>'
+		end
+		'You decide that now is as good a time as any to do it. You grab a basket and head out, walking to the forest.'
+		minut += 60
+		act 'Continue': gt 'gadforest', '1'
+	end	
+end
+
+
 --- grandmahelp ---------------------------------
 

+ 68 - 35
locations/grandpahelp.qsrc

@@ -59,7 +59,7 @@ if $ARGS[0] = 'start':
 			act 'Continue':gt'gadsarai','horse'
 		end
 	elseif grandpaQW['chore_type'] = 2:
-		'"<<$pcs_nickname>>, go to the barn to feed the cows."'
+		'"<<$pcs_nickname>>, go to the barn and feed the cow."'
 
 		grandpaQW['chore_feed_cow'] = 1
 		act 'Tell him that you will do it in a little while':gt 'gadhouse', 'grandpa'
@@ -88,20 +88,24 @@ if $ARGS[0] = 'start':
 		gt 'grandpahelp', 'leadcows'
 	elseif grandpaQW['chore_type'] = 8 and hour >= 6 and hour < 9:
 		gt 'grandpahelp', 'grazecows'
-	elseif grandpaQW['chore_type'] = 9 and temper >= 15 and sunWeather = 1 and week > 5:
+	elseif grandpaQW['chore_type'] = 9 and temper >= 15 and sunWeather = 1 and week > 5 and ARRSIZE('swimwear') > 0:
 		gt 'grandpahelp', 'washhorse'
-	elseif grandpaQW['chore_type'] >= 10 and grandpaQW['chore_type'] < 13 and $grandpaQW['chore_gather_from_forest'] = '' and ARRSIZE('swimwear') > 0:
-		gt 'grandpahelp', 'pickforest'
+	elseif grandpaQW['chore_type'] = 10:
+		gt 'grandpahelp', 'pickforest_mushrooms'
+	elseif grandpaQW['chore_type'] = 11:
+		gt 'grandpahelp', 'pickforest_berries'
+	elseif grandpaQW['chore_type'] = 12:
+		gt 'grandpahelp', 'pickforest_both'
 	elseif grandpaQW['chore_type'] = 13 and temper >= 15 and sunWeather = 1 and hour >= 6 and hour < 9:
-		'"<<$pcs_nickname>>, we need to help out with hay gathering today. We have to go to the field and help out."'
+		'"<<$pcs_nickname>>, we need to help out with baling hay today. We have to go to the field to meet the others."'
 		'"Okay, grandfather," you replied.'
 
 		grandpaQW['chore_bale_hay'] = 1
-		act 'Tell him you will meet him there':gt 'gadhouse', 'grandpa'
+		act 'Tell him you will head over there soon':gt 'gadhouse', 'grandpa'
 		act 'Grab a rake and head to the field (0:40)':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_gadfield.jpg"></center>'
-			'With the rake in your hand you met up with the other local residents at the field. All the present at the field got assigned to a task. You work hard gathering the hay.'
+			'With the rake in your hand, you go to meet up with the other local residents at the field.'
 			minut += 40
 			gs'stat'
 
@@ -144,14 +148,13 @@ if $ARGS[0] = 'cleanyard':
 		*clr & cla
 		if month >= 4 and month <= 10:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard1.jpg"></center>'
-			'Armed with a rake, you begin cleaning the yard. You''re pleased seeing the yard clean. You return the rake to the shed and continue on with your business.'
+			'Armed with a rake, you begin cleaning the yard. You''re pleased, seeing the yard clean. You return the rake to the shed and continue on with your business.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard2.jpg"></center>'
-			'Armed with a shovel, you begin clearing the yard of snow. You''re pleased with yourself seeing the courtyard is free of snow. You return the shovel to the shed and continue on with your business.'
+			'Armed with a shovel, you begin clearing the yard of snow. You''re pleased with yourself, seeing the courtyard is free of snow. You return the shovel to the shed and continue on with your business.'
 		end
 		minut += 60
-		grandpaQW['chore_clean_yard'] = 0
-		grandmaQW['help_amount'] += 1
+		grandpaQW['chore_clean_yard'] = 2
 		if month >= 4 and month <= 10:
 			fat -= rand(1,3)
 		else
@@ -160,12 +163,12 @@ if $ARGS[0] = 'cleanyard':
 		end
 		gs'stat'
 
-		act 'Go':gt'gaddvor'
+		act 'Continue':gt'gaddvor'
 	end
 end
 
 if $ARGS[0] = 'feedhogs':
-	'"<<$pcs_nickname>>, could you go to the barn and feed the hogs."'
+	'"<<$pcs_nickname>>, could you go to the barn and feed the hog?"'
 
 	grandpaQW['chore_feed_boar'] = 1
 	act 'Tell him you will get to it soon':gt 'gadhouse', 'grandpa'
@@ -187,7 +190,7 @@ end
 if $ARGS[0] = 'washhorse':
 	'"It''s good weather today. Take Desperado to the river and give him a bath."'
 
-		grandpaQW['chore_bathe_horse'] = 1
+	grandpaQW['chore_bathe_horse'] = 1
 	act 'Tell him you will do it in a little while':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
@@ -266,7 +269,7 @@ if $ARGS[0] = 'grazecows':
 end
 
 if $ARGS[0] = 'leadcows':
-	'"I have sore feet today, <<$pcs_nickname>>. My dear granddaughter, could you lead the cows on the field and tell the herders to drive them home at the end of the day."'
+	'"I have sore feet today, <<$pcs_nickname>>. My dear granddaughter, could you lead the cow to the field and tell the herders to drive her home at the end of the day?"'
 
 	grandpaQW['chore_lead_cow_to_field'] = 1
 	act 'Tell him you will soon':gt 'gadhouse', 'grandpa'
@@ -281,27 +284,56 @@ if $ARGS[0] = 'leadcows':
 	end
 end
 
-if $ARGS[0] = 'pickforest':
-	if grandpaQW['chore_type'] = 10:
-		$grandpaQW['chore_gather_from_forest'] = 'mushroom'
-		grandpaQW['chore_mushroom_quantity'] = rand(2,3)
-		'"<<$pcs_nickname>>, could you go to the forest and pick mushrooms? I''m craving fried mushrooms."'
-		'"How much should I pick, grandpa?", you ask.'
-		'"<<grandpaQW[''chore_mushroom_quantity'']>> kg will be enough," grandfather replies. "Be careful so you don''t get lost."'
-	elseif grandpaQW['chore_type'] = 11:
-		$grandpaQW['chore_gather_from_forest'] = 'berry'
-		grandpaQW['chore_berry_quantity'] = rand(3,5)
-		'"<<$pcs_nickname>>, could you go to the forest to pick some berries? Grandma wants to make homemade fruit jam."'
-		'"How much should I pick, grandpa?" you ask.'
-		'"<<grandpaQW[''chore_berry_quantity'']>> kg will be enough," grandfather replies. "Just be careful so you don''t get lost."'
-	elseif grandpaQW['chore_type'] = 12:
-		$grandpaQW['chore_gather_from_forest'] = 'both'
-		grandpaQW['chore_mushroom_quantity'] = rand(1,2)
-		grandpaQW['chore_berry_quantity'] = rand(2,3)
-		'"<<$pcs_nickname>>, can you go to the forest and pick some berries and mushrooms? Your grandmother wants to make a mushroom soup, and has a craving for some fresh berries."'
-		'"How much should I pick, grandpa?"'
-		'"<<grandpaQW[''chore_mushroom_quantity'']>> kg mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kg of berries will be enough," grandfather replies. "Just don''t get lost."'
+if $ARGS[0] = 'pickforest_mushrooms':
+	grandpaQW['chore_gather_mushrooms'] = 1
+	grandpaQW['chore_mushroom_quantity'] = rand(2,3)
+	'"<<$pcs_nickname>>, could you go to the forest and pick mushrooms? I''m craving fried mushrooms."'
+	'"How much should I pick, grandpa?", you ask.'
+	'"<<grandpaQW[''chore_mushroom_quantity'']>> kilos will be enough," grandfather replies. "Be careful so you don''t get lost."'
+	
+	act 'Tell him you will go get some soon':gt 'gadhouse', 'grandpa'
+	act 'Agree and go to the forest (1:00)':
+		*clr & cla
+		if hour >= 6 and hour < 22:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_night.jpg"></center>'
+		end
+		'You agree to help your grandfather, grabbing a basket and setting out on the road to the forest.'
+		minut += 60
+		act 'Continue': gt 'gadforest', '1'
+	end
+end
+
+if $ARGS[0] = 'pickforest_berries':
+	grandpaQW['chore_gather_berries'] = 1
+	grandpaQW['chore_berry_quantity'] = rand(3,5)
+	'"<<$pcs_nickname>>, could you go to the forest to pick some berries? Grandma wants to make homemade fruit jam."'
+	'"How much should I pick, grandpa?" you ask.'
+	'"<<grandpaQW[''chore_berry_quantity'']>> kilos will be enough," grandfather replies. "Just be careful so you don''t get lost."'
+
+	act 'Tell him you will go get some soon':gt 'gadhouse', 'grandpa'
+	act 'Agree and go to the forest (1:00)':
+		*clr & cla
+		if hour >= 6 and hour < 22:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_night.jpg"></center>'
+		end
+		'You agree to help your grandfather, grabbing a basket and setting out on the road to the forest.'
+		minut += 60
+		act 'Continue': gt 'gadforest', '1'
 	end
+end
+
+if $ARGS[0] = 'pickforest_both':
+	grandpaQW['chore_gather_both'] = 1
+	grandpaQW['chore_mushroom_quantity'] = rand(1,2)
+	grandpaQW['chore_berry_quantity'] = rand(2,3)
+	'"<<$pcs_nickname>>, can you go to the forest and pick some berries and mushrooms? Your grandmother wants to make a mushroom soup, and I have a craving for some fresh berries."'
+	'"How much should I pick, grandpa?"'
+	'"<<grandpaQW[''chore_mushroom_quantity'']>> kilos of mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kilos of berries will be enough," grandfather replies. "Just don''t get lost."'
+
 	act 'Tell him you will go get some soon':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the forest (1:00)':
 		*clr & cla
@@ -316,5 +348,6 @@ if $ARGS[0] = 'pickforest':
 	end
 end
 
+
 --- grandpahelp ---------------------------------
 

+ 1 - 0
locations/gschool_boys_bathroom.qsrc

@@ -2,6 +2,7 @@
 
 !!This bathroom file is for the bathroom scenes when Sveta is skiping class
 if $ARGS[0] = 'start':
+	$location_type = 'public_indoors'
 	*clr & cla
 	$menu_loc = 'gschool_boys_bathroom'
 	$menu_arg = 'start'

+ 2 - 1
locations/gschool_break.qsrc

@@ -3,6 +3,7 @@
 $loc = 'gschool_break'
 $locM = 'gschool_break'
 $menu_loc = 'gschool_break'
+$location_type = 'public_indoors'
 
 if $ARGS[0] = 'watercooler':
 	*clr & cla
@@ -33,7 +34,7 @@ if $ARGS[0] = 'watercooler':
 	act 'Take a drink':
 		cla & *nl
 		frost = 1
-		alko -= 1
+		if alko > 0: alko -= 1
 		minut += 5
 		pcs_health += 10
 		pcs_energy += 4

+ 449 - 0
locations/gschool_cheerleading.qsrc

@@ -0,0 +1,449 @@
+# gschool_cheerleading
+
+!! cheerleadingQW['quest_stage']	- stage of quest (-2 blocked, -1 rejected/ignored, 1 tryouts, 2 backup, 3 member)
+!! cheerleadingQW['reject']			- day you ignored the poster/got rejected at tryouts. primes one more attempt after 30 days
+!! cheerleadingQW['try_count']		- times Sveta tried joining (for text variation)
+!! cheerleadingQW['try_social']		- Sveta''s social score for success/failure calculation at tryouts
+!! cheerleadingQW['try_physical']	- Sveta''s physical score for success/failure calculation at tryouts
+!! cheerleadingQW['grupTipe']		- grupTipe at first tryouts (for tracking and commenting on changes)
+!! cheerleadingQW['day']			- prevents repeating practice/game day triggers
+!! cheerleadingQW['practice_count']	- number of practice sessions attended
+!! cheerleadingQW['backup_game']	- flag for Albina letting Sveta attend game day as a backup
+!! cheerleadingQW['game_count']		- number of game day performances participated in
+!! cheerleadingQW['skipped']		- tracks times Sveta skipped practice/game day (3 > gets you kicked out)
+!! cheerleadingQW['skipped_ev']		- primes Albina confronting Sveta about missing practice next time she sees her
+!! cheerleadingQW['skipped_ev_g']	- primes Albina confronting Sveta about missing the game next time she sees her
+
+menu_off = 1
+$location_type = 'event'
+
+if $ARGS[0] = 'poster':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/poster.jpg"></center>'
+	'Walking through the hallway, you notice a poster saying that a spot has opened up on the school''s cheerleading squad and that tryouts are being held after school today. The squad is ruled with an iron fist by Albina and is made up of only the most popular and athletic girls in school.'
+	'However, this hasn''t stopped some of the nerds from working out and even attending dance practice to try out for a spot, despite them spreading rumours about the squad, most of them sexual.'   
+	*nl
+	if grupTipe = 1 or grupTipe = 2:
+		'You''re just the kind of person that the squad is looking for and feel that Albina will heavily approve of you.'
+	elseif grupTipe = 3 or grupTipe = 4:
+		'You know that Albina would judge you harshly since you''re not a jock or part of the cool group.'
+	elseif grupTipe = 5:
+		'You are an outcast. Albina wouldn''t even look at you, never mind give you a chance. Would it even be worth trying?'
+	end
+	*nl
+	act 'Decide to give it a try':
+		cla
+		cheerleadingQW['quest_stage'] = 1
+		if grupTipe = 1 or grupTipe = 2:
+			'"I''m one of them. They would be mad to not at least consider me! Those nerds and their rumours are just jealous losers." you think to yourself as you decide to attend the tryouts and show them that you deserve that spot.'
+		else
+			'While you''re not as athletically inclined and they have no respect for you, you decide that you''re going to try anyway.'
+			'"I''ll show these stuck up bimbos that I can be as good as any one of them!" you tell yourself, as you walk away with a steely confidence.'
+		end
+		gs 'gschool_events', 'leave_break_events'
+	end
+	
+	act 'This doesn''t interest you':
+		cla
+		cheerleadingQW['reject'] = daystart
+		cheerleadingQW['quest_stage'] = -1
+		if grupTipe = 1 or grupTipe = 2:
+			'Even though you''re capable enough to try out, prancing around on the field to amuse people doesn''t sound fun to you at all. You shake your head and continue on your way.'
+		else
+			'"Why would I ever want to join a group of skimpily dressed sluts prancing around a field for the amusement of perverts?" you think to yourself as you walk away in disgust.'
+		end
+		gs 'gschool_events', 'leave_break_events'
+	end
+end
+
+if $ARGS[0] = 'poster_repeat':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/poster.jpg"></center>'
+	'Walking through the hallway, you notice the poster for the school''s cheerleading tryouts again. It looka like they still have that open spot and are trying to fill it. You recall how the squad only allows popular or athletic girls to join but that nerds still try out regardless. You also remember some of the sexual rumours you''ve heard about them. '
+	*nl
+	!! Slightly different text if Sveta tried once already
+	if cheerleadingQW['try_count'] > 0:
+		if grupTipe = 3 or grupTipe = 4:
+			$temp = 'You already know you won''t be given a fair chance, just like last time.'
+			if cheerleadingQW['try_social'] < npc_rel['A23'] + grupvalue[npc_grupTipe['A23']]/2 and cheerleadingQW['try_physical'] < pcs_agil + pcs_vital + pcs_danc + pcs_cheer:
+				$temp += ' On the other hand, you''ve become better friends with Albina and the cool kids since then, and you''re in better shape too! Maybe things will be different this time?'
+			elseif cheerleadingQW['try_social'] < npc_rel['A23'] + grupvalue[npc_grupTipe['A23']]/2:
+				$temp += ' On the other hand, you''ve become better friends with Albina and the cool kids since then, so maybe they''ll take you seriously this time?'
+			elseif cheerleadingQW['try_physical'] < pcs_agil + pcs_vital + pcs_danc + pcs_cheer: 
+				$temp += ' On the other hand, you''re in better shape than you were then, so maybe you''ll have a chance this time?'
+			end
+		elseif grupTipe = 5:
+			if cheerleadingQW['grupTipe'] = grupTipe:
+				'They laughed you right out of the hall last time. They will never accept you, no matter how good you are. There''s probably not much point in trying.'
+			else
+				'They didn''t accept you last time, so there''s no chance at all now that you''re an outcast. Why even bother trying?'
+			end
+		else
+			if cheerleadingQW['grupTipe'] ! grupTipe:
+			 !! if Sveta changed groups
+				'Now that you''re part of their clique, they''re bound to treat you better than last time. It''s worth giving it another shot.'
+			else
+			 !! if Sveta somehow got rejected as a cool kid/jock (would have to fall out with Albina somehow)
+				'"I''m sure Albina just had a bad day last time, she wouldn''t treat me like that again, would she?" you think to yourself as you consider attending the tryouts one more time.'
+			end
+		end
+	else
+		if grupTipe = 3 or grupTipe = 4:
+			'You know that Albina would judge you harshly since you''re not a jock or part of the cool group.'
+		elseif grupTipe = 5:
+			'You are an outcast. Albina wouldn''t even look at you, never mind give you a chance. Would it even be worth trying?'
+		end
+	end
+	*nl
+	act iif(cheerleadingQW['try_count'] > 0, 'Decide to try one more time', 'Decide to give it a try this time'):
+		cla
+		cheerleadingQW['quest_stage'] = 1
+		if grupTipe = 1 or grupTipe = 2:
+			'"I''m one of them. They would be mad to not at least consider me! Those nerds and their rumours are just jealous losers." you think to yourself as you decide to attend the tryouts and show them that you deserve that spot.'
+		else
+			'While you''re not as athletically inclined and they have no respect for you, you decide that you''re going to try anyway.'
+			'"I''ll show these stuck up bimbos that I can be as good as any one of them!" you tell yourself, as you walk away with a steely confidence.'
+		end
+		gs 'gschool_events', 'leave_break_events'
+	end
+	
+	act iif(cheerleadingQW['try_count'] > 0, 'It''s not worth the hassle ', 'Ignore the poster')+' <font color="red">(Last chance to join cheerleading)</font>':
+		cla
+		cheerleadingQW['quest_stage'] = -2
+		if grupTipe = 1 or grupTipe = 2:
+			'Even though you''re capable enough to try out, prancing around on the field to amuse people doesn''t sound fun to you at all. You shake your head and continue on your way.'
+		else
+			'"Why would I ever want to join a group of skimpily dressed sluts prancing around a field for the amusement of perverts?" you think to yourself as you walk away in disgust.'
+		end
+		gs 'gschool_events', 'leave_break_events'
+	end
+end
+
+if $ARGS[0] = 'tryouts':
+	*clr & cla
+	cheerleadingQW['try_count'] += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/tryouts.jpg"></center>'
+	'After school you head to the PE hall to try out for the cheerleading team'+iif(cheerleadingQW['try_count'] > 1, ' again','')+'. There''s a group of hopeful girls already here. Albina is standing with Vicky, Christina, Lina, Lariska and Bella, who make up the squad.' 
+	'Once everyone is gathered, Albina speaks up. "Before we begin, you should all know that training is every Tuesday and Thursday and game days are every second Friday. Anyone who can''t commit to the squad on those days, fuck off!"' 
+	'A few girls leave as Albina starts showing you part of the cheerleading routine as an example and asks everyone to copy it.'
+	act 'Try to follow Albina''s example':
+		*clr & cla
+		!! double cheer_exp so it progresses faster given that Sveta cant get it anywhere else
+		gs 'exercise', 'tier2', 0, 'agil_exp', 'vital_exp', 'cheer_exp', 'cheer_exp', 'danc_exp'
+		gs 'exercise', 'tier2', 0, 'agil_exp', 'vital_exp', 'cheer_exp', 'cheer_exp', 'danc_exp'
+		!! Success calculation - Contributing factors: social group, cool kids standing, Albina friendship, agility, endurance, dance skill, natural cheerleading talent
+		!!  New game character comparison:
+		!!  Cool kids would just about pass								~250 (100 cool + 55 friendship + 30 agi + 30 end + 20 dance + 15 talent)
+		!!  Any jock start would easily pass (especially dancers)		~280+(100 jock + 30 friendship + 50 agi + 50 end + 25 dance + 25 talent)
+		!!  Nerds would need a lot of work 								~112 (0 rep + 20 friendship + 30 agi + 30 end + 15 dance + 15 talent)
+		!!  Gopniks would also need a lot of work						~134 (0 rep + 30 friendship + 35 agi + 35 end + 17 dance + 17 talent)
+		!!  Outcasts stand no chance									~-80 (-200 outcast + 30 friendship + 30 agi + 30 end + 15 dance + 15 talent)
+		cheerleadingQW['try_physical'] = pcs_agil + pcs_vital + pcs_danc + pcs_cheer
+		cheerleadingQW['try_social'] = npc_rel['A23']
+		if grupTipe = 1 or grupTipe = 2:
+			cheerleadingQW['try_social'] += 100
+		elseif grupTipe = 5:
+			cheerleadingQW['try_social'] -= 200
+		else
+			!! If not jock or cool kid, adds half of your rep with Albina''s group
+			cheerleadingQW['try_social'] += grupvalue[npc_grupTipe['A23']]/2
+		end
+		
+		if cheerleadingQW['try_physical'] + cheerleadingQW['try_social'] >= 250:
+		 !! Success
+			cheerleadingQW['day'] = daystart
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/lineup.jpg"></center>'
+			!! Different text based on what contributed more
+			if cheerleadingQW['try_physical'] < cheerleadingQW['try_social']:
+				'While you are a bit clumsy during your turn, you are able to somewhat match the example set and Albina and the girls seem impressed.'
+			else
+				'While they clearly judge you more harshly than some of the other girls, you are able to impress Albina and the girls with your physical abilities.'
+			end
+			'After you finish, they line the group up and start moving along, viciously mocking and laughing at those they reject until only you and one other girl remain.'
+			if grupTipe = 1 or grupTipe = 2:
+				!! Stage 3 = regular member
+				cheerleadingQW['quest_stage'] = 3
+				'"You, <<$pcs_nickname>>, you actually impressed us'+iif(cheerleadingQW['try_count'] > 1, ' this time','')+'. '+iif(cheerleadingQW['try_physical'] < cheerleadingQW['try_social'],'Sure, you were a bumbling idiot in your execution, but we have a good feeling about you.','I didn''t think you had it in you, but those moves really were quite good.')+' I expect to see you on time at next practice!"'
+				'You barely have time to react before Albina and her girls walk away. You ignore the jealous stares you recieve from the others and get ready to leave.'
+			else
+				!! Stage 2 = backup
+				cheerleadingQW['quest_stage'] = 2
+				'"I like your moves Sveta, but I can''t let someone like you on my squad. I''ve got a reputation to uphold. Tell you what, how does being a backup sound?"'
+				'Being asked to be a backup is further than anyone like you has ever made it! You nod your head and try not to look too excited. Albina then selects the girl she wants on the team.'
+				'There are a lot of puzzled stares and whispers directed at you as everyone prepares to leave.'
+			end
+		else
+		 !! Failure
+			cheerleadingQW['quest_stage'] -= 1
+			cheerleadingQW['reject'] = daystart
+			!! Saving current social group number here so it can get mentioned on the second tryouts if it changes
+			cheerleadingQW['grupTipe'] = grupTipe
+			pcs_mood -= 20
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/lineup.jpg"></center>'
+			!! Different text based on what contributed more
+			if cheerleadingQW['try_physical'] < cheerleadingQW['try_social']:
+				'You '+iif(cheerleadingQW['try_count'] > 1, 'still','just')+' don''t have the capability to match Albina''s high standards. You mess up almost every move and you can hear the mocking laughter of the girls.'
+			else
+				'You have the feeling you''re doing at least as good as some of the others, maybe even better, but Albina and her girls constantly keep pointing in your direction and laughing at the tiniest mistakes'+iif(cheerleadingQW['try_count'] > 1, ', just like last time','')+'. Being under such scrutiny causes you to stumble even more, provoking yet more mocking.'
+			end
+			'Embarrassed, you sheepishly line up with the group as Albina and the girls move along, rejecting girls with vicious mockery.'
+			'When they get to you, the girls behind Albina can''t control themselves and burst out laughing. Albina speaks to you: "'+iif(cheerleadingQW['try_count'] > 1, 'I didn''t think you could do any worse than last time, but you sure showed us!','I don''t think I''ve ever seen such a horrific attempt as that.')+' Why are you even here <<$pcs_nickname>>? We''re cheerleaders, not a circus, you clown!"'
+			'Feeling dejected, you watch her continue down the line and select the girl she wants on the team. '+iif(cheerleadingQW['try_physical'] < cheerleadingQW['try_social'],'You don''t think much of it as you quickly leave to avoid further humiliation.','"There''s no way that girl performed better than me! She just chose her because they''re friends!" you tell yourself as you angrily turn to leave.')
+		end
+		act 'Leave the hall': gt 'gschool_grounds', 'main'
+	end
+end
+
+if $ARGS[0] = 'afterschool_practice':
+	*clr & cla
+	cheerleadingQW['day'] = daystart
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/gymdoors.jpg"></center>'
+	
+	'You are standing next to the doors leading to the PE hall. You have cheerleading practice at 14:15 and should go and change if you don''t want to be late.'
+	*nl
+	if cheerleadingQW['skipped'] = 1 or cheerleadingQW['skipped'] = 2:
+		'You remember how angry Albina was last time you were missing. It wouldn''t be a good idea to do it again.'
+	elseif cheerleadingQW['skipped'] >= 3:
+		'You remember Albina telling you the next time you aren''t there, she''s kicking you off the squad.'
+	end
+	
+	act 'Attend cheerleading practice': gt 'gschool_cheerleading', 'practice'
+	gs 'willpower', 'misc', 'self', iif(cheerleadingQW['skipped'] > 0, 'hard', '')
+	if will_cost <= pcs_willpwr:
+		act 'Skip practice (<<will_cost>> Willpower)':
+			gs 'willpower', 'pay', 'self'
+			cheerleadingQW['skipped'] += 1
+			!! Trigger for Albina confronting Sveta next time she sees her at school
+			cheerleadingQW['skipped_ev'] = 1
+			gt 'gschool_grounds', 'main'
+		end
+	else
+		act 'Skip practice (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
+end
+
+if $ARGS[0] = 'afterschool_game':
+	*clr & cla
+	cheerleadingQW['day'] = daystart
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/field.jpg"></center>'
+	
+	'There is a football game at 14:15 on the sports field behind the school today.'
+	*nl
+	if cheerleadingQW['skipped'] = 1 or cheerleadingQW['skipped'] = 2:
+		'You remember how angry Albina was last time you were missing. It wouldn''t be a good idea to do it again.'
+	elseif cheerleadingQW['skipped'] >= 3:
+		'You remember Albina telling you the next time you aren''t there, she''s kicking you out off the squad.'
+	end
+	
+	act 'Go cheer for your school': gt 'gschool_cheerleading', 'game'
+	gs 'willpower', 'misc', 'self', iif(cheerleadingQW['skipped'] > 0, 'hard', '')
+	if will_cost <= pcs_willpwr:
+		act 'Skip the game (<<will_cost>> Willpower)':
+			gs 'willpower', 'pay', 'self'
+			cheerleadingQW['skipped'] += 1
+			!! Trigger for Albina confronting Sveta next time she sees her at school (different one for games)
+			cheerleadingQW['skipped_g_ev'] = 1
+			gt 'gschool_grounds', 'main'
+		end
+	else
+		act 'Skip the game (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
+end
+
+if $ARGS[0] = 'practice':
+	*clr & cla
+	minut += 5
+	cheerleadingQW['practice_count'] += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/changing.jpg"></center>'
+	
+	!! First time scene
+	if cheerleadingQW['practice_count'] = 1:
+		if cheerleadingQW['quest_stage'] = 2:
+			'Albina is impatiently waiting for you in the locker room as you arrive. "Hurry up <<$pcs_firstname>>, I don''t have all day! Get changed and get out there already!" She pushes past you and out the door.'
+			'You quickly change into your regular sports clothes and start to head out.'
+		else
+			'You walk into the locker room and see Albina waiting. She is holding a cheerleading uniform and hands it to you.'
+			'"Hey girl! I hope this is your size. So why don''t you try it on and join us out in the hall? Welcome to the cheerleading squad <<$pcs_nickname>>!!"'
+			'She leaves you to admire how pretty your new outfit is and slip it on with utter glee.'
+		end
+	elseif cheerleadingQW['quest_stage'] = 2:
+		'The squad is already out practicing when you arrive at the locker room and change. You don''t have the privelege of owning a uniform and instead train in your sports clothing.'
+	else
+		'Heading into the locker room, you see Albina and the rest of the squad have already arrived and are in various states of changing into their outfits while chatting to each other. You head to your locker and and strip down. You pull your uniform out and start getting dressed. You just finish tying your shoes when Albina gives the order to head out into the PE hall.'
+	end
+	
+	act 'Follow the others into the hall':
+		*clr & cla
+		temp_time = 6
+		temp_count = 1
+		:cheerleading_practice_loop
+		!! double cheer_exp so it progresses faster given that Sveta cant get it anywhere else
+		gs 'exercise', 'tier2', 0, 'agil_exp', 'vital_exp', 'cheer_exp', 'cheer_exp', 'danc_exp'
+		if temp_count < temp_time: temp_count += 1 & jump 'cheerleading_practice_loop'
+		killvar 'temp_count'
+		killvar 'temp_time'
+		
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/practice.mp4"></center>'
+		
+		!! First time scene
+		if cheerleadingQW['practice_count'] = 1:
+			if cheerleadingQW['quest_stage'] = 3:
+				'Albina heads over to you and cheerfully greets you. "Don''t you just look delightful!" She then explains what your role in the squad will be and leads you over to the group.' 
+				'"It''s all really simple. Just follow our lead and you''ll be fine. From the top girls!"'
+                'You take your place and Albina begins. You practice tumbling and flips and manage not only to impress Albina, but the rest of the squad too. "Not bad for your first time <<$pcs_nickname>>. I expect great things from you."'				
+			elseif cheerleadingQW['quest_stage'] = 2:
+				pcs_mood += 10
+				gs 'stat'
+				'You head into the hall and Albina comes over to begrudgingly greet you. "Look, I''m taking a risk trusting you here <<$pcs_firstname>>, so don''t make me regret it. Just get in the corner and try to follow along."'
+				'She heads back to the girls and resumes what she was doing. You closely follow the movements of each girl and attempt to copy them with varying degrees of success. Albina watches you with a mixed look of amusement and intrigue on her face.'
+				'Albina ends the training session and lets the girls leave. She comes over to you. "Not bad <<$pcs_firstname>>, not bad. You''ve a long way to go before I even let you near my squad but I have no doubts that I can rely on you in the future."'
+				'You actually got praised by the best dancer in school! You contain your excitement as Albina leaves.'
+			end
+		elseif cheerleadingQW['quest_stage'] = 2:
+		 !! Backup variant
+			gs 'npc_relationship', 'modify', 'A23', 'like'
+			'You head into the hall and into your corner. You watch the girls closely and copy their moves. You feel like you''re getting better with each training session and Albina seems to think so too, even giving you a smile a few times as she observes you.'
+			! Sveta has to have attended practice for at least 2 weeks, it has to be Thursday and there''s a 33% chance it happens
+			if cheerleadingQW['practice_count'] > 4 and week = 4 and rand(0,2) = 0:
+				*nl
+				cheerleadingQW['backup_game'] = 1
+				'You finish practicing the last of your moves as Albina heads your way. "<<$pcs_firstname>>, I need you to stand in for one of the girls at the game tomorrow. Don''t get ahead of yourself, you''re only serving your purpose. So be here tomorrow after school."'
+				'Albina walks away, but your excited eagerness is suddenly shattered when she turns and glares directly at you. "Don''t make me regret choosing you!"'
+				'You are left with a slight feeling of dread within you.'
+			end
+		elseif cheerleadingQW['quest_stage'] = 3:
+		 !! Regular variant
+			if pcs_cheer < 20:
+				'Once in the hall, you take your place as Albina explains what you will be practicing and has you begin. You try your best to follow the unfamiliar routine, Albina keeping a watchful eye on you the entire time.'
+				'"Can you at least try to put some effort into not looking like an idiot <<$pcs_nickname>>?"'
+			elseif pcs_cheer < 30:
+				gs 'npc_relationship', 'modify', 'A23', 'like'
+				'Once in the hall, you take your place as Albina explains what you will be practicing and has you begin. You are starting to learn your moves and can perform them with less clumsiness, but Albina is still critical.'
+				'Raise your head and lift your feet <<$pcs_nickname>>! At least look like you''re happy to be here.'
+			elseif pcs_cheer < 40:
+				gs 'npc_relationship', 'modify', 'A23', 'like'
+				'Once in the hall, you take your place as Albina explains what you will be practicing and has you begin. Your training is starting to take hold and you are able to perform almost to Albina''s exacting standards.' 
+				'You''re actually starting to impress me <<$pcs_nickname>>. Keep it up!'
+			elseif pcs_cheer < 50:
+				gs 'npc_relationship', 'modify', 'A23', 'love'
+				'Once in the hall, you take your place as Albina explains what you will be practicing and has you begin. You have performed the routines dozens of times now and can execute your moves flawlessly to Albina''s satisfaction.'
+				'Perfect <<$pcs_nickname>>! Now that''s how it''s done!'
+			else
+				gs 'npc_relationship', 'modify', 'A23', 'love'
+				'Once in the hall, you take your place as Albina explains what you will be practicing and has you begin. Your skill having drastically improved, Albina now considers you one of her best girls and uses you as an example to the others.'
+			end
+		end
+		
+		act 'Go take a shower': gt 'gschool_cheerleading', 'shower'
+	end
+end
+
+if $ARGS[0] = 'game':
+	*clr & cla
+	minut += 5
+	cheerleadingQW['game_count'] += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/changing.jpg"></center>'
+	
+	'Heading into the locker room, you see Albina and the rest of the squad have already arrived and are in various states of changing into their uniforms while chatting to each other. You head to your locker and and strip down. You pull your uniform out and start getting dressed.'+iif(cheerleadingQW['backup_game'] = 1,' The fact that you are actually wearing the uniform and are going out to perform with them doesn''t seem real to you, even if the girls have only reluctantly let you join them.','')+' You finish tying your shoes when Albina stands on the bench. "You already know that today is game day! So let''s go out there and cheer our boys to victory! Maybe we''ll get some perverts all hot and bothered as well!"'
+	'The squad cheers in unison as you all head out onto the field.'
+	
+	act 'Go to the field':
+		*clr & cla
+		!! double cheer_exp so it progresses faster given that Sveta cant get it anywhere else
+		gs 'exercise', 'tier2', 0, 'agil_exp', 'vital_exp', 'cheer_exp', 'cheer_exp', 'danc_exp'
+		gs 'stat'
+	    '<center><video autoplay loop src="images/locations/pavlovsk/school/afterschool/cheerleading/opening.mp4"></video></center>'
+		
+		'Out on the field, you and the girls perform your opening routine flawlessly under Albina''s direction and spend the rest of the game chanting and cheering your team. You see some guys in the crowd appreciating the view of your ass as you are performing right in front of them.'
+		
+		act 'Wait until the end of the game':
+			minut += 90
+			!! double cheer_exp so it progresses faster given that Sveta cant get it anywhere else
+			gs 'exercise', 'tier2', 0, 'agil_exp', 'vital_exp', 'cheer_exp', 'cheer_exp', 'danc_exp'
+			gs 'stat'
+			'<center><video autoplay loop src="images/locations/pavlovsk/school/afterschool/cheerleading/closing.mp4"></video></center>'
+			
+			'The game ends and you and you perform your closing routine to the crowd as the players leave the field. You soon join them in returning to the locker room.'
+			'Once in the locker room, you strip from your uniform and head into the showers.'
+			
+			!! Resets the flag letting backups attend games
+			if cheerleadingQW['backup_game'] = 1:
+				cheerleadingQW['backup_game'] = 0
+				'After the game, Albina comes over to you. "I''l give it to you <<$pcs_firstname>>, you didn''t embarrass us as much as I thought you would. Don''t go taking that uniform by the way, you haven''t earned it."'
+			end
+			
+			'She leaves you to walk back to the locker room yourself. Maybe you''ll earn her respect and this uniform one day if you keep this up?'
+			act 'Take a shower': gt 'gschool_cheerleading', 'shower'
+		end
+	end
+end
+
+if $ARGS[0] = 'shower':
+	*clr & cla
+	minut += 10
+	dynamic $showerdin
+	if deodorant_on = 1: gs 'sweat', 'remove_deo' & 'Your deodorant gets washed away in the shower.'
+	
+	'<center><video autoplay loop src="images/shared/home/bathroom/dush<<rand(1,6)>>.mp4"></video></center>'
+	
+	'You head back to the locker room, where you strip from your uniform and head into the showers. You find an empty stall and step inside. You turn the water on and enjoy the sensation of it on your skin.'
+	'You turn the water off, grab your towel and head back to the lockers. You get dressed, place your uniform back in your locker and get ready to leave.'
+	
+	act 'Leave school': gt 'gschool_grounds', 'main'
+end
+
+if $ARGS[0] = 'skipped_ev':
+	*clr & cla
+	if cheerleadingQW['skipped_ev'] = 1: cheerleadingQW['skipped_ev'] = 0
+	if cheerleadingQW['skipped_g_ev'] = 1: cheerleadingQW['skipped_g_ev'] = 0
+	minut += 2
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
+	
+	if cheerleadingQW['skipped'] = 1:
+		gs 'npc_relationship', 'modify', 'A23', -5
+		'Albina is waiting for you in the hall and pulls you to the side.'
+		'"Where were you yesterday <<$pcs_nickname>>? '+iif(cheerleadingQW['skipped_ev'] = 1, 'You missed learning about and practicing the new part we added to our routine, but you also let me down."','You missed the game and it was really hard adjusting the routine, but you also let me down."')
+		'You meekly reply. "Sorry, Albina. I... had a family thing I had to deal with yesterday and I didn''t have time to tell you."'
+		'She doesn''t look completely convinced. "Right... Well if you care about your place on the team then you''ll be at the next '+iif(cheerleadingQW['skipped_ev'] = 1,'practice session','game')+' on time. No excuses."'
+		'You nod at her and she gives you a pat on the head before walking away. It looks like you got off lightly this time.'
+	elseif cheerleadingQW['skipped'] = 2:
+		gs 'npc_relationship', 'modify', 'A23', -10
+		pcs_mood -= 5
+		'You notice Albina watching you walk down the hall towards her and she drags you to the side when you reach her.'
+		'"Skipping '+iif(cheerleadingQW['skipped_ev'] = 1,'practice','the game')+' <i>again</i>, <<$pcs_nickname>>?! I thought I told you that you were to be '+iif(cheerleadingQW['skipped_ev'] = 1,'at practice','at the game')+'... <b>no excuses</b>! I don''t care what miserable story you have to defend yourself with. You either commit to the squad or you''re out. Don''t test me <<$pcs_firstname>>!"'
+		'You don''t have a chance to speak as she storms off. Maybe it''s best for both of you if you stopped pissing her off?'
+	elseif cheerleadingQW['skipped'] = 3:
+		gs 'npc_relationship', 'modify', 'A23', -20
+		grupvalue[1] -= 3
+		grupvalue[2] -= 2
+		grupvalue[4] += 1
+		pcs_mood -= 10
+		'You are walking down the hall when you clock a furious Albina heading straight for you. You barely have time to react before she grabs your shirt and forcefully pins you against the lockers, silencing the hall as everyone looks at you.'
+		'Albina glares directly into your eyes. "ARE YOU DOING THIS TO MOCK ME YOU FUCKING BITCH?! I''VE GIVEN YOU CHANCE AFTER FUCKING CHANCE AND YOU STILL SKIP '+iif(cheerleadingQW['skipped_ev'] = 1,'PRACTICE','GAME DAY')+'?! Luckily for you, Vicky convinced me to give you one. Last. Fucking. Chance <<$pcs_firstname>>. You dare miss even ONE FUCKING SECOND of our next '+iif(cheerleadingQW['skipped_ev'] = 1,'session','performance')+', you better pray that I don''t find you."'
+		'She releases you and angrily walks off, shoving other students out of her way. You compose yourself and continue on your way, trying to ignore the stares.'
+	else
+	 ! Getting kicked after skipping practice 4 times
+		gs 'npc_relationship', 'set', 'A23', 20
+		gs 'npc_relationship', 'modify', 'A15', 'dislike'
+		grupvalue[1] -= 10
+		grupvalue[2] -= 7
+		grupvalue[3] -= 2
+		grupvalue[4] += 3
+		pcs_mood -= 20
+		'As you walk down the hall, you hear your name echo off the walls and the angry stomping of heels as you see an absolutely livid Albina, fists clenched, storming down the hall at you, Vicky following close behind.'
+		'"You think this is funny don''t you <<$pcs_firstname>>? Well, you''re FUCKING DONE WITH MOCKING ME!!" Vicky stops her from attacking you in a fit of rage.'
+		'"That''s right. Done. I''m kicking your fucking bitch ass off the team. Right here, right fucking now. If I EVER see you anywhere near us..." She walks right up to you. "then you better hope I''m in a good fucking mood, bitch!"'
+		'She stares at you enraged before she relaxes her clenched fist as Vicky places a hand on her shoulder and leads her away, while looking extremely disappointed with you.'
+		'The other students start talking among themselves as you are left feeling somewhat intimidated by Albina''s actions.'
+	end
+	gs 'stat'
+end
+
+--- gschool_cheerleading ---------------------------------
+

+ 6 - 0
locations/gschool_events.qsrc

@@ -1068,6 +1068,12 @@ if $ARGS[0] = 'break_events':
 		else
 			'<br>If you ever forgot to do your homework, now would be a good time to convince him to do your homework for one of your classes.'
 		end
+	elseif break_rand = 37 and month ! 9 and cheerleadingQW['quest_stage'] = 0:
+	 !! month ! 9 so it doesnt happen in september, but does any time after that or early next year if you have really bad luck with RNG
+		gt 'gschool_cheerleading', 'poster'
+	elseif break_rand = 37 and cheerleadingQW['quest_stage'] = -1 and cheerleadingQW['reject'] + 30 => daystart:
+	 !! 'repeat' event that reminds the player of cheerleading if they rejected it the first time or failed the tryouts.
+		gt 'gschool_cheerleading', 'poster_repeat'
 	else
 		gt 'gschool_events', 'leave_break_events2'
 	end

+ 42 - 3
locations/gschool_gossip.qsrc

@@ -66,7 +66,7 @@ end
 
 
 if $ARGS[0] = 'mixed':
-	chat_rand = rand(1, 90)
+	chat_rand = rand(1,94)
 	if chat_rand = 1:
 		'"Man, this town is so boring! We really need to graduate soon, so we can go live in the city!"'
 		'His friend heartily agrees. "Absolutely, I hear they have parties in the university hostel every day of the week!"'
@@ -387,6 +387,22 @@ if $ARGS[0] = 'mixed':
 		'The other student laughs. "Your grandmother is crazy, I want some of what she is taking. Magic and demons aren''t real."'
 		'"So you don''t believe in god and stuff? I mean if that is all real, why wouldn''t demons and stuff be?"'
 		'Then they both go silent as if really considering it'
+	elseif chat_rand = 91 and cheerleadingQW['quest_stage'] < 0 and cheerleadingQW['try_count'] > 0:
+		'"Did you hear about <<$pcs_nickname>> trying to be a cheerleader?"'
+		'"There''s no way someone like that made the team."'
+		'"Of course she didn''t. Albina laughed her right out of the place."'
+		'"Did someone record it? I bet it would be hilarious to watch."'
+	elseif chat_rand = 92 and cheerleadingQW['quest_stage'] > 1 and (grupTipe = 1 or grupTipe = 2):
+		'"So <<$pcs_nickname>> joined the cheerleading squad."'
+		'"Well yeah, she is one of them. You know, '+iif(grupTipe = 1, 'popular', 'sporty')+' enough to pass their judgemental selection process?"'
+		'"It''s pretty harsh I know. I can only imagine Anushka on the team if they allowed it, running around the field flashing everyone during a game."'
+	elseif chat_rand = 93 and cheerleadingQW['quest_stage'] = 2:
+		'"Why did Albina let <<$pcs_nickname>> on the team? I thought they only allowed their own to join?"'
+		'"She is their so called backup member. Honestly, she is probably only there so they can laugh at her."'
+		'"Poor naive girl doesn''t know what she''s gotten herself into."'
+	elseif chat_rand = 94:
+		'"Is Lariska only on the cheerleading squad because Christina is there? She seems to enjoy volleyball more than dancing."'
+		'"Well she does follow Christina around like a lost puppy, so maybe you''re right."'
 	else
 		gs 'gschool_gossip', 'mixed'
 	end
@@ -399,7 +415,7 @@ if $ARGS[0] = 'mixed':
 end
 
 if $ARGS[0] = 'boys':
-	chat_rand = rand(1, 39)
+	chat_rand = rand(1,42)
 	if chat_rand = 1:
 		'"Dude, you should''ve seen me in League of Legends yesterday. I totally carried my crappy team to victory!" His friend does not seem impressed and scoffs back, "Man, I''ve seen you play before. You couldn''t carry a paper bag to the litter bin, if your life depended on it."'
 	elseif chat_rand = 2:
@@ -612,6 +628,22 @@ if $ARGS[0] = 'boys':
 			'"Come on man, I''m in a bit of a dry spell. Please? I''ll try to negotiate you in on the deal. Surely 200 <b>₽</b> is enough for two."'
 			'"That''s just sick, I like it. Alright, I''m in."'
 		end
+	elseif chat_rand = 40:
+		'"So I heard that the cheerleaders have lesbian orgies with each other in the locker room."'
+		'"Are you for real? I wish I could watch Albina eating Bella''s pussy. That would be so fucking hot."'
+		'"Tell me about it. Maybe they make Lariska lick them all out?"'
+		'They nod to each other as they debate over who the hottest cheerleader is.'
+	elseif chat_rand = 41:
+		'"I wish I could do sports. The cheerleaders fuck the football team after every game."'
+		'"What? No way!"'
+		'"So I heard. They just walk right into the girls locker room and all the girls just drop to their knees and blow them."'
+		'"Shit. What I would do to have one of those well toned chicks suck my dick. Those uniforms make them look so fucking sexy."'
+		'"Too right man, too fucking right."'
+	elseif chat_rand = 42:
+		'"Hey man, you want to go to the next football game?"'
+		'"I''m not interested in football."'
+		'"I''m not talking about the game. I''m going there to watch Bella do her stuff. I know a good spot in the stands where you can get a nice view of that toned ass."'
+		'"Oh I''m definitely down to see that!"'
 	else
 		gs 'gschool_gossip', 'boys'
 	end
@@ -624,7 +656,7 @@ end
 
 
 if $ARGS[0] = 'girls':
-	chat_rand = rand(1, 38)
+	chat_rand = rand(1,40)
 	if chat_rand = 1:
 		'"I quit volleyball."'
 		'"Why?"'
@@ -797,6 +829,13 @@ if $ARGS[0] = 'girls':
 		'The other girl nods, inattentively listening to her friend. "Come on, tell me..."'
 		'The girl looks carefully around. "So I saw Ivan and Fedor earlier this last weekend, they were going towards the beach. I didn''t dare to follow them to see what they were up to."'
 		'The other girl lets out a squeal, "We''re sooo going to meet up this weekend and see if they''re heading there again."'
+	elseif chat_rand = 39:
+		'"Those snooty bimbos just love dressing up like sluts and dancing for that field of perverts. Sluts don''t care if those pervs are looking at their butts and undressing them with their eyes!"'
+		'"Not so loud! Do you want them to hear you? Who knows what they would do to you if they found out you said that."'
+	elseif chat_rand = 40 and cheerleadingQW['quest_stage'] ! 0:
+		'"I''m wondering whether I should have tried out for the cheerleading squad or not."'
+		'"Yeah, I''m sure that they would have invited your unfit ass wih open arms. Besides, they''re a bunch of sluts who enjoy teasing the perverts in the stands and sucking off the football team."'
+		'"Maybe I did dodge a bullet then..."'
 	else
 		gs 'gschool_gossip', 'girls'
 	end

+ 14 - 5
locations/gschool_grounds.qsrc

@@ -30,10 +30,8 @@ if $ARGS[0] = 'main':
 			if money >= 1000:act 'Go to the party (1,000 <b>₽</b>)':money -= 1000 & gt 'nyp_school', 'start'
 		end
 	end
-	if InvitationToDimkaNYparty = 1 and day = 31 and day = nyp_day:
-		killvar 'InvitationToDimkaNYparty'
-		act 'Follow Dimka to his home at the New Year party':  minut += 30 & gt 'sny', '3'
-	end
+	
+	if InvitationToDimkaNYparty = 1 and day = 31 and day = nyp_day: act 'Follow Dimka to the New Year''s party at his home': killvar 'InvitationToDimkaNYparty' & minut += 30 & gt 'sny', '3'
 
 	if week < 6 and hour = 14 and kanikuli = 0 and afterschool_day ! daystart:
 		afterschool_day = daystart
@@ -44,7 +42,18 @@ if $ARGS[0] = 'main':
 			gt 'gschool_events', 'afterschool_events'
 		end
 	end
-
+	
+	!! Cheerleading tryouts if Sveta decided to attend
+	if hour = 14 and cheerleadingQW['quest_stage'] = 1:
+		gt 'gschool_cheerleading', 'tryouts'
+	!! Sveta attends training after school every Tuesday and Thursday.
+	elseif hour = 14 and cheerleadingQW['day'] ! daystart and (week = 2 or week = 4) and kanikuli = 0 and cheerleadingQW['quest_stage'] > 1:
+		gt 'gschool_cheerleading', 'afterschool_practice'
+	!! A football game is played once every 2nd Friday and the cheerleaders perform out on the field. 
+	elseif hour = 14 and cheerleadingQW['day'] ! daystart and week = 5 and ((daystart - (daystart mod 7)) / 7) mod 2 = 1 and kanikuli = 0 and (cheerleadingQW['quest_stage'] >= 3 or cheerleadingQW['backup_game'] = 1):
+		gt 'gschool_cheerleading', 'afterschool_game'
+	end
+	
 	if hour <= 8 and kanikuli = 6:
 		'Today is graduation day! The school prom is tonight as well.'
 

+ 10 - 0
locations/gschool_lessons.qsrc

@@ -4,6 +4,7 @@ if $ARGS[0] = 'morning':
 	*clr & cla
 	$menu_loc = 'gschool_lessons'
 	$menu_arg = 'morning'
+	$location_type = 'public_indoors'
 	menu_off = 0
 	
 	if school_check_day ! daystart:
@@ -104,6 +105,9 @@ if $ARGS[0] = 'morning':
 			act 'Use water cooler': $breaktype = 'first' & gt 'gschool_break', 'watercooler'
 			act 'Go to the girls restroom': $breaktype = 'first' & gt 'gschool_break', 'girls_restroom'
 			act 'Go to the boys restroom': $breaktype = 'first' & gt 'gschool_break', 'boys_restroom'
+		elseif late = 0 and cheerleadingQW['skipped_ev'] + cheerleadingQW['skipped_g_ev'] > 0:
+			gs 'gschool_cheerleading', 'skipped_ev'
+			act 'Continue down the hall': gt 'gschool_lessons', 'morning'
 		else
 			'<center><b><font color="maroon">School Hallway</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall0<<Rand(0,2)>>.jpg"></center>'
@@ -290,6 +294,11 @@ if $ARGS[0] = 'short_break':
 		act 'Move to next class': gt 'gschool_lessons', 'schedule'
 
 		act 'Skip next class': school_period += 1 & gt 'gschool_lessons', 'skip'
+		
+		if cheerleadingQW['skipped_ev'] + cheerleadingQW['skipped_g_ev'] > 0:
+			gs 'gschool_cheerleading', 'skipped_ev'
+			act 'Continue down the hall': gt 'gschool_lessons', 'short_break'
+		end
 	elseif Kuznetsov_punishment = 1:
 		'<center><b><font color="maroon">School Hallway</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall0<<Rand(0,2)>>.jpg"></center>'
@@ -304,6 +313,7 @@ if $ARGS[0] = 'skip':
 	*clr & cla
 	$menu_loc = 'gschool_lessons'
 	$menu_arg = 'skip'
+	$location_type = 'public_indoors'
 	menu_off = 0
 	killvar '$breaktype'
 	gs 'stat'

+ 1 - 1
locations/gschool_lessons2.qsrc

@@ -412,7 +412,7 @@ if $ARGS[0] = 'computer':
 	act 'Play with your phone':
 		*clr & cla
 		pcs_grades -= rand(0,1)
-		mood +10
+		pcs_mood += 10
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/phone.jpg"></center>'
 		'The lesson is so boring that you have to do something to keep yourself entertained. You take out your phone and begin to play a mobile game, hoping the lesson will be over soon.'
 		playphone = rand(1,2)

+ 1 - 0
locations/gschool_lessons4.qsrc

@@ -1838,6 +1838,7 @@ if $ARGS[0] = 'post_dress':
 	$locM = 'gschool_lessons4'
 	$menu_loc = 'gschool_lessons4'
 	$menu_arg = 'post_dress'
+	$location_type = 'bathroom'
 	menu_off = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphys<<rand(1,4)>>.jpg"></center>'

+ 10 - 3
locations/gschool_lunch.qsrc

@@ -40,6 +40,7 @@ if $ARGS[0] = 'cafeteria':
 	$metka = 'cafeteria'
 	$menu_loc = 'gschool_lunch'
 	$menu_arg = 'cafeteria'
+	$location_type = 'public_indoors'
 	menu_off = 0
 	minut += 10
 	gs 'stat'
@@ -102,15 +103,21 @@ if $ARGS[0] = 'break':
 	*clr & cla
 	$menu_loc = 'gschool_lunch'
 	$menu_arg = 'break'
+	$location_type = 'public_indoors'
 	menu_off = 0
 	gs 'stat'
 	urand = rand(0,8)
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/cooljocks.jpg"></center>'
 	'During break many of the kids split up to hang out with those in their same social groups. The nerds and outcast hangout in the classrooms, while the cool kids and jocks hang out in the hallway near the lockers, and the gopniks hangout in the stairwell, near the classrooms that are not used.'
-	cla
-
+	
 	$eventtype = 'long_break'
-
+	
+	if cheerleadingQW['skipped_ev'] + cheerleadingQW['skipped_g_ev'] > 0:
+		gs 'gschool_cheerleading', 'skipped_ev'
+		act 'Continue down the hall': gt 'gschool_events', 'leave_break_events2'
+		exit
+	end
+	
 	if $breaktype ! 'long':
 		if dimaRevenge = 4 and dimaRevChoice = 2 and hour < 10: '<br>"Hi Nat did you happen to see Dimka?" "Hi <<$pcs_nickname>>, he was here before speaking with Lena and Lera.'
 

+ 1 - 0
locations/gschool_socialchg.qsrc

@@ -740,6 +740,7 @@ end
 if $ARGS[0] = 'explore':
 	$menu_loc = 'gschool_socialchg'
 	$menu_arg = 'explore'
+	$location_type = 'public_indoors'
 	menu_off = 0
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/oldschool/gophangout/party/party.jpg"></center>'
 	'Once your story has been told and everyone took a drink or more of the vodka, the large crowd scatters around and smaller cliques have formed instead. Those left in the main office are <a href="exec:gt ''gschool_socialchg'', ''tVitek''">Vitek</a> and <a href="exec:gt ''gschool_socialchg'', ''tLavrenti''">Lavrenti</a> who are discussing something, while <a href="exec:gt ''gschool_socialchg'', ''tDan''">Dan</a> is sitting on the sofa with a drink in his hand carefully listening to the discussion.'

+ 1 - 0
locations/katjaEv.qsrc

@@ -27,6 +27,7 @@ if $ARGS[0] = '1':
 	cls
 	minut += 15
 	pcs_mood = 100
+	menu_off = 1
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
 	if month=1 or month=2 or month=12 or month=11:

+ 1 - 1
locations/kiosk.qsrc

@@ -168,7 +168,7 @@ if $ARGS[0] = 'counter':
 		act 'Buy some water (40 <b>₽</b>) (0:05)':
 			*clr & cla
 			frost = 1
-			alko -= 1
+			if alko > 0: alko -= 1
 			minut += 5
 			money -= 40
 			pcs_health += 10

+ 5 - 6
locations/koncepod.qsrc

@@ -10,7 +10,7 @@ if hour <= 7 or hour >= 21:
     cla
     *clr
     '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/koncepod1.jpg" ></center>'
-    'The concierge counter is empty.'
+    'The concierge''s desk is empty.'
 else
     cla
     *clr
@@ -21,7 +21,7 @@ else
 		'Sorry, but the apartment has already been rented.'
 	end
 
-	act 'Go up stairs':gt'koncepod1','krr2x1'
+	act 'Go upstairs':gt'koncepod1','krr2x1'
 
 
 
@@ -29,16 +29,15 @@ else
 		nurand = RAND(0,100)
 		if nurand >= 90:
 			pcs_mood -= 5
-			'As you walk away you heard the barely audible murmur from the concierge "That slut! She walks around in a short skirt and no panties, ass and pussy on display for all to see!"'
+			'As you walk away you hear the concierge hissing under his breath, "That slut! She walks around in a short skirt and no panties. Ass and pussy on display for all to see!"'
 		end
 	end
 
 	if pcs_makeup = 4 and hour >= 7 and hour <= 21:
-		'As you walk away you heard the barely audible murmur from the concierge "Oh, look at her now. All painted up like some cheap whore."'
+		'As you walk away you hear the concierge hissing under his breath, "Oh, look at her now, all painted up like some cheap whore!"'
 	end
 end
 
 act 'Leave':gt'dvor'
 
---- koncepod ---------------------------------
-
+--- koncepod ---------------------------------

+ 3 - 3
locations/koncepod1.qsrc

@@ -21,9 +21,9 @@ if $ARGS[0]='krr2x1':
     '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/koncepod3.jpg" ></center>'
 
     if psiho = 0:
-        'You stopped at the door and immediately opened it. You have the eerie feeling of the presence of the old man, causing a chill to run down your spine.'
-        'You look at your hand and try to focus on it, and get rid of delusions.'
-        'Heart pounding, like the beating wings of a bird in a snare, gradually you start to calm down, looking at the usual architecture, the flight of stairs and the general atmosphere of the old building helps, and you begin to calm you down.'
+        'You stop at the door and immediately open it. You have the eerie feeling of the presence of the old man, causing a chill to run down your spine.'
+        'You look at your hand and try to focus on it so that you can rid yourself of the feeling.'
+        'Your heart pounds, like the beating wings of a bird in a snare. Looking at the usual architecture, the flight of stairs, and the general atmosphere of the old building helps. You begin to calm down.'
 
         act 'Quickly go inside':gt'koncepod1','krr2x'
     end

+ 7 - 11
locations/kuhrPar.qsrc

@@ -28,14 +28,11 @@ gs 'kit_din'
 gs 'themes', 'indoors'
 '<center><b><font color="maroon">Kitchen</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/kuhrpar.jpg"></center>'
-if hour = 7 and indorf = 0:
-!!tweaking this so there is two versions for when Anya is there during the week and the weekend when she is not there. Needs code for each. Anya sleeps in on the weekends from hanging out drinking with friends.
+if hour = 7 and week < 6 and indorf = 0:
 	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''">mother</a>, <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating breakfast. You could sit down and join them for breakfast or just grab something and go.'
-elseif 
-!!this is the weekend version of the above.
+elseif hour = 7 and week > 5:
 	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''">mother</a>, and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating breakfast. It seems your sister is sleeping in again. You could sit down and join them for breakfast or just grab something and go.'
-elseif hour = 7 and indorf = 0:
-!!this is for dinner need the hours changed to fit dinner time.
+elseif hour = 18 and minut <= 30 and indorf = 0:
 	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''">mother</a>, <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating dinner. You could sit down and join them for dinner or just grab something and go.'
 else
 	'The kitchen is not very impressive, but it has everything your family needs. Since everyone can''t always join for family meals, <<$npc_nickname[''A29'']>> usually pre-cooks some meals and stores them in the fridge, to be handy for later. Of course, you could also just have a snack if you''re not that hungry.'
@@ -43,7 +40,6 @@ end
 gs 'family'
 
 if hour = 7 and breakfast_day ! daystart: 
-!!shouldn''t this be all week aka all 7 days?
 	act 'Eat breakfast with your family (0:20)': 
 		*clr & cla
 		frost = 0
@@ -71,6 +67,7 @@ if hour = 7 and breakfast_day ! daystart:
 		else
 			'You glance to him. "Um ok, I guess." You notice your mother frowning at you, so you quickly try to change the subject but they won''t let you. You do your best to make them think you are doing better than you are but neither seem to have bought it. Meanwhile Kolka snickers at you getting grilled.'
 			'The rest of breakfast is taken up with talk about how Kolka is doing in school whom seems to be doing better than you and is showered in praise from your mother and step father. The food is good even if the conversation wasn''t the best, you quickly finish your meal.'
+		end	
 		act 'Get up from the table': gt $loc, $metka
 	end
 else
@@ -80,14 +77,13 @@ else
 end
 
 if hour = 18 and minut <= 30 and dinner_day ! daystart: 
-!!this is a copy and paste of the breakfast the code needs to be changed to dinner time the whole week.
 	act 'Eat dinner with your family (0:20)': 
 		*clr & cla
 		frost = 0
 		minut += 20
 		pcs_health += 10
 		pcs_mood += 10
-		fat += 6
+		fat += 8
 		pcs_energy += 60
 		if pcs_hydra >= 100:
 			pcs_hydra += 30
@@ -103,14 +99,12 @@ if hour = 18 and minut <= 30 and dinner_day ! daystart:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/dinnerhome.jpg"></center>'
 		'As you sit down and join your family for dinner, you step father asks. "So <<$pcs_nickname>> do you have a boyfriend yet?"'
 		if pav_slut > 75 and motherKnowSpravka = 0:
-!!and mother doesn''t know Sveta is a slut
 			'You start to respond to him, when your mother interrupts. "Of course not, she is still too young to be thinking about boys."'
 			'Then Kolka adds under his breath. "Like any boy would date her, when she sucks them all off anyways."'
 			'You mother turns towards Kolka. "That''s not funny apologize to your sister right now, right now!" Anya just smirks at that.'
 			'Kolka freezes in place, seeing that she is pissed he decides he doesn''t want to be the one to tell her about your reputation and says. "Sorry."'
 			'Your step father clears his throat and quickly changes the subject talking about how his work went. After that you have a fairly enjoyable dinner.'
 		elseif pav_slut > 75:
-!!and mother knows Sveta is a slut
 			'You start to respond to him, when your mother interrupts. "She is two young to worry about that and ... we talked about it." She gives you a meaningful glance and you shut your mouth.'
 			'Then Kolka adds under his breath. "Like any boy would date her, when she sucks them all off anyways."'
 			'You mother turns towards Kolka. "That''s not funny." Then she glances at you for a moment. "She might have made some mistakes but she is trying to be a better girl now. Now apologize to your sister right now, right now!" Anya just smirks at that.'
@@ -121,6 +115,8 @@ if hour = 18 and minut <= 30 and dinner_day ! daystart:
 			'Your step father sighs a little. "She is old enough to start dating dear."'
 			'You mother gives him a hard look. "No she isn''t she needs to focus on school and then going to the University before she can start thinking about boys."'
 			'You step father decides to drop it and start talking about some of the stuff that happened at his work. All and all you have a fairly enjoyable dinner.'
+		end
+		
 		act 'Get up from the table': gt $loc, $metka
 	end
 else

+ 9 - 9
locations/liam.qsrc

@@ -37,15 +37,15 @@ else
 	end
 end
 
-'The old part of the city, usually call old town. A couple of centuries ago, this was the village of Pushkin.'
-'Later, the rich bought land off the poor here and knocked down the wooden shacks and farm houses to build large houses. As the city continued to grow rapidly, it became a desirable suburb.'
-'Since then even the old houses have been improved, extended and modernized. The old buildings and beautiful park make it popular with tourists and it has become part of Pavlovsk.'
+'The old part of the city, usually called Old Town. A few of centuries ago, this was the village of Pushkin.'
+'Later, the rich bought the land off the poor and knocked down the wooden shacks and farm houses to build large estates. The city began to grow rapidly and it became a desirable suburb.'
+'Since then, even the old houses have been improved, extended, and modernized. The old buildings and beautiful park made it popular with tourists, and it has became part of Pavlovsk.'
 
-'Not far from here is the quiet <a href="exec:gt ''liames'',''start''">high street</a>.'
+'Not far from here is the quiet <a href="exec:gt ''liames'',''start''">High Street</a>.'
 'Close by is a narrow street leading to a <a href="exec:gt ''dvor'',''start''">vacant house</a>.'
-'You see a <a href="exec:gt ''ugol'',''start''">passage</a> between the houses lead to a courtyard.'
+'You see a <a href="exec:gt ''ugol'',''start''">passage</a> between the houses leading to a courtyard.'
 if car > 0 and cardrive = 14:
-	'I parked at the curb <a href="exec:gs ''carF'',''start''">your <<$car>></a>.'
+	'<a href="exec:gs ''carF'',''start''">Your <<$car>></a> is parked at the curb.'
 end
 
 if hour >= 13 and hour <= 15 and bodimodel = 1 and arts = 0 and tusa = 1:
@@ -56,13 +56,13 @@ if hour >= 13 and hour <= 15 and bodimodel = 1 and arts = 0 and tusa = 1:
 		gs'dibodi'
 
 		'<center><img <<$set_imgh>> src="images/characters/oldtown/marinka/marinka.jpg"></center>'
-		'Suddenly you notice a girl from the local hangouts Marinka, I am standing at the door.'
+		'While standing at the door, you notice a girl from the local hangout, Marinka.'
 
 		act 'Ask':gt 'dibodi', 'sptusa'
 	end
 end
 
-if arts = 1:'Apartment <a href="exec:gt ''Marin'',''start''">Marina</a>'
+if arts = 1:'<a href="exec:gt ''Marin'',''start''">Marina''s Apartment</a>'
 
 act 'Walk to the train station (0:15)':minut += 15 & nroad = 15 & gt 'pavTrain'
 act 'Walk to Pavlovsk park (0:10)':minut += 10 & nroad = 10 & gt 'gskver', 'start'
@@ -78,7 +78,7 @@ if pushkin_walk_day ! daystart:
 		pcs_willpwr += 1
 		pushkin_walk_day = daystart
 		gs 'stat'
-		'You breathe in the fresh air and slowly walk along the narrow streets of the Old Town admiring the beautiful architecture.'
+		'You breathe in the fresh air and slowly walk along the narrow streets of the Old Town, admiring the beautiful architecture.'
 		act 'Continue': gt'liam', 'start'
 	end
 end

+ 3 - 3
locations/liamelkafe.qsrc

@@ -6,11 +6,11 @@ if $ARGS[0] = 'start':
 	menu_off = 0
 	$location_type = 'indoors'
 	gs 'stat'
-	'<center><B><font color=maroon>Tiny Cafe</font></B></center>'
+	'<center><B><font color=maroon>Liamel Cafe</font></B></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/cafe/larek.jpg" ></center>'
 	*nl
-	'You enter a tiny cafe, consisting of very little floor space packed with small tables.'
+	'What little floor space the quaint cafe has, is packed with many small tables and chairs.'
 
 	act 'Leave the cafe':gt 'liames'
 
@@ -32,7 +32,7 @@ if $ARGS[0] = 'food':
 	$menu_loc = 'liamelkafe'
 	$menu_arg = 'food'
 	menu_off = 0
-	'<center><B><font color=maroon>Tiny Cafe</font></B></center>'
+	'<center><B><font color=maroon>Liamel Cafe</font></B></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/cafe/larek.jpg" ></center>'
 

+ 19 - 20
locations/liames.qsrc

@@ -22,44 +22,44 @@ set borMir=0
 set borLoker=0
 set minut+=10
 
-'<center><B>High street</B></center>'
+'<center><B>High Street</B></center>'
 '<center><img <<$set_imgh>> src="images/locations/oldtown/liames.jpg" ></center>'
-'Not so much of a street, more of a connection of several streets including cafes and shops.'
-'A street runs straight to the <a href="exec:gt ''liam'',''start''">Town center</a>.'
-'Street leads to the Old Town <a href="exec:gt ''parks'',''start''">park</a>.'
+'High Street is a square serving as the joining point of several smaller streets.  There are many small cafes and shops.'
+'Another street runs straight to the <a href="exec:gt ''liam'',''start''">Town Center</a>.'
+'High Street itself leads to the Old Town <a href="exec:gt ''parks'',''start''">Park</a>.'
 if hour >= 8 and hour <= 20:
-	'A small <a href="exec:gt ''larek'',''start''">shop</a> is currently open.'
+	'A small <a href="exec:gt ''larek'',''start''">grocery store</a> is currently open.'
 else
-	'There is a small local shop that is open 8:00 - 20:00 everyday. Currently closed.'
+	'There is a small whole foods store that is open from 8:00 - 20:00 everyday. It is currently closed.'
 end
 
 if hour >= 10 and hour <= 22:
-	'A <a href="exec:gt ''liamelkafe'',''start''">tiny cafe</a> displays a street sign outside its door.'
+	'A quaint little restaurant has put a sign outside of its door, reading, "<a href="exec:gt ''liamelkafe'',''start''">Liamel Cafe</a>."'
 else
-	'The tiny cafe here is close currently, it is open every day 10:00 - 22:00'
+	'Liamel Cafe is current closed, it is open every day 10:00 - 22:00'
 end
 
 if exhibitionQW > 3:
 	if week < 7 and hour >= 8 and hour <= 18:
 		'<a href="exec:gt ''exhibitionistshop'',''start''">Expression of You</a> is just down a small side street from here.'
 	else
-		'Expression of You is open Mon - Sat, 8:00 - 18:00'
+		'<b>Expression of You,</b> is open Mon - Sat, 8:00 - 18:00'
 	end
 end
 
 if hour >= 18 and hour <= 22:
 	if pcs_inhib > 30:
-		'An old theatre here is now a <a href="exec:gt ''burlesque'',''start''">burlesque club</a> with shows running until 22:00.'
+		'There is a <a href="exec:gt ''burlesque'',''start''">burlesque club</a> with shows running until 22:00, that was once an old theatre.'
 	else
-		'There is a burlesque club in an old theatre here. It makes you self-conscious about your own looks and you cannot bring yourself to go there.'
+		'There is a burlesque club in an old theatre here. It makes you self-conscious about your looks and you cannot bring yourself to go there.'
 	end
 else
 	'The old theatre housing a burlesque club is closed now. It is open every day 18:00 - 22:00'
 end
 
-if home_owned[4] = 1: act '<b>Go home</b>':gt'korr2x'
+if home_owned[4] = 1: act '<b>Go home.</b>':gt'korr2x'
 
-if hour >= 8 and hour <= 17 and exhibitionQW = 3: act 'Search for the shop on the card from Kseniya': gt 'exhibitionistshop', 'start'
+if hour >= 8 and hour <= 17 and exhibitionQW = 3: act 'Search for the shop on the card from Kseniya.': gt 'exhibitionistshop', 'start'
 
 act 'wait':gs 'obj_din', 'wait'
 
@@ -77,12 +77,12 @@ if streetrand >= 60 and pcs_lover < 3:
 		'To you came <<$boybody>> <<$boybod>> <<$boyface>>. It <<$boyClo>>'
 		'The guy introduced himself as <<$boydesc>> and I asked for your telephone number.'
 
-		act 'Tell him your telephone number':
+		act 'Tell him your telephone number.':
 			cla
 			gs'boyfrend', 'start'
 			stopboy = 0
-			'<<$boydesc>> record your phone and left.'
-			act 'Complete outing':gt 'liames'
+			'<<$boydesc>> saved your phone number and left.'
+			act 'Complete outing.':gt 'liames'
 		end
 	end
 end
@@ -90,7 +90,7 @@ end
 if stallionQ = 3:
 	*clr
 	cla
-	'There is a rumbling in your stomach, you need to use the restroom. Luckily there appears to be a public restroom tucked into the corner of a building. Unluckily, the female one has a sign saying it is out of order.'
+	'There is a rumbling in your stomach, you need to use the restroom. There appears to be a public restroom tucked into the corner of a building. Unfortunately, the female one has a sign reading, "Out of order."'
 	act 'Use the Men''s Restroom':gt 'stallion','start'
 	act 'Hold it':stallionQ = 1 & gt 'liames'
 end
@@ -103,7 +103,7 @@ if temp >= 90:
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/liamhud1.jpg"></center>'
 
-	'You have seen both a sitting area-the artist, here the artist girl came and sat opposite him,and the artist began to paint it'
+	'Making your way down High Street, you see a woman waiting patiently while an artist paints her portrait.'
 
 	act 'Further':gt'liames'
 end
@@ -131,8 +131,7 @@ if hour >= 15 and hour <= 22 and tusa = 1 and tusnyakday ! daystart:
 		gs'dibodi'
 		minut += 20
 		'<center><img <<$set_imgh>> src="images/locations/oldtown/photo.jpg"></center>'
-		'You came to talking to girls and boys and greeted you.'
-		'In response you too greeted them.'
+		'The girls and boys at the local hangout happily greet you.'
 
 		if $pantyworntype = 'none' and sttan = 0:
 			'- A <<$pcs_nickname>> campaign wears panties - said one of the boys.'

+ 1 - 1
locations/natbelapt.qsrc

@@ -1469,7 +1469,7 @@ if $ARGS[0] = 'snack':
 	*nl
 	!!Snack + Water
 	minut += 15
-	alko -= 1
+	if alko > 0: alko -= 1
 	pcs_health += 20
 	pcs_mood += 20
 	fat += 6

+ 14 - 14
locations/npcstatic1.qsrc

@@ -366,7 +366,7 @@ $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 23
 hotcat_rating['A<<npctemp>>'] = 7
-npc_body[n] = 's5'
+$npc_body['A<<npctemp>>'] = 's5'
 
 
 npctemp = 13
@@ -392,7 +392,7 @@ npc_sexskill['A<<npctemp>>'] = 2
 npc_hymen['A<<npctemp>>'] = 4
 npc_bust['A<<npctemp>>'] = 8
 hotcat_rating['A<<npctemp>>'] = 6
-npc_body[n] = 'l2'
+$npc_body['A<<npctemp>>'] = 'l2'
 
 
 npctemp = 14
@@ -414,7 +414,7 @@ $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 20
 hotcat_rating['A<<npctemp>>'] = 7
-npc_body[n] = 's3'
+$npc_body['A<<npctemp>>'] = 's3'
 
 
 npctemp = 15
@@ -437,7 +437,7 @@ $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 18
 $npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''viktoria''"><<$npc_usedname[''A15'']>></a>'
 hotcat_rating['A<<npctemp>>'] = 7
-npc_body[n] = 's3'
+$npc_body['A<<npctemp>>'] = 's3'
 
 
 npctemp = 16
@@ -459,7 +459,7 @@ $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 26
 hotcat_rating['A<<npctemp>>'] = 6
-npc_body[n] = 'm3'
+$npc_body['A<<npctemp>>'] = 'm3'
 
 
 npctemp = 17
@@ -481,7 +481,7 @@ $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 34
 hotcat_rating['A<<npctemp>>'] = 9
-npc_body[n] = 'm3'
+$npc_body['A<<npctemp>>'] = 'm3'
 
 
 npctemp = 18
@@ -513,7 +513,7 @@ else
 	gs 'npcstaticdefaults', 'group', 'jock'
 end
 hotcat_rating['A<<npctemp>>'] = 7
-npc_body[n] = 'l3'
+$npc_body['A<<npctemp>>'] = 'l3'
 
 
 npctemp = 19
@@ -535,7 +535,7 @@ $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 14
 hotcat_rating['A<<npctemp>>'] = 7
-npc_body[n] = 'l1'
+$npc_body['A<<npctemp>>'] = 'l1'
 
 
 npctemp = 20
@@ -557,7 +557,7 @@ npc_sexskill['A<<npctemp>>'] = 2
 npc_hymen['A<<npctemp>>'] = 5
 npc_bust['A<<npctemp>>'] = 22
 hotcat_rating['A<<npctemp>>'] = 6
-npc_body[n] = 'l1'
+$npc_body['A<<npctemp>>'] = 'l1'
 
 
 npctemp = 21
@@ -581,7 +581,7 @@ npc_bust['A<<npctemp>>'] = 18
 $npc_dad['A<<npctemp>>'] = 'A26'
 $npc_mom['A<<npctemp>>'] = 'A27'
 hotcat_rating['A<<npctemp>>'] = 6
-npc_body[n] = 'm4'
+$npc_body['A<<npctemp>>'] = 'm4'
 
 
 npctemp = 22
@@ -599,7 +599,7 @@ $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 27
 hotcat_rating['A<<npctemp>>'] = 9
-npc_body[n] = 'm4'
+$npc_body['A<<npctemp>>'] = 'm4'
 
 
 npctemp = 23
@@ -619,7 +619,7 @@ npc_hymen['A<<npctemp>>'] = 6
 npc_bust['A<<npctemp>>'] = 14
 $npc_dad['A<<npctemp>>'] = 'A117'
 hotcat_rating['A<<npctemp>>'] = 8
-npc_body[n] = 'l2'
+$npc_body['A<<npctemp>>'] = 'l2'
 
 
 npctemp = 24
@@ -637,7 +637,7 @@ npc_sexskill['A<<npctemp>>'] = 1
 npc_hymen['A<<npctemp>>'] = 4
 npc_bust['A<<npctemp>>'] = 20
 hotcat_rating['A<<npctemp>>'] = 5
-npc_body[n] = 'l2'
+$npc_body['A<<npctemp>>'] = 'l2'
 
 
 npctemp = 25
@@ -664,7 +664,7 @@ else
 	gs 'npcstaticdefaults', 'group', 'coolkid'
 end
 hotcat_rating['A<<npctemp>>'] = 6
-npc_body[n] = 'm2'
+$npc_body['A<<npctemp>>'] = 'm2'
 
 
 npctemp = 26

+ 7 - 7
locations/npcstatic3.qsrc

@@ -470,7 +470,7 @@ $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 22
 hotcat_rating['A<<npctemp>>'] = 6
-npc_body[n] = 's3'
+$npc_body['A<<npctemp>>'] = 's3'
 
 
 npctemp = 140
@@ -487,7 +487,7 @@ $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 13
 hotcat_rating['A<<npctemp>>'] = 7
-npc_body[n] = 's2'
+$npc_body['A<<npctemp>>'] = 's2'
 
 
 npctemp = 141
@@ -504,7 +504,7 @@ $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 20
 hotcat_rating['A<<npctemp>>'] = 7
-npc_body[n] = 'm2'
+$npc_body['A<<npctemp>>'] = 'm2'
 
 
 npctemp = 142
@@ -521,7 +521,7 @@ $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 13
 hotcat_rating['A<<npctemp>>'] = 5
-npc_body[n] = 's4'
+$npc_body['A<<npctemp>>'] = 's4'
 
 
 npctemp = 143
@@ -536,7 +536,7 @@ gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'gopnik'
 npc_bust['A<<npctemp>>'] = 7
 hotcat_rating['A<<npctemp>>'] = 6
-npc_body[n] = 'm1'
+$npc_body['A<<npctemp>>'] = 'm1'
 
 
 npctemp = 144
@@ -553,7 +553,7 @@ $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 24
 hotcat_rating['A<<npctemp>>'] = 8
-npc_body[n] = 'l3'
+$npc_body['A<<npctemp>>'] = 'l3'
 
 
 npctemp = 145
@@ -568,7 +568,7 @@ gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'gopnik'
 npc_bust['A<<npctemp>>'] = 31
 hotcat_rating['A<<npctemp>>'] = 4
-npc_body[n] = 'l4'
+$npc_body['A<<npctemp>>'] = 'l4'
 
 
 npctemp = 146

+ 1 - 0
locations/obj_din.qsrc

@@ -337,6 +337,7 @@ if $ARGS[0] = 'skills':
 	if pcs_danc > 0: 'Modern Dancing - <<pcs_danc>>'
 	if pcs_dancero > 0: 'Erotic Dancing - <<pcs_dancero>>'
 	if pcs_dancpol > 0: 'Pole Dancing - <<pcs_dancpol>>'
+	if pcs_cheer > 0: 'Cheerleading - <<pcs_cheer>>'
 	if pcs_mdlng > 0: 'Modelling - <<pcs_mdlng>>'
 	*nl
 	'<b>Sexual Skills</b>'

+ 7 - 8
locations/parks.qsrc

@@ -12,15 +12,15 @@ if $ARGS[0] = 'start':
 	gs'stat'
 	'<center><B>Old Town Park</B></center>'
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/park/parkus.jpg" ></center>'
-	'These gardens of the old palace have been sculpted over many years into wonderful, landscaped gardens with a tranquil atmosphere.'
-	'The old park is a favorite vacation spot for tourists and the main feature of old town.'
+	'The gardens of the old palace have been sculpted over many years into a wonder landscape with a tranquil atmosphere.'
+	'The old park is a favourite vacation spot for tourists and servers as the main feature of Old Town.'
 
-	'Wander deeper into the <a href="exec:gt ''lug'',''start''">park</a> .'
+	'Wander deeper into the <a href="exec:gt ''lug'',''start''">park</a>.'
 
 
-	act 'Go to the high street': minut += 10 &  gt 'liames'
+	act 'Go to High Street': minut += 10 &  gt 'liames'
 
-	act 'Go to the town center': minut += 10 & gt 'liam'
+	act 'Go to Town Center': minut += 10 & gt 'liam'
 
 	act 'Walk around the park (1 hour)':
 		if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1', 1
@@ -28,9 +28,9 @@ if $ARGS[0] = 'start':
 		minut += 60
 		pcs_mood += 10
 		gs'stat'
-		'You leisurely stroll through the park of the Old Town. Breathe in the fresh air, reflecting on the vicissitudes of fate.'
+		'You leisurely stroll through Old Town Park, breathing in the fresh air, and reflecting on the vicissitudes of fate.'
 
-		act 'Complete outing':gt 'parks','start'
+		act 'Complete outing.':gt 'parks','start'
 	end
 
 	gs 'parkivent', 'run'
@@ -75,6 +75,5 @@ if $ARGS[0] = 'start':
 	end
 end
 
-
 --- parks ---------------------------------
 

+ 1 - 1
locations/pavResidential.qsrc

@@ -147,7 +147,7 @@ end
 if kanikuli = 0 and StoryLine > 0 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 7 and hour < 9: act '<b>Go to school</b>': minut += 2 & gt 'gschool_grounds', 'main'
 
 if InvitationToDimkaNYparty = 1 and month = 12 and day = 31 and hour > 14 and hour <= 18:
-	act '<b>Go to Dimka''s house at the New Year party</b>': killvar 'InvitationToDimkaNYparty' & minut += 30 & gt 'sny', '3'
+	act '<b>Go to the New Year''s party at Dimka''s house</b>': killvar 'InvitationToDimkaNYparty' & minut += 30 & gt 'sny', '3'
 elseif InvitationToDimkaNYparty = 1 and month ! 12:
 	killvar 'InvitationToDimkaNYparty'
 end

+ 4 - 2
locations/preSYS2.qsrc

@@ -404,7 +404,7 @@ if $ARGS[0] = 'modatt':
 	gs 'preSYS2', 'modrel_setup2', 'pcs_prcptn', 'Perception'
 	if MagikDostup = 0: gs 'preSYS2', 'modrel_setup2', 'pcs_magik', 'Magic'
 	gs 'preSYS2', 'modrel_setup2', 'pcs_grades', 'Grades'
-	gs 'preSYS2', 'modrel_setup4', '100-pcs_inhib', 'Inhibition'
+	gs 'preSYS2', 'modrel_setup4', 'pcs_inhib', 'Inhibition'
 	gs 'preSYS2', 'modrel_setup2', 'pcs_heels', 'Heels'
 	'</table></center>'
 	nl
@@ -473,6 +473,7 @@ if $ARGS[0] = 'modskl_bea':
 	gs 'preSYS2', 'modrel_setup2', 'pcs_danc', 'Modern Dancing'
 	gs 'preSYS2', 'modrel_setup2', 'pcs_dancero', 'Erotic Dancing'
 	gs 'preSYS2', 'modrel_setup2', 'pcs_dancpol', 'Pole Dancing'
+	gs 'preSYS2', 'modrel_setup2', 'pcs_cheer', 'Cheerleading'
 	gs 'preSYS2', 'modrel_setup2', 'pcs_mdlng', 'Modelling'
 	'</table></center>'
 	nl
@@ -554,6 +555,7 @@ if $ARGS[0] = 'none':
 	pcs_danc = 0
 	pcs_dancero = 0
 	pcs_dancpol = 0
+	pcs_cheer = 0
 	pcs_mdlng = 0
 	
 	!!Artistic Skills Reset
@@ -614,7 +616,7 @@ if $ARGS[0] = 'none':
 	stat['hj'] = 0	
 	stat['vaginal'] = 0
 	$soc_grup = 'outcast'
-	gs 'preSYS2', $soc_grup
+	gs 'preSYS', $soc_grup
 end
 
 if $ARGS[0] = 'modrel':

+ 3 - 3
locations/saveupdater.qsrc

@@ -748,9 +748,9 @@ If graze_cow_exp > 0: grandpaQW['chore_herd_cattle_experience'] = graze_cow_exp
 If haying_time > 0: grandpaQW['chore_bale_hay'] = haying_time & killvar 'haying_time'
 If horse_field > 0: grandpaQW['chore_lead_horse_to_field'] = horse_field & killvar 'horse_field'
 If horse_river > 0: grandpaQW['chore_bathe_horse'] = horse_river & killvar 'horse_river'
-If go_in_bilberry > 0: $grandpaQW['chore_gather_from_forest'] = 'berry' & killvar 'go_in_bilberry'
-If go_in_boletus > 0: $grandpaQW['chore_gather_from_forest'] = 'mushroom' & killvar 'go_in_boletus'
-If go_in_boletus_bilberry > 0: $grandpaQW['chore_gather_from_forest'] = 'both' & killvar 'go_in_boletus_bilberry'
+If go_in_bilberry > 0: grandpaQW['chore_gather_berries'] = go_in_bilberry & killvar 'go_in_bilberry'
+If go_in_boletus > 0: grandpaQW['chore_gather_mushrooms'] = go_in_boletus & killvar 'go_in_boletus'
+If go_in_boletus_bilberry > 0: grandpaQW['chore_gather_both'] = go_in_boletus_bilberry & killvar 'go_in_boletus_bilberry'
 !!---Grandma
 If grandma_trouble > 0: grandmaQW['nudity_trouble'] = grandma_trouble & killvar 'grandma_trouble'
 If grandmastory > 0: grandmaQW['last_day_asked_for_story'] = grandmastory & killvar 'grandmastory'

+ 6 - 0
locations/sister.qsrc

@@ -60,6 +60,12 @@ if $ARGS[0] = 'gdk':
 			end
 			act 'Move away': SiSgdk = 0 & gt $loc, $metka
 		end
+		gs 'willpower', 'drink', 'resist', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Decline and move along (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt $loc, $metka
+		else
+			act 'Decline and move along (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to resist.</font>'
+		end
 	end
 end
 

+ 3 - 3
locations/sister_chat.qsrc

@@ -390,7 +390,7 @@ if $ARGS[0] = 'sister_chat':
 			act 'Continue': gt 'sister_chat', 'sister_chat'
 			exit
 		!! If you had sex with Anya
-		elseif sisterLesb > 0 and sisterQW['dno'] = 0 and sisterQW['lesb'] = 0 and sisterQW['bi'] = 0 and sisterQW['sisbi'] = 0 and $loc = 'bedrPar':
+		elseif sisterLesb > 3 and sisterQW['dno'] = 0 and sisterQW['lesb'] = 0 and sisterQW['bi'] = 0 and sisterQW['sisbi'] = 0 and $loc = 'bedrPar':
 			*clr & cla
 			minut += 2
 			gs 'stat'
@@ -756,7 +756,7 @@ if $ARGS[0] = 'sister_chat':
 					act 'Keep talking': gt 'sister_chat', 'sister_chat'
 				end
 			
-				if sisterLesb => 6 and $loc = 'bedrPar':
+				if sisterLesb => 7 and $loc = 'bedrPar':
 					act 'Tell her you want to have sex':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat.jpg"></center>'
@@ -881,7 +881,7 @@ if $ARGS[0] = 'sister_chat':
 									act 'Finish': gt 'sister_chat', 'sister_chat'
 								end
 							end
-						elseif temp <= 3 and npc_QW['A33'] = 10 and sisterLesb >= 4 and sisboyday ! daystart and sistrioday <= daystart and sisterQW['roma3block'] = 0:
+						elseif temp <= 3 and npc_QW['A33'] = 10 and sisterLesb >= 5 and sisboyday ! daystart and sistrioday <= daystart and sisterQW['roma3block'] = 0:
 							'<center><h1><font color="maroon">Anya</font></h1></center>'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_09.jpg"></center>'
 							sisboyday = daystart

+ 73 - 50
locations/sistersleep.qsrc

@@ -4,7 +4,7 @@
 if $ARGS[0] = 'sister_sleep':
 	*clr & cla
 	'<center><b><font color="maroon">Anya</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sleep0<<rand(1,5)>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sleep0<<rand(1,7)>>.jpg"></center>'
 	'Anya is sleeping face down on her bed, with her covers tossed aside, exposing her panty clad ass. You admit she has a really nice ass, you never see her workout, you wonder how she keeps so fit.'
 	if sisterLesb >= 6 or sisterLesb = -1:
 		'You want to touch her again but you keep from doing it, you agreed to not wake her up like this anymore. You sigh and then move away.'
@@ -12,10 +12,10 @@ if $ARGS[0] = 'sister_sleep':
 		gs 'stat'
 		act 'Move away': gt 'bedrPar'
 	else
-		if sisterLesb['day'] = daystart:
+		if sisterQW['lesbDay'] = daystart:
 			act 'Move away': gt 'bedrPar'
 		else
-			sisterLesb['day'] = daystart
+			sisterQW['lesbDay'] = daystart
 			act 'Move away': gt 'bedrPar'
 			if sisterbfspy = 4:
 				if sisterLesb = 0:
@@ -35,7 +35,6 @@ end
 
 if $ARGS[0] = 'sister_sleep_1':
 	*clr & cla
-	pcs_horny += 5
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/touch1.jpg"></center>'
 	act 'Move away': gs 'arousal', 'end' & gt 'bedrPar'
 	if sisterLesb <= 2:
@@ -147,11 +146,15 @@ if $ARGS[0] = 'sister_sleep_2_kiss':
 				gs 'stat'
 				act 'Move away': gt 'bedrPar'
 			end
-			gs 'willpower', 'sex', 'force'
-			if will_cost <= pcs_willpwr:
-				act 'Convince her (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'force' & gt 'sistersleep', 'sister_sleep_3'
+			if sisterLesb = 5:
+				gs 'willpower', 'sex', 'force'
+				if will_cost <= pcs_willpwr:
+					act 'Convince her (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'force' & gt 'sistersleep', 'sister_sleep_3'
+				else
+					act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end
 			else
-				act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				act 'What about last time?': gt 'sistersleep', 'sister_sleep_3'
 			end
 		end
 	end
@@ -160,10 +163,17 @@ end
 if $ARGS[0] = 'sister_sleep_3':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/les2.jpg"></center>'
-	'"Why is it wrong? We love each other and just making each other feel good, how can that be wrong?" You ask her as you pull her panties down, she only half heartedly resists you.'
-	'"You know why, where sisters and I like guys even if that wasn''t true." She says, still not really putting up much of a fight.'
-	'You push her legs apart and you can see her pussy is wet from here. "If it is so wrong, why is your pussy so wet?"'
-	'"I... I was having a sex dream is all." She explains.'
+	if sisterLesb = 5:
+		'"Why is it wrong? We love each other and just making each other feel good, how can that be wrong?" You ask her as you pull her panties down, she only half heartedly resists you.'
+		'"You know why, where sisters and I like guys even if that wasn''t true." She says, still not really putting up much of a fight.'
+		'You push her legs apart and you can see her pussy is wet from here. "If it is so wrong, why is your pussy so wet?"'
+		'"I... I was having a sex dream is all." She explains.'
+	else
+		'"Did it feel wrong last time? I think you enjoyed it enough to cum, tell me you didn''t enjoy it?" You ask her as you pull her panties down, she only half heartedly resists you.'
+		'"It doesn''t matter, you can enjoy things that are wrong, it doesn''t make them any less wrong." She says, still not really putting up much of a fight.'
+		'You push her legs apart and you can see her pussy is wet from here. "If it is so wrong, why is your pussy so wet?"'
+		'"I... shut up." She says with a blush, knowing why she is wet and knowing you know why as well.'
+	end
 	gs 'arousal', 'foreplay', 5, 'incest', 'lesbian'
 	gs 'stat'
 	act 'Finger her':
@@ -179,14 +189,22 @@ if $ARGS[0] = 'sister_sleep_3':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/les5.jpg"></center>'
 			'With that you move around and lay down between her legs and start licking and sucking on her clit with your mouth and tongue, as your fingers keep plunging in and out of her pussy.'
-			'She finally lays back and starts caress her breasts no longer resisting or even pretending to not enjoy it anymore.'
+			if sisterLesb = 5:
+				'She finally lays back and starts caress her breasts no longer resisting or even pretending to not enjoy it anymore.'
+			else
+				'She lays back and starts caress her breasts moaning passionately having fully given into your love making.'
+			end
 			gs 'arousal', 'cuni_give', 5, 'incest', 'lesbian'
 			gs 'arousal', 'vaginal_finger_give', -5, 'incest', 'lesbian'
 			gs 'stat'
 			act 'Have her return the favor':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/les6.jpg"></center>'
-				'You get up and strip down, you lay down near her head. She watches you with lust in her eyes, but you can still see a bit of resistance. Not wanting to give her time to recover, you reach over and pull her head between your legs. She resist for a moment and then stops, instead she starts to lick your pussy in return.'
+				if sisterLesb = 5:
+					'You get up and strip down, you lay down near her head. She watches you with lust in her eyes, but you can still see a bit of resistance. Not wanting to give her time to recover, you reach over and pull her head between your legs. She resist for a moment and then stops, instead she starts to lick your pussy in return.'
+				else
+					'You get up and strip down, you lay down near her head. This time without even needing to prod her she rolls over and places her face between your legs and starts licking at your pussy and clit.'
+				end
 				gs 'arousal', 'cuni', 5, 'incest', 'lesbian'
 				$orgasm_txt = '"Aaaaaaaaaaaa!!!" You catch a wave of pure bliss as you violently cum.'
 				$orgasm_or = 'yes'
@@ -205,43 +223,48 @@ if $ARGS[0] = 'sister_sleep_3':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/les8.jpg"></center>'
 						'Once her orgasm has fully passed she climbs off you and gets up on her knees and blushes deeply. "Look I had fun but lets forget this ever happened ok?"'
-						'You respond by getting up on your knees and kissing her, she returns the kiss. Once you finish kissing her you tell her. "Sure sis, nothing happened." You tell her in a slightly teasing tone.'
-						*nl
-						'She shakes her head. "I need to get some sleep. You need to go back to your bed and go to sleep too." With that she lays back down and rolls over facing away from you and tries to go back to sleep.'
-						'She gives you a stern look. "I''m serious we can''t do this anymore, do you hear me? This is the last time."'
-						act 'Accept her decision':
-							*clr & cla
-							sisterLesb = -1
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_20.jpg"></center>'					
-							'You put your best little sister pout on your face, but thinking she has already made her mind up, you shrug, and accept that you won''t be having any more private times with her. You sigh and say. "Ok I promise I won''t wake you up for sex anymore."'
-							'She rolls over and goes to sleep.'
-							gs 'arousal', 'end'
-							gs 'stat'
-							act 'Move away': gt 'bedrPar'
-						end
-						!! Flagged for skill check (instead of willpower check, which has been removed)
-						act 'Convince her otherwise':
-							*clr & cla
-							girl += 1
+						if sisterLesb = 5:
 							sisterLesb = 6
-							npc_rel['A33'] += 5
-							$orgasm_or = 'no'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/les8.jpg"></center>'
-							'"Anya, you don''t have to be a lesbian to enjoy a special release that only another woman can know how to give you.", you say as you begin lightly caressing her thigh.'
-							'"What if we agreed that we''ll help each other out only when we REALLLLYYYYY need it, but depend on our normal boyfriends most of the time, hmmm?". Her breathing starts to get faster as your fingertips glide to the center of her legs.'
-							*nl
-							'"Well... since you put it that way, I''m still not a lesbian, but helping each other out when we.... REALLLLYYYYY....need....mmmmmhhmmmm... help might be okay ....mmmmm..", she sighed, as she leans in and kisses you.'
+							'You respond by getting up on your knees and kissing her, she returns the kiss. Once you finish kissing her you tell her. "Sure sis, nothing happened." You tell her in a slightly teasing tone.'
 							*nl
-							'Once you break the kiss she adds. "Ok but seriously no more waking me up like this, we can ... when we really need it just tell the other one ok?" You nod and agree to not wake up her like this anymore, besides her into it from the start would be better anyways. Then she rolls over and tries to go to sleep. "Night" She tells you. You tell her good night as well and then go leave her to sleep.'
-							gs 'arousal', 'kiss', 3, 'incest'
-							gs 'arousal', 'forplay', 3, 'incest'
-							gs 'arousal', 'vaginal_finger', 3, 'incest'
-							$orgasm_txt = 'You both start feeling the heat, and lay down, kissing, touching, licking each other into orgasm.'
-							$orgasm_or = 'yes'
-							gs 'arousal', 'cuni', 3, 'incest'
-							gs 'arousal', 'end'
-							gs 'stat'
+							'She shakes her head. "I need to get some sleep. You need to go back to your bed and go to sleep too." With that she lays back down and rolls over facing away from you and tries to go back to sleep.'
 							act 'Move away': gt 'bedrPar'
+						else
+							'She gives you a stern look. "I''m serious we can''t do this anymore, do you hear me? This is the last time."'
+							act 'Accept her decision':
+								*clr & cla
+								sisterLesb = -1
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_20.jpg"></center>'					
+								'You put your best little sister pout on your face, but thinking she has already made her mind up, you shrug, and accept that you won''t be having any more private times with her.'
+								'She rolls over and goes to sleep.'
+								gs 'arousal', 'end'
+								gs 'stat'
+								act 'Move away': gt 'bedrPar'
+							end
+							!! Flagged for skill check (instead of willpower check, which has been removed)
+							act 'Convince her otherwise':
+								*clr & cla
+								girl += 1
+								sisterLesb = 7
+								npc_rel['A33'] += 5
+								$orgasm_or = 'no'
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/les8.jpg"></center>'
+								'"Anya, you don''t have to be a lesbian to enjoy a special release that only another woman can know how to give you.", you say as you begin lightly caressing her thigh.'
+								'"What if we agreed that we''ll help each other out only when we REALLLLYYYYY need it, but depend on our normal boyfriends most of the time, hmmm?". Her breathing starts to get faster as your fingertips glide to the center of her legs.'
+								*nl
+								'"Well... since you put it that way, I''m still not a lesbian, but helping each other out when we.... REALLLLYYYYY....need....mmmmmhhmmmm... help might be okay ....mmmmm..", she sighed, as she leans in and kisses you.'
+								*nl
+								'Once you break the kiss she adds. "Ok but seriously no more waking me up like this, we can ... when we really need it just tell the other one ok?" You nod and agree to not wake up her like this anymore, besides her into it from the start would be better anyways. Then she rolls over and tries to go to sleep. "Night" She tells you. You tell her good night as well and then go leave her to sleep.'
+								gs 'arousal', 'kiss', 3, 'incest'
+								gs 'arousal', 'forplay', 3, 'incest'
+								gs 'arousal', 'vaginal_finger', 3, 'incest'
+								$orgasm_txt = 'You both start feeling the heat, and lay down, kissing, touching, licking each other into orgasm.'
+								$orgasm_or = 'yes'
+								gs 'arousal', 'cuni', 3, 'incest'
+								gs 'arousal', 'end'
+								gs 'stat'
+								act 'Move away': gt 'bedrPar'
+							end
 						end
 					end
 				end
@@ -252,9 +275,9 @@ end
 
 if $ARGS[0] = 'sister_sex':
 	sisterLesb += 1
-	if sisterLesb <= 6: 
+	if sisterLesb <= 7:
 		gt 'sistersleep', 'sister_lesbian'
-	elseif sisterLesb = 9:
+	elseif sisterLesb < 9:
 		gt 'sistersleep', 'sister_strapon'
 	else
 		if rand(1,3) = 1:

+ 157 - 1
locations/stat_display.qsrc

@@ -1626,6 +1626,7 @@ else
 		if pcs_danc > 0: gs 'show_table', '<<pcs_danc>> Modern Dancing', '2'
 		if pcs_dancero > 0: gs 'show_table', '<<pcs_dancero>> Erotic Dancing', '2'
 		if pcs_dancpol > 0: gs 'show_table', '<<pcs_dancpol>> Pole Dancing', '2'
+		if pcs_cheer > 0: gs 'show_table', '<<pcs_cheer>> Cheerleading', '2'
 		if pcs_mdlng > 0: gs 'show_table', '<<pcs_mdlng>> Modelling', '2'
 		if pcs_heels > 0: gs 'show_table', '<<pcs_heels>> Heels', '2'
 	end
@@ -2014,6 +2015,9 @@ if $nichStatMsg ! '': $stat_msg += '<br><b><<$nichStatMsg>></b>'
 
 if npc_QW['A113'] = 1: $stat_msg += '<br>You owe Vadim Bely <<belgangpay>> <b><b>₽</b></b> and you need to pay him <<belgangpayweek>> <b>₽</b></b> this week.'
 
+!!------------------ Things without an icon (End) -------------------
+
+!!------------------ Gadukino chores and such -------------------
 if display_bb = 1:
 	if boletus + bilberry > 0:
 		if boletus + bilberry >= 10:
@@ -2030,7 +2034,159 @@ if display_bb = 1:
 	end
 end
 
-!!------------------ Things without an icon (End) -------------------
+!! Grandma chores
+if grandmaQW['chore_clean_floor'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would clean the floors in her house today.</b>'
+elseif grandmaQW['chore_clean_floor'] = 2:
+    $stat_msg += '<br><b>You cleaned the floors for Grandma - you should let her know that it is done.</b>'
+elseif grandmaQW['chore_wash_clothes'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would wash clothes for her today.</b>'
+elseif grandmaQW['chore_wash_clothes'] = 2:
+    $stat_msg += '<br><b>You washed clothes for Grandma - you should let her know that it is done.</b>'
+elseif grandmaQW['chore_milk_cow'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would milk the cow in the barn for her today.</b>'
+elseif grandmaQW['chore_milk_cow'] = 2:
+    $stat_msg += '<br><b>You milked the cow for Grandma - you should let her know that it is done.</b>'
+elseif grandmaQW['chore_groceries'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would go get groceries for her today.</b>'
+elseif grandmaQW['chore_groceries'] = 2:
+    $stat_msg += '<br><b>You got the groceries for Grandma - you should go give them to her.</b>'
+elseif grandmaQW['chore_can_mushrooms'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would help her can mushrooms today.</b>'
+elseif grandmaQW['chore_can_berries'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would help her can berries today.</b>'
+elseif grandmaQW['can_veggies'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would help her can vegetables today.</b>'
+elseif grandmaQW['chore_feed_chickens'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would feed the chickens for her today.</b>'
+elseif grandmaQW['chore_feed_chickens'] = 2:
+    $stat_msg += '<br><b>You fed the chickens for Grandma - you should let her know that it is done.</b>'
+elseif grandmaQW['chore_work_in_garden'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would work in the garden today.</b>'
+elseif grandmaQW['chore_work_in_garden'] = 2:
+    $stat_msg += '<br><b>You worked in the garden for Grandma - you should let her know that it is done.</b>'
+elseif grandmaQW['chore_water_garden'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would water the plants in the garden today.</b>'
+elseif grandmaQW['chore_water_garden'] = 2:
+    $stat_msg += '<br><b>You watered the plants in the garden for Grandma - you should let her know that it is done.</b>'
+elseif grandmaQW['chore_collect_strawberries'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would pick strawberries from the garden for her today.</b>'
+elseif grandmaQW['chore_collect_strawberries'] = 2:
+    $stat_msg += '<br><b>You picked strawberries for Grandma - you should give them to her.</b>'
+elseif grandmaQW['chore_collect_fruit'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would collect fruit from the garden for her today.</b>'
+elseif grandmaQW['chore_collect_fruit'] = 2:
+    $stat_msg += '<br><b>You collected fruit for Grandma - you should give them to her.</b>'
+elseif grandmaQW['chore_harvest_garden'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would harvest vegetables from the garden for her today.</b>'
+elseif grandmaQW['chore_harvest_garden'] = 2:
+    $stat_msg += '<br><b>You harvested vegetables for Grandma - you should give them to her.</b>'
+elseif grandmaQW['chore_gather_mushrooms'] > 0 and grandmaQW['chore_gather_mushrooms'] < 3:
+	if boletus < grandmaQW['chore_mushroom_quantity']:
+		grandmaQW['chore_gather_mushrooms'] = 1
+		$stat_msg += '<br><b>You promised Grandma you would pick <<grandmaQW[''chore_mushroom_quantity'']>> kg of mushrooms for her today.</b>'
+	else
+		grandmaQW['chore_gather_mushrooms'] = 2
+		$stat_msg += '<br><b>You have picked the <<grandmaQW[''chore_mushroom_quantity'']>> kg of mushrooms that Grandma asked for - you should give them to her.</b>'
+	end
+elseif grandmaQW['chore_gather_berries'] > 0 and grandmaQW['chore_gather_berries'] < 3:
+	if bilberry < grandmaQW['chore_berry_quantity']:
+		grandmaQW['chore_gather_berries'] = 1
+		$stat_msg += '<br><b>You promised Grandma you would pick <<grandmaQW[''chore_berry_quantity'']>> kg of berries for her today.</b>'
+	else
+		grandmaQW['chore_gather_berries'] = 2
+		$stat_msg += '<br><b>You have picked the <<grandmaQW[''chore_berry_quantity'']>> kg of berries that Grandma asked for - you should give them to her.</b>'
+	end
+elseif grandmaQW['chore_gather_both'] > 0 and grandmaQW['chore_gather_both'] < 3:
+	if bilberry < grandmaQW['chore_berry_quantity'] or boletus < grandmaQW['chore_mushroom_quantity']:
+		grandmaQW['chore_gather_both'] = 1
+		$stat_msg += '<br><b>You promised Grandma you would pick <<grandmaQW[''chore_mushroom_quantity'']>> kg of mushrooms and <<grandmaQW[''chore_berry_quantity'']>> kg of berries for her today.</b>'
+	else
+		grandmaQW['chore_gather_both'] = 2
+		$stat_msg += '<br><b>You have picked the <<grandmaQW[''chore_mushroom_quantity'']>> kg of mushrooms and <<grandmaQW[''chore_berry_quantity'']>> kg of berries that Grandma asked for - you should give them to her.</b>'
+	end
+end
+
+!! Grandpa chores
+if grandpaQW['chore_fetch_firewood'] = 1:
+    $stat_msg += '<br><b>You promised Grandpa you would fetch firewood for him today.</b>'
+elseif grandpaQW['chore_fetch_firewood'] = 2:
+    $stat_msg += '<br><b>You fetched some firewood for Grandpa - you should give it to him.</b>'
+elseif grandpaQW['chore_feed_horse'] = 1:
+    $stat_msg += '<br><b>You promised Grandpa you would feed the horse in the barn for him today.</b>'
+elseif grandpaQW['chore_feed_horse'] = 2:
+    $stat_msg += '<br><b>You fed the horse for Grandpa - you should let him know that it is done.</b>'
+elseif grandpaQW['chore_feed_cow'] = 1:
+    $stat_msg += '<br><b>You promised Grandpa you would feed the cow in the barn for him today.</b>'
+elseif grandpaQW['chore_feed_cow'] = 2:
+    $stat_msg += '<br><b>You fed the cow for Grandpa - you should let him know that it is done.</b>'
+elseif grandpaQW['chore_clean_yard'] = 1:
+    $stat_msg += '<br><b>You promised Grandpa you would clean the yard for him today.</b>'
+elseif grandpaQW['chore_clean_yard'] = 2:
+    $stat_msg += '<br><b>You cleaned the yard for Grandpa - you should let him know that it is done.</b>'
+elseif grandpaQW['chore_brush_horse'] = 1:
+    $stat_msg += '<br><b>You promised Grandpa you would groom the horse for him today.</b>'
+elseif grandpaQW['chore_brush_horse'] = 2:
+    $stat_msg += '<br><b>You groomed the horse for Grandpa - you should let him know that it is done.</b>'
+elseif grandpaQW['chore_feed_boar'] = 1:
+    $stat_msg += '<br><b>You promised Grandpa you would feed the pig in the barn for him today.</b>'
+elseif grandpaQW['chore_feed_boar'] = 2:
+    $stat_msg += '<br><b>You fed the pig for Grandpa - you should let him know that it is done.</b>'
+elseif grandpaQW['chore_lead_horse_to_field'] = 1:
+    $stat_msg += '<br><b>You promised Grandpa you would take the horse from the barn to the field for him today.</b>'
+elseif grandpaQW['chore_lead_horse_to_field'] = 2:
+    $stat_msg += '<br><b>You took the horse to the field for Grandpa - you should let him know that it is done.</b>'
+elseif grandpaQW['chore_lead_cow_to_field'] = 1:
+    $stat_msg += '<br><b>You promised Grandpa you would take the cow from the barn to the field for him today.</b>'
+elseif grandpaQW['chore_lead_cow_to_field'] = 2:
+    $stat_msg += '<br><b>You took the cow to the field for Grandpa - you should let him know that it is done.</b>'
+elseif grandpaQW['chore_bathe_horse'] = 1:
+    $stat_msg += '<br><b>You promised Grandpa you would take the horse from the barn and bathe it in the river for him today.</b>'
+	if grandpaQW['chore_bathe_horse_prog'] = 1:
+		$stat_msg += '<br><b>You have taken the horse to the river, but haven''t bathed him yet.</b>'
+	elseif grandpaQW['chore_bathe_horse'] = 2:
+		$stat_msg += '<br><b>You have bathed the horse in the river, but haven''t led him back home yet.</b>'
+	end
+elseif grandpaQW['chore_bathe_horse'] = 2:
+    $stat_msg += '<br><b>You bathed the horse for Grandpa - you should let him know that it is done.</b>'
+elseif grandpaQW['chore_gather_mushrooms'] > 0 and grandpaQW['chore_gather_mushrooms'] < 3:
+	if boletus < grandpaQW['chore_mushroom_quantity']:
+		grandpaQW['chore_gather_mushrooms'] = 1
+		$stat_msg += '<br><b>You promised Grandpa you would pick <<grandpaQW[''chore_mushroom_quantity'']>> kg of mushrooms for him today.</b>'
+	else
+		grandpaQW['chore_gather_mushrooms'] = 2
+		$stat_msg += '<br><b>You have picked the <<grandpaQW[''chore_mushroom_quantity'']>> kg of mushrooms that Grandpa asked for - you should give them to him.</b>'
+	end
+elseif grandpaQW['chore_gather_berries'] > 0 and grandpaQW['chore_gather_berries'] < 3:
+	if bilberry < grandpaQW['chore_berry_quantity']:
+		grandpaQW['chore_gather_berries'] = 1
+		$stat_msg += '<br><b>You promised Grandpa you would pick <<grandpaQW[''chore_berry_quantity'']>> kg of berries for him today.</b>'
+	else
+		grandpaQW['chore_gather_berries'] = 2
+		$stat_msg += '<br><b>You have picked the <<grandpaQW[''chore_berry_quantity'']>> kg of berries that Grandpa asked for - you should give them to him.</b>'
+	end
+elseif grandpaQW['chore_gather_both'] > 0 and grandpaQW['chore_gather_both'] < 3:
+	if bilberry < grandpaQW['chore_berry_quantity'] or boletus < grandpaQW['chore_mushroom_quantity']:
+		grandpaQW['chore_gather_both'] = 1
+		$stat_msg += '<br><b>You promised Grandpa you would pick <<grandpaQW[''chore_mushroom_quantity'']>> kg of mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kg of berries for him today.</b>'
+	else
+		grandpaQW['chore_gather_both'] = 2
+		$stat_msg += '<br><b>You have picked the <<grandpaQW[''chore_mushroom_quantity'']>> kg of mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kg of berries that Grandpa asked for - you should give them to him.</b>'
+	end
+end
+
+!! in case both grandparents gave you forest gathering chores
+if (boletus >= grandpaQW['chore_mushroom_quantity'] or boletus >= grandmaQW['chore_mushroom_quantity']) and (boletus < (grandpaQW['chore_mushroom_quantity'] + grandmaQW['chore_mushroom_quantity'])):
+	temp_boletus = (grandpaQW['chore_mushroom_quantity'] + grandmaQW['chore_mushroom_quantity']) - boletus
+	$stat_msg += '<br><b>You need <<temp_boletus>> more '+iif(temp_boletus = 1, 'kilo', 'kilos')+' of mushrooms to satisfy both of your grandparents'' requests.</b>'
+end
+if (bilberry >= grandpaQW['chore_berry_quantity'] or bilberry >= grandmaQW['chore_berry_quantity']) and (bilberry < (grandpaQW['chore_berry_quantity'] + grandmaQW['chore_berry_quantity'])):
+	temp_bilberry = (grandpaQW['chore_berry_quantity'] + grandmaQW['chore_berry_quantity']) - bilberry
+	$stat_msg += '<br><b>You need <<temp_bilberry>> more '+iif(temp_bilberry = 1, 'kilo', 'kilos')+' of berries to satisfy both of your grandparents'' requests.</b>'
+end
+
+
+!!------------------ Gadukino chores and such (End) -------------------
 
 if enable_extra_msg = 1:
 	if hour < meethour[0] and svidanie[0] = 1:

+ 1 - 0
locations/stat_sklattrib.qsrc

@@ -87,6 +87,7 @@ $skl_name[34] = 'perform'
 $skl_name[35] = 'bushcraft'
 $skl_name[36] = 'cleaning'
 $skl_name[37] = 'bkbll'
+$skl_name[38] = 'cheer'
 
 !!Trait Section
 !!This is where Traits that will affect attribute or skill advancement or degradation have those aspects defined.

+ 12 - 2
locations/stat_sklattrib_lvlset.qsrc

@@ -33,6 +33,12 @@ if pcs_magik < 0: pcs_magik = 0
 
 !!Skill set Section
 !!Each skill has three lines, the first is the comment that says what the skill is, the next that sets pcs_"name", and the finial which sets "name"[1] to [x] with the attribute index of the attribute(s) ending with a -1 to show end.
+!! Clarification on the third line:
+!!  These are the numerical attribute IDs (found at the top of stat_sklattrib) that are associated with the skill. They get a small portion (1/5) of the skill''s exp.
+!!  This means they don''t necessarily need to contribute to this skills pcs_X value, merely if it makes sense for an attribute to increase slightly due to Sveta
+!!  gaining experience with said skill, then you can do that by adding the attribute''s numerical ID there.
+!! Example:
+!!  the heel skill doesn''t benefit from agility, reaction and charisma, however they are listed in the third line (1, 4, 6) and consequently grow a little when it increases
 
 !!Jabs; Quick strikes that do not have much power
 pcs_jab = (jab_lvl + (pcs_agil * 2 + pcs_stren) / 3) / 2
@@ -185,8 +191,12 @@ pcs_inhib = inhib_lvl + (alko * 3) & if pcs_inhib > 100: pcs_inhib = 100
 inhib[1] = 3 & inhib[2] = -1
 
 !!Performance; Skill at things like acting or putting on a show
-pcs_perform = (perform_lvl + (pcs_prcptn + pcs_chrsm) / 2) / 2
-perform[1] = 1 & perform[2] = 3 & perform[3] = -1
+pcs_perform = (perform_lvl + (pcs_chrsm + pcs_prcptn) / 2) / 2
+perform[1] = 6 & perform[2] = 7 & perform[3] = -1
+
+!!Cheerleading; Should be self-explanatory
+pcs_cheer = (cheer_lvl + (pcs_agil + pcs_react + pcs_vital) / 3) / 2
+cheer[1] = 1 & cheer[2] = 2 & cheer[3] = 4 & cheer[4] = -1
 
 
 !!Skiing; Should be self-explanatory

+ 8 - 8
locations/street_event.qsrc

@@ -186,17 +186,17 @@ if $ARGS[1] = 'main':
 			else
 				streetev_rape = 5
 			end
-		elseif PCloExhibit > 30:
+		elseif PCloInhibit > 30:
 			if alko >= 6:
-				streetev_rape = 3
-			else
 				streetev_rape = 6
+			else
+				streetev_rape = 3
 			end
 		else
 			if alko >= 6:
-				streetev_rape = 2
-			else
 				streetev_rape = 4
+			else
+				streetev_rape = 2
 			end
 		end
 	else
@@ -212,7 +212,7 @@ if $ARGS[1] = 'main':
 			else
 				streetev_rape = 10
 			end
-		elseif PCloExhibit > 30:
+		elseif PCloInhibit > 30:
 			if alko >= 6:
 				streetev_rape = 10
 			else
@@ -220,9 +220,9 @@ if $ARGS[1] = 'main':
 			end
 		else
 			if alko >= 6:
-				streetev_rape = 2
-			else
 				streetev_rape = 5
+			else
+				streetev_rape = 2
 			end
 		end
 	end