Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

locations/gschool_cheerleading.qsrc

@@ -139,15 +139,15 @@ if $ARGS[0] = 'tryouts':
 		'Christina laughs as she walks up to you. "Oh my god, does this ' + iif(pcs_hotcat < 6, 'hidious hag', 'social reject') + ' actually think she can become a cheerleader? Everyone would be too busy laughing to focus on the game!"'
 		'"It''s best if you just leave. Nobody wants you hanging around making things awkward," Albina says.'
 		'"You better hope that I''m still too busy laughing at your dumb ass that I forget to punish you for embarrassing me," Christina adds.'
-		'It''s clear that you''re not wanted here and all the girls present are pointing and laughing at you as Albina just shakes her head dismissively. Tears well up in your eyes as you run out the door, the vicious sound of mocking laughter following you down the corrider.'
+		'It''s clear that you''re not wanted here and all the girls present are pointing and laughing at you as Albina just shakes her head dismissively. Tears well up in your eyes as you run out the door, the vicious sound of mocking laughter following you down the corridor.'
 		act 'Flee': gt 'gschool_grounds', 'main'
 	elseif grupTipe = 4:
 		cheerleadingQW['quest_stage'] = -1
 		cheerleadingQW['reject'] = daystart
 		cheerleadingQW['grupTipe'] = grupTipe
 		'The other girls grow silent and just stare at you as you enter and Albina walks up to you with a cold glare on her face. "You''re mistaken if you think I''m even going to give someone like <i>you</i> a chance. Now fuck off," she says while pointing to the door.'
-		'Christina laughs as she walks up to you. "Oh my god, does this specimen actually think she can become a cheerleader? Isn''t there some '+iif(gopnik_slut = 1,'dirty gopnik cock waiting for you somewhere to suck it?','some drugs waiting somewhere for you to snort them?')+'" she asks mockingly, which causes Bella to let out a loud laugh.'
-	    'You clench your fist. You want to beat the smug smile off her face, but there''s nothing you can do except leave, the sounds of mocking laughter following you down the corrider.'
+		'Christina laughs as she walks up to you. "Oh my god, does this specimen actually think she can become a cheerleader? Isn''t there some '+iif(gopnik_slut = 1,'dirty gopnik cock waiting for you somewhere to suck it?','drugs waiting somewhere for you to snort them?')+'" she asks mockingly, which causes Bella to let out a loud laugh.'
+	    'You clench your fist. You want to beat the smug smile off her face, but there''s nothing you can do except leave, the sounds of mocking laughter following you down the corridor.'
 		act 'Leave': gt 'gschool_grounds', 'main'
 	else
 		'After school, you head to the PE hall to try out for the cheerleading team'+iif(cheerleadingQW['try_count'] > 1, ' again','')+', taking your place amongst the group of hopeful girls already here. Albina is standing with Vicky, Christina, Lina, Lariska and Bella, as well as a few other girls from other classes who you don''t recognise that round out the squad. They are all inspecting you and talking amongst themselves.'

locations/gschool_jock_chats.qsrc

@@ -631,7 +631,7 @@ if $ARGS[0] = 'albina':
 			else
 				'"Hey <<$pcs_nickname>>, "Albina smiles at you. "I wanted to thank you again for what you did. I don''t want to get into any mushy bullshit, but I just wanted to let you know I appreciated it. It meant a lot."'
 			end
-			'"It was no problem Albina. You''re my friend. That''s what friends do," you say.'
+			'"It was no problem, Albina. You''re my friend. That''s what friends do," you reply.'
 			'She smiles. "Also, I''m disbanding the Starlets," she says. "Too many bad memories you know?"'
 			'"I get it."'
 			'Albina embraces you in a tight hug before giving you a quick smile and continuing down the hall.'

locations/katja_city.qsrc

@@ -62,7 +62,7 @@ if $ARGS[0] = 'metro_destination':
 		$loc_arg = 'start'
 		$menu_loc = 'city_nightclub'
 		$menu_arg = 'start'
-		menu_off = 0
+		menu_off = 1
 		$location_type = 'public_outdoors'
 		$sexloc = 'city_nightclub'
 		katjaQW['disco_arrival'] = totminut
@@ -90,10 +90,34 @@ if $ARGS[0] = 'metro_destination':
 		end
 		if rand(0,1) = 0:
 			'"Let''s start with a dance," she says when you''re finally inside the club and drags you to the dance floor.'
-			act 'Go to the dance floor': gt 'katja_nightclub', 'dance'
+			act 'Go to the dance floor': 
+				$loc = 'city_nightclub'
+				$loc_arg = 'inside'
+				$menu_loc = 'city_nightclub'
+				$menu_arg = 'inside'
+				menu_off = 1
+				$location_type = 'public_indoors'
+				killvar '$locclass'
+				minut += 5
+				frost = 0
+				gs 'themes', 'indoors'
+				gt 'katja_nightclub', 'dance'
+			end
 		else
 			'"Let''s start with a drink," she says when you''re finally inside the club and drags you to the bar.'
-			act 'Go to the bar': gt 'katja_nightclub', 'bar_arrive'
+			act 'Go to the bar':
+				$loc = 'city_nightclub'
+				$loc_arg = 'inside'
+				$menu_loc = 'city_nightclub'
+				$menu_arg = 'inside'
+				menu_off = 1
+				$location_type = 'public_indoors'
+				killvar '$locclass'
+				minut += 5
+				frost = 0
+				gs 'themes', 'indoors'
+				gt 'katja_nightclub', 'bar_arrive'
+			end
 		end
 	else
 		if katjaQW['on_date'] = 1:

locations/katja_nightclub.qsrc

@@ -681,7 +681,7 @@ if $ARGS[0] = 'bar_after_drink':
 				katjaQW['horny'] += max(0,rand(katjaQW['slut']-50,100)/50)
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dringking_man_approach.jpg"></center>'
 				'You tell him that he''s welcome to join and Katja nods in agreement. You spend the time chatting with him while your glasses empty.'
-				if rand(5,8) < pcs_hotcat:
+				if rand(5,8) > pcs_hotcat:
 					'He then thanks you for a nice time, but says he has to run, and leaves you and Katja alone at the bar.'
 					gs 'katja_nightclub', 'bar_end'
 				else
@@ -968,6 +968,7 @@ if $ARGS[0] = 'bar_end':
 			'"It''s getting late, <<$pcs_nickname>>. I''m heading home," Katja says after finishing her drink. It looks like there''s no way to convince her to stay.'
 			if (npc_sex['A14'] > 0 and katjaQW['sex_clossedness'] < 2) or $home['current'] = 'university_dorm':
 				act 'Suggest you go home together':
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 					'"Why don''t we go back together?" you suggest.'
 					'"Great idea," she replies.'

locations/pav_beach_chat.qsrc

@@ -303,7 +303,7 @@ if $ARGS[0] = 'albina':
 	if AlbinaQW['Friends'] = 1:
 		AlbinaQW['Friends'] = 2
 		gs 'npc_relationship', 'set', 'A23', 100
-		'Albina is relaxing in the sun and working on her tan as you approach. She lifts her sunglasses and smiles gratefully when she notices you. "I just wanted to thank you again <<$pcs_nickname>>. There''s some stupid shit about ''a friend in need'' or something. I''m letting you know that I''m disbanding the Starlets as well. Too many bad memories you know?"'
+		'Albina is relaxing in the sun and working on her tan as you approach. She lifts her sunglasses and smiles gratefully when she notices you. "I just wanted to thank you again, <<$pcs_nickname>>. There''s some stupid shit about ''a friend in need'' or something. I''m letting you know that I''m disbanding the Starlets as well. Too many bad memories you know?"'
 		'You tell her you understand and she embraces you in a tight hug before composing herself, staring down anyone looking at her with a cold glare and returning to her sunbathing.'
 	elseif AlbinaQW['Friends'] = 2:
 		'Albina is relaxing in the sun and working on her tan as you approach. She lifts her sunglasses and glares up when you block her light, but smiles when she sees you.'
@@ -313,7 +313,8 @@ if $ARGS[0] = 'albina':
 			'Albina has a friendly, yet awkward conversation with you. You both talk about your shared interests, but when you bring up family life she fiercely avoids the subject, eventually refusing to speak with you anymore and storming off to swim in the lake. You don''t know what her problem is, but she''s always been sensitive when it comes to discussing her home life.'
 		elseif npc_rel['A23'] <= 20:
 			'Albina is relaxing in the sun and working on her tan as you approach. She lifts her sunglasses and glares up at you when you block her light.'
-			'"What do you want, you fake ass bitch?" You can tell she isn''t waiting for an answer, so you back off before she causes a scene.'
+			'"What do you want, you fake ass bitch?" she scowls.'
+			'You can tell she isn''t waiting for an answer, so you back off before she causes a scene.'
 		else
 			'Albina is relaxing in the sun and working on her tan as you approach. She lifts her sunglasses and glares up at you when you block her light. "What do you want, <<$pcs_nickname>>?" she asks in an exasperated tone.'
 			'"I just wanted to talk," you reply with a smile.'
@@ -325,7 +326,8 @@ if $ARGS[0] = 'albina':
 			'She engages you in a friendly, yet awkward conversation where you both talk about the sports you enjoy and which of the male jocks have caught your eye, but when you bring up family life she fiercely avoids the subject, eventually refusing to speak with you anymore and storming off to swim in the lake. You don''t know what her problem is, but she''s always been sensitive when it comes to discussing her home life.'
 		elseif npc_rel['A23'] <= 20:
 			'Albina is relaxing in the sun and working on her tan as you approach. She lifts her sunglasses and glares up at you when you block her light.'
-			'She scoffs at you. "I don''t like you, I barely tolerate you being in the same social group as me, so why would I want to talk to you?" You can tell she isn''t waiting for an answer, so you back off before she causes a scene.'
+			'She scoffs at you. "I don''t like you, I barely tolerate you being in the same social group as me, so why would I want to talk to you?"'
+			'You can tell she isn''t waiting for an answer, so you back off before she causes a scene.'
 		else
 			'Albina is relaxing in the sun and working on her tan as you approach. She lifts her sunglasses and glares up at you when you block her light. "What do you want, <<$pcs_nickname>>?" she asks in an exasperated tone.'
 			'"I just wanted to talk," you reply with a smile.'
@@ -348,8 +350,9 @@ if $ARGS[0] = 'albina':
 	elseif grupTipe = 4:
 		'Albina is relaxing in the sun and working on her tan as you approach. She lifts her sunglasses and glares up at you when you block her light. "Oh god, it''s you. What the fuck do you want?"'
 		'"What''s your problem, bitch? I just want to talk," you scornfully reply.'
-		'She looks at you unimpressed. "My problem is that some knuckle brained moron is blocking my sunlight! Can you fuck off now?"'
+		'She looks at you unimpressed. "<i>My problem</i> is that some knuckle brained moron is blocking my sunlight! Can you fuck off already?!"'
 		'"Fucking stuck up rich bitch..." you mutter as you walk away, but she doesn''t hear you.'
+		'You don''t know why, but she seems to have an intense hatred for the gopniks, yourself included.'
 	else
 		'Albina is relaxing in the sun and working on her tan as you approach. She lifts her sunglasses and glares up at you when you block her light before pulling them down again.'
 		'When you don''t move and continue blocking her light, she lifts her glasses again and looks up at you with an annoyed glare. "What the fuck do you want, you social reject? Can''t you see I''m working on my tan?"'

locations/pav_lake.qsrc

@@ -647,7 +647,8 @@ if $ARGS[0] = 'school_mates':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/beach_hangout/school_mates.jpg"></center>'
 	if fame['pav_slut'] >= 225:
-		'You start approaching them, but are immediately greeted with disgusted stares and rude comments before Dimka walks over with Svyatoslav. "Get lost slut! We don''t want you here." You sigh before turning and walking away.'
+		'You start approaching them, but are immediately greeted with disgusted stares and rude comments before Dimka walks over with Svyatoslav. "Get lost, slut! We don''t want you here."'
+		'You sigh before turning and walking away.'
 		act 'Leave': gt 'pav_lake'
 	elseif grupTipe = 1 or grupTipe = 2:
 		'You start approaching them and are greeted with friendly smiles as several wave at you to come over and join them.'
@@ -658,8 +659,9 @@ if $ARGS[0] = 'school_mates':
 		act 'Leave': gt 'pav_lake'
 		act 'Join them': gt 'pav_lake', 'beach_hangout'
 	else
-		'You start approaching them and are greeted with annoyed stares and rude comments before Dimka walks over with Svyatoslav. "Get lost loser! We don''t want you here." You sigh before turning and walking away.'
-		act 'Leave': gt'pav_lake'
+		'You start approaching them and are greeted with annoyed stares and rude comments before Dimka walks over with Svyatoslav. "Get lost, loser! We don''t want you here."'
+		'You sigh before turning and walking away.'
+		act 'Leave': gt 'pav_lake'
 	end
 end
 

locations/version.qsrc

@@ -6,10 +6,21 @@ act 'Return': gt 'start'
 '- Experimental trials pharmacy (with some links to therapist storyline) added by anjuna'
 '- More ballet content and background code for it to function from Myles Croft'
 '- Character menu - Skills now has a completely new look! thanks to anjuna'
-'- Grandfather (Zlatek) now on a schedule for better tracking thanks to Myles Croft'
+'- Grandparents home overhaul and Grandparents put on a schedule by Myles Croft and Anjuna'
 '- Excessive camgirl money making nerfed by anjuna'
 '- Universal wait function added to side bar (old wait actions removed as unnecessary) by Myles Croft'
 '- Next part of Natasha''s love quest. Written by BBZ01 with code from anjuna'
+'- New kitchen in gad and new classes in ballet secrets from Myles Croft'
+'- Added more books that can be loaned to the library by Anjuna'
+'- Havana code migrations by Anjuna'
+'- Vitek, Dan, and Vasily now take all your slutty behaviour into account instead of just your slut fame by Anjuna'
+'- Added a newspaper by Anjuna'
+'- Overhaul of nearly all underlying code related to Lovers, migrating code to general npc generators by Anjuna'
+'- Merged code from boyStat, pronounces, as well as redundant code in npc generators into npcStat by Anjuna'
+'- Significant updates to fuckbuddies and sugar daddies due to the merger of lovers and npc generator changes by Anjuna'
+'- Time and date management is now fully handled by the time routine. daystart is the primary date variable by Anjuna'
+'- Hypno shave body hair event for the therapist, written by HiddenFlame, coded by Anjuna'
+'- Full rework of body image system, including new images, updated cheatmenu, and better custom sets by Anjuna'
 '- Gadukino Farmers market added by anjuna'
 '- Option to do a full flash in the parks added by anjuna'
 '- Grab google fonts from the interwebs as well as html-to-image thingy from Earnest (for making in game button images)'
@@ -28,11 +39,11 @@ act 'Return': gt 'start'
 '- New build script so we can compile the game code much quicker thanks to Awesome'
 '- Code refactoring and UI improvements from Myles Croft and anjuna'
 '- Code migration, file renaming and optimizations from anjuna'
+'- 12 Hour format by Awesome'
 '- Text edits by Vengeance11, Awesome and bgkjdgbizgblzdgbr'
 '- Bug fixes from Honey, Felix, Myles Croft, Anjuna, Awesome, netuttki, Lusticon, acien, Derryth Love, hornguy6, bgkjdgbizgblzdgbr and Kevin Smarts'
 '- image pack updated and maintained by Anya'
 
-
 '0.9.3.1'
 '- Text edits by Hornguy6 and Vengeance11'
 '- Bug fixes from Felix, Myles Croft, Anjuna, Awesome, Derryth Love, Azdraik, Lusticon, hornguy6, bgkjdgbizgblzdgbr and Kevin Smarts'