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

.gitignore

@@ -47,4 +47,5 @@ glife.7z
 *.test
 *.drawio
 missing_media.txt
-plugins.dat
+plugins.dat
+*.log

locations/Cheatmenu_din.qsrc

@@ -2218,7 +2218,7 @@ $cheatmenu['theme_presets_copy'] = {
 	custom_theme['table_bg'] = theme['table_bg']
 	custom_theme['table_bg_alt'] = theme['table_bg_alt']
 
-	$custom_theme['is_dark'] = str(theme['is_dark'])
+	custom_theme['is_dark'] = theme['is_dark']
 
 	gs 'themes', 'set_custom'
 	dynamic $cheatmenu['theme_customize']
@@ -2237,7 +2237,7 @@ $cheatmenu['theme_export'] = {
 	"custom_theme['table_bg'] = <<custom_theme['table_bg']>>"
 	"custom_theme['table_bg_alt'] = <<custom_theme['table_bg_alt']>>"
 	""
-	"$custom_theme['is_dark'] = '<<$custom_theme['is_dark']>>'"
+	"custom_theme['is_dark'] = <<custom_theme['is_dark']>>"
 }
 
 $cheatmenu['theme_presets'] = {
@@ -2325,10 +2325,10 @@ $cheatmenu['theme_customize'] = {
 	!!  --- DARK MODE ---
 	*nl
 	*p 'Dark Mode&nbsp;'
-	if $custom_theme['is_dark'] = '0':
-		*pl '<a href="exec: $custom_theme[''is_dark''] = ''1'' & dynamic $cheatmenu[''theme_customize'']"><img src="images/system/ui/box<<$icon_selector>>.png" height="<<icon_height>>"></img></a>'
+	if custom_theme['is_dark'] = 0:
+		*pl '<a href="exec: custom_theme[''is_dark''] = 1 & dynamic $cheatmenu[''theme_customize'']"><img src="images/system/ui/box<<$icon_selector>>.png" height="<<icon_height>>"></img></a>'
 	else
-		*pl '<a href="exec: $custom_theme[''is_dark''] = ''0'' & dynamic $cheatmenu[''theme_customize'']"><img src="images/system/ui/check<<$icon_selector>>.png" height="<<icon_height>>"></img></a>'
+		*pl '<a href="exec: custom_theme[''is_dark''] = 0 & dynamic $cheatmenu[''theme_customize'']"><img src="images/system/ui/check<<$icon_selector>>.png" height="<<icon_height>>"></img></a>'
 	end
 
 	!!  --- INCREMENT ---

locations/HotelRoom.qsrc

@@ -1,5 +1,7 @@
 # HotelRoom
 
+if hotelRoomDays[$region] = 0 and hour > 11: hotelRoom[$region] = 0
+if hotelRoomDays[$region] < 0: hotelRoom[$region] = 0
 CLOSE ALL
 if $ARGS[0] = 'normal':
 	*clr & cla

locations/KGstart.qsrc

@@ -96,7 +96,7 @@ if KFOnLineReaga > 0:
 			cls
 			$KGOLname = input("Enter your nickname")
 
-			if $KGOLname <= 0:msg 'Not valid nickname' & gt $curloc
+			if $KGOLname = '': msg 'Not valid nickname' & gt $curloc
 
 			'Your nickname <<$KGOLname>>'
 			'You must select the player race'

locations/MeynoldHome.qsrc

@@ -779,7 +779,7 @@ if $ARGS[0] = 'Natalia Park 2':
 	minut += 15
 	gs'stat'
 	'<center><b><h4><font color=#00eaff><<"Natalia [Nat] Pavlova">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big240.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big240.jpg"></center>'
 	'You, and Natalia continue chatting for a few minutes before Natalia looks at her phone then says, "Wow, I can''t believe it gotten so late. We should really get home." You both walk home. When you reach your door Natalia says, "Stay safe <<$pcs_firstname>>, and remember to follow your heart. Have a good night." You then wave goodbye to Natalia, as she walks away.'
 	
 	act 'Enter your apartment':gt 'korrPar'

locations/NPCChanger.qsrc

@@ -61,19 +61,19 @@ end
 if $ARGS[0] = 'npcdisplay':
 	*nl 'NPC[A<<n>>] = '
 
-	if $npc_firstname['A<<n>>'] = 0:
-	*p ''
+	if isnum($npc_firstname['A<<n>>']):
+		*p ''
 	else
-	*p '<<$npc_firstname[''A<<n>>'']>>'
+		*p $npc_firstname['A<<n>>']
 	end
 
-	if $npc_firstname['A<<n>>'] = $npc_nickname['A<<n>>'] or $npc_nickname['A<<n>>'] = 0:
+	if $npc_firstname['A<<n>>'] = $npc_nickname['A<<n>>'] or isnum($npc_nickname['A<<n>>']):
 		*p''
 	else
 		*p ' "<<$npc_nickname[''A<<n>>'']>>"'
 	end
 
-	if $npc_lastname['a<<n>>'] = 0:
+	if isnum($npc_lastname['a<<n>>']):
 		*p ''
 	else
 		*p ' <<$npc_lastname[''A<<n>>'']>>'
@@ -81,10 +81,9 @@ if $ARGS[0] = 'npcdisplay':
 
 end
 if $ARGS[0] = 'selection':
-	s = input("Which NPC do you want to edit? Enter #")
-		!!cla
-		!!*clr
-	if s = '':
+	s = val(input("Which NPC do you want to edit? Enter #"))
+	!!*clr & cla
+	if s = 0:
 		n = (o - 10)
 		gt 'NPCChanger', 'NPCLoop'
 	else

locations/SMS_selfies.qsrc

@@ -50,7 +50,7 @@ if $ARGS[0] = 'show_sms':
 	gs 'telefon', 'show_sms', SMSSelfieVars['SMSid']
 	$SMSMessage[SMSSelfieVars['SMSid']] = $temp_curSMS
 	$SMSReplies[SMSSelfieVars['SMSid']] = $temp_curReplies
-	SMSSelfieVars['text'] = ''
+	$SMSSelfieVars['text'] = ''
 	killvar 'temp_curSMS'
 	killvar 'temp_curReplies'
 end

locations/SMStext_builder.qsrc

@@ -274,7 +274,7 @@ if $ARGS[0] = 'add_sms':
 	end
 	gs 'telefon', 'add_sms', $ARGS[1], $SMSBuilderVars['text'], $SMSBuilderVars['replies'], $SMSBuilderImages[0], $SMSBuilderImages[1], $SMSBuilderImages[2], $SMSBuilderImages[3]
 	
-	SMSBuilderVars['replies'] = ''
+	$SMSBuilderVars['replies'] = ''
 
 elseif $ARGS[0] = 'show_sms':
 	if arrsize('SMSBuilderReplies') > 0:

locations/_attributes_cats_dress.qsrc

@@ -679,7 +679,6 @@ elseif ARGS[1] = 99:
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 4
-	CloDress = 1
 	
 elseif ARGS[1] = 100:
 	CloQuality = 5

locations/agentned.qsrc

@@ -187,7 +187,7 @@ if $ARGS[0] = 'sell':
 			'<h4>Available offers for your properties</h4>'
 			i = 0
 			:listing_offers_on_owned_properties_loop
-				if $property_code[i] ! 'matryona_mansion' or ($property_code[i] = 'matryona_mansion' and $property_construction_status[i] = 0):
+				if $property_code[i] ! 'matryona_mansion' or ($property_code[i] = 'matryona_mansion' and property_construction_status[i] = 0):
 					!! NOTE: Offer: (last sales price + rand(-10%, +10%)) + (renovation value + rand(0%,+10%)
 					!! 		 No need to check what has been renovated, the only thing that matters is the total value of the renovation
 					!! 		 If Sveta sells, this will be stored as the new sales price of the property

locations/anushapt_city.qsrc

@@ -438,7 +438,7 @@ if $ARGS[0] = 'bathroom':
 			'Despite the pattering noise of the running water, you hear the bathroom door open. You look past the shower curtain to see Eduard walking up to the toilet and unzipping his pants.'
 			act 'Uhm excuse me?':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/showergetout.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/showergetout.jpg"></center>'
 				'You pull the shower curtain tight against your body to make sure there is nothing for him to see other than your head, but you look out at him in consternation.'
 				'He looks up at you when you question him. It takes him a moment to realize who you are and he quickly zips up his pants. "Shit sorry... I thought you were my wife." He turns away and hurries for the door. "I''ll just be going... Sorry again." he says as he pulls the door closed. Unsure about what to think, you just decide to finish your shower.'
 				act 'Get out of the shower': gt 'anushapt_city','bathroom'
@@ -447,7 +447,7 @@ if $ARGS[0] = 'bathroom':
 				act 'Give him a show':
 					*clr & cla
 					inhib_exp += 3
-					'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/showershow.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/showershow.jpg"></center>'
 					'It seems he hasn''t looked over to see who is in the shower yet. You decide to pull the curtain wide open and give him a proper view of your soapy naked body. "Excuse me, is this what you were looking for?" you ask him.'
 					*nl
 					'He is a bit surprised at first. "Oh sorry... I thought you were my wife." His eyes roam up and down your naked body as he pulls out his dick and starts to piss in the toilet. "Don''t mind me. Just get back to your shower." he adds with a smirk.'
@@ -461,7 +461,7 @@ if $ARGS[0] = 'bathroom':
 			'Despite the pattering noise of the running water, you hear the bathroom door creaking slightly. Looking past the shower curtain you see that the bathroom door has been cracked open a little bit. Through the small crack in the doorway, you notice Maksim, Anushka''s younger brother, peeking in to watch you shower.'
 			act 'Yell at him':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/showergetout.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/showergetout.jpg"></center>'
 				if locat['A144'] = 0:
 					'You pull the shower curtain tight against your body to make sure there is nothing for him to see other than your head. "Get out of here you little pervert!"'
 					'He laughs, then quickly ducks away before you hear Anushka yelling at him. "What the hell are you doing?" As you continue your shower, you hear a lot more yelling from behind the door, and there is even a loud crash. Suddenly, silence descends upon the apartment.'
@@ -477,7 +477,7 @@ if $ARGS[0] = 'bathroom':
 				act 'Give him a show':
 					*clr & cla
 					inhib_exp += 3
-					'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/showershow.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/showershow.jpg"></center>'
 					'Looking straight at him, you give him a smile. You pull the curtain wide open to give him the perfect view of your naked, wet, supple body. His eyes grow wide and he wastes no time, quickly coming into the bathroom, pulling the door closed behind him. After a few minutes of just watching you, you notice him pulling out his phone and trying to take a picture. You immediately shake your head at him. "No pictures or I will tell your sister that you snuck in here and started taking pictures of me in the shower." He doesn''t say anything, but gives you a look that''s a mixture of disgust, annoyance and fear at the mention of his sister.'
 					'He just settles in, enjoying watching you shower and dry yourself off. As you start getting dressed, you shoo him out of the room before finishing up.'
 					act 'Get out of the shower': gt 'anushapt_city','bathroom'
@@ -523,7 +523,7 @@ if $ARGS[0] = 'livingroom':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A156', 'like'
 			minut += 30
-			'<center><img <<$set_imgh>> src="images/shared/food/video_games/videogame_boy.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/shared/home/video_games/videogame_boy.jpg"></center>'
 			'You take a seat next to Arkadi as he plays a video game. After a few minutes he switches games to a two player game. Smiling to him you pick up the other controller and start playing with him. The two of you have a good time playing games for awhile, but after a bit you get kinda tired playing the game you are playing and he seems to have no interest in switching games. So you get up and decide to look around the rest of the apartment.'
 			act 'Leave the livingroom':gt 'anushapt_city', 'hallway'
 		end
@@ -876,7 +876,7 @@ if $ARGS[0] = 'nushlivroom':
 	gs 'anushapt_city_schedule'
 	locat['A144'] = 5
 	'<center><b><font color = maroon>Living room</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/living.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/living_room.jpg"></center>'
 	'The room has a couple of recliners and a couch where Anushka is sitting. In front of the couch is a large coffee table. Several empty beer bottles and cups are spread across the table. There are also some scattered papers and a pill bottle sitting on the table. Opposite the couch but in front of the window is a fairly large TV playing an action movie of some sort and a stereo system. The room isn''t exactly messy, but it is far from clean. It doesn''t look like it has been dusted in months or the floor has been recently swept. You walk over and sit down next to Anushka.'
 	*nl
 	'You notice that you don''t hear anything else. "Where''s everyone else?" you ask her.'

locations/arousal.qsrc

@@ -1056,8 +1056,8 @@ end
 !!-----------------------------------------------
 
 !!workaround over use
-if $ARGS[0] ! 'auto_lube' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0] ! 'count2':
-	if arousal_overcall = 0:
+if arousal_overcall = 0:
+	if $ARGS[0] ! 'auto_lube' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0] ! 'count2':
 		$arousal_overcall = $ARGS[0]+$ARGS[2]+$ARGS[3]+$ARGS[4]+$ARGS[5]+$ARGS[6]+$ARGS[7]+$ARGS[8]
 		arousal_overcall = 1
 	end

locations/artem_chebotarev_schedule.qsrc

@@ -2,7 +2,7 @@
 !!2023/05/02
 
 
-$locat['A2'] = 0
+$locat['A2'] = ''
 
 if yearstart = 1:
 	!! Schedule for school year not yet done

locations/artem_dorm.qsrc

@@ -45,7 +45,7 @@ if $ARGS[0] = 'start':
 	gs 'artem_chebotarev_schedule'
 	gs 'stat'
 	'<center><b><font color="maroon">Artem''s Dorm Room</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/artemroom/artem_dorm_room.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/artemroom/artem_dorm_room.jpg"></center>'
 	'The dorm room has two beds. The one on the left belongs to Artem''s roommate while the one on the right is Artem''s.' 
 	if $locat['A2'] = 'dormroom_ studying_or _relaxing':
 		'Above his bed is a small <a href="exec:gt ''artem_dorm'',''bookshelf''">bookshelf</a> full of books, and the wall is plastered with sci-fi, fantasy, anime and super hero posters. At the foot of his bed is a small desk with a <a href="exec:gt ''artem_dorm'',''computer''">laptop</a> on it. Artem is sitting on a couch facing a TV sitting against the wall.'
@@ -68,7 +68,7 @@ if $ARGS[0] = 'bookshelf':
 	*clr & cla
 	minut += 2
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artem_dorm/artemroom/bookshelf.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/bookshelf.jpg"></center>'
 	'The small bookshelf has a lot of fantasy and science fiction books, a few gaming books and a lot of various nerdy nicknacks from popular fantasy, anime, and science fiction movies and TV shows. Maybe he wouldn''t mind if you borrowed a book?'
 	if artem_borrowed_book ! 1:
 		act 'Ask to borrow a book':
@@ -79,7 +79,7 @@ if $ARGS[0] = 'bookshelf':
 			artembook = 5
 !!need code to add a book for Sveta to read other than the ones she can buy.			
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artem_dorm/artemroom/bookshelf.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/bookshelf.jpg"></center>'
 			'You look through the books until you find one you like. "Do you mind if I borrow this to read?"'
 			'He looks a little surprised as he walks over. "Oh sure yeah, you can borrow it," he answers a little excitedly.'
 			'You take the book and put it in your purse. "Thanks. I''ll get it back to you as soon as I finish it."'
@@ -94,7 +94,7 @@ if $ARGS[0] = 'bookshelf':
 			artem_borrowed_book = 0
 			artembook = 0
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artem_dorm/artemroom/bookshelf.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/bookshelf.jpg"></center>'
 			'"I brought your book back," you tell him as you take it out of your purse and put it back in place on the shelf, right where you got it from.'
 			'"Did you like it?" he asks.'
 			act 'I did':
@@ -129,7 +129,7 @@ if $ARGS[0] = 'computer':
 		ArtemCompUse = 1
 		*clr & cla
 		'<center><h4><font color="maroon">Artem''s Dorm Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artem_dorm/start/laptop.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/laptop.jpg"></center>'
 		'You point towards his laptop. "You''re so lucky to have your own computer."'
 		'"I saved up my allowance for years before I could afford it," he replies.'
 		'"Mind if I use it? I want to check my emails and stuff," you ask.'

locations/artem_nush_sex.qsrc

@@ -802,7 +802,7 @@ if $ARGS[0] = 'artem_nush_disco_walk':
 	menu_off = 1
 	*clr & cla
 	minut += 10
-	'<center><img <<$set_imgh>> src="'+'images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walking.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/walking.jpg"></center>'
 	'Artem leads you down the side streets and into the alleyway that runs behind the apartment courtyard where all the garages are located. You and Artem hold hands and Anushka walks on the other side of him as the three of you talk about a variety of subjects, mostly about your classmates and teachers. Artem then talks about the D&D game, but quickly drops it when Anushka seems like she''s getting bored.'
 	'She changes the subject by asking you what you thought of some of the boys at the disco tonight, but is interrupted by a smacking sound as she jumps. "What the fuck, dude?" she asks.'
 	*nl
@@ -811,7 +811,7 @@ if $ARGS[0] = 'artem_nush_disco_walk':
 	'Artem barks a laugh. "Doubtful. I''m a great boyfriend. I''m kind, caring, romantic, good in bed and when my girl needs to be dominated, then I can do that too. What more could she want?"'
 	act 'Just let them banter':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="'+'images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walking.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/walking.jpg"></center>'
 		'Anushka snorts. "Maybe she wants to try a real bad boy for a change..."'
 		'Artem responds by smacking her on the ass again. "Maybe, but I''m not worried."'
 		'Anushka scowls a little. "What was that for?"'
@@ -828,18 +828,18 @@ if $ARGS[0] = 'artem_nush':
 	menu_off = 1
 	*clr & cla
 	minut += 5
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk1.jpg"></center>'
 	'Anushka sits and leaves room for you between her and Artem, but you motion for her to scoot over next to Artem and you sit next to her, sandwiching her between the two of you. Artem gives you a questioning look, but you just smile and nod at him.'
 	'He grins and leans back in a half reclining position as you engage Anushka in a conversation about her latest sexual partner. You can see the bulge growing in his pants, and Anushka soon does as well. "Guess someone likes my story, huh?" she asks in a bemused tone.'
 	act 'Tell her to peek':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk2.jpg"></center>'
 		'You lean against her, pushing her closer to Artem. "I think someone wants to say hi. Why don''t you take a peek?"'
 		'She looks back at you with a questioning look, but starts to unbutton and unzip his pants to peek inside. "It''s too dark to see anything. Pull his dick out so we can see it," you tell her.'
 		act 'Tell her to take it out':
 			*clr & cla
 			gs 'boyStat', 'A2'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_bj1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj1.jpg"></center>'
 			'She reaches into his underwear and pulls out his <<dick>>cm <<$dick_girth>> dick. Once it''s free, he reaches over and pulls her head down into his lap. "You made it hard, so now you got to suck it," you say with a smirk.'
 			'She starts stroking his dick with one hand before taking it into her mouth and sucking on it as Artem moans in pleasure.'
 			gs 'arousal', 'voyeur_sex', 2
@@ -848,14 +848,14 @@ if $ARGS[0] = 'artem_nush':
 			act 'Push her head down':
 				*clr & cla
 				anushkaQW['dom_nush'] += 1
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_bj2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj2.jpg"></center>'
 				'As Anushka continues sucking Artem''s cock, you reach over and push her head down to force her to take more of it into her mouth.'
 				'"Oh yeah babe! Just like that..." Artem moans as he looks at you.'
 				gs 'arousal', 'voyeur_sex', 2, 'dom'
 				gs 'stat'
 				act 'Grab her hair':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_bj3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj3.jpg"></center>'
 					'You grab hold of Anushka''s hair and push her head down until you hear her gagging on his cock.'
 					'"Just think if some of the other gopniks walked by and seen you sucking my nerd dick. What would they think?" Artem says to her between moans as you make her deepthroat his cock.'
 					'After a few minutes of this, Artem looks you dead in the eye. "Help me take her jeans off so I can fuck this slut."'
@@ -866,14 +866,14 @@ if $ARGS[0] = 'artem_nush':
 			end
 			act 'Let her suck his dick':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_bj2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj2.jpg"></center>'
 				'As Anushka sucks Artem''s cock, you lean over and partially lay on her back so you can peek around and watch as most of his dick disappears into her mouth with each downward bob of her head.'
 				'"Yeah bitch... Just like that... Suck my dick!" Artem groans between moans of pleasure.'
 				gs 'arousal', 'voyeur_sex', 2, 'dom'
 				gs 'stat'
 				act 'Grab her hair':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_bj3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj3.jpg"></center>'
 					'You grab ahold of Anushka''s hair to pull it up out of the way so it is easier to watch her suck Artem''s dick. "Just think if some of the other gopniks walked by and seen you sucking my nerd dick. What would they think?" Artem says with a smirk.' 
 					'After a few minutes of this, Artem looks you dead in the eye. "Help me take her jeans off so I can fuck this slut."'
 					gs 'arousal', 'voyeur_sex', 2, 'dom'
@@ -888,27 +888,27 @@ end
 if $ARGS[0] = 'artem_nush_strip':
 	menu_off = 1
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_strip1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_strip1.jpg"></center>'
 	'You pull her head up and both you and Artem start unbuttoning her jeans. Once you have them off, Artem tosses them aside as Anushka continues jerking him off. He then starts to tug at her panties.'
 	gs 'arousal', 'voyeur', 1
 	gs 'stat'
 	act 'Watch Artem take off her panties':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_strip2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_strip2.jpg"></center>'
 		'Artem roughly pulls her panties off and tosses them down by her jeans before he stands up and starts pulling down his pants and underwear. "Roll the dirty slut over on all fours so I can fuck her."'
 		gs 'arousal', 'voyeur', 1
 		gs 'stat'
 		act 'Help her onto all fours':
 			*clr & cla
 			gs 'boyStat', 'A2'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_vaginal1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_vaginal1.jpg"></center>'
 			'You help Anushka get up on all fours so her ass is facing Artem. Once she''s in place, Artem kneels down behind her. "Damn, you''re soaking wet! Look babe, her juices are already running down her thigh!"'
 			'He moves forward and she suddenly moans loudly as he shoves his <<dick>>cm <<$dick_girth>> cock inside her pussy and starts fucking her as you lean in and start kissing her.'
 			gs 'arousal', 'kiss', 2
 			gs 'stat'
 			act 'Spread her ass cheeks':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_vaginal2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_vaginal2.jpg"></center>'
 				'After you break the kiss with her, you reach back and spread her ass cheeks as wide as you can while looking up at Artem. He grins as he gets the hint.'
 				'"Look at that little asshole, just begging to be used by nerd dick!" he says before he spits on her ass and uses a finger to rub it into her asshole.'
 				gs 'arousal', 'voyeur_sex', 2
@@ -917,7 +917,7 @@ if $ARGS[0] = 'artem_nush_strip':
 					*clr & cla
 					artemQW['artem_dom'] += 1
 					gs 'boyStat', 'A2'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_anal1.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_anal1.jpg"></center>'
 					'After spending a few more minutes fucking her pussy, he pulls his hips back. "Tell me you want this nerd dick in your ass."'
 					'"Yes... I want you to fuck my ass with your big nerd dick," she says, sounding rather desperate, yet also aroused.'
 					'You hold her ass cheeks wide for him as he lines his dick up with her asshole. "Oh fuck!" she mutters as he forces his cock up her ass.'
@@ -929,7 +929,7 @@ if $ARGS[0] = 'artem_nush_strip':
 					gs 'stat'
 					act 'Keep holding her':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_anal2.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_anal2.jpg"></center>'
 						'Now that she''s unable to move, Artem shoves his hips forward again, causing her to moan loudly. As he starts really hammering her ass, she starts crying out and shaking as she has a massive orgasm, so much so you have to help hold her up as Artem starts grunting louder himself.'
 						gs 'arousal', 'voyeur_sex', 2
 						gs 'arousal', 'end'
@@ -937,7 +937,7 @@ if $ARGS[0] = 'artem_nush_strip':
 						act 'Watch him cum':
 							*clr & cla
 							minut += 5
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_facial.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_facial.jpg"></center>'
 							'Artem suddenly pulls out of Anushka and stands up. "Turn her around to face me." You help her quickly turn around, her body still shaking from her orgasm. "Jerk me off and let me cum over your face, slut!" he orders.' 
 							'She takes hold of his dick and starts jerking him off. Almost at once, he starts cumming over her face. She milks his cock until every last drop of it has been squeezed out of it. They both sigh and sit back against the garage once he''s finished.'
 							*nl
@@ -972,18 +972,18 @@ if $ARGS[0] = 'artem_sveta':
 	menu_off = 1
 	*clr & cla
 	minut += 5
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk1.jpg"></center>'
 	'Artem and Anushka take a seat, with Anushka leaving room for you to sit between her and Artem. You sit between them and lean against Artem as the three of you talk a bit more.'
 	'Artem leans back in a half reclining position and you can see his bulge growing in his pants. After a while, Anushka notices as well. "Looks like someone is getting a little worked up, huh?" she asks is a bemused tone.'
 	'Artem smiles at you. "Sorry babe, but I can''t help it. You''re just so beautiful."'
 	act 'Take a peek':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk2.jpg"></center>'
 		'You unbutton his pants, but it''s too dark to see anything as you hear Anushka''s voice in your ear. It seems she''s leaned over to try and take a look too. "Go on. Pull it out."'
 		act 'Pull his dick out':
 			*clr & cla
 			gs 'boyStat', 'A2'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_bj1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj1.jpg"></center>'
 			'You pull his dick out and he looks at you with pleading eyes. "Please suck it, babe."'
 			'You lean forward and take his dick into your mouth and start sucking it while stroking his shaft. "Damn <<$pcs_nickname>>, you''re getting good at that!" Anushka says.'
 			'You''re unable to answer, so Artem replies for you. "She''s the best!"'
@@ -993,14 +993,14 @@ if $ARGS[0] = 'artem_sveta':
 			act 'Deepthroat':
 				*clr & cla
 				gs 'boyStat', 'A2'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_bj2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj2.jpg"></center>'
 				'As you''re sucking Artem''s dick, you feel a hand press down on the back of your head and force it down until his dick slides down your throat, causing you to gag. You think it''s Artem at first, but soon realize that it''s Anushka.'
 				gs 'arousal', 'bj', 2, 'deepthroat'
 				gs 'stat'
 				act 'Get your hair grabbed':
 					*clr & cla
 					gs 'boyStat', 'A2'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_bj3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj3.jpg"></center>'
 					'You feel her fingers wrap themselves in your hair as she roughly forces you to deepthroat Artem before he speaks up. "Okay, let her up."'
 					'You can keep sucking his dick until he blows his load, offer up your pussy or give him your ass.'
 					gs 'arousal', 'bj', 2, 'deepthroat', 'rough'
@@ -1011,7 +1011,7 @@ if $ARGS[0] = 'artem_sveta':
 						*clr & cla
 						minut += 5
 						gs 'boyStat', 'A2'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_facial.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_facial.jpg"></center>'
 						'He stands up and you keep sucking his dick until he tells you he''s about to cum. You then pop his dick out of your mouth and jerk him off until he starts cumming on your face. Once you''ve milked every last drop out of him, you look up at him with a grin as he tucks his dick back away in his pants.'
 						gs 'cum_call', 'face', 'A2', 1
 						gs 'arousal', 'end'
@@ -1041,7 +1041,7 @@ if $ARGS[0] = 'artem_sveta_vag':
 	menu_off = 1
 	*clr & cla
 	gs 'boyStat', 'A2'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_vaginal1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_vaginal1.jpg"></center>'
 	'You slide his dick out of your mouth and turn to look at him. "I want you to fuck me, right here, right now."'
 	'He just grins and gets up as Anushka helps you get naked from the waist down while he strips out of his pants and underwear. Once you''re both ready, you lay on your back and spread your legs wide before he lays down between your legs and slides his <<dick>>cm <<$dick_girth>> cock into your already wet pussy.'
 	gs 'arousal', 'vaginal', 2
@@ -1049,7 +1049,7 @@ if $ARGS[0] = 'artem_sveta_vag':
 	act 'Watch Anushka':
 		*clr & cla
 		gs 'boyStat', 'A2'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_vaginal2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_vaginal2.jpg"></center>'
 		'As Artem fucks you, you glance over and see that Anushka has her hand down her pants, rubbing one out as she watches you get fucked by Artem. You just grin.'
 		gs 'arousal', 'vaginal', 2
 		gs 'stat'
@@ -1057,7 +1057,7 @@ if $ARGS[0] = 'artem_sveta_vag':
 		act 'Get fucked some more':
 			*clr & cla
 			gs 'boyStat', 'A2'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_vaginal3.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_vaginal3.jpg"></center>'
 			'Anushka is soon moaning almost as loud as you are, enough to attract even Artem''s attention. "What a little slut you are, rubbing one off while you watch me fuck your friend," he grins. "Admit it. You wish you were being fucked by some nerd cock right now, don''t you?"'
 			'Anushka bites her lower lip and redoubles her effort as she keeps rubbing one off. "YES! Oh fuck yes, I wish you were fucking me with your big nerd cock right now!"'
 			'Artem looks at you and smiles before looking back at her as he keeps fucking you. "Maybe next time I''ll ask Petka or Feofan to come along and they can fuck you while you watch me fuck <<$pcs_nickname>>. You''d like that, wouldn''t you? I can tell by your expression that the meer thought of some other nerd using you turns you on."'
@@ -1066,14 +1066,14 @@ if $ARGS[0] = 'artem_sveta_vag':
 			act 'Let him finish':
 				*clr & cla
 				gs 'boyStat', 'A2'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_vaginal4.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_vaginal4.jpg"></center>'
 				'He then starts really pounding your pussy, even more so once Anushka starts arching her back and moaning loudly as she rubs herself to orgasm. This pushes Artem to the edge as well as he starts grunting hard before he pulls out of you and points his dick in your face.'
 				gs 'arousal', 'vaginal', 2
 				gs 'stat'
 				act 'Artem blows his load':
 					*clr & cla
 					minut += 5
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_facial.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_facial.jpg"></center>'
 					'You quickly jerk him off and he soon starts cumming on your face. Once you''ve milked every last drop out of him, you look up at him with a grin as he tucks his dick back away in his pants.'
 					gs 'cum_call', 'face', 'A2', 1
 					gs 'arousal', 'end'
@@ -1102,7 +1102,7 @@ if $ARGS[0] = 'artem_sveta_anal':
 	menu_off = 1
 	*clr & cla
 	gs 'boyStat', 'A2'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_anal1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_anal1.jpg"></center>'
 	'"I want you to fuck my ass," you tell him with a smile.'
 	'He grins. "Get on all fours for me then."'
 	'You get on all fours while Anushka keeps rubbing one out. Artem uses your pussy juices and some spit to lube your asshole up before he gently slides it in. Once his dick is inside you, he starts to slowly fuck your ass.'
@@ -1111,14 +1111,14 @@ if $ARGS[0] = 'artem_sveta_anal':
 	act 'Take an anal pounding':
 		*clr & cla
 		gs 'boyStat', 'A2'		
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_anal2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_anal2.jpg"></center>'
 		'Artem pushes his cock deeper into your ass as he starts to fuck you harder and faster, even more so once Anushka starts arching her back and moaning loudly as she rubs herself to orgasm. This pushes Artem to the edge as well as he starts grunting hard before he pulls out of you and points his dick in your face.'
 		gs 'arousal', 'anal', 2, 'lube'
 		gs 'stat'
 		act 'Artem blows his load':
 			*clr & cla
 			minut += 5
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_facial.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_facial.jpg"></center>'
 			'You quickly jerk him off and he soon starts cumming on your face. Once you''ve milked every last drop out of him, you look up at him with a grin as he tucks his dick back away in his pants.'
 			gs 'cum_call', 'face', 'A2', 1
 			gs 'arousal', 'end'

locations/artem_nush_sex_uni.qsrc

@@ -801,7 +801,7 @@ if $ARGS[0] = 'nerd_game_night_walk':
 	menu_off = 1
 	*clr & cla
 	minut += 10
-	'<center><img <<$set_imgh>> src="'+'images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walking.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/walking.jpg"></center>'
 	if func('uniutil', 'student', 'enrolled'):
 		'You and Artem hold hands and Anushka walks on the other side of him as the three of you talk about a variety of subjects, mostly about the university, your respective courses and the professors. Artem then talks about the D&D game, but quickly drops it when Anushka seems like she''s getting bored.' 
 		'You then walk past the garages out back of the apartment complex Anushka lives in, and she points out which one the band is renting. Artem suddenly stops and takes his jacket off before spreading it wide on the ground. "Hey, why don''t we sit and talk for a bit here?" If you want Anushka to have sex with Artem, then you should sit with her between you and him. If you want to have sex with him, then you should sit between them.'
@@ -817,18 +817,18 @@ if $ARGS[0] = 'artem_nush':
 	menu_off = 1
 	*clr & cla
 	minut += 5
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk1.jpg"></center>'
 	'Anushka sits and leaves room for you between her and Artem, but you motion for her to scoot over next to Artem and you sit next to her, sandwiching her between the two of you. Artem gives you a questioning look, but you just smile and nod at him.'
 	'He grins and leans back in a half-reclining position as you engage Anushka in a conversation about her latest sexual partner. You can see the bulge growing in his pants, and Anushka soon does as well. "Guess someone likes my story, huh?" she asks in a bemused tone.'
 	act 'Tell her to peek':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk2.jpg"></center>'
 		'You lean against her, pushing her closer to Artem. "I think someone wants to say hi. Why don''t you take a peek?"'
 		'She looks back at you with a questioning look but starts to unbutton and unzip his pants to peek inside. "It''s too dark to see anything. Pull his dick out so we can see it," you tell her.'
 		act 'Tell her to take it out':
 			*clr & cla
 			gs 'boyStat', 'A2'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_bj1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj1.jpg"></center>'
 			'She reaches into his underwear and pulls out his <<dick>>cm <<$dick_girth>> dick. Once it''s free, he reaches over and pulls her head down into his lap. "You made it hard, so now you got to suck it," you say with a smirk.'
 			'She starts stroking his dick with one hand before taking it into her mouth and sucking on it as Artem moans in pleasure.'
 			'"This is the best use for that mouth of her''s," he says as you grin at him.'
@@ -838,14 +838,14 @@ if $ARGS[0] = 'artem_nush':
 			act 'Push her head down':
 				*clr & cla
 				anushkaQW['dom_nush'] += 1
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_bj2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj2.jpg"></center>'
 				'As Anushka continues sucking Artem''s cock, you reach over and push her head down to force her to take more of it into her mouth.'
 				'"Oh yeah babe! Just like that..." Artem moans as he looks at you.'
 				gs 'arousal', 'voyeur_sex', 2, 'dom'
 				gs 'stat'
 				act 'Grab her hair':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_bj3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj3.jpg"></center>'
 					'You grab hold of Anushka''s hair and push her head down until you hear her gagging on his cock.'
 					'"God, you''re the best girlfriend a guy could have!" he says between moans as you make Anushka deepthroat his cock.' 
 					'After a few minutes of this, Artem looks you dead in the eye. "Help me take her jeans off so I can fuck this slut."'
@@ -856,14 +856,14 @@ if $ARGS[0] = 'artem_nush':
 			end
 			act 'Let her suck his dick':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_bj2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj2.jpg"></center>'
 				'As Anushka sucks Artem''s cock, you lean over and partially lay on her back so you can peek around and watch as most of his dick disappears into her mouth with each downward bob of her head.'
 				'"Yeah bitch... Just like that... Suck my dick!" Artem groans between moans of pleasure.'
 				gs 'arousal', 'voyeur_sex', 2, 'dom'
 				gs 'stat'
 				act 'Grab her hair':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_bj3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj3.jpg"></center>'
 					'You grab hold of Anushka''s hair and pull it up out of the way so it''s easier to watch her suck Artem''s dick.'
 					'"Just look at you submissively and obediently sucking my dick like a good little slut. We''ll make you into a slut for all the nerds before long," he says to her.'
 					'After a few minutes of this, Artem looks you dead in the eye. "Help me take her jeans off so I can fuck this dirty slut in this alley."'
@@ -879,27 +879,27 @@ end
 if $ARGS[0] = 'artem_nush_strip':
 	menu_off = 1
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_strip1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_strip1.jpg"></center>'
 	'You pull her head up and both you and Artem start unbuttoning her jeans. Once you have them off, Artem tosses them aside as Anushka continues jerking him off. He then starts to tug at her panties.'
 	gs 'arousal', 'voyeur', 1
 	gs 'stat'
 	act 'Watch Artem take off her panties':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_strip2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_strip2.jpg"></center>'
 		'Artem roughly pulls her panties off and tosses them down by her jeans before he stands up and starts pulling down his pants and underwear. "Roll the dirty slut over on all fours so I can fuck her."'
 		gs 'arousal', 'voyeur', 1
 		gs 'stat'
 		act 'Help her onto all fours':
 			*clr & cla
 			gs 'boyStat', 'A2'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_vaginal1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_vaginal1.jpg"></center>'
 			'You help Anushka get up on all fours so her ass is facing Artem. Once she''s in place, Artem kneels down behind her. "Damn, you''re soaking wet! Look babe, her juices are already running down her thigh!"'
 			'He moves forward and she suddenly moans loudly as he shoves his <<dick>>cm <<$dick_girth>> cock inside her pussy and starts fucking her as you lean in and start kissing her.'
 			gs 'arousal', 'kiss', 2
 			gs 'stat'
 			act 'Spread her ass cheeks':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_vaginal2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_vaginal2.jpg"></center>'
 				'After you break the kiss with her, you reach back and spread her ass cheeks as wide as you can while looking up at Artem. He grins as he gets the hint.'
 				'"Look at that little asshole, just begging to be used by nerd dick!" he says before he spits on her ass and uses a finger to rub it into her asshole.'
 				gs 'arousal', 'voyeur_sex', 2
@@ -908,7 +908,7 @@ if $ARGS[0] = 'artem_nush_strip':
 					*clr & cla
 					artemQW['artem_dom'] += 1
 					gs 'boyStat', 'A2'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_anal1.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_anal1.jpg"></center>'
 					'After spending a few more minutes fucking her pussy, he pulls his hips back. "Tell me you want this nerd dick in your ass."'
 					'"Yes... I want you to fuck my ass with your big nerd dick," she says, sounding rather desperate, yet also aroused.'
 					'You hold her ass cheeks wide for him as he lines his dick up with her asshole. "Oh fuck!" she mutters as he forces his cock up her ass.'
@@ -920,7 +920,7 @@ if $ARGS[0] = 'artem_nush_strip':
 					gs 'stat'
 					act 'Keep holding her':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_anal2.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_anal2.jpg"></center>'
 						'Now that she''s unable to move, Artem shoves his hips forward again, causing her to moan loudly. As he starts really hammering her ass, she starts crying out and shaking as she has a massive orgasm, so much so you have to help hold her up as Artem starts grunting louder himself.'
 						gs 'arousal', 'voyeur_sex', 2
 						gs 'arousal', 'end'
@@ -928,7 +928,7 @@ if $ARGS[0] = 'artem_nush_strip':
 						act 'Watch him cum':
 							*clr & cla
 							minut += 5
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk_facial.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_facial.jpg"></center>'
 							'Artem suddenly pulls out of Anushka and stands up. "Turn her around to face me." You help her quickly turn around, her body still shaking from her orgasm. "Jerk me off and let me cum over your face, slut!" he orders.' 
 							'She takes hold of his dick and starts jerking him off. Almost at once, he starts cumming over her face. She milks his cock until every last drop of it has been squeezed out of it. They both sigh and sit back against the garage once he''s finished.'
 							*nl
@@ -971,18 +971,18 @@ if $ARGS[0] = 'artem_sveta':
 	menu_off = 1
 	*clr & cla
 	minut += 5
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk1.jpg"></center>'
 	'Artem and Anushka take a seat, with Anushka leaving room for you to sit between her and Artem. You sit between them and lean against Artem as the three of you talk a bit more.'
 	'Artem leans back in a half reclining position and you can see his bulge growing in his pants. After a while, Anushka notices as well. "Looks like someone is getting a little worked up, huh?" she asks is a bemused tone.'
 	'Artem smiles at you. "Sorry babe, but I can''t help it. You''re just so beautiful."'
 	act 'Take a peek':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk2.jpg"></center>'
 		'You unbutton his pants, but it''s too dark to see anything as you hear Anushka''s voice in your ear. It seems she''s leaned over to try and take a look too. "Go on. Pull it out."'
 		act 'Pull his dick out':
 			*clr & cla
 			gs 'boyStat', 'A2'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_bj1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj1.jpg"></center>'
 			'You pull his dick out and he looks at you with pleading eyes. "Please suck it, babe."'
 			'You lean forward and take his dick into your mouth and start sucking it while stroking his shaft. "Damn <<$pcs_nickname>>, you''re getting good at that!" Anushka says.'
 			'You''re unable to answer, so Artem replies for you. "She''s the best!"'
@@ -992,14 +992,14 @@ if $ARGS[0] = 'artem_sveta':
 			act 'Deepthroat':
 				*clr & cla
 				gs 'boyStat', 'A2'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_bj2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj2.jpg"></center>'
 				'As you''re sucking Artem''s dick, you feel a hand press down on the back of your head and force it down until his dick slides down your throat, causing you to gag. You think it''s Artem at first, but soon realize that it''s Anushka.'
 				gs 'arousal', 'bj', 2, 'deepthroat'
 				gs 'stat'
 				act 'Get your hair grabbed':
 					*clr & cla
 					gs 'boyStat', 'A2'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_bj3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj3.jpg"></center>'
 					'You feel her fingers wrap themselves in your hair as she roughly forces you to deepthroat Artem before he speaks up. "Okay, let her up."'
 					'You can keep sucking his dick until he blows his load, offer up your pussy or give him your ass.'
 					gs 'arousal', 'bj', 2, 'deepthroat', 'rough'
@@ -1010,7 +1010,7 @@ if $ARGS[0] = 'artem_sveta':
 						*clr & cla
 						minut += 5
 						gs 'boyStat', 'A2'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_facial.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_facial.jpg"></center>'
 						'He stands up and you keep sucking his dick until he tells you he''s about to cum. You then pop his dick out of your mouth and jerk him off until he starts cumming on your face. Once you''ve milked every last drop out of him, you look up at him with a grin as he tucks his dick back away in his pants.'
 						gs 'cum_call', 'face', 'A2', 1
 						gs 'arousal', 'end'
@@ -1047,7 +1047,7 @@ if $ARGS[0] = 'artem_sveta_vag':
 	menu_off = 1
 	*clr & cla
 	gs 'boyStat', 'A2'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_vaginal1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_vaginal1.jpg"></center>'
 	'You slide his dick out of your mouth and turn to look at him. "I want you to fuck me, right here, right now."'
 	'He just grins and gets up as Anushka helps you get naked from the waist down while he strips out of his pants and underwear. Once you''re both ready, you lay on your back and spread your legs wide before he lays down between your legs and slides his <<dick>>cm <<$dick_girth>> cock into your already wet pussy.'
 	gs 'arousal', 'vaginal', 2
@@ -1055,7 +1055,7 @@ if $ARGS[0] = 'artem_sveta_vag':
 	act 'Watch Anushka':
 		*clr & cla
 		gs 'boyStat', 'A2'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_vaginal2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_vaginal2.jpg"></center>'
 		'As Artem fucks you, you glance over and see that Anushka has her hand down her pants, rubbing one out as she watches you get fucked by Artem. You just grin.'
 		gs 'arousal', 'vaginal', 2
 		gs 'stat'
@@ -1063,7 +1063,7 @@ if $ARGS[0] = 'artem_sveta_vag':
 		act 'Get fucked some more':
 			*clr & cla
 			gs 'boyStat', 'A2'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_vaginal3.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_vaginal3.jpg"></center>'
 			'Anushka is soon moaning almost as loud as you are, enough to attract even Artem''s attention. "What a little slut you are, rubbing one off while you watch me fuck your friend," he grins. "Admit it. You wish you were being fucked by some nerd cock right now, don''t you?"'
 			'Anushka bites her lower lip and redoubles her effort as she keeps rubbing one off. "YES! Oh fuck yes, I wish you were fucking me with your big nerd cock right now!"'
 			'Artem looks at you and smiles before looking back at her as he keeps fucking you. "Maybe next time I''ll ask Petka or Feofan to come along and they can fuck you while you watch me fuck <<$pcs_nickname>>. You''d like that, wouldn''t you? I can tell by your expression that the meer thought of some other nerd using you turns you on."'
@@ -1072,14 +1072,14 @@ if $ARGS[0] = 'artem_sveta_vag':
 			act 'Let him finish':
 				*clr & cla
 				gs 'boyStat', 'A2'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_vaginal4.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_vaginal4.jpg"></center>'
 				'He then starts really pounding your pussy, even more so once Anushka starts arching her back and moaning loudly as she rubs herself to orgasm. This pushes Artem to the edge as well as he starts grunting hard before he pulls out of you and points his dick in your face.'
 				gs 'arousal', 'vaginal', 2
 				gs 'stat'
 				act 'Artem blows his load':
 					*clr & cla
 					minut += 5
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_facial.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_facial.jpg"></center>'
 					'You quickly jerk him off and he soon starts cumming on your face. Once you''ve milked every last drop out of him, you look up at him with a grin as he tucks his dick back away in his pants.'
 					gs 'cum_call', 'face', 'A2', 1
 					gs 'arousal', 'end'
@@ -1116,7 +1116,7 @@ if $ARGS[0] = 'artem_sveta_anal':
 	menu_off = 1
 	*clr & cla
 	gs 'boyStat', 'A2'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_anal1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_anal1.jpg"></center>'
 	'"I want you to fuck my ass," you tell him with a smile.'
 	'He grins. "Get on all fours for me then."'
 	'You get on all fours while Anushka keeps rubbing one out. Artem uses your pussy juices and some spit to lube your asshole up before he gently slides it in. Once his dick is inside you, he starts to slowly fuck your ass.'
@@ -1125,14 +1125,14 @@ if $ARGS[0] = 'artem_sveta_anal':
 	act 'Take an anal pounding':
 		*clr & cla
 		gs 'boyStat', 'A2'		
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_anal2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_anal2.jpg"></center>'
 		'Artem pushes his cock deeper into your ass as he starts to fuck you harder and faster, even more so once Anushka starts arching her back and moaning loudly as she rubs herself to orgasm. This pushes Artem to the edge as well as he starts grunting hard before he pulls out of you and points his dick in your face.'
 		gs 'arousal', 'anal', 2, 'lube'
 		gs 'stat'
 		act 'Artem blows his load':
 			*clr & cla
 			minut += 5
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/sveta/walk_facial.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_facial.jpg"></center>'
 			'You quickly jerk him off and he soon starts cumming on your face. Once you''ve milked every last drop out of him, you look up at him with a grin as he tucks his dick back away in his pants.'
 			gs 'cum_call', 'face', 'A2', 1
 			gs 'arousal', 'end'

locations/boyStat.qsrc

@@ -27,7 +27,7 @@ end
 if mid($npcboytemp,1,1) = 'A' or mid($npcboytemp,1,1) = 'B' or mid($npcboytemp,1,1) = 'C':
 	$npclastcalled = $npcboytemp
 	npclastcalledn = val(mid($npcboytemp, 2))
-	if $npc_usedname[$npclastcalled]=0: $npc_usedname[$npclastcalled] = $npc_firstname[$npclastcalled] & !! this is a workaround which compensate incomplete settings in npc_static files, it can be removed later ...
+	if isnum($npc_usedname[$npclastcalled]) or $npc_usedname[$npclastcalled] = '': $npc_usedname[$npclastcalled] = $npc_firstname[$npclastcalled] & !! this is a workaround which compensate incomplete settings in npc_static files, it can be removed later ...
 	$bstemp[1] = $npc_usedname[$npclastcalled]
 	bstemp[2] = npc_dick[$npclastcalled]
 	$bstemp[3] = $npc_thdick[$npclastcalled]
@@ -103,9 +103,7 @@ elseif $ARGS[1] = 'f':
 	$dick_girth6 = $bstemp[3]
 	silavag6 = bstemp[4]
 else
-	boyStat_i = ARGS[1]
-	!! check if $ARGS[1] is an empty string or not
-	if $ARGS[1] ! 0 and isnum($ARGS[1]) ! 0: boyStat_i = val($ARGS[1])
+	boyStat_i = max(ARGS[1], val($ARGS[1]))
 	$boy[boyStat_i] = $npclastcalled
 	$boydesc[boyStat_i] = $bstemp[1]
 	dick[boyStat_i] = bstemp[2]

locations/camera.qsrc

@@ -135,7 +135,7 @@ if $ARGS[0] = 'start':
 		! Assign the variables
 		dynamic $camera_locations[iterator]
 		! Show the player unphotographed locations
-		if camera_found[$camera_event] ! 1: '<<$camera_description>>'
+		if camera_found[$camera_event] ! 1: $camera_description
 		iterator += 1
 		if iterator < location_count: jump 'location_loop'
 	end
@@ -148,7 +148,7 @@ if $ARGS[0] = 'start':
 		! Assign the variables
 		dynamic $camera_people[iterator]
 		! If the subject has not been photographed and requirements are met (-1), show the name
-		if camera_found[$camera_event] ! 1 and camera_requirement = -1: '<<$camera_description>>'
+		if camera_found[$camera_event] ! 1 and camera_requirement = -1: $camera_description
 		iterator += 1
 		if iterator < people_count: jump 'people_loop'
 	end
@@ -158,7 +158,7 @@ end
 
 if $ARGS[0] = 'check_location':
 	! If the player has a camera and this location exists in the array
-	if photographyEv >= 2 and $camera_locations[$loc] ! 0:
+	if photographyEv >= 2 and arrpos('$camera_locations', $loc) >= 0:
 		! Assign the variables
 		dynamic $camera_locations[$loc]
 		! If they have not already photographed the location
@@ -181,7 +181,7 @@ end
 
 if $ARGS[0] = 'check_person':
     ! If the player has a camera and this person exists in the array
-    if photographyEv >= 2 and $camera_people[$ARGS[1]] ! 0:
+    if photographyEv >= 2 and arrpos('$camera_people', $ARGS[1]) >= 0:
         ! Assign the variables
         dynamic $camera_people[$ARGS[1]]
         ! If they have not already photographed the person

locations/cikl.qsrc

@@ -164,13 +164,13 @@ if husbandMark = 1 and husband <= 10:
 end
 
 !! after having surgery you will be in recuperation for a few days
-
-if surgeryday ! '':
+if surgeryday > 0:
 	if daystart - 7 <= surgeryday:
 		dailyhealthimprov = (daystart - surgeryday) * 50
 		pcs_health = dailyhealthimprov
 		recuperation = 1
 	else
+		killvar 'surgeryday'
 		killvar 'recuperation'
 		killvar 'dailyhealthimprov'
 	end

locations/city_experimental_trials_events.qsrc

@@ -83,14 +83,14 @@ elseif $experimentQW['trial_active'] = 'pill_red':
 		end
 
 		'Your agility has increased and you feel faster! This must have been that experimental pill you took.'
-	
+
 	elseif experimentQW['random_option'] = 5:
 		if vital_lvl > 11:
 			vital_exp -= 2 * vital_xpnxt
 		end
 
 		'Your endurance has decreased! This must have been that experimental pill you took.'
-	
+
 	else
 		if vital_lvl < 99:
 			vital_exp += 2 * vital_xpnxt
@@ -514,7 +514,7 @@ if $experimentQW['trial_active'] = 'aphrodisiac_pill':
 		orgasm += 1
 		pcs_mood = 100
 		if pcs_traits['easy_orgams'] < 2: pcs_traits['easy_orgams'] = 2
-		
+
 		*nl
 		'You feel a heat spreading from your stomach and moving towards your pussy. The heat pulses and you find yourself in the grips of an intense orgasm! You feel like it''ll be easier to orgasm from now on. This must have been that experimental aphrodisiac.'
 	end
@@ -530,7 +530,7 @@ end
 
 if $experimentQW['trial_active'] = 'butt_injection':
 	pcs_horny += 10
-	butt_tr_exp += butt_tr_xpnxt * 2
+	bodyVars['butt_other'] += 2
 
 	if experimentQW['trial_duration'] >= 4:
 		*nl
@@ -568,7 +568,7 @@ if $experimentQW['trial_active'] = 'fertility_shot':
 	if experimentQW['trial_duration'] = 3:
 		if min_arousal < 20: min_arousal = 20
 		if pcs_horny < 20: pcs_horny = 20
-		
+
 		*nl
 		'You feel a heat radiate from your womb, awakening your arousal. This must have been that experimental fertility shot.'
 	elseif experimentQW['trial_duration'] = 2:

locations/city_experimental_trials_list.qsrc

@@ -106,13 +106,13 @@ if $ARGS[0] = $trial_sections[0]:
 	$loc_arg = $trial_sections[0]
 
 	minut += 2
-	
+
 	!!Image of the desk, or an experimental trials folder
 	'<center><img <<$set_imgh>> src="images\system\image_needed.png"></center>'
 
 	'We have developed a range of enhancement pills that are designed to improve both body and mood. They''ve just been approved for human trials, so we''re still cataloguing the effects.'
 	'The following are expected: mood swings, aches, itches, rashes and physical changes.'
-	
+
 	act 'Sign up':
 		$experimentQW['trial_active'] = $trial_names[0]
 
@@ -137,77 +137,77 @@ if $ARGS[0] = $trial_sections[0]:
 		!! Change tits
 		if temp_rand < 10:
 			$temp_pill_color = 'cyan'
-			$experimentQW['trial_active']     = 'pill_cyan'
+			$experimentQW['trial_active']    = 'pill_cyan'
 			experimentQW['pill_cyan_taken'] += 1
-			experimentQW['trial_duration']   = rand(1,3)
+			experimentQW['trial_duration']   = rand(1, 3)
 
 		!! Change stren, vital, or agil
 		elseif temp_rand < 20:
 			$temp_pill_color = 'red'
-			$experimentQW['trial_active']    = 'pill_red'
+			$experimentQW['trial_active']   = 'pill_red'
 			experimentQW['pill_red_taken'] += 1
-			experimentQW['trial_duration']  = rand(2,4)
+			experimentQW['trial_duration']  = rand(2, 4)
 
 		!! Change intel, cha, perception?
 		elseif temp_rand < 30:
 			$temp_pill_color = 'blue'
 			$experimentQW['trial_active']     = 'pill_blue'
-			experimentQW['pill_blue_taken'] += 1
-			experimentQW['trial_duration']   = rand(2,4)
+			 experimentQW['pill_blue_taken'] += 1
+			 experimentQW['trial_duration']   = rand(2, 4)
 
 		!! Change skin
 		elseif temp_rand < 40:
 			$temp_pill_color = 'yellow'
-			$experimentQW['trial_active']       = 'pill_yellow'
+			$experimentQW['trial_active']      = 'pill_yellow'
 			experimentQW['pill_yellow_taken'] += 1
-			experimentQW['trial_duration']     = rand(2,5)
+			experimentQW['trial_duration']     = rand(2, 5)
 
 		!! Change butt
 		elseif temp_rand < 50:
 			$temp_pill_color = 'orange'
-			$experimentQW['trial_active']       = 'pill_orange'
+			$experimentQW['trial_active']      = 'pill_orange'
 			experimentQW['pill_orange_taken'] += 1
-			experimentQW['trial_duration']     = rand(2,4)
+			experimentQW['trial_duration']     = rand(2, 4)
 
 		!! Change inhib
 		elseif temp_rand < 60:
 			$temp_pill_color = 'violet'
-			$experimentQW['trial_active']       = 'pill_violet'
+			$experimentQW['trial_active']      = 'pill_violet'
 			experimentQW['pill_violet_taken'] += 1
 			experimentQW['trial_duration']     = 1
 
 		!! Change min_arousal
 		elseif temp_rand < 65:
 			$temp_pill_color = 'brown'
-			$experimentQW['trial_active']      = 'pill_brown'
+			$experimentQW['trial_active']     = 'pill_brown'
 			experimentQW['pill_brown_taken'] += 1
-			experimentQW['trial_duration']    = rand(2,4)
-		
+			experimentQW['trial_duration']    = rand(2, 4)
+
 		!! Change clit
 		elseif temp_rand < 70:
 			$temp_pill_color = 'purple'
-			$experimentQW['trial_active']     = 'pill_purple'
+			$experimentQW['trial_active']      = 'pill_purple'
 			experimentQW['pill_purple_taken'] += 1
-			experimentQW['trial_duration']   = rand(2,4)
+			experimentQW['trial_duration']     = rand(2, 4)
 
 		!! Change alko_status
 		elseif temp_rand < 80:
 			$temp_pill_color = 'green'
-			$experimentQW['trial_active']      = 'pill_green'
+			$experimentQW['trial_active']     = 'pill_green'
 			experimentQW['pill_green_taken'] += 1
 			experimentQW['trial_duration']    = 1
 
 		!! Give exhib level or change willwpower
 		elseif temp_rand < 85:
 			$temp_pill_color = 'gray'
-			$experimentQW['trial_active']     = 'pill_gray'
+			$experimentQW['trial_active']    = 'pill_gray'
 			experimentQW['pill_gray_taken'] += 1
 			experimentQW['trial_duration']   = 1
 
 		!! Give bimbo lvl or change willpower?
 		elseif temp_rand < 90:
 			$temp_pill_color = 'pink'
-			$experimentQW['trial_active']     = 'pill_pink'
+			$experimentQW['trial_active']    = 'pill_pink'
 			experimentQW['pill_pink_taken'] += 1
 			experimentQW['trial_duration']   = 1
 		end
@@ -403,7 +403,7 @@ elseif $ARGS[0] = $trial_sections[4]:
 		 experimentQW['times_participated_4'] += 1
 		$experimentQW['trial_active'] = $trial_sections[4]
 		 experimentQW['trial_duration'] = trial_durations[4]
-		
+
 		menu_off = 1
 		minut += 2
 		gs 'stat'

locations/city_experimental_trials_pharmacy.qsrc

@@ -15,11 +15,26 @@ if $ARGS[0] = 'counter':
 		end
 		*nl
 
-		'There is currently nothing of note being sold here (yet).'
-		'More content will be added here in later updates.'
+		if experimentQW['times_participated_1'] = 0 and experimentQW['times_participated_2'] = 0 and experimentQW['times_participated_3'] = 0 and experimentQW['times_participated_4'] = 0 and experimentQW['times_participated_5'] = 0:
+			'"If any of our experimental trials lead to a breakthrough, we will sell the medicine those trials produced here. Currently all of our trials are ongoing so there''s nothing in stock, do check back later. Sign up for a trial, if you want to help us develop medicine for the future."'
+		else
+			act 'Buy something': gt 'city_experimental_trials_pharmacy', 'cart'
+		end
 
 		act 'Go back to the front desk': gt 'city_experimental_trials', 'front_desk'
 end
 
 
+if $ARGS[0] = 'cart':
+	*clr & cla
+	$loc_s = 'city_experimental_trials_pharmacy'
+	$args_s = 'cart'
+
+	gs 'item_cart', 'shoppping_aisle', 'experimental_trials'
+	gs 'themes', 'indoors'
+	gs 'stat'
+
+	act 'Exit shopping cart': gt 'city_experimental_trials_pharmacy', 'counter'
+end
+
 --- city_experimental_trials_pharmacy ---------------------------------

locations/city_hotel.qsrc

@@ -1,6 +1,8 @@
 # city_hotel
 
 if $ARGS[0] = 'start' or $ARGS[0] = '':
+	if hotelRoomDays['city'] = 0 and hour > 11: hotelRoom['city'] = 0
+	if hotelRoomDays['city'] <= 0: hotelRoom['city'] = 0
 	*clr & cla
 	nom_o[1] = 100
 	nom_o[2] = 1000

locations/din_van.qsrc

@@ -156,7 +156,7 @@ $shower = {
 				'His cum <i>leaking</i> out of you.'
 				*nl
 				'You grab the soap again and scrub yourself again, but it still feels like something is there, coating your skin. You scrub and scrub and scrub but it just won''t go away until you finally cry out, throwing it into the corner. Tremors begin coursing through your body and you slowly sink down onto the shower floor, where you remain, sobbing while the water continues raining down on you.'
-				
+
 				dynamic $dryOff
 			end
 		elseif pcs_horny >= 40:
@@ -188,9 +188,9 @@ $shower = {
 				dynamic $dryOff
 			end
 		end
-		
+
 		gs 'selfplay', 'shower_dildo_check'
-		
+
 		act 'Take a selfie':
 			gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
 		end
@@ -282,7 +282,7 @@ $bath = {
 			gs 'arousal', 'end'
 			dynamic $dryOff
 		end
-		
+
 		gs 'selfplay', 'bathtub_dildo_check'
 
 		act 'Take a selfie':
@@ -305,7 +305,7 @@ $SkinCare = {
 			minut += 5
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/skincare.jpg"></center>'
 			'You get out your skin care products and apply them, the creams feel cool and nice against your skin. You sometimes wonder if all this effort and money is worth it, but one look in the mirror at your skin and you figure it is.'
-			
+
 			gs 'body', 'SkinGain', 'Moisturizer'
 			gs 'stat'
 			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
@@ -332,7 +332,7 @@ $brit = {
 							$shave_txt1 = 'You do your legs first before lathering up your crotch and taking a razor to the bush growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got everything.'
 							$shave_txt2 = 'Satisfied there isn''t even a single hair left, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
 						else
-							$shave_txt1 = 'You lather up your legs and crotch, grabbing your razor and carefully scraping away stubble that is growing from them.' 
+							$shave_txt1 = 'You lather up your legs and crotch, grabbing your razor and carefully scraping away stubble that is growing from them.'
 							$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble left. Satisfied, you rinse yourself off, smiling in relief that your pussy is silky smooth once again.'
 						end
 					elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:
@@ -360,7 +360,7 @@ $brit = {
 					elseif pubestyle = 11:
 						$shave_act = 'Shave your legs and pussy'
 						if pcs_pubes <= 10:
-							$shave_txt1 = 'You do your legs first before realizing that the stubble growing around your pussy is starting to become irritating and you can''t put it off any longer. Lathering yourself up, you grab your razor and carefully scrape away the rough itchy hairs have been bothering you so.' 
+							$shave_txt1 = 'You do your legs first before realizing that the stubble growing around your pussy is starting to become irritating and you can''t put it off any longer. Lathering yourself up, you grab your razor and carefully scrape away the rough itchy hairs have been bothering you so.'
 							$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, smiling in relief that your pussy is smooth once again.'
 						else
 							$shave_txt1 = 'You do your legs first before lathering up your crotch and taking a razor to the hair growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
@@ -368,7 +368,7 @@ $brit = {
 					else
 						$shave_act = ''
 					end
-				
+
 					if $shave_act ! '':
 						act '<<$shave_act>> (0:15)':
 							menu_off = 1
@@ -415,7 +415,7 @@ $brit = {
 				if pubestyle = 1:
 					$shave_act = 'Shave your pussy'
 					if pcs_pubes <= 10:
-						$shave_txt1 = 'You lather up yourself up, and grab your razor, carefully scraping away stubble that is growing from your crotch.' 
+						$shave_txt1 = 'You lather up yourself up, and grab your razor, carefully scraping away stubble that is growing from your crotch.'
 						$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, smiling in relief that your pussy is silky smooth once again.'
 					else
 						$shave_txt1 = 'You lather up your crotch and take a razor to the hair growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
@@ -716,7 +716,7 @@ $publicpan = {
 	!! Changing into a different outfit for prostitution
 	if prostitute['active'] = 1 and ARGS[1] ! 'no_prost' and $loc ! 'gschool_break':
 		gs 'prostitution_functions', 'work_clothes'
-		if  prostitute['work_clothes'] = 0 and prostitute['outfit_is_set']: 
+		if  prostitute['work_clothes'] = 0 and prostitute['outfit_is_set']:
 			act 'Change into prostitute outfit': gt 'prostitution_functions', 'change_to_work', 'restroom'
 		elseif prostitute['work_clothes'] and prostitute['changed_for_work']:
 			act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'restroom'
@@ -909,7 +909,7 @@ $basin = {
 			act 'Continue': menu_off = 0 & gt $loc, $loc_arg
 		end
 	end
-	
+
 	if KandidozOnce = 1 and KandidNapr > 0:
 		act 'Use antifungal Medication':
 			*clr & cla
@@ -1073,7 +1073,7 @@ if $ARGS[0] = 'private':
 	end
 
 	if mc_inventory['chaffing_cream'] > 0: 'On a shelf is a tube of ointment for chafing, which will be enough for <b><<mc_inventory[''chaffing_cream'']>></b> applications.'
-	if mc_inventory['moisturiser'] > 0: 
+	if mc_inventory['moisturiser'] > 0:
 		'You look at your moisturiser and think you have about <<mc_inventory[''moisturiser'']>> applications left.'
 	end
 	if mc_inventory['tampons'] =  0 and mc_inventory['sanitary_pads'] = 0:
@@ -1086,7 +1086,7 @@ if $ARGS[0] = 'private':
 	elseif mc_inventory['tampons'] > 0:
 		'You have <b><<mc_inventory[''tampons'']>></b> tampons.'
 	end
-	
+
 	if mc_inventory['sanitary_pads'] = 1 and tampon['warning'] ! daystart:
 		tampon['warning'] = daystart
 		msg'<font color="red">You only have <b><<mc_inventory[''sanitary_pads'']>></b> pad left!</font>'
@@ -1097,7 +1097,7 @@ if $ARGS[0] = 'private':
 	end
 
 	'Your deodorant will last you for <b><<mc_inventory[''deodorant'']>></b> more '+iif(mc_inventory['deodorant'] =  1, 'application.', 'applications.')
-	
+
 	if $ARGS[1] = 'hotelroom':
 		dynamic $shower
 		if $ARGS[2] = 'bath': dynamic $bath
@@ -1140,6 +1140,13 @@ if $ARGS[0] = 'private':
 		end
 	end
 
+	if mc_inventory['hair_extensioncream'] > 0:
+		'<a href="exec:gs ''drugs'', ''hair_extensioncream'' & gt $loc, $loc_arg">Apply hair extension shampoo.</a> Uses left: <<mc_inventory[''hair_extensioncream'']>>.'
+	end
+	if mc_inventory['butt_injection'] > 0:
+		'<a href="exec:gs ''drugs'', ''butt_injection'' & gt $loc, $loc_arg">Inject the KBI butt enhancement shot.</a> Uses left: <<mc_inventory[''butt_injection'']>>.'
+	end
+
 	if mc_inventory['breastcream'] > 0:
 		'<a href="exec:gs ''drugs'', ''breastcream'' & gt $loc, $loc_arg">Apply breast cream.</a> Uses left: <<mc_inventory[''breastcream'']>>.'
 	end
@@ -1200,7 +1207,7 @@ if $ARGS[0] = 'private':
 	dynamic $brit
 
 	dynamic $enema
-	
+
 	dynamic $palelady
 
 
@@ -1271,7 +1278,7 @@ if $ARGS[0] = 'private':
 				*nl
 				'The test shows one band. You are not pregnant.'
 				act 'Sigh in relief': gt 'din_van', 'ReliefReact'
-				
+
 				act 'Sigh in disappointment': gt 'din_van', 'DisappointedReact'
 			end
 
@@ -1795,7 +1802,7 @@ if $ARGS[0] = 'shave_options':
 
 	!! ROW 1: IMAGES
 		*p '<TR><TD><center><a href="exec:view''images/pc/body/pussy/hair/pussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hair/pussy.jpg"></a></center></TD>'
-		
+
 		$temp_pube_image = FUNC('$pube_image', 16, pcs_pubecol[2], 2)
 		*p '<TD><center><a href="exec:view''<<$temp_pube_image>>''"><img Height = <<shave_img_hgt>> src="<<$temp_pube_image>>"></a></center></TD>'
 
@@ -1856,7 +1863,7 @@ if $ARGS[0] = 'shave_options':
 
 		$temp_pube_image = FUNC('$pube_image', 26, pcs_pubecol[2], 10)
 		*p '<TD><center><a href="exec:view''<<$temp_pube_image>>''"><img Height = <<shave_img_hgt>> src="<<$temp_pube_image>>"></a></center></TD></TR>'
-	
+
 	!! ROW 2: TEXT
 		*p '<TR><TD><center>'
 		if pubestyle ! 6 and pcs_pubes > 15:

locations/drugs.qsrc

@@ -22,6 +22,8 @@ if $ARGS[0] = 'cikl':
 	gs 'drugs', 'cocaine', 'cikl'
 	gs 'drugs', 'mentats', 'cikl'
 	gs 'drugs', 'aphrodisiac', 'cikl'
+	gs 'drugs', 'hair_extensioncream', 'cikl'
+	gs 'drugs', 'butt_injection', 'cikl'
 
 elseif $ARGS[0] = 'hourly_events':
 	gs 'drugs', 'smoke', 'hourly_events'
@@ -74,7 +76,7 @@ elseif $ARGS[0] = 'smoke':
 			drugVars['cigarettes_used'] += 1
 			if drugVars['cigarettes_used'] > 20 and drugVars['cigarettes_exp'] = 0: drugVars['cigarettes_exp'] = 1
 		end
-		
+
 		stat['cigarettes_smoked'] += 1
 		drugVars['cigarettes_day'] = daystart
 		drugVars['cigarettes_hour'] = hour
@@ -96,7 +98,7 @@ elseif $ARGS[0] = 'smoke':
 		gs 'stat'
 	end
 
-	
+
 elseif $ARGS[0] = 'joint':
 	if $ARGS[1] = 'hourly_events':
 		if drugVars['weed_high'] > 0: drugVars['weed_high'] -= 1
@@ -137,16 +139,16 @@ elseif $ARGS[0] = 'joint':
 
 elseif $ARGS[0] = 'heroin':
 	if $ARGS[1] = 'hourly_events':
-		if drugVars['heroin_high'] > 0: 
+		if drugVars['heroin_high'] > 0:
 			pcs_mood -= (40 / drugVars['heroin_high'])
 			drugVars['heroin_high'] -= 1
 		end
 
-		if drugVars['heroin_need'] > 0 and pcs_mood > 10: 
+		if drugVars['heroin_need'] > 0 and pcs_mood > 10:
 			drugVars['heroin_need'] += 1
 			pcs_mood -= pcs_mood / 10
 		end
-		if drugVars['heroin_need'] > 100 and drugVars['heroin_high'] <= 0: 
+		if drugVars['heroin_need'] > 100 and drugVars['heroin_high'] <= 0:
 			drugVars['heroin_need'] = 0
 			drugVars['heroin_used'] = 0
 		end
@@ -189,7 +191,7 @@ elseif $ARGS[0] = 'cocaine':
 	elseif $ARGS[1] = 'hourly_events':
 		if drugVars['cocaine_addict'] = 1 and drugVars['cocaine_day'] ! daystart:
 			pcs_health -= 5
-			
+
 			!! Changed from pcs_mood > 40 -> pcs_mood > 45 to avoid pcs_mood becoming lower than 5. Blame Anjuna
 			if pcs_mood > 45:
 				pcs_mood -= 40
@@ -246,7 +248,7 @@ elseif $ARGS[0] = 'amphetamine':
 			end
 		end
 
-		if drugVars['amphetamine_withdrawl'] >= 5: 
+		if drugVars['amphetamine_withdrawl'] >= 5:
 			drugVars['amphetamine_withdrawl'] += 1
 			pcs_mood -= (drugVars['amphetamine_withdrawl'] / 5)
 		end
@@ -275,7 +277,7 @@ elseif $ARGS[0] = 'amphetamine':
 			drugVars['amphetamine_bonus'] = 1
 		end
 
-		if drugVars['amphetamine_withdrawl'] > 169: 
+		if drugVars['amphetamine_withdrawl'] > 169:
 			drugVars['amphetamine_withdrawl'] = 1
 			drugVars['amphetamine_bonus'] = 1
 			drugVars['amphetamine_used'] = 0
@@ -299,7 +301,7 @@ elseif $ARGS[0] = 'amphetamine':
 				mc_inventory['amphetamine'] -= 1
 				if mc_inventory['amphetamine'] <= 0: mc_inventory['amphetamine'] = 0 & msg 'That was your last amphetamine pill.'
 			end
-			if cheatVars['drugs_immune'] = 0: 
+			if cheatVars['drugs_immune'] = 0:
 				drugVars['amphetamine_used'] += 1
 				if drugVars['amphetamine_used'] > 5 and drugVars['amphetamine_exp'] = 0: drugVars['amphetamine_exp'] = 1
 			end
@@ -362,7 +364,7 @@ elseif $ARGS[0] = 'breastcream':
 			drugVars['breastcream_dose'] = 0
 
 			temp = pcs_mass['bust'] - pcs_mass['bust_gen']
-			temp = rand(0, 5 + max(0, temp)) / max(1, temp)
+			temp = rand(0, 10 + max(0, temp)) / max(1, temp)
 
 			if temp > 0:
 				bodyVars['bust_other'] += 1
@@ -407,12 +409,12 @@ elseif $ARGS[0] = 'alcohol':
 			pain['relief'] = 15
 		end
 	else
-		if cheatVars['drugs_immune'] = 0: 
+		if cheatVars['drugs_immune'] = 0:
 			drugVars['alcohol_used'] += 1
 			if drugVars['alcohol_used'] > 15 and drugVars['alcohol_exp'] = 0: drugVars['alcohol_exp'] = 1
-		end	
+		end
 
-		if ARGS[2] <= 1: 
+		if ARGS[2] <= 1:
 			temp_alc_count = 1
 		else
 			temp_alc_count = ARGS[2]
@@ -567,6 +569,64 @@ elseif $ARGS[0] = 'aphrodisiac':
 		end
 		gs 'stat'
 	end
+elseif $ARGS[0] = 'hair_extensioncream':
+	if $ARGS[1] = 'cikl':
+		if drugVars['hair_extensioncream_dose'] >= 1:
+			drugVars['hair_extensioncream_dose'] = 0
+
+			if pcs_hairlng < 999:
+				pcs_hairlng += 2
+				'Feels like your hair has grown slightly.'
+			end
+		end
+	else
+		if drugVars['hair_extensioncream_dose'] < 1:
+			'<font color = #DB7093>You smear the shampoo into your hair and rub it in, then wash it out shortly later.</font>'
+
+			if ARGS[1] = 0 and $ARGS[1] = '':
+				mc_inventory['hair_extensioncream'] -= 1
+				if mc_inventory['hair_extensioncream'] <= 0: mc_inventory['hair_extensioncream'] = 0 & msg 'That was your last bit of hair extension shampoo.'
+			end
+
+			drugVars['hair_extensioncream_used'] += 1
+			drugVars['hair_extensioncream_dose'] = 1
+		else
+			'Using any more hair extension shampoo won''t have any effect.'
+		end
+		gs 'stat'
+	end
+
+elseif $ARGS[0] = 'butt_injection':
+	if $ARGS[1] = 'cikl':
+		if drugVars['butt_injection_dose'] >= 1:
+			drugVars['butt_injection_dose'] = 0
+
+			temp = pcs_mass['butt'] - pcs_mass['butt_gen']
+			temp = rand(0, 10 + max(0, temp)) / max(1, temp)
+
+			if temp > 0:
+				bodyVars['butt_other'] += 1
+				'Feels like your butt has grown slightly.'
+			end
+			killvar 'temp'
+		end
+	else
+		if drugVars['butt_injection_dose'] < 1:
+			'<font color = #DB7093>You inject the KBI formula into your ass.</font>'
+
+			if ARGS[1] = 0 and $ARGS[1] = '':
+				mc_inventory['butt_injection'] -= 1
+				if mc_inventory['butt_injection'] <= 0: mc_inventory['butt_injection'] = 0 & msg 'That was your last KBI shot.'
+			end
+
+			drugVars['butt_injection_used'] += 1
+			drugVars['butt_injection_dose'] = 1
+		else
+			'Using any more injections won''t have any effect.'
+		end
+		gs 'stat'
+	end
+
 else
 	'<br><font color = red>Developer note: The type of drug is wrong or missing in this scene. Please report this and a small part of the text of the current scene as a bug.</font>'
 end

locations/emp_functions.qsrc

@@ -168,7 +168,7 @@ if $ARGS[0] = 'job_info':
 	$msg_body += '<p>Notes: ' + $emp_job_notes[j_id]+ '</p>'
 	$msg_body += '<p>Wages: ' + func('agentned', 'format_price_string', emp_job_wages[j_id]) + '<b>₽</b></p>'
 
-	msg '<<$msg_body>>'
+	msg $msg_body
 	killvar '$msg_body'
 end
 
@@ -300,17 +300,14 @@ if $ARGS[0] = 'gen_evt':
 	transient_evt_minutes = rand(0, 9)
 
 	!! Set as multiples of 60
-	if transient_evt_duration = '':
-		transient_evt_duration = rand(1,8)
-	end
-	!! logic check for when randomising event duration
+	if transient_evt_duration <= 0: transient_evt_duration = rand(1,8)
 
+	!! logic check for when randomising event duration
 	if transient_evt_duration + transient_evt_hour >= 22:
 		transient_evt_hour = 22 - transient_evt_duration
 	end
 
 	!! find a suitable date
-
 	srch_day_u = rnd_day + 7
 	if srch_day_u >= monthsend[transient_evt_month]:
 		srch_day_u = monthsend[transient_evt_month]
@@ -476,7 +473,7 @@ end
 
 if $ARGS[0] = 'evt_day_suffix':
 
-	if ARGS[1] ! '':
+	if ARGS[1] ! 0:
 		query_day = ARGS[1]
 	else
 		query_day = transient_evt_day
@@ -486,7 +483,7 @@ if $ARGS[0] = 'evt_day_suffix':
 	else
 		test_day = query_day
 	end
-	if transient_evt_day ! '':
+	if transient_evt_day ! 0:
 		if test_day => 4 and test_day <= 10:
 			$evt_suffix = 'th'
 		elseif test_day = 1 or test_day = 31:

locations/gad_gphouse.qsrc

@@ -310,7 +310,7 @@ if $ARGS[0] = 'main':
 
 	if hour < 8:
 		temp = rand(0,9)
-		if temp = 0: 'In a box filled with scraps of cloth, <a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a>is curled up, sleeping peacefully.'
+		if temp = 0: 'In a box filled with scraps of cloth, <a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> is curled up, sleeping peacefully.'
 	elseif hour >= 8 and hour < 12 and sunWeather = 1:
 		temp = rand(0,2)
 		if temp = 1: '<a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> is busy cleaning himself with his tongue on the table by the window.'

locations/goplust.qsrc

@@ -108,7 +108,7 @@ $namgop[0] = ''
 $gopnik = ''
 
 if gopV = 1:
-	$gopnik += '<<$gopV>>'
+	$gopnik += $gopV
 	if gopB + gopVi + gopK + gopU + gopS > 1:
 		$gopnik += ', '
 	elseif gopB + gopVi + gopK + gopU + gopS = 1:
@@ -117,7 +117,7 @@ if gopV = 1:
 end
 
 if $namgop[1] ! '':
-	$namgop[0] += '<<$namgop[1]>>'
+	$namgop[0] += $namgop[1]
 	if namgop[2] + namgop[3] + namgop[4] + namgop[5] + namgop[6] > 1:
 		$namgop[0] += ', '
 	elseif namgop[2] + namgop[3] + namgop[4] + namgop[5] + namgop[6] = 1:
@@ -126,7 +126,7 @@ if $namgop[1] ! '':
 end
 
 if gopB = 1:
-	$gopnik += '<<$gopB>>'
+	$gopnik += $gopB
 	if gopVi + gopK + gopU + gopS > 1:
 		$gopnik += ', '
 	elseif gopVi + gopK + gopU + gopS = 1:
@@ -135,7 +135,7 @@ if gopB = 1:
 end
 
 if $namgop[2] ! '':
-	$namgop[0] += '<<$namgop[2]>>'
+	$namgop[0] += $namgop[2]
 	if namgop[3] + namgop[4] + namgop[5] + namgop[6] > 1:
 		$namgop[0] += ', '
 	elseif namgop[3] + namgop[4] + namgop[5] + namgop[6] = 1:
@@ -144,7 +144,7 @@ if $namgop[2] ! '':
 end
 
 if gopVi = 1:
-	$gopnik += '<<$gopVi>>'
+	$gopnik += $gopVi
 	if gopK + gopU + gopS > 1:
 		$gopnik += ', '
 	elseif gopK + gopU + gopS = 1:
@@ -152,8 +152,8 @@ if gopVi = 1:
 	end
 end
 
-if namgop[3] ! '':
-	$namgop[0] += '<<$namgop[3]>>'
+if $namgop[3] ! '':
+	$namgop[0] += $namgop[3]
 	if namgop[4] + namgop[5] + namgop[6] > 1:
 		$namgop[0] += ', '
 	elseif namgop[4] + namgop[5] + namgop[6] = 1:
@@ -162,7 +162,7 @@ if namgop[3] ! '':
 end
 
 if gopK = 1:
-	$gopnik += '<<$gopK>>'
+	$gopnik += $gopK
 	if gopU + gopS > 1:
 		$gopnik += ', '
 	elseif gopU + gopS = 1:
@@ -170,8 +170,8 @@ if gopK = 1:
 	end
 end
 
-if namgop[4] ! '':
-	$namgop[0] += '<<$namgop[4]>>'
+if $namgop[4] ! '':
+	$namgop[0] += $namgop[4]
 	if namgop[5] + namgop[6] > 1:
 		$namgop[0] += ', '
 	elseif namgop[5] + namgop[6] = 1:
@@ -180,18 +180,18 @@ if namgop[4] ! '':
 end
 
 if gopU = 1:
-	$gopnik += '<<$gopU>>'
+	$gopnik += $gopU
 	if gopS = 1:$gopnik += ' and '
 end
 
-if namgop[5] ! '':
-	$namgop[0] += '<<$namgop[5]>>'
+if $namgop[5] ! '':
+	$namgop[0] += $namgop[5]
 	if namgop[6] = 1:$gopnik += ' and '
 end
 
-if gopS = 1:$gopnik += '<<$gopS>>'
+if gopS = 1:$gopnik += $gopS
 
-if namgop[6] ! '':$namgop[0] += '<<$namgop[6]>>'
+if $namgop[6] ! '':$namgop[0] += $namgop[6]
 
 $namgop[0] += ' strip off your clothes and get out their members'
 

locations/gschool_chats.qsrc

@@ -166,13 +166,13 @@ if $ARGS[0] = 'gopniks':
 					grupvalue[4] -= 10
 					gs 'gschool_socialchg', 'group_rel_change', 'gopniks', -5
 					gs 'npc_relationship', 'modify', 'A189', 5
-					
+
 					'You head to the stairwell that you and your fellow gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations.'
 					'A few of them stare at you before Dan laughs and Lavrenti speaks up. "What are you wearing?" They seem stunned at your uniform as Anushka chimes in. "Please tell me you just lost some kind of bet?" Several others comment, all expressing displeasure at your choice of uniform. After a few minutes of ridicule, they finally lose interest in you, but you can tell you lost their respect and maybe more today.'
 				else
 					grupvalue[4] -= 5
 					gs 'gschool_socialchg', 'group_rel_change', 'gopniks', -2
-					
+
 					'You head to the stairwell that the gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations.'
 					'A few of them stare at you before Radomir speaks up. "Are you lost or something?" Pauline then chimes in, pointing back the way you came. "The nerds are back that way, loser." Several others also comment, all expressing displeasure at your choice of uniform. You feel very unwelcome among them, which makes you uneasy.'
 				end
@@ -227,7 +227,7 @@ if $ARGS[0] = 'gopniks':
 					gs 'npc_relationship', 'modify', 'A9', 'dislike'
 					pcs_mood -= 10
 					gs 'stat'
-					
+
 					'You head to the stairwell that '+iif(grupTipe = 4,'you and your fellow','the')+' gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations. As you approach, Dan stands up and whistles. "Hey there, slut. Why don''t you come over here and suck my dick?" Several of the other gopniks laugh and a few of the guys comment about being next in line. You feel yourself getting very nervous around them dressed the way you are and fear they might actually try something. No one comes down to this end of the school at this time of the day after all without a good reason.'
 					*nl
 					'Vitek stands up and shoves Dan up against the wall. "What did you say about my girl?"'
@@ -238,7 +238,7 @@ if $ARGS[0] = 'gopniks':
 					gs 'npc_relationship', 'modify', 'A9', 'hate'
 					pcs_mood -= 10
 					gs 'stat'
-					
+
 					'You head to the stairwell that '+iif(grupTipe = 4,'you and your fellow','the')+' gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations. As you approach, everyone notices you and when Vitek sees you, he tenses up and angrily walks over to you before grabbing you roughly by the arm and dragging you out of the stairwell. "What did I tell you about coming to school dressed like this? No girl of mine is going to walk around dressed like some slut. Now don''t come back to school dressed like this again!" He roughly shoves you into the wall and storms back to the other gopniks.'
 					act 'Leave': gt 'gschool_lessons', 'short_break'
 				elseif grupTipe = 4:
@@ -248,7 +248,7 @@ if $ARGS[0] = 'gopniks':
 				else
 					grupvalue[4] -= 5
 					gs 'fame', 'pav', 'sex', 3
-					
+
 					'You head to the stairwell that the gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations. As you approach, Dan stands up and whistles. "Hey there, slut. Why don''t you come over here and suck my dick?" Several of the other gopniks laugh and a few of the guys comment as well. "Like she came to see you Dan! She obviously came to throw herself at me," Radomir says. You feel yourself getting very nervous around them dressed the way you are and fear they might actually try something. No one comes down to this end of the school at this time of the day after all without a good reason.'
 					gs 'gschool_groups', 'gopniks'
 					act 'Leave': gt 'gschool_lessons', 'short_break'
@@ -354,8 +354,8 @@ if $ARGS[0] = 'cooljocks':
 					gs 'npc_relationship', 'modify', 'A139', 'dislike'
 					gs 'npc_relationship', 'modify', 'A140', 'dislike'
 					'As you approach them, several of them give you once over, obviously noticing your uniform. "Someone''s trying hard to look tough," Stasya says with a smirk.'
-                    'Hearing this, Bella gives you a closer look. "It wouldn''t be so bad if it was a good quality."'
-                    '"Now Bella, you know her family can''t afford the finer things in life," Dimka adds. If not for the tone of his voice and the smirk, it would almost sound like he was defending you, but it comes across as more of an insult. Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Christina, Lariska, Lina, Veronika, Lazar, Erast and Vanya just stay out of it.'
+					'Hearing this, Bella gives you a closer look. "It wouldn''t be so bad if it was a good quality."'
+					'"Now Bella, you know her family can''t afford the finer things in life," Dimka adds. If not for the tone of his voice and the smirk, it would almost sound like he was defending you, but it comes across as more of an insult. Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Christina, Lariska, Lina, Veronika, Lazar, Erast and Vanya just stay out of it.'
 				elseif PCloQuality >= 4:
 					grupvalue[1] += 1
 					grupvalue[2] += 1
@@ -368,7 +368,7 @@ if $ARGS[0] = 'cooljocks':
 					if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', 1
 					gs 'npc_relationship', 'modify', 'A139', 1
 					gs 'npc_relationship', 'modify', 'A140', 1
-					'As you approach them, several of them give you approving looks. "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Stasya comments.' 
+					'As you approach them, several of them give you approving looks. "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Stasya comments.'
 					'"Yeah I like it, it looks very nice," Vicky adds. Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta and Bella all comment on how nice your outfit looks while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves. However, you do notice Igor seems to be somewhat paying attention, maybe at you in particular. Christina just pretends you don''t exist while she talks to Lina and Lariska while Veronika is reading something and seems to be entirely unaware of the conversation.'
 				else
 					'Dimka, Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Lariska, Christina, Lina, Bella, Veronika, Lazar, Erast and Vanya are all gathered around the lockers.'
@@ -406,16 +406,16 @@ if $ARGS[0] = 'cooljocks':
 					gs 'npc_relationship', 'modify', 'A139', 'dislike'
 					gs 'npc_relationship', 'modify', 'A140', 'dislike'
 					'As you approach them, several of them give you once over, obviously noticing your uniform. "Someone''s trying hard to look tough," Stasya says with a smirk.'
-                    'Hearing this, Bella gives you a closer look. "It wouldn''t be so bad if it was a good quality."'
-                    '"Now Bella, you know her family can''t afford the finer things in life," Dimka adds. If not for the tone of his voice and the smirk, it would almost sound like he was defending you, but it comes across as more of an insult. Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Christina, Lariska, Lina, Veronika, Lazar, Erast and Vanya just stay out of it.'
+					'Hearing this, Bella gives you a closer look. "It wouldn''t be so bad if it was a good quality."'
+					'"Now Bella, you know her family can''t afford the finer things in life," Dimka adds. If not for the tone of his voice and the smirk, it would almost sound like he was defending you, but it comes across as more of an insult. Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Christina, Lariska, Lina, Veronika, Lazar, Erast and Vanya just stay out of it.'
 				elseif PCloQuality >= 4:
 					gs 'gschool_socialchg', 'group_rel_change', 'cool kids', 1
 					grupvalue[1] += 2
 					gs 'gschool_socialchg', 'group_rel_change', 'jocks', 1
 					grupvalue[2] += 1
 					if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', 'like'
-					
-					'As you approach them, several of them give you approving looks. "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Stasya comments.' 
+
+					'As you approach them, several of them give you approving looks. "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Stasya comments.'
 					'"Yeah, looking sexy <<$pcs_nickname>>!" Vicky adds. Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta and Bella all comment on how nice your outfit looks while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves. However, you do notice Igor seems to be somewhat paying attention, maybe to you in particular. Christina just pretends you don''t exist while she talks to Lina and Lariska while Veronika is reading something and seems to be entirely unaware of the conversation.'
 				else
 					gs 'gschool_socialchg', 'group_rel_change', 'jocks', 1, 'male'

locations/gschool_lessonsev1.qsrc

@@ -87,16 +87,22 @@ if $ARGS[0] = 'fiz2':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand3.jpg"></center>'
 	'You and some of the other girls get down on your knees together, enjoying the attention of the watching boys as you all show off your asses to them. Deciding to tease them further, the girls all pull their pants down at the same time.'
-	gs 'willpower', 'misc', 'self', 'medium'
+	gs 'willpower', 'flash', 'self', 'medium'
 	if will_cost <= pcs_willpwr:
 		act 'Pull your pants down':
 			cla
-			gs 'willpower', 'misc', 'self', 'hard'
+			gs 'willpower', 'flash', 'self', 'hard'
 			gs 'willpower', 'pay', 'self'
 			gs 'arousal', 'foreplay', 10, 'exhibitionism'
 			pcs_mood += 20
-			gs 'stat'
-			'You join in and enjoy the small boost of confidence as the boys drool over the panty-clad asses all swaying in front of them. Coach Pavlovich is keeping his distance, unsure what to think or do.'
+			if $pantyworntype = 'none':
+				gs 'fame', 'pav', 'sex', 1
+				gs 'stat'
+				'You are not wearing panties so you sway your naked ass for the boys, this gains you a lot of attention but its not great for your reputation. Coach Pavlovich is keeping his distance, unsure what to think or do.'
+			else
+				gs 'stat'
+				'You join in and enjoy the small boost of confidence as the boys drool over the panty-clad asses all swaying in front of them. Coach Pavlovich is keeping his distance, unsure what to think or do.'
+			end
 			act 'End of lesson': gt 'gschool_lessons4', 'postphys'
 		end
 	else

locations/homes_properties.qsrc

@@ -90,7 +90,7 @@ if $ARGS[0] = 'set_access':
 	orig_status_code = accessible_property[$propcode]
 	new_status_code = ARGS[2]
 	if orig_status_code ! new_status_code:
-		if $accessible_property[$propcode] = '' or accessible_property['<<$propcode>>-display'] = '' or accessible_property['<<$propcode>>-name'] = '':
+		if $accessible_property[$propcode] = '' or $accessible_property['<<$propcode>>-display'] = '' or $accessible_property['<<$propcode>>-name'] = '':
 			if $property['code'] ! $propcode: 				
 				gs 'homes_properties_attr', 'get_property_attr', $propcode	
 			else
@@ -538,10 +538,8 @@ if $ARGS[0] = 'get_properties_for_sale':
 			$getforsalespropcode = $homes[i]
 			if $getforsalespropcode ! '' and checked_homes[$getforsalespropcode] = 0 and accessible_property[$getforsalespropcode] < 2:
 				checked_homes[$getforsalespropcode] = 1
-				if accessible_property[$getforsalespropcode] = '': 
-					gs 'homes_properties_attr', 'get_property_attr', $getforsalespropcode
-				end
-				ishome = iif(accessible_property[$getforsalespropcode] = '', INSTR($property['type'], 'residence') > 0, INSTR($accessible_property['<<$getforsalespropcode>>-type'], 'residence') > 0 )
+				if $accessible_property[$getforsalespropcode] = '': gs 'homes_properties_attr', 'get_property_attr', $getforsalespropcode
+				ishome = iif($accessible_property[$getforsalespropcode] = '', INSTR($property['type'], 'residence') > 0, INSTR($accessible_property['<<$getforsalespropcode>>-type'], 'residence') > 0 )
 				hasprice = iif($accessible_property[$getforsalespropcode] = '', property['price'] > 0, accessible_property['<<$getforsalespropcode>>-sales-price'] > 0)
 				if (($ARGS[1] ! 'home' and ishome = 0) or ($ARGS[1] ! 'business' and ishome)) and hasprice:
 					$property_code[j] = $getforsalespropcode
@@ -586,7 +584,7 @@ if $ARGS[0] = 'get_properties_for_rent':
 			$getpropforrentcode = $homes[i]
 			if $getpropforrentcode ! '' and checked_homes[$getpropforrentcode] = 0 and accessible_property[$getpropforrentcode] = 0:
 				checked_homes[$getpropforrentcode] = 1
-				if accessible_property[$getpropforrentcode] = '': gs 'homes_properties_attr', 'get_property_attr', $getpropforrentcode
+				if $accessible_property[$getpropforrentcode] = '': gs 'homes_properties_attr', 'get_property_attr', $getpropforrentcode
 				ishome = iif($accessible_property[$getpropforrentcode] = '', INSTR($property['type'], 'residence') > 1, INSTR($accessible_property['<<$getpropforrentcode>>-type'], 'residence') > 1 )
 				isrental = iif($accessible_property[$getpropforrentcode] = '', property['rental'] = 1, accessible_property['<<$getpropforrentcode>>-rental'] = 1 )
 				if (($ARGS[1] ! 'home' and ishome = 0) or ($ARGS[1] ! 'business' and ishome)) and isrental:			
@@ -838,7 +836,7 @@ end
 !!
 !! $ARGS[1] - property code
 if $ARGS[0] = 'get_property_sales_price':
-	if accessible_property[$ARGS[1]] ! '':
+	if $accessible_property[$ARGS[1]] ! '':
 		result = accessible_property['<<$ARGS[1]>>-sales-price']
 	else
 		gs 'homes_properties_attr', 'get_property_attr', $ARGS[1]

locations/hourly_events.qsrc

@@ -85,6 +85,11 @@ else
 		pcs_mood -= rand(2,5)
 	end
 
+	if hypnoHair > 0 and pcs_mood > 50:
+		if pcs_pubes > 3: pcs_mood -= rand(2, 5)
+		if pcs_leghair > 3: pcs_mood -= rand(2, 5)
+	end
+
 	if pcs_energy > 20: pcs_stam += stammax / max(5, 110-pcs_energy)
 	pcs_willpower_feeder += willpowermax*4/3
 	pcs_willpwr += pcs_willpower_feeder/100
@@ -113,7 +118,7 @@ else
 	if pcs_willpwr < willpowermax/4: will_counter -= 1
 end
 
-if will_counter <= -10: 
+if will_counter <= -10:
 	willpowermax -= 1
 	will_counter = 0
 end
@@ -157,11 +162,11 @@ else
 
 		if alko > 4:
 			vomit['hangover'] = 1
-		
+
 		elseif pregchem > 600 and pregchem < 2160 and rand(1,4) = 4:
 			vomit['morning_sick'] = 1
-		
-		elseif rand(1,100) = 100: 
+
+		elseif rand(1,100) = 100:
 			vomit['unlucky'] = 1
 		end
 	end
@@ -175,7 +180,7 @@ if alko > 0 and alkoblock = 0:
 	if alko >= 6:
 		if pcs_run > 0: run_deg -= 1
 		if vball_lvl >= 50: vball_deg -= 1
-		
+
 		if alko >= 10:
 			if pcs_stren > 10: stren_deg -= 1
 			if pcs_vital > 10: vital_deg -= 1
@@ -204,7 +209,7 @@ if $pantyworntype = 'none' and PCloPants > 0 and PCloPanties = 0 and $clothingwo
 	elseif pcs_traits['commando_lvl'] = 1:
 		mosol += 1
 	end
-	
+
 	if mosol >= 100: pcs_mood -= 5
 
 	if mosol >= 60 and pain['pubic'] < 80: gs 'pain', 1, 'pubic', 'ache'
@@ -223,14 +228,14 @@ end
 if pcs_hydra > 200: pcs_hydra = 200
 
 if mosol > 0:
-	if $pantyworntype ! 'none' or $clothingworntype = 'nude' or PCloPanties = 1: 
+	if $pantyworntype ! 'none' or $clothingworntype = 'nude' or PCloPanties = 1:
 		mosol -= rand(0,1)
 	end
 end
 
 if pcs_lipbalm > 0: pcs_lipbalm -= 1
 
-if sickstage = 1: 
+if sickstage = 1:
 	sick += 1
 	sicktimer += 1
 
@@ -242,7 +247,7 @@ end
 
 if sickstage = 2:
 	if sick > 0: sick -= 1
-	if sick <= 0: 
+	if sick <= 0:
 		sick = 0
 		sickstage = 0
 	end

locations/igorev.qsrc

@@ -582,7 +582,7 @@ if $ARGS[0] = 'strap on':
 						gs 'stat'
 						act 'Insert the tip':
 							*clr & cla
-							'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/vstavlaet1.mp4"></video></center>'
+							'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/vstavlaet_1.mp4"></video></center>'
 							'You lube up the strap-on real good and for good measure you spit on his asshole for a little extra lube. You move up behind him and slowly begin to push the tip of the strap-on against his asshole. Igor starts moaning immediately.'
 							gs 'arousal', 'anal_strap_give', 10, 'dom'
 							gs 'stat'

locations/intro_customization.qsrc

@@ -384,7 +384,7 @@ if $ARGS[0] = 'modpur':
 	act 'I do not want a purse':
 		bag = 0
 		$currentpursetype = ''
-		currentpursenumber = ''
+		currentpursenumber = 0
 		gt 'intro_customization','modpur'
 	end	
 end

locations/item_cart.qsrc

@@ -2,7 +2,7 @@
 
 if $ARGS[0] = 'shoppping_aisle':
 	gs 'item_stock_db', 'cleanup'
-	
+
     $curr_aisle = $ARGS[1]
 	gs 'item_stock_db', $ARGS[1]
 
@@ -45,7 +45,7 @@ if $ARGS[0] = 'shoppping_aisle':
 		i += 1
 	if i <= item_idx:jump 'loopshopping_cart'
 	'</table></center>'
-	
+
 	killvar '$temp_bcolor' & killvar '$icon_selector' & killvar 'icon_height'
 
 	!! Checkout

locations/journal.qsrc

@@ -4,7 +4,7 @@
 !! Refactored 24 Aug 22
 !! Amended by Hooded Silence
 !! Game Character Journal - central core game data area for players.
-!! V .01 Refactored to enable menu bar navigation for UI consistency. 
+!! V .01 Refactored to enable menu bar navigation for UI consistency.
 !! V .02 Redesign and integration of content areas.
 !! V .03 Bug fixes.
 !!
@@ -14,7 +14,7 @@
 !! 2 Work - calls in journal_work
 !! 3 Quests - calls in journal_quest section
 !! 4 Relations / Current Group - pulls in various elements refactored from other areas to make tracking relationships easier. To be expanded on.
-!! 5 General Information 
+!! 5 General Information
 !! 6 User Notes - custom function
 !!
 !! Menu Variables
@@ -52,19 +52,19 @@ if $ARGS[0]='journalmenu':
 	$tablebody += '</tr>'
 
 	!display the table here.
-	
+
 	'<center><table width="90%" align="center" width="90%" cellspacing="0" cellpadding="0" valign="top"><tr><<$tablebody>></tr></table></center>'
 	killvar '$tablebody'
-	
-	if $jumploc = '' or jclose = 1: 
-		if $start_type[1] ! 'nomagic': 
+
+	if $jumploc = '' or jclose = 1:
+		if $start_type[1] ! 'nomagic':
 			menutrack = 0
 			jclose = 0
 			gt 'journal', 'magictab'
 		else
 			menutrack = 1
 			jclose = 0
-			gt 'journal', 'housingtab'  
+			gt 'journal', 'housingtab'
 		end
 	end
 	gs 'journal', 'leaveactions'
@@ -83,19 +83,19 @@ end
 if $ARGS[0] = 'magictab':
 	$jumploc = 'magictab'
 	gs 'journal', 'journalmenu'
-	
+
 	'<center><h2>Spells</h2></center><br>'
 	'<center><h2>Spells to Cast</h2></center><br>'
-	func('spellBook','cast','$nonComSpells', 'gt ''journal'', ''magictab''', 'jclose = 1') 
+	func('spellBook','cast','$nonComSpells', 'gt ''journal'', ''magictab''', 'jclose = 1')
 	!!''''
 	'<br><center><h2>Spell Learning</h2></center><br>'
 	'<br><center><h3>Combat</h3></center><br>'
-	func('spellBook','learn','$combatSpells') 
+	func('spellBook','learn','$combatSpells')
 	'<br><center><h3>Non-Combat</h3></center><br>'
-	func('spellBook','learn','$nonComSpells') 
+	func('spellBook','learn','$nonComSpells')
 	delact 'Never mind'
-	
-	
+
+
 ! magic
 end
 
@@ -111,7 +111,7 @@ if $ARGS[0] = 'housingtab':
 	gs 'journal', 'journalmenu'
 
 	'<center><h2>Housing</h2></center>'
-	
+
 	*nl
 	if accessible_property['shared_apartment'] = 4: 'You share an apartment with three others in Pavlovsk. Your bills are paid by the other tenants in exchange for your house services.'
 	if accessible_property['city_apartment'] = 1: 'You rent a two bedroom apartment in the city residential area. Your rent for the apartment is subtracted automatically in sum of <<accessible_property[''city_apartment-rent'']>> <b>₽</b> us electric bill on 25th of each month. You are currently paid up for <b><<accessible_property[''city_apartment-days-left'']>></b> days.'
@@ -171,26 +171,26 @@ if $ARGS[0] = 'relationstab':
 
 	'<center><h2>Relationships</h2></center>'
 	'<h2>Family</h2>'
-		
+
 	'Mother:'
-		
+
 	gs 'journal', 'relindex', 'A29'
-	
+
 	'Stepfather:'
-	
+
 	gs 'journal', 'relindex', 'A28'
-	
+
 	'Sister:'
 
 	gs 'journal', 'relindex', 'A33'
-	
+
 	'Brother:'
-	
+
 	gs 'journal', 'relindex', 'A34'
 
-	
+
 	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
-	
+
 		'<center><h2>Standings by Social Group</h2></center>'
 
 		if grupTipe < 5 and grupvalue[grupTipe] > 700:
@@ -217,7 +217,7 @@ if $ARGS[0] = 'relationstab':
 			'Your school social group consists of losers, teacher''s pets, sluts and the ugly.'
 		end
 		*nl
-		
+
 		'Cool Kids'
 
 		gs 'indik', '4', grupvalue[1]/10, grupvalue[1], 1 & '<<$ind>>'
@@ -230,94 +230,94 @@ if $ARGS[0] = 'relationstab':
 
 		'Gopnik'
 		gs 'indik', '4', grupvalue[4]/10, grupvalue[4], 4 & '<<$ind>>'
-			
+
 		'<center><h2>Popular Kids Relations</h2></center>'
-		
-		if npc_rel['A1']   > 0: 'Friendship with Dimka:'    & gs 'journal', 'relindex', 'A1' 
-		if npc_rel['A4']   > 0: 'Friendship with Igor:'     & gs 'journal', 'relindex', 'A4' 
-		if npc_rel['A14']  > 0: 'Friendship with Katja:'    & gs 'journal', 'relindex', 'A14' 
-		if npc_rel['A15']  > 0: 'Friendship with Vicky:'    & gs 'journal', 'relindex', 'A15' 
+
+		if npc_rel['A1']   > 0: 'Friendship with Dimka:'    & gs 'journal', 'relindex', 'A1'
+		if npc_rel['A4']   > 0: 'Friendship with Igor:'     & gs 'journal', 'relindex', 'A4'
+		if npc_rel['A14']  > 0: 'Friendship with Katja:'    & gs 'journal', 'relindex', 'A14'
+		if npc_rel['A15']  > 0: 'Friendship with Vicky:'    & gs 'journal', 'relindex', 'A15'
 		if npc_rel['A17']  > 0: 'Friendship with Irina:'    & gs 'journal', 'relindex', 'A17'
-		if npc_rel['A22']  > 0: 'Friendship with Bella:'    & gs 'journal', 'relindex', 'A22' 
-		if npc_rel['A146'] > 0: 'Friendship with Marcus:'   & gs 'journal', 'relindex', 'A146' 
-		if npc_rel['A147'] > 0: 'Friendship with Andrey:'   & gs 'journal', 'relindex', 'A147' 
-		if npc_rel['A148'] > 0: 'Friendship with Mefodiy:'  & gs 'journal', 'relindex', 'A148' 
-		if soniaPS = 0 and npc_rel['A25'] > 0: 'Friendship with Sonia:' & gs 'journal', 'relindex', 'A25' 
-		if npc_rel['A139'] > 0: 'Friendship with Stasya:'   & gs 'journal', 'relindex', 'A139' 
-		if npc_rel['A140'] > 0: 'Friendship with Lizaveta:' & gs 'journal', 'relindex', 'A140' 
-		
+		if npc_rel['A22']  > 0: 'Friendship with Bella:'    & gs 'journal', 'relindex', 'A22'
+		if npc_rel['A146'] > 0: 'Friendship with Marcus:'   & gs 'journal', 'relindex', 'A146'
+		if npc_rel['A147'] > 0: 'Friendship with Andrey:'   & gs 'journal', 'relindex', 'A147'
+		if npc_rel['A148'] > 0: 'Friendship with Mefodiy:'  & gs 'journal', 'relindex', 'A148'
+		if soniaPS = 0 and npc_rel['A25'] > 0: 'Friendship with Sonia:' & gs 'journal', 'relindex', 'A25'
+		if npc_rel['A139'] > 0: 'Friendship with Stasya:'   & gs 'journal', 'relindex', 'A139'
+		if npc_rel['A140'] > 0: 'Friendship with Lizaveta:' & gs 'journal', 'relindex', 'A140'
+
 		'<center><h2>Jocks Relations</h2></center>'
-		
-		if npc_rel['A3']   > 0: 'Friendship with Ivan:'       & gs 'journal', 'relindex', 'A3' 
-		if fedormasha = 0 and npc_rel['A5'] > 0: 'Friendship with Fedor:' & gs 'journal', 'relindex', 'A5' 
-		if npc_rel['A8']   > 0: 'Friendship with Svyatoslav:' & gs 'journal', 'relindex', 'A8' 
-		if npc_rel['A13']  > 0: 'Friendship with Lariska:'    & gs 'journal', 'relindex', 'A13' 
+
+		if npc_rel['A3']   > 0: 'Friendship with Ivan:'       & gs 'journal', 'relindex', 'A3'
+		if fedormasha = 0 and npc_rel['A5'] > 0: 'Friendship with Fedor:' & gs 'journal', 'relindex', 'A5'
+		if npc_rel['A8']   > 0: 'Friendship with Svyatoslav:' & gs 'journal', 'relindex', 'A8'
+		if npc_rel['A13']  > 0: 'Friendship with Lariska:'    & gs 'journal', 'relindex', 'A13'
 		if npc_rel['A18']  > 0: 'Friendship with Christina:'  & gs 'journal', 'relindex', 'A18'
 		if npc_rel['A19']  > 0: 'Friendship with Lina:'       & gs 'journal', 'relindex', 'A19'
-		if npc_rel['A23']  > 0: 'Friendship with Albina:'     & gs 'journal', 'relindex', 'A23' 
-		if npc_rel['A149'] > 0: 'Friendship with Lazar:'      & gs 'journal', 'relindex', 'A149' 
-		if npc_rel['A150'] > 0: 'Friendship with Erast:'      & gs 'journal', 'relindex', 'A150' 
-		if npc_rel['A141'] > 0: 'Friendship with Veronika:'   & gs 'journal', 'relindex', 'A141' 
-		if npc_rel['A165'] > 0: 'Friendship with Vanya:'      & gs 'journal', 'relindex', 'A165' 
-		
+		if npc_rel['A23']  > 0: 'Friendship with Albina:'     & gs 'journal', 'relindex', 'A23'
+		if npc_rel['A149'] > 0: 'Friendship with Lazar:'      & gs 'journal', 'relindex', 'A149'
+		if npc_rel['A150'] > 0: 'Friendship with Erast:'      & gs 'journal', 'relindex', 'A150'
+		if npc_rel['A141'] > 0: 'Friendship with Veronika:'   & gs 'journal', 'relindex', 'A141'
+		if npc_rel['A165'] > 0: 'Friendship with Vanya:'      & gs 'journal', 'relindex', 'A165'
+
 		'<center><h2>Nerds Relations</h2></center>'
-		
-		if npc_rel['A2']   > 0: 'Friendship with Artem:'   & gs 'journal', 'relindex', 'A2' 
-		if npc_rel['A6']   > 0: 'Friendship with Petka:'   & gs 'journal', 'relindex', 'A6' 
-		if npc_rel['A12']  > 0: 'Friendship with Julia:'   & gs 'journal', 'relindex', 'A12' 
-		if npc_rel['A16']  > 0: 'Friendship with Natasha:' & gs 'journal', 'relindex', 'A16' 
+
+		if npc_rel['A2']   > 0: 'Friendship with Artem:'   & gs 'journal', 'relindex', 'A2'
+		if npc_rel['A6']   > 0: 'Friendship with Petka:'   & gs 'journal', 'relindex', 'A6'
+		if npc_rel['A12']  > 0: 'Friendship with Julia:'   & gs 'journal', 'relindex', 'A12'
+		if npc_rel['A16']  > 0: 'Friendship with Natasha:' & gs 'journal', 'relindex', 'A16'
 		if npc_rel['A151'] > 0: 'Friendship with Evgeny:'  & gs 'journal', 'relindex', 'A151'
 		if npc_rel['A152'] > 0: 'Friendship with Feofan:'  & gs 'journal', 'relindex', 'A152'
-		if npc_rel['A153'] > 0: 'Friendship with Gerasim:' & gs 'journal', 'relindex', 'A153' 
-		if npc_rel['A142'] > 0: 'Friendship with Zinaida:' & gs 'journal', 'relindex', 'A142' 
-		if npc_rel['A240'] > 0: 'Friendship with Natalia:' & gs 'journal', 'relindex', 'A240' 
-		
+		if npc_rel['A153'] > 0: 'Friendship with Gerasim:' & gs 'journal', 'relindex', 'A153'
+		if npc_rel['A142'] > 0: 'Friendship with Zinaida:' & gs 'journal', 'relindex', 'A142'
+		if npc_rel['A240'] > 0: 'Friendship with Natalia:' & gs 'journal', 'relindex', 'A240'
+
 		'<center><h2>Gopnik Relations</h2></center>'
-		
-		if npc_rel['A9']   > 0: 'Friendship with Vitek:'     & gs 'journal', 'relindex', 'A9' 
-		if npc_rel['A10']  > 0: 'Friendship with Dan:'       & gs 'journal', 'relindex', 'A10' 
-		if npc_rel['A11']  > 0: 'Friendship with Vasily:'    & gs 'journal', 'relindex', 'A11' 
-		if npc_rel['A20']  > 0: 'Friendship with Lena:'      & gs 'journal', 'relindex', 'A20' 
+
+		if npc_rel['A9']   > 0: 'Friendship with Vitek:'     & gs 'journal', 'relindex', 'A9'
+		if npc_rel['A10']  > 0: 'Friendship with Dan:'       & gs 'journal', 'relindex', 'A10'
+		if npc_rel['A11']  > 0: 'Friendship with Vasily:'    & gs 'journal', 'relindex', 'A11'
+		if npc_rel['A20']  > 0: 'Friendship with Lena:'      & gs 'journal', 'relindex', 'A20'
 		if npc_rel['A21']  > 0: 'Friendship with Lera:'      & gs 'journal', 'relindex', 'A21'
-		if npc_rel['A24']  > 0: 'Friendship with Pauline:'   & gs 'journal', 'relindex', 'A24' 
-		if npc_rel['A154'] > 0: 'Friendship with Radomir:'   & gs 'journal', 'relindex', 'A154' 
-		if npc_rel['A155'] > 0: 'Friendship with Lavrenti:'  & gs 'journal', 'relindex', 'A155' 
-		if npc_rel['A156'] > 0: 'Friendship with Arkadi:'    & gs 'journal', 'relindex', 'A156' 
-		if npc_rel['A157'] > 0: 'Friendship with Roman:'     & gs 'journal', 'relindex', 'A157' 
-		if npc_rel['A158'] > 0: 'Friendship with Valentin:'  & gs 'journal', 'relindex', 'A158' 
-		if npc_rel['A143'] > 0: 'Friendship with Alyona:'    & gs 'journal', 'relindex', 'A143' 
-		if npc_rel['A144'] > 0: 'Friendship with Anushka:'   & gs 'journal', 'relindex', 'A144' 
-		if npc_rel['A145'] > 0: 'Friendship with Ekaterina:' & gs 'journal', 'relindex', 'A145' 
-		if npc_rel['A189'] > 0: 'Friendship with Niko:'      & gs 'journal', 'relindex', 'A189' 
-		
+		if npc_rel['A24']  > 0: 'Friendship with Pauline:'   & gs 'journal', 'relindex', 'A24'
+		if npc_rel['A154'] > 0: 'Friendship with Radomir:'   & gs 'journal', 'relindex', 'A154'
+		if npc_rel['A155'] > 0: 'Friendship with Lavrenti:'  & gs 'journal', 'relindex', 'A155'
+		if npc_rel['A156'] > 0: 'Friendship with Arkadi:'    & gs 'journal', 'relindex', 'A156'
+		if npc_rel['A157'] > 0: 'Friendship with Roman:'     & gs 'journal', 'relindex', 'A157'
+		if npc_rel['A158'] > 0: 'Friendship with Valentin:'  & gs 'journal', 'relindex', 'A158'
+		if npc_rel['A143'] > 0: 'Friendship with Alyona:'    & gs 'journal', 'relindex', 'A143'
+		if npc_rel['A144'] > 0: 'Friendship with Anushka:'   & gs 'journal', 'relindex', 'A144'
+		if npc_rel['A145'] > 0: 'Friendship with Ekaterina:' & gs 'journal', 'relindex', 'A145'
+		if npc_rel['A189'] > 0: 'Friendship with Niko:'      & gs 'journal', 'relindex', 'A189'
+
 		'<center><h2>Outcast/Loner Relations</h2></center>'
-		
-		if npc_rel['A7']   > 0: 'Friendship with Lesco:' & gs 'journal', 'relindex', 'A7' 
-		if npc_rel['A159'] > 0: 'Friendship with Petia:' & gs 'journal', 'relindex', 'A159' 
-		if soniaPS    > 0 and npc_rel['A25'] > 0: 'Friendship with Sonia:' & gs 'journal', 'relindex', 'A25' 
-		if fedormasha = 1 and npc_rel['A5']  > 0: 'Friendship with Fedor:' & gs 'journal', 'relindex', 'A5' 
-		
+
+		if npc_rel['A7']   > 0: 'Friendship with Lesco:' & gs 'journal', 'relindex', 'A7'
+		if npc_rel['A159'] > 0: 'Friendship with Petia:' & gs 'journal', 'relindex', 'A159'
+		if soniaPS    > 0 and npc_rel['A25'] > 0: 'Friendship with Sonia:' & gs 'journal', 'relindex', 'A25'
+		if fedormasha = 1 and npc_rel['A5']  > 0: 'Friendship with Fedor:' & gs 'journal', 'relindex', 'A5'
+
 		'<center><h2>Teachers/Coaches/School Staff Relations</h2></center>'
-		
-		if npc_rel['A26']  > 0: 'Friendship with Anatoly Tsarev (Math Teacher):'             & gs 'journal', 'relindex', 'A26' 
-		if npc_rel['A69']  > 0: 'Friendship with Mikhail Nikolaevich (Volleyball Coach):'    & gs 'journal', 'relindex', 'A69' 
-		if npc_rel['A128'] > 0: 'Friendship with Makar Vasilyev (Art Teacher):'              & gs 'journal', 'relindex', 'A128' 
+
+		if npc_rel['A26']  > 0: 'Friendship with Anatoly Tsarev (Math Teacher):'             & gs 'journal', 'relindex', 'A26'
+		if npc_rel['A69']  > 0: 'Friendship with Mikhail Nikolaevich (Volleyball Coach):'    & gs 'journal', 'relindex', 'A69'
+		if npc_rel['A128'] > 0: 'Friendship with Makar Vasilyev (Art Teacher):'              & gs 'journal', 'relindex', 'A128'
 		if npc_rel['A129'] > 0: 'Friendship with Serafim Ivanov (Computer Science Teacher):' & gs 'journal', 'relindex', 'A129'
-		if npc_rel['A130'] > 0: 'Friendship with Ilya Yenotin (Literature Teacher):'         & gs 'journal', 'relindex', 'A130' 
+		if npc_rel['A130'] > 0: 'Friendship with Ilya Yenotin (Literature Teacher):'         & gs 'journal', 'relindex', 'A130'
 		if npc_rel['A131'] > 0: 'Friendship with Viktor Pavlovich (P.E. Teacher):'           & gs 'journal', 'relindex', 'A131'
-		if npc_rel['A132'] > 0: 'Friendship with Ruslan Kuznetsov (Shop Teacher):'           & gs 'journal', 'relindex', 'A132' 
-		if npc_rel['A133'] > 0: 'Friendship with Rolan Metveev (Janitor):'                   & gs 'journal', 'relindex', 'A133' 
-		if npc_rel['A134'] > 0: 'Friendship with Aleksandrina Volkov (Headmistress):'        & gs 'journal', 'relindex', 'A134' 
+		if npc_rel['A132'] > 0: 'Friendship with Ruslan Kuznetsov (Shop Teacher):'           & gs 'journal', 'relindex', 'A132'
+		if npc_rel['A133'] > 0: 'Friendship with Rolan Metveev (Janitor):'                   & gs 'journal', 'relindex', 'A133'
+		if npc_rel['A134'] > 0: 'Friendship with Aleksandrina Volkov (Headmistress):'        & gs 'journal', 'relindex', 'A134'
 		if npc_rel['A135'] > 0: 'Friendship with Yeva Sokoloff (Geography Teacher):'         & gs 'journal', 'relindex', 'A135'
-		if npc_rel['A136'] > 0: 'Friendship with Olga Aleksandrov (School Nurse):'           & gs 'journal', 'relindex', 'A136' 
-		if npc_rel['A137'] > 0: 'Friendship with Raven Braakman (English Teacher):'          & gs 'journal', 'relindex', 'A137' 
+		if npc_rel['A136'] > 0: 'Friendship with Olga Aleksandrov (School Nurse):'           & gs 'journal', 'relindex', 'A136'
+		if npc_rel['A137'] > 0: 'Friendship with Raven Braakman (English Teacher):'          & gs 'journal', 'relindex', 'A137'
 		if npc_rel['A138'] > 0: 'Friendship with Arina Orlov (Biology Teacher):'             & gs 'journal', 'relindex', 'A138'
-		
+
 
 		!!!WD: Formatting
 		if (npc_rel['A93'] + npc_rel['A41'] + npc_rel['A42'] + npc_rel['A43'] + gosh + npc_rel['A220'] + npc_rel['A219'] + npc_QW['A192'] + npc_rel['A218']) > 0:*nl
 		*nl
-		
+
 	end
 
 	'<center><h2>Pavlovsk Relations</h2></center>'
@@ -326,7 +326,7 @@ if $ARGS[0] = 'relationstab':
 	if npc_rel['A217'] > 0: 'Friendship with Pavlin:'         & gs 'journal', 'relindex', 'A217'
 	if npc_rel['A112'] > 0: 'Friendship with Sergey Shulgin:' & gs 'journal', 'relindex', 'A112'
 	if npc_rel['A119'] > 0: 'Friendship with Borislav:'       & gs 'journal', 'relindex', 'A119'
-		
+
 	'<center><h2>Gadukino Relations</h2></center>'
 	if npc_rel['A31']  > 0: 'Friendship with Elena (your great-grandmother):'  & gs 'journal', 'relindex', 'A31'
 	if npc_rel['A32']  > 0: 'Friendship with Zlatek (your great-grandfather):' & gs 'journal', 'relindex', 'A32'
@@ -340,7 +340,7 @@ if $ARGS[0] = 'relationstab':
 	if npc_rel['A172'] > 0: 'Friendship with Andrei (hunter):' & gs 'journal', 'relindex', 'A172'
 	if npc_rel['A173'] > 0: 'Friendship with Igor (hunter):'   & gs 'journal', 'relindex', 'A173'
 	if npc_rel['A174'] > 0: 'Friendship with Sergei (hunter):' & gs 'journal', 'relindex', 'A174'
-	
+
 	'<center><h2>Saint Petersburg Relations</h2></center>'
 	if npc_QW['A192']  > 0: 'Friendship with Nastya:'  & gs 'journal', 'relindex', 'A192'
 	if npc_rel['A218'] > 0: 'Friendship with Tanya:'   & gs 'journal', 'relindex', 'A218'
@@ -348,11 +348,11 @@ if $ARGS[0] = 'relationstab':
 	if npc_rel['A220'] > 0: 'Friendship with Vika:'    & gs 'journal', 'relindex', 'A220'
 	if npc_rel['A93']  > 0: 'Friendship with Ira:'     & gs 'journal', 'relindex', 'A93'
 	if npc_rel['A43']  > 0: 'Friendship with Tamara:'  & gs 'journal', 'relindex', 'A43'
-	if npc_rel['A35']  > 0: 'Friendship with Mikhail Kuznetsov (your biological father):' & gs 'journal', 'relindex', 'A35' 
+	if npc_rel['A35']  > 0: 'Friendship with Mikhail Kuznetsov (your biological father):' & gs 'journal', 'relindex', 'A35'
 	if npc_rel['A169'] > 0: 'Friendship with Dima:'    & gs 'journal', 'relindex', 'A169'
 	if npc_rel['A89']  > 0: 'Friendship with Eugene:'  & gs 'journal', 'relindex', 'A89'
 	if npc_rel['A216'] > 0: 'Friendship with Martin:'  & gs 'journal', 'relindex', 'A216'
-	
+
 	! '<center><h2>Other Relations</h2></center>'
 	! Uncomment if re-introduced into the game ensure you use NPC ID to update them
 	! if alla > 0: 'Friendship with Alla <<alla>>'
@@ -432,10 +432,10 @@ end
 if $ARGS[0] = 'generaltab':
 	$jumploc = 'generaltab'
 	gs 'journal', 'journalmenu'
-	
+
 !! generaltab
 	'<center><h2>General Information</h2></center>'
-	
+
 	if ARRSIZE('$portfolio_locations') > 0 or ARRSIZE('$portfolio_people') > 0:
 		act 'View your photography portfolio': gt 'journal_portfolio'
 	end
@@ -447,13 +447,13 @@ if $ARGS[0] = 'generaltab':
 	'<br><center><a href="exec: gs ''journal'', ''city_res''">City Residents</a></center>'
 	if mod_ballet['blocker'] >  0 or balletqw['school'] > 0: '<br><center><a href="exec: gs ''journal'', ''ballet''">Ballet Career</a></center>'
 
-	if SchoolAtestat = 0 and mid($start_type, 1, 2) = 'sg' and SchoolBlock = 0: 
+	if SchoolAtestat = 0 and mid($start_type, 1, 2) = 'sg' and SchoolBlock = 0:
 		'<br><center><a href="exec: gs ''journal_school'', ''school''">School</a></center>
 		<br><center><a href="exec: gs ''journal_school'', ''coursesinfo''">School Courses and Grades</a></center>'
 	end
 
 	!!Make this an elseif, add a third option to see where our friends end up in city-life??
-	if university['student'] = 1: 
+	if university['student'] = 1:
 		'<br><center><a href="exec: gs ''journal'', ''uni''">University</a></center>'
 	end
 
@@ -470,7 +470,7 @@ end
 if $ARGS[0] = 'notestab':
 	$jumploc = 'notestab'
 	gs 'journal', 'journalmenu'
-	'<center><h2>Notes</h2></center>' 
+	'<center><h2>Notes</h2></center>'
 
 	'Your Current Start is: ' + $start_type['cat']
 	'Create notes to keep track of any information you need.'
@@ -486,7 +486,7 @@ if $ARGS[0] = 'notestab':
 		jump 'jur_loop'
 	end
 	killvar 'jur_temp'
-	
+
 !! notes
 end
 
@@ -522,23 +522,23 @@ if $ARGS[0] = 'ballet':
 	gs 'journal', 'journalmenu'
 	'<center><h1>Ballet Career</h1></center>'
 	'<center><img <<$set_imgh>> src="mod/img_ballet/system/readme.jpg"></center>'
-	
+
 	'Пан или пропал (You become the master or, leave).'
-	
+
 	'A narrative based mod and activities for the Dancer start. The MC has been given a grant to attend an intensive 6 day summer class with an assessment that, if passed, can lead to a weekly rehearsal and a Winter dance show in December.'
-	
+
 	'Note: This storyline will play out over a long time span and your actions will have consequences that won''t initially be obvious. Some of this is dependent on the development of the main Girl Life codebase.'
-	
+
 	 'Current and planned features:'
-	
+
 		'• A new dancer start option, with other starts being granted access later or uni/city years paying to join.'
 		'• A 6 day intensive course during the school summer break - look for the letter in your parents kitchen to notify you.'
 		'• New pen friend(s), with meet ups and theatre or ballet nights with family or partner.'
 		'• A new dance instructor, whose intentions may prevent MC from joining the Pushkin Ballet Company or could have far ranging consequences on both herself and NPC characters.'
 		'• New dance gigs. At each rehearsal, there''s a chance that you may get a dance job for the local theatre or the city if you pass with merit.'
-	
+
 	'NB: There is no sex acts in this mod at present. If you wish to write such scenes based on the content, then contact me on the Girl Life Discord.'
-	
+
 	'<center><h2>In Memoriam — Hooded Silence.</h2></center>'
 	*nl
 	'This content is being maintained as part of Hooded Silence''s legacy. I have approximately 1-2 years of original content to add but if you wish to contribute, then note that there is no sexual content in this mod until at least year 3 as per his notes.'
@@ -550,10 +550,10 @@ if $ARGS[0] = 'ballet':
 
 	*nl
 	'These are the obvious repercussions, but there will be subtle consequences for your interactions with NPCs. This mod is meant to be played blind for your initial playthrough and the only feedback will be the varying conversations.'
-	
+
 end
 
-!! ---- Other Sections ---- 
+!! ---- Other Sections ----
 
 
 !! --- General Information -- Clothing
@@ -616,7 +616,7 @@ if $ARGS[0] = 'uni':
 		j += 1
 		if j < 8: jump 'semester_loop'
 	killvar 'j'
-	
+
 	if university['semester_passed'] = university['enrolled_in_semester'] and university['diploma'] = 0:
 		*nl
 		'You need to register for your next semester at the university administration building.'
@@ -714,7 +714,7 @@ if $ARGS[0] = 'uni':
 			if ARRSIZE('class_list_institution') >= j: jump 'exam_loop'
 		killvar 'j'
 	end
-	
+
 	*nl
 	!!Added a link to the various Character Journal entries for location: journal_uni.
 	!!Should probably be put somewhere else.                                           Blame Anjuna and Nutluck
@@ -725,7 +725,7 @@ if $ARGS[0] = 'uni':
 	*nl
 	'<br><center><a href="exec: gs ''journal_uni'', ''former_pavlovsk_students''">Former Pavlovsk Students</a></center>'
 
-	
+
 	act 'Go back': gt 'journal', 'generaltab'
 	gs 'journal', 'leaveactions'
 end
@@ -797,7 +797,7 @@ if $ARGS[0] = 'family':
 elseif $ARGS[0] = 'pav_res':
 	$jumploc = 'generalsub'
 	gs 'journal', 'journalmenu'
-	
+
 	'<center><h2>Pavlovsk Residents</h2></center>'
 
 	!! Post Secondary school !!
@@ -813,25 +813,25 @@ elseif $ARGS[0] = 'pav_res':
 		*nl
 		!!Erast Vagin
 		gs 'journal_NPC_information', 'A150', 'uni'
-		*nl	
+		*nl
 		!!Veronika
 		gs 'journal_NPC_information', 'A141', 'uni'
-		*nl	
+		*nl
 		!!Evgany
 		gs 'journal_NPC_information', 'A151', 'uni'
 		*nl
 		!!Natalia
 		gs 'journal_NPC_information', 'A240', 'uni'
-		*nl	
+		*nl
 		!!Vitek
 		gs 'journal_NPC_information', 'A9',   'uni'
 		*nl
 		!!Dan
 		gs 'journal_NPC_information', 'A10',  'uni'
-		*nl	
+		*nl
 		!!Vasily
 		gs 'journal_NPC_information', 'A11',  'uni'
-		*nl	
+		*nl
 		!!Roman
 		gs 'journal_NPC_information', 'A157', 'uni'
 		*nl
@@ -865,7 +865,7 @@ elseif $ARGS[0] = 'pav_res':
 elseif $ARGS[0] = 'gad_res':
 	$jumploc = 'generalsub'
 	gs 'journal', 'journalmenu'
-	
+
 	'<center><h2>Gadukino Residents</h2></center>'
 	!!Grandpa
 	gs 'journal_NPC_information', 'A31'
@@ -874,7 +874,7 @@ elseif $ARGS[0] = 'gad_res':
 	gs 'journal_NPC_information', 'A32'
 	*nl
 	!!Mira
-	if npc_known['A60'] = 1: 
+	if npc_known['A60'] = 1:
 		gs 'journal_NPC_information', 'A60'
 		*nl
 	end
@@ -892,12 +892,12 @@ elseif $ARGS[0] = 'gad_res':
 		*nl
 	end
 	!!Afanasiy (Mira''s father)
-	if npc_known['A60'] = 1: 
+	if npc_known['A60'] = 1:
 		gs 'journal_NPC_information', 'A64'
 		*nl
 	end
 	!!Vtialiy (Mira''s brother)
-	if npc_known['A60'] = 1: 
+	if npc_known['A60'] = 1:
 		gs 'journal_NPC_information', 'A64'
 		*nl
 	end
@@ -905,7 +905,7 @@ elseif $ARGS[0] = 'gad_res':
 	if npc_qw['A221'] > 0:
 		gs 'journal_NPC_information', 'A221'
 		*nl
-	end 
+	end
 	!!Hunters
 	if hunters_were_met > 0:
 		gs 'journal_NPC_information', 'A172'
@@ -915,7 +915,7 @@ elseif $ARGS[0] = 'gad_res':
 		gs 'journal_NPC_information', 'A174'
 		*nl
 	end
-	
+
 	act 'Go back': gt 'journal', 'generaltab'
 	gs 'journal', 'leaveactions'
 
@@ -923,7 +923,7 @@ elseif $ARGS[0] = 'gad_res':
 elseif $ARGS[0] = 'city_res':
 	$jumploc = 'generalsub'
 	gs 'journal', 'journalmenu'
-	
+
 	'<center><h2>City Residents</h2></center>'
 
 	!! Post Secondary school !!
@@ -937,7 +937,7 @@ elseif $ARGS[0] = 'city_res':
 		!!Valentin
 		gs 'journal_NPC_information', 'A154', 'uni'
 	end
-	
+
 	act 'Go back': gt 'journal', 'generaltab'
 	gs 'journal', 'leaveactions'
 end
@@ -951,11 +951,11 @@ if $ARGS[0] = 'relindex':
 
 
 elseif $ARGS[0] = 'leaveactions':
-	act 'Put your notebook down': 		 
+	act 'Put your notebook down':
 		killvar 'jumploc'
 		jclose = 1
 		gt $loc, $loc_arg
-	end	
+	end
 end
 
 

locations/katja_city_sex.qsrc

@@ -160,7 +160,7 @@ if $ARGS[0] = 'walking_home_with_a_guy':
 								gs 'stat'
 								gs 'katja_procedural', 'take_cocaine'
 								gs 'stat'										
-								'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 								'"Come on, let''s do it together," you say as you take the tube from <<$npc_nickname[$npclastgenerated]>>.'
 								'She still looks skeptical. "I don''t know, <<$pcs_nickname>>... I''m not sure it''s a good idea," she replies.'
 								'"You liked it last time! It''ll be fine this time too," you continue.'
@@ -239,7 +239,7 @@ if $ARGS[0] = 'walking_home_with_a_guy':
 							gs 'stat'
 							gs 'katja_procedural', 'take_cocaine'
 							gs 'stat'										
-							'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 							'"Come on, let''s do it together," you say as you take the tube from <<$npc_nickname[$npclastgenerated]>>.'
 							'She agrees and <<$npc_nickname[$npclastgenerated]>> hands her another tube, which she happily takes.'
 							'You put your tubes to your nostrils and lower your heads to the table to sniff your line. Katja does it with great enthusiasm.' 
@@ -325,7 +325,7 @@ if $ARGS[0] = 'walking_home_with_a_guy':
 							gs 'stat'
 							gs 'katja_procedural', 'take_cocaine'
 							gs 'stat'										
-							'<center><img <<$set_imgh>> src="images/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 							'"Okay, let''s do it together," you say.'
 							'"Yes! That''s the spirit," she replies. She''s already taken the tube from <<$npc_nickname[$npclastgenerated]>>, so he quickly produces another one and hands it to you.'
 							'You both put your tubes to your nostrils and lower your heads to the table to sniff your lines. Katja does it like it''s something she does all the time.' 

locations/katja_dorm.qsrc

@@ -1471,7 +1471,7 @@ if $ARGS[0] = 'cocain_offer':
 		gs 'stat'
 		gs 'katja_procedural', 'take_cocaine'
 		gs 'stat'										
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 		'"Okay, Katja. Let''s do it," you say.'
 		'"Yes. That''s the spirit," she replies and prepares some lines for the two of you, and finds some tubes for you to use.'
 		'You both put your tubes to you nostrils and lover your heads to the table and sniff your lines. Katja does it like it''s something she does all the time.' 

locations/katja_nightclub_sex.qsrc

@@ -225,7 +225,7 @@ if $ARGS[0] = 'private_room1':
 						gs 'stat'
 						gs 'katja_procedural', 'take_cocaine'
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 						'"Come on, let''s do it together," you say as you take the tube from <<$npc_nickname[$npclastgenerated]>>.'
 						'She agrees and <<$npc_nickname[$npclastgenerated]>> hands her another tube, which she happily takes.'
 						'You put your tubes to your nostrils and lower your heads to the table to sniff your line. Katja does it with great enthusiasm.' 
@@ -311,7 +311,7 @@ if $ARGS[0] = 'private_room1':
 						gs 'stat'
 						gs 'katja_procedural', 'take_cocaine'
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 						'"Okay, let''s do it together," you say.'
 						'"Yes! That''s the spirit," she replies. She''s already taken the tube from <<$npc_nickname[$npclastgenerated]>>, so he quickly produces another one and hands it to you.'
 						'You both put your tubes to your nostrils and lower your heads to the table to sniff your lines. Katja does it like it''s something she does all the time.' 

locations/katja_pantyquest.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = 'kitchen':
 				katjaQW['horny'] += rand(5,10)
 				katjaQW['slut'] += 1
 				katjaQW['no_panties_day'] = daystart
-				if PCloSkirt > 1:
+				if PCloSkirt => 1:
 					if analplugIN = 1:
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/katja/tanga1_7.mp4"></video></center>'
 					else
@@ -34,7 +34,7 @@ if $ARGS[0] = 'kitchen':
 					end
 						'You look around to see if anyone is coming before pulling up your skirt and showing off your pussy from behind.'
 				else
-					'<center><img <<$set_imgh>> src="images/pc/activitirs/flashing/pants/inside/pussy/hairy1>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/activities/flashing/pants/inside/pussy/hairy<<rand(1,3)>>.jpg"></center>'
 					'You look around to see if anyone is coming before pulling down your pants and showing Katja your pussy.'
 				end
 				if katjaQW['slut'] < 30 and katjaQW['pantiesQWstage'] = 0:
@@ -110,7 +110,7 @@ if $ARGS[0] = 'kitchen':
 					end
 						'You look around to see if anyone is coming before pulling up your skirt and showing off your pussy from behind.'
 				else
-					'<center><img <<$set_imgh>> src="images/pc/activitirs/flashing/pants/inside/pussy/hairy1>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/activities/flashing/pants/inside/pussy/hairy<<rand(1,3)>>.jpg"></center>'
 					'You look around to see if anyone is coming before pulling down your pants and showing Katja your pussy.'
 				end
 				if katjaQW['slut'] < 100 and katjaQW['pantiesQWstage'] < 4:
@@ -228,7 +228,7 @@ if $ARGS[0] = 'kitchen':
 								end
 								'You look around to see if anyone is coming before pulling up your skirt to show Katja your pussy from behind.' 
 							else
-								'<center><img <<$set_imgh>> src="images/pc/activitirs/flashing/pants/inside/pussy/hairy1>>.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/pc/activities/flashing/pants/inside/pussy/hairy<<rand(1,3)>>.jpg"></center>'
 								'You look around to see if anyone is coming before pulling down your pants to show Katja your pussy.' 
 							end
 							act 'Katja''s turn': gt 'katja_pantyquest', 'kitchen_show_pussy'
@@ -268,7 +268,7 @@ if $ARGS[0] = 'kitchen':
 					end
 					'You look around to see if anyone is coming before pulling up your skirt and showing Katja your pussy from behind.' 
 				else
-					'<center><img <<$set_imgh>> src="images/pc/activitirs/flashing/pants/inside/pussy/hairy1>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/activities/flashing/pants/inside/pussy/hairy<<rand(1,3)>>.jpg"></center>'
 					'You look around to see if anyone is coming before pulling down your pants and showing Katja your bare pussy.' 
 				end
 				act 'Katja''s turn': gt 'katja_pantyquest', 'kitchen_show_pussy'
@@ -337,7 +337,7 @@ if $ARGS[0] = 'uni_hallway':
 				end
 					'You look around to see if anyone is coming, before pulling up your skirt to show Katja your pussy from behind.' 
 			else
-				'<center><img <<$set_imgh>> src="images/pc/activitirs/flashing/pants/inside/pussy/hairy1>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/flashing/pants/inside/pussy/hairy<<rand(1,3)>>.jpg"></center>'
 				'You look around to see if anyone is coming before pulling down your pants to show Katja your pussy.' 
 			end
 			if katjaQW['slut'] < 30 and katjaQW['pantiesQWstage'] = 0:
@@ -539,7 +539,7 @@ if $ARGS[0] = 'uni_exit':
 				end
 					'You look around to see if anyone is coming before pulling up your skirt to show Katja your pussy from behind.' 
 			else
-				'<center><img <<$set_imgh>> src="images/pc/activitirs/flashing/pants/inside/pussy/hairy1>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/flashing/pants/inside/pussy/hairy<<rand(1,3)>>.jpg"></center>'
 				'You look around to see if anyone is coming before pulling down your pants to show Katja your pussy.' 
 			end
 			if katjaQW['slut'] < 50 and katjaQW['pantiesQWstage'] = 1:

locations/katja_party.qsrc

@@ -428,7 +428,7 @@ if $ARGS[0] = 'party_heading_out':
 			gs 'drugs', 'cocaine', 1
 			gs 'katja_procedural', 'take_cocaine'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 			'"OK, Katja. Let''s do it together," you say.'
 			'"Yes. That''s the spirit," she replies. She then prepares some lines for the two of you and finds some tubes to use to snort the cocaine.'
 			'You both put your tubes to your nostrils and lower your heads to the table and snort your lines.' 
@@ -552,7 +552,7 @@ if $ARGS[0] = 'party_heading_out':
 							minut += 5
 							gs 'drugs', 'cocaine'
 							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/shared/drugs/cocaine.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/shared/drugs/cocaine.jpg"></center>'
 							'You open your bag and make some lines on the table before taking a tube and snorting the first line, then the second. Katja looks at you with wide open eyes.'
 							'After a short moment, it hits you and you feel the full effect of the drug. "Damn, that was good!" you exclaim, as you come down a little.'
 							'You try to hand Katja the tube, "Your turn."'
@@ -676,7 +676,7 @@ if $ARGS[0] = 'party_heading_out':
 						mc_inventory['cocaine'] -= 1
 						gs 'katja_procedural', 'take_cocaine'
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 						'You prepare some lines for yourself and Katja and produce some tubes to use, handing one to her.'
 						'You put your tubes to your nostrils and lower your heads to the table and snort your lines. Katja does it with great enthusiasm.' 
 						*nl
@@ -695,7 +695,7 @@ if $ARGS[0] = 'party_heading_out':
 						mc_inventory['cocaine'] -= 1
 						gs 'katja_procedural', 'take_cocaine'
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_cocaine.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 						'You prepare some lines for yourself and Katja and produce some tubes to use, handing one to her.'
 						'You both put your tubes to you nostrils and lower your heads to the table and snort your lines. Katja does it like it''s something she does all the time.' 
 						*nl

locations/katja_uni.qsrc

@@ -910,7 +910,7 @@ if $ARGS[0] = 'studying_ask':
 		end	
 	else
 		iif(npc_rel['A14'] >= 70 or katjaQW['QWstage'] > 0, '"I would love to study with you,"', '"Sounds like a good idea,"')+' she says, making space for you to sit next to her.'
-		act 'Start studying together': gt 'katja_uni', 'studying', '<<$ARGS[1]>>', '<<$ARGS[2]>>'
+		act 'Start studying together': gt 'katja_uni', 'studying', $ARGS[1], $ARGS[2]
 	end
 end
 
@@ -919,7 +919,7 @@ if $ARGS[0] = 'studying':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/studying_together.jpg"></center>'
 	minut += 15
 	modifier = dyneval('RESULT = max(npc_intel[''<<$ARGS[5]>>''], pcs_intel) + (max(10+min(npc_intel[''<<$ARGS[5]>>''] -pcs_intel, pcs_intel -npc_intel[''<<$ARGS[5]>>'']),0)*(100 - max(npc_intel[''<<$ARGS[5]>>''], pcs_intel)))/50')
-	gs 'grades', 'optional_activity_attribute', '<<$ARGS[1]>>', '<<$ARGS[2]>>', 'yes', min(modifier+10,100)
+	gs 'grades', 'optional_activity_attribute', $ARGS[1], $ARGS[2], 'yes', min(modifier+10,100)
 	killvar 'modifier'
 	gs 'npc_relationship', 'modify', 'A14', 'like'
 	gs 'stat'
@@ -982,7 +982,7 @@ if $ARGS[0] = 'studying_exam_ask':
 		end	
 	else
 		iif(npc_rel['A14'] >= 70 or katjaQW['QWstage'] > 0, '"I would love to study with you for the <<$ARGS[2]>> exam"', '"Sounds like a good idea,"')+' she says, making space for you to sit next to her.'
-		act 'Start studying together': gt 'katja_uni', 'studying_exam', '<<$ARGS[1]>>', '<<$ARGS[2]>>'
+		act 'Start studying together': gt 'katja_uni', 'studying_exam', $ARGS[1], $ARGS[2]
 	end
 end
 
@@ -1064,7 +1064,7 @@ if $ARGS[0] = 'studying_exam':
 		else
 			'You study for half an hour and believe that you''re improving a lot.'
 		end		
-		gs 'grades', 'grade_award', '<<$ARGS[1]>>', '<<$ARGS[2]>>', study_mod
+		gs 'grades', 'grade_award', $ARGS[1], $ARGS[2], study_mod
 	end
 	
 	gs 'stat'
@@ -1072,8 +1072,7 @@ if $ARGS[0] = 'studying_exam':
 	killvar 'modifier'
 	killvar 'study_mod'
 	
-	if (week < 6 or hour < 23) and hour > 7 and 'no_study' = 0:
-		killvar 'no_study'
+	if (week < 6 or hour < 23) and hour > 7 and no_study = 0:
 		act 'Say goodbye to Katja and return to the library entrance':
 			killvar 'no_study'
 			minut += 2
@@ -1087,7 +1086,7 @@ if $ARGS[0] = 'studying_exam':
 			'She leaves the library, giving you a wave and a smile on the way out.'
 		end
 	else
-		if 'no_study' = 0:
+		if no_study = 0:
 			'"Well, it looks like the library is closing up," Katja says, reaching to pack up her stuff. "But it was nice studying together. We should do it again sometime!"'
 			'You leave together, parting ways at the entrance with a wave and a smile.'
 		else

locations/lact_bp.qsrc

@@ -72,8 +72,8 @@ if $ARGS[0] = 'build_bp':
 	bpID_arr[bp_i] = bp_i
 	bpType_arr[bp_i] = ARGS[1]
 	bpLocID_arr[bp_i] = ARGS[2]
-	bpbID1_arr[bp_i] = ''
-	bpbID2_arr[bp_i] = ''
+	bpbID1_arr[bp_i] = -1
+	bpbID2_arr[bp_i] = -1
 	result = bp_i
 end
 

locations/nerd_game_night.qsrc

@@ -123,7 +123,7 @@ if $ARGS[0] = 'game_night1':
 		'You hear a few sighs as Feofan passionately continues. "Why does it always end up like this? Let''s get on with the game already!" Petka exclaims.'
 		gs 'nerd_game_night', 'group_rel_change','nerds', 1
 	elseif $loc = 'city_coffee_hole':
-		'<center><img <<$set_imgh>> src="'+'images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 		'Upon entering the Coffee Hole, you can see the nerds have claimed a area of couches around a large coffee table in the back corner. As you make your way over to them, you can''t help but notice Anushka working the counter. As you join them, you can feel the anxious gazes as you greet the group sitting around the table that has a large map spread across it, along with small figures, various papers and books, and lots and lots of dice.'
 		'Just as you''re about to ask what they''re doing, Feofan speaks up. "Welcome to our little game night, <<$pcs_nickname>>! Please take a seat and I''ll explain the rules to you."'
 		*nl
@@ -269,7 +269,7 @@ if $ARGS[0] = 'keep_playing_on1':
 					'She just shakes her head slightly and continues serving. "Your Elven Ladyship," she says teasingly to Petka which causes him to blush, loud enough for everyone to hear. "Well, have fun nerds. Just remember to clean up after yourselves."'
 					act 'Back to the game':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 						'Once Anushka is gone, you all get back into the game. The rest continue with their special banter and the discussions are quite intensive, forcing you to take small breaks.'
 						'Feofan tries his best to be a good game leader, but sometimes even he can''t keep his head cool and gets carried away as he passionately discusses the game world.'
 						'The time quickly flies by before Feofan interrupts and stops the game as it''s getting late and he has to get back to the dorm.'
@@ -371,7 +371,7 @@ if $ARGS[0] = 'keep_playing_on2':
 				'He blushes bright red and stammers. "What?! No! I just... I mean...." He''s totally flustered by her question and you notice Zinaida smiling slightly at the interaction. Petka''s reaction makes Anushka grin, having gotten the reaction she was hoping for. "Well, have fun nerds. Just remember to clean up after yourselves."'
 				act 'Back to the game':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 					'Once Anushka is gone, you all get back into the game. The group banter back and forth as their characters talking about what they plan to spend their share of the treasure on, before deciding the order of who is on watch during the night. After that, everyone takes their turn on watch as Petka receives a ribbing about what Anushka said about his choice of character.'
 					'"We''re out of time," Feofan announces and you and the group let out a sigh. "Don''t worry, there are lots of adventures left to explore. We''ll pick it up next time." The group then gather up their books and walk out of the shop. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 					act 'Leave': gt 'city_coffee_hole', 'inner'
@@ -411,7 +411,7 @@ if $ARGS[0] = 'keep_playing_on2':
 					'"See, this is why I could never play a game like this. You guys never want to role play the fun stuff." She walks away without waiting for a reply, but you notice Feofan watching her, seemingly thinking about what she just said.'
 					act 'Back to the game':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="'+'images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 						'Once Anushka is gone, you all get back into the game. The party beds down for the night as you and the others keep teasing Petka.'
 						'"We''re out of time," Feofan announces and you and the rest of the group let out a sigh. "Don''t worry, there are lots of adventures left to explore. We''ll pick it up next time. Hopefully Petka will get to see <<$pcs_nickname>> naked again..." he says with a wink, which gets everyone laughing again as Petka blushes once more. The group then gather up their books and walk out of the shop. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 						act 'Leave': gt 'city_coffee_hole', 'inner'
@@ -512,7 +512,7 @@ if $ARGS[0] = 'game_night3':
 										'Before it can go further, Anushka clears her throat and just pointedly looks at the clock. When she returns and gives everyone their order, she leans over to Gerasim. "You should just seduce Princess Buttercup and give her what she needs tonight." Gersim just smiles as Anushka walks away.'
 										act 'Back to the game':
 											*clr & cla
-											'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+											'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 											'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 											act 'Leave': gt 'city_coffee_hole', 'inner'
 											act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
@@ -567,7 +567,7 @@ if $ARGS[0] = 'game_night3':
 										'Before it can go further, Anushka clears her throat and just pointedly looks at the clock. When she returns and gives everyone their order, she leans over to Gerasim. "You should just seduce Princess Buttercup and give her what she needs tonight." Gersim just smiles as Anushka walks away.'
 										act 'Back to the game':
 											*clr & cla
-											'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+											'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 											'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 											act 'Leave': gt 'city_coffee_hole', 'inner'
 											act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
@@ -620,7 +620,7 @@ if $ARGS[0] = 'game_night3':
 										'Before it can go further, Anushka clears her throat and just pointedly looks at the clock. When she returns and gives everyone their order, she leans over to Gerasim. "You should just seduce Princess Buttercup and give her what she needs tonight." Gersim just smiles as Anushka walks away.'
 										act 'Back to the game':
 											*clr & cla
-											'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+											'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 											'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 											act 'Leave': gt 'city_coffee_hole', 'inner'
 											act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
@@ -705,7 +705,7 @@ if $ARGS[0] = 'game_night3':
 									'Before it can go further, Anushka clears her throat and just pointedly looks at the clock. When she returns and gives everyone their order, she leans over to Gerasim. "You should just seduce Princess Buttercup and give her what she needs tonight." Gerasim just smiles as Anushka walks away.'
 									act 'Back to the game':
 										*clr & cla
-										'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+										'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 										'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 										act 'Leave': gt 'city_coffee_hole', 'inner'
 										act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
@@ -773,7 +773,7 @@ if $ARGS[0] = 'game_night4':
 					if anushkaQW['artem_dom'] = 1:
 						act 'Wait for your order':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/coffe_hole/waiting_tables.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/coffee_hole/waiting_table.jpg"></center>'
 							'When Anushka leaves to go get your orders Zinaida looks pretty shocked as she says. "I can''t believe she played along."'
 							'Gerasim clears his throat. "I''ve been telling you guys she''s not that bad once you get to know her." Which quickly starts a debate if she is that bad or not. Gerasim is firmly on the side she isn''t that bad, Feofan seems a bit torn but leans towards that she isn''t so bad. The rest seem not to really trust her or think she is going to play some prank on them or get back at them later. Before you can get into to much Feofan clears his throat and everyone glances to where he is looking and you see her returning with your orders.'
 							*nl 
@@ -787,7 +787,7 @@ if $ARGS[0] = 'game_night4':
 								'Anushka only gives a backwards glance to that as she walks off. Everyone watches her walk away, as she throws some extra sway into her walk, really rocking her ass, that is barely covered by a pair of really tight shorts, as it rocks back and forth. Zinaida gives a annoyed snort and barely looks, Julia''s gaze lingers a bit longer but she too looks away, the boys though, they all pretty much watch her until she is back behind the counter, you know they are all staring at her ass, just like that walk was intended to get them to do.'
 								act 'Back to the game':
 									*clr & cla
-									'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+									'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 									'Once Anushka is gone, Feofan turns and looks at Artem. "Dude I can''t believe you did that."'
 									'Petka chimes in. "I can''t believe she didn''t kick your ass right on the spots."'
 									'Zinaida shakes her head. "Personally I can''t believe you would do that in front of <<$pcs_nickname>>, you know your Girl Friend!" She looks very annoyed he would treat you like this.'
@@ -806,7 +806,7 @@ if $ARGS[0] = 'game_night4':
 										'Then Feofan looks to you. "What do you think <<$pcs_nickname>>? We are split three for and three against." You realize you are the deciding vote. Even if you votes yes you don''t think she would agree, but then you never thought she would play along either like she just did.'
 										act 'I will ask':
 											*clr & cla
-											'<center><img <<$set_imgh>> src="'+'images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+											'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 											'You look around and figure why not ask her. "I kinda doubt she will say yes, but you never know. I will ask her next time we hang out."'
 											'Feofan speaks up. "I think this could be fun, text me with what she says <<$pcs_nickname>>." Julia, Petka, and Zinaida look disappointed, while Artem gives you a reassuring smile and Gerasim looks happy.'
 											*nl
@@ -818,7 +818,7 @@ if $ARGS[0] = 'game_night4':
 										end
 										act 'I won''t ask':
 											*clr & cla
-											'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+											'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 											'You shake your head. "Even if I asked her, she wouldn''t agree. I know her well enough that any free time she has, she would rather go party, than sit around playing a game."'
 											'Artem speaks up. "I agree, while it might be fun I just don''t see her agreeing." Gerasim and Feofan look disappointed while the rest look relieved.'
 											*nl
@@ -838,7 +838,7 @@ if $ARGS[0] = 'game_night4':
 										'Artem just looks more smug and proud of himself. "She''s more bark than bit, after <<$pcs_nickname>> and I started dating. We started hanging out with her some and I realized, she isn''t that bad once you get to know her."'									
 										act 'Back to the game':
 											*clr & cla
-											'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+											'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 											'With that settled you all get back into the game. Feofan continues. "After a bit the patrons seems to have relaxed and forget about you. Their is several patrons that catch your trained eyes. There''s a beautiful woman sitting furthest away, almost hidden from the rest. She''s dressed in all black, observing your group. Closest to the bar counter, you see a group of drunk and rowdy men in armor, talking loudly about some of the adventures they''ve been on. Lastly, an old man, his face covered in scars, is enjoying his drink..."'
 											'Julia nudges you. "Pick one and go talk to them." You look around in confusion. "Don''t look so worried! You have the highest persuasion out of the whole group, so decide who to talk to and if anything happens, we have your back."'
 											act 'Talk to the woman': gt 'nerd_game_night', 'woman'
@@ -852,7 +852,7 @@ if $ARGS[0] = 'game_night4':
 					else
 						act 'Wait for your order':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/coffe_hole/waiting_tables.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/coffee_hole/waiting_table.jpg"></center>'
 							'When Anushka leaves to go get your orders Zinaida looks pretty shocked as she says. "I can''t believe she played along."'
 							'Gerasim clears his throat. "I''ve been telling you guys she''s not that bad once you get to know her." Which quickly starts a debate if she is that bad or not. Gerasim is firmly on the side she isn''t that bad, Feofan seems a bit torn but leans towards that she isn''t so bad. The rest seem not to really trust her or think she is going to play some prank on them or get back at them later. Before you can get into to much Feofan clears his throat and everyone glances to where he is looking and you see her returning with your orders.'
 							*nl 
@@ -870,7 +870,7 @@ if $ARGS[0] = 'game_night4':
 								'Anushka pours on the seductive girl charm and giggles. "I thought you would never ask." Followed by planting a big kiss on his lips, which has all the other nerds staring. After breaking the kiss she gets up. "I have to get back to work, but I will see you tonight for more of that." Then she saunters off in character and for real. Everyone watches her walk away, as she throws some extra sway into her walk, really rocking her ass, that is barely covered by a pair of really tight shorts, as it rocks back and forth. Zinaida gives a annoyed snort and barely looks, Julia''s gaze lingers a bit longer but she too looks away, the boys though, they all pretty much watch her until she is back behind the counter, you know they are all staring at her ass, just like that walk was intended to get them to do.'
 								act 'Back to the game':
 									*clr & cla
-									'<center><img <<$set_imgh>> src="'+'images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+									'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 									'Once Anushka is gone, Gerasim turns to the group and says. "We should ask her to join again."'
 									'Most are against the idea, while Artem points out. "Even if we wanted she works on the days we play."'
 									'Gerasim presses on. "We could switch days to one that she is off then, I mean if she said yes." Feofan seems open to the idea but the rest are against it so you just keep your opinion to yourself, since they always vote. Even if you voted with Gerasim and Feofan there would be more no''s.'
@@ -1095,7 +1095,7 @@ if $ARGS[0] = 'game_night5':
 				act 'So what about next week?':
 					*clr & cla
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 					'Feofan chokes up a little. "I-I haven''t had time to finish the story. I didn''t know which one you would pick until last week and it takes me weeks to write the adventure and prepare the maps and stuff. It''ll take some time..."'
 					'The group immediately starts moaning and complaining about his lack of forward planning. "Great, just when it got good we need to stop... You are aware that we play this game mostly for the adventures, right?" Artem scoffs.'
 					*nl
@@ -1114,7 +1114,7 @@ if $ARGS[0] = 'game_night5':
 				act 'So what about next week?':
 					*clr & cla
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/nerd_game_night.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/coffe_hole/nerd_game_night.jpg"></center>'
 					'Feofan chokes up a little. "I-I haven''t had time to finish the story. I didn''t know which one you would pick until last week and it takes me weeks to write the adventure and prepare the maps and stuff. It''ll take some time..."'
 					'The group immediately starts moaning and complaining about his lack of forward planning. "Great, just when it got good we need to stop... You are aware that we play this game mostly for the adventures, right?" Artem scoffs.'
 					*nl

locations/npc_finder.qsrc

@@ -3,62 +3,94 @@
 *clr
 gs 'obj_din', 'cheattabs'
 '<center><a href="exec: gt ''npc_finder'', ''finder''">Enter the ID of the character.</a></center>'
+*nl
+'<center><a href="exec: gt ''npc_finder'', ''finderDNA''">Enter the DNA of the character.</a></center>'
+
 if $ARGS[0] = 'finder':
     $looking = input ('ID (like <i>A17</i>)')
+    if $looking ! '': gt 'npc_finder'
+end
+
+if $ARGS[0] = 'finderDNA':
+    $looking = input ('DNA (like <i>1594378993</i>)')
+    if $looking ! '' and isnum($looking):
+        killvar 'npctemp'
+        :npcdnafinder
+            if val($looking) = val($mid($npc_dna['A<<npctemp>>'], 1, 10)): $npctemp = 'A<<npctemp>>'
+            if $npctemp = '':
+                if val($looking) = val($mid($npc_dna['B<<npctemp>>'], 1, 10)): $npctemp = 'B<<npctemp>>'
+            end
+            if $npctemp = '':
+                if val($looking) = val($mid($npc_dna['C<<npctemp>>'], 1, 10)): $npctemp = 'C<<npctemp>>'
+            end
+        if npctemp < arrsize('$npc_dna') and $npctemp = '': npctemp += 1 & jump 'npcdnafinder'
+        $looking = $npctemp
+        killvar 'npctemp'
+    end
+    if $looking = '': msg 'Can''t find this NPC' & killvar 'looking' & exit
     gt 'npc_finder'
 end
 
 if $looking ! '':
     '<br><br>'
     'Found character:'
-    '<br>'
-    '<<$npc_pic[''<<looking>>'']>>'
-    'DNA string: <<$npc_dna[''<<$looking>>'']>>'
-    'Name: <<$npc_firstname[''<<$looking>>'']>> "<<$npc_nickname[''<<$looking>>'']>>" <<$npc_lastname[''<<$looking>>'']>> (<<$npc_usedname[''<<$looking>>'']>>)'
-    if npc_dob['<<$looking>>'] ! '': 'Birthday (YYYY-MM-DD): <<mid(npc_dob[''<<$looking>>''],1,4)>>-<<mid(npc_dob[''<<$looking>>''],5,2)>>-<<mid(npc_dob[''<<$looking>>''],7,2)>>'
-    'Intelligence: <<npc_intel[''<<$looking>>'']>>'
-    if npc_grupTipe['<<$looking>>'] ! '': 'Social group: <<npc_grupTipe[''<<$looking>>'']>>'
-    if npc_sexskill['<<$looking>>'] ! '': 'Sex skill: <<npc_sexskill[''<<$looking>>'']>>'
-    if npc_rep['<<$looking>>'] ! '': ' Reputation in school: <<npc_rep[''<<$looking>>'']>>'
-    if npc_haircol['<<$looking>>'] = 0:
-        'Natural hair color: black (<<npc_haircol[''<<$looking>>'']>>)'
-    elseif npc_haircol['<<$looking>>'] = 1:
-        'Natural hair color: brown (<<npc_haircol[''<<$looking>>'']>>)'
-    elseif npc_haircol['<<$looking>>'] = 2:
-        'Natural hair color: read (<<npc_haircol[''<<$looking>>'']>>)'
+    if $mid($looking,1,1) = 'A':
+        if $npc_pic[$looking] = '':
+            '<center><img src="images/characters/shared/headshots_main/big<<mid($looking,2)>>.jpg"></center>'
+        else
+            '<center><img <<$set_imgh>> src="<<$npc_pic[$looking]>>"></center>'
+        end
+    else
+        '<center><img <<$set_imgh>> src="images/system/phone/icons/<<$npc_pic[$looking]>>"></center>'
+    end
+    '<br>ID: <<$looking>>'
+    'DNA string: <<$npc_dna[$looking]>>'
+    'Name: <<$npc_firstname[$looking]>>'+ iif($npc_nickname[$looking] ! '', ' "<<$npc_nickname[$looking]>>" ',' ') +'<<$npc_lastname[$looking]>> (<<$npc_usedname[$looking]>>)'
+    if npc_dob[$looking] > 0: 'Birthday (YYYY-MM-DD): <<mid(npc_dob[$looking],1,4)>>-<<mid(npc_dob[$looking],5,2)>>-<<mid(npc_dob[$looking],7,2)>>'
+    if npc_intel[$looking] > 0: 'Intelligence: <<npc_intel[$looking]>>'
+    if npc_grupTipe[$looking] >= 0: 'Social group: <<npc_grupTipe[$looking]>>'
+    if npc_sexskill[$looking] >= 0: 'Sex skill: <<npc_sexskill[$looking]>>'
+    if npc_rep[$looking] > 0: ' Reputation in school: <<npc_rep[$looking]>>'
+    if npc_haircol[$looking] = 0:
+        'Natural hair color: black (<<npc_haircol[$looking]>>)'
+    elseif npc_haircol[$looking] = 1:
+        'Natural hair color: brown (<<npc_haircol[$looking]>>)'
+    elseif npc_haircol[$looking] = 2:
+        'Natural hair color: read (<<npc_haircol[$looking]>>)'
     else
-        'Natural hair color: blonde (<<npc_haircol[''<<$looking>>'']>>)'
+        'Natural hair color: blonde (<<npc_haircol[$looking]>>)'
     end
-    if hotcat_rating['<<$looking>>'] ! '': 'Hotness rating: <<hotcat_rating[''<<$looking>>'']>>'
-    'Appearance value: <<npc_apprnc[''<<$looking>>'']>>'
-    'Height: <<npc_height[''<<$looking>>'']>>'
-    if npc_gender['<<$looking>>'] = 0:
+    if hotcat_rating[$looking] > 0: 'Hotness rating: <<hotcat_rating[$looking]>>'
+    if npc_apprnc[$looking] > 0: 'Appearance value: <<npc_apprnc[$looking]>>'
+    if nnpc_heightpc_rep[$looking] > 0: 'Height: <<npc_height[$looking]>>'
+    if npc_gender[$looking] = 0:
         'Gender: male'
-        'Dick thickness: <<$npc_thdick[''<<$looking>>'']>>'
-        'Dick length: <<npc_dick[''<<$looking>>'']>>'
-        'Potential: <<npc_spermpot[''<<$looking>>'']>> (default is 10000)'
+        'Dick thickness: <<$npc_thdick[$looking]>>'
+        'Dick length: <<npc_dick[$looking]>>'
+        'Potential: <<npc_spermpot[$looking]>> (default is 10000)'
     else
         'Gender: female'
-        'Breast size: <<npc_bust[''<<$looking>>'']>>'
+        'Breast size: <<npc_bust[$looking]>>'
     end
-    if npc_herpes['<<$looking>>'] > 0: $npcvendisease += 'herpes; '
-    if npc_syth['<<$looking>>'] > 0: $npcvendisease += 'syphilis; '
-    if npc_gon['<<$looking>>'] > 0: $npcvendisease += 'gonorrhea; '
-    if npc_thrush['<<$looking>>'] > 0: $npcvendisease += 'yeast infection; '
+    if npc_herpes[$looking] > 0: $npcvendisease += 'herpes; '
+    if npc_syth[$looking] > 0: $npcvendisease += 'syphilis; '
+    if npc_gon[$looking] > 0: $npcvendisease += 'gonorrhea; '
+    if npc_thrush[$looking] > 0: $npcvendisease += 'yeast infection; '
     if $npcvendisease = '': $npcvendisease = 'none'
     'Veneral diseases: <<$npcvendisease>>'
-    'Sexual acts with PC: <<npc_sex[''$looking'']>>'
-    'Perversion: <<npc_perv[''$looking'']>>'
-    'Notes: <<$npc_notes[''<<$looking>>'']>>'
+    'Sexual acts with PC: <<npc_sex[$looking]>>'
+    'Perversion: <<npc_perv[$looking]>>'
+    'Notes: <<$npc_notes[$looking]>>'
     ''
     'Found relationships:'
     npctemp = 0
     :relationshipfinder
-        gs 'DNA','relate', $npc_dna['<<$looking>>'], $npc_dna['A<<npctemp>>']
-        if $gen_relationship ! '' and 'A<<npctemp>>' ! '<<$looking>>':
-            '<br>ID: A<<npctemp>>'
+        gs 'DNA','relate', $npc_dna[$looking], $npc_dna['A<<npctemp>>']
+        if $gen_relationship ! '' and 'A<<npctemp>>' ! $looking:
+            '<center><img src="images/characters/shared/headshots_main/big<<npctemp>>.jpg"></center>'
+            '<br><a href="exec:$looking = ''A<<npctemp>>'' & gt ''npc_finder''">ID: A<<npctemp>></a>'
             'DNA string: <<$npc_dna[''A<<npctemp>>'']>>'
-            'Name: <<$npc_firstname[''A<<npctemp>>'']>> "<<$npc_nickname[''A<<npctemp>>'']>>" <<$npc_lastname[''A<<npctemp>>'']>> (<<$npc_usedname[''A<<npctemp>>'']>>)'
+            'Name: <<$npc_firstname[''A<<npctemp>>'']>>'+ iif($npc_nickname['A<<npctemp>>'] ! '', ' "<<$npc_nickname[''A<<npctemp>>'']>>" ',' ') +'<<$npc_lastname[''A<<npctemp>>'']>> (<<$npc_usedname[''A<<npctemp>>'']>>)'
             'Relationship type: <<$gen_relationship>>'
         end
     if npctemp < aarraynumber: npctemp += 1 & jump 'relationshipfinder'

locations/npcgeneratec.qsrc

@@ -231,7 +231,7 @@ npc_intel[$npclastgenerated] = rand(1,npctempc2)
 npc_drunk[$npclastgenerated] = 0
 
 !! Horniness
-npc_horny[$npclastgenerated] = rand(0,60)
+npc_horny[$npclastgenerated] = max(0, rand(hotcat*2,hotcat*8) - npc_gender[$npclastgenerated]*20)
 
 !! Attractiveness
 npc_apprnc[$npclastgenerated] = rand(30,60)

locations/npcstatic1.qsrc

@@ -30,7 +30,8 @@ Empty number - 66(bandit), 100, 231
 
 Example
 npctemp = 1
-$npc_dna['A<<npctemp>>'] = '1594378993 1607632682 1428796224 1448474566 1775134737 1909315069 1882255348'
+Use Cheat Menu DNA Generation tool for custom DNA or parents DNA, otherwise func is enough
+$npc_dna['A<<npctemp>>'] = func('dna','create')
 $npc_firstname['A<<npctemp>>'] = 'Dmitriy'
 $npc_nickname['A<<npctemp>>'] = 'Dimka'
 $npc_lastname['A<<npctemp>>'] = 'Nosov'

locations/npcstatic2.qsrc

@@ -634,7 +634,7 @@ gs 'npc_standard_preferences', 'A<<npctemp>>'
 
 npctemp = 85
 $npc_dna['A<<npctemp>>'] = '1938942779 2106314839 1289521515 1217866816 2023591880 1519928587 1939169723'
-$npc_firstname['A<<npctemp>>'] = 0
+$npc_firstname['A<<npctemp>>'] = ''
 $npc_nickname['A<<npctemp>>'] = 'Kas'
 $npc_notes['A<<npctemp>>'] = 'A black handyman from the office.'
 npc_gender['A<<npctemp>>'] = 0
@@ -665,7 +665,7 @@ npc_dick['A<<npctemp>>'] = 20
 npctemp = 87
 $npc_dna['A<<npctemp>>'] = '1847378236 1162293273 1556619643 1329175895 1349109199 1613614049 1534225588'
 $npc_firstname['A<<npctemp>>'] = 'Boris'
-$npc_nickname['A<<npctemp>>'] = 0
+$npc_nickname['A<<npctemp>>'] = ''
 $npc_lastname['A<<npctemp>>'] = 'Ivanovich'
 $npc_notes['A<<npctemp>>'] = 'Cleaning Job Boss'
 npc_gender['A<<npctemp>>'] = 0

locations/obj_din.qsrc

@@ -2331,17 +2331,19 @@ if $ARGS[0] = 'wait':
 	if waiting > 0 and waiting <= 120:
 		minut += waiting
 	else
-		'Invalid time.'
+		msg 'Invalid time.'
 	end
 	gs 'stat'
+	killvar 'waiting'
+	killvar 'waitStr'
 	gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'rest':
 	cla
-	waiting = input ("How long would you like to rest?<br>(Default 15 minutes, maximum 120 minutes)")
+	waiting = val(input("How long would you like to rest?<br>(Default 15 minutes, maximum 120 minutes)"))
 
-	if waiting = '':
+	if waiting = 0:
 		minut += 15
 	elseif waiting > 0 and waiting <= 120:
 		minut += waiting
@@ -2349,10 +2351,11 @@ if $ARGS[0] = 'rest':
 		if pcs_sleep < 90 and waiting >= 60:
 			pcs_sleep += 10
 		end
-	elseif waiting <= 0 or waiting > 120:
+	else
 		msg 'Invalid time.'
 	end
 	gs 'stat'
+	killvar 'waiting'
 	gt $loc, $loc_arg
 end
 

locations/pav_disco.qsrc

@@ -1029,7 +1029,7 @@ if $ARGS[0] = 'artem_disco':
 		end
 		act 'Just walk home with Artem':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="'+'images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walking.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/walking.jpg"></center>'
 			'Artem and you walk holding hands talking about how much fun the two of you had tonight.'
 			'Artem walks you all the way to your apartment door. You smile and kiss him. "Good night honey."'
 			'He hugs you. "See you later babe." He kisses you again before you go into your apartment.'

locations/pav_hotel.qsrc

@@ -7,6 +7,8 @@ $location_type = 'public_indoors'
 menu_off = 0
 
 $receptionName = 'Elisabet'
+if hotelRoomDays['pav'] = 0 and hour > 11: hotelRoom['pav'] = 0
+if hotelRoomDays['pav'] < 0: hotelRoom['pav'] = 0
 gs 'stat'
 
 ! use this args if some event  transfers you directly to the lobby  and it is can happen  between  midnight and 01:00.

locations/pav_hotelReception.qsrc

@@ -4,6 +4,8 @@ if $ARGS[0] = '':
 	$menu_loc = 'pav_hotelReception'
 	$menu_arg = ''
 	menu_off = 0
+	if hotelRoomDays['pav'] = 0 and hour > 11: hotelRoom['pav'] = 0
+	if hotelRoomDays['pav'] < 0: hotelRoom['pav'] = 0
 	gs'stat'
 	'<center><H4>Hotel reception</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/resep.girl0,'+rand(0,10)+'.jpg"></center>'

locations/placer_sex.qsrc

@@ -1821,11 +1821,11 @@ if $ARGS[0] = 'sitting_park_bench':
 		else
 			'<center><img <<$set_imgh>> src="images/locations/shared/park/bench_3.jpg"></center>'
 		end
-		waiting = input ("How long would you like to rest?<br>(Default 15 minutes, maximum 120 minutes)")
+		waiting = val(input("How long would you like to rest?<br>(Default 15 minutes, maximum 120 minutes)"))
 
 		if alko >= 4:gt 'placer_sex', 'sleeping_park_bench'
 
-		if waiting = '':
+		if waiting = 0:
 			minut += 15
 		elseif waiting > 0 and waiting <= 120:
 			minut = minut + waiting
@@ -1833,10 +1833,10 @@ if $ARGS[0] = 'sitting_park_bench':
 			if pcs_sleep < 90 and waiting >= 60:
 				pcs_sleep += 10
 			end
-		elseif waiting <= 0 or waiting > 120:
-			'Invalid time.'
+		else
+			msg 'Invalid time.'
 		end
-
+		killvar 'waiting'
 		gt $loc, $loc_arg
 	end
 end

locations/pornstudio.qsrc

@@ -908,7 +908,7 @@ if $ARGS[0] = 'yes':
 									firstkasting = 1
 									$pfname = input ("What will your porn name be? (Leave blank for <<$pcs_nickname>> Starr)")
 
-									if $pfname <= 0:$pfname = '<<$pcs_nickname>> Starr'
+									if $pfname = '': $pfname = '<<$pcs_nickname>> Starr'
 
 									'"There we go, you''re now registered. We shoot about four films a day, so you can choose what you to be in. Anal or gangbang, it''s your choice, just remember to take care of your health. If you get sick or something, just cancel the shoot. You can do this up to the day of the shooting."'
 									'A stern look then appears on his face. "Before shooting starts, you have to pass a mandatory medical examination. If we find any sign of a sexually transmitted disease, you''re out, no exceptions. Understood?"'
@@ -955,7 +955,7 @@ if $ARGS[0] = 'yes':
 									firstkasting = 1
 									$pfname = input ("What will your porn name be? (Leave blank for <<$pcs_nickname>> Starr)")
 
-									if $pfname <= 0:$pfname = '<<$pcs_nickname>> Starr'
+									if $pfname = '': $pfname = '<<$pcs_nickname>> Starr'
 
 									'"There we go, you''re now registered. We shoot about four films a day, so you can choose what you to be in. Anal or gangbang, it''s your choice, just remember to take care of your health. If you get sick or something, just cancel the shoot. You can do this up to the day of the shooting."'
 									'A stern look then appears on his face. "Before shooting starts, you have to pass a mandatory medical examination. If we find any sign of a sexually transmitted disease, you''re out, no exceptions. Understood?"'

locations/praiders_garage_chat.qsrc

@@ -1721,7 +1721,7 @@ if $ARGS[0] = 'chat_niko1':
 			'You grunt in disgust. "That''s sick! What''s wrong with you?!" You then get up and walk away.'
 		elseif VK = 2:
 			if VK_AlisaQW = 0 and $start_type['magic'] ! 'nomagic':
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/alisaev/park/1.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/alisaev/park/alisa_park.jpg"></center>'
 				'Not having much to really talk about, you decide to start up a casual conversation with Niko. "Is there anything new around here? It''s been kind of a drag lately."'
 				'He pulls out his phone and shows you a picture of a woman wearing dark robes near a lake. "Check out this girl. I saw her a few times at the lake in town chanting some bullshit. Some of the guys think she''s a witch, but with skin that pale, I think she looks more like a vampire."'
 				'Feeling like he''s just messing with you, you smirk. "A vampire? I think you''ve been watching too many sci-fi flicks."'
@@ -1746,7 +1746,7 @@ if $ARGS[0] = 'chat_niko1':
 				'You shake your head before getting up and walking away.'		
 			end
 			if VK_AlisaQW >= 1 and $start_type['magic'] ! 'nomagic':
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/alisaev/park/1.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/alisaev/park/alisa_park.jpg"></center>'
 				'Not having much to talk about, you decide to start up a casual conversation with Niko. "Is there anything new around here? It''s been kind of a drag lately."' 
 				'He pulls out his phone and shows you a picture of a woman wearing dark robes near a lake, who you quickly recognize as Alisa. "Check out this girl. I saw her a few times at the lake in town chanting some bullshit. Some of the guys think she''s a witch, but with skin that pale, I think she looks more like a vampire."'
 				'Realizing that he''s referring to Alisa, you decide to play dumb. "A vampire? I think you''ve been watching too many sci-fi flicks."'

locations/praiders_garage_events.qsrc

@@ -256,7 +256,7 @@ if $ARGS[0] = 'alyona_dad':
 	act 'Leave': gt 'pav_complex', 'garages'
 	act 'Leave with them':
 		*clr & cla
-		'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/zoykov.jpg"></center>'
+		'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/zuykov.jpg"></center>'
 		'You decide to go with them and the four of you talk and laugh as you walk. Before you make it far though, a man comes out of the darkness of the courtyard. He''s older and fairly tall with thick meaty arms, and a bit of a beer gut on him. Everyone stops talking as you feel the tension set in. "Where the fuck have you been, you little slut?" the man says as he closes in, heading right for Alyona.'
 		'Alyona takes a step back as the man walks right up to her face. "I was just hanging out with my friends. Chill out." The words barely leave her mouth before the man backhands her hard and sends he sprawling to the ground.' 
 		'"What the fuck?!" Anushka yells before rushing over to Alyona while Valentin steps up to put himself between Alyona and the man. The man starts to step around Valentin, who just steps in his way.' 
@@ -277,7 +277,7 @@ if $ARGS[0] = 'alyona_dad':
 				gs 'npc_relationship', 'modify', 'A158', 'like'
 				grupvalue[4] += 3
 				gs 'stat'
-				'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/zoykov.jpg"></center>'
+				'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/zuykov.jpg"></center>'
 				'The man gets Valentin on the ground and starts really pounding on him. Valentin does his best to cover up as Alyona finally seems to snap out of it. "Dad! Leave him alone!" She doesn''t get off the ground though, even as Anushka jumps on her dad''s back. He only pauses hitting Valentin long enough to grab Anushka and fling her off him, causing her to crash into the door of one of the garages before he goes back to beating on Valentin.'
 				'You step in to try and help as well, but suffer the same fate. The man is very strong and easily tosses you aside. Before you can get back up, you see someone running up the alleyway.'
 				act 'Continue': gt 'praiders_garage_events', 'edward_arrives'
@@ -295,7 +295,7 @@ if $ARGS[0] = 'alyona_dad':
 				gs 'npc_relationship', 'modify', 'A158', 'like'
 				grupvalue[4] += 3
 				gs 'stat'
-				'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/zoykov.jpg"></center>'
+				'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/zuykov.jpg"></center>'
 				'The man gets Valentin on the ground and starts really pounding on him. Valentin does his best to cover up as Alyona finally seems to snap out of it. "Dad! Leave him alone!" She doesn''t get off the ground though, even as Anushka jumps on her dad''s back. He only pauses hitting Valentin long enough to grab Anushka and fling her off him, causing her to crash into the door of one of the garages before he goes back to beating on Valentin.'
 				'You step in to try and help as well, but suffer the same fate. The man is very strong and easily tosses you aside. Before you can get back up, you see someone running up the alleyway.'
 				act 'Continue': gt 'praiders_garage_events', 'edward_arrives'
@@ -309,12 +309,12 @@ if $ARGS[0] = 'edward_garage':
 	*clr & cla
 	minut + 15
 	gs 'stat'
-	'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/ed/ed2.jpg"></center>'
+	'<center><img src="images/locations/pavlovsk/resident/apartment/garage/ed/ed2.jpg"></center>'
 	'You rush down to Edward''s garage as you hear Alyona screaming "Dad! Leave him alone!" As you reach the garage, you jerk open the door and find Edward inside working on his bike. He looks up at you in surprise and opens his mouth to say something, but you beat him to it. "Alyona''s dad hit her and when Val tried to stop him, he starting beating the shit out of Val!"'
 	'Edwards eyes darken. "You okay?" When you nod, he gives you a quick look over before he rushes out.'
 	act 'Wait':
 		*clr & cla
-		'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/ed/ed6.jpg"></center>'
+		'<center><img src="images/locations/pavlovsk/resident/apartment/garage/ed/ed6.jpg"></center>'
 		'You take a seat and wait. It takes a while, but Edward finally opens the door. His hands are bloodied and you notice he has a grim look on his face. Behind him is Valentin, whose face is all bloodied and bruised. Anushka has her arm wrapped around Alyona protectively. "Alright, let''s go," Edward says. His tone is hard and angry, but you can tell he isn''t angry at you. After a moment, he forces a smile to his face. As you walk out, he turns off the lights and locks the garage.'
 		'The five of you walk towards the apartments as Edward talks to Valentin, telling him what a good job he did. You can see Valentin react to this and straighten his shoulders and even smile at the compliments. He first walks you to his building, stopping at the door. "Okay, you girls go on up to your room. I''ll be back shortly," he says to Anushka, who gives him a grateful smile.'
 		'Edward and Valentin then walk you to your building next. "You should get home," Edward tells you and won''t take no for a answer, so you head inside after giving him a friendly smile. Once inside, you give it a moment and open the door, peeking out to see Edward walking with his arm over Valentin''s shoulder. You let the door close after a moment.'
@@ -322,19 +322,19 @@ if $ARGS[0] = 'edward_garage':
 	end
 	act 'Run after him':
 		*clr & cla
-		'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zoykov1.jpg"></center>'
+		'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zuykov1.jpg"></center>'
 		'You decide you don''t want to wait, so you run after him. You try to keep up with Edward, but he runs faster than you. When he arrives on the scene, he picks Alyona''s dad off Valentin and tosses him to the ground, but the man quickly gets to his feet. "What the fuck? Ed? This isn''t any of your business!"'
 		'Edward responds by punching him in the face. "What the fuck is wrong with you, Zoykov? Beating on fucking kids?" Alyona goes over to check on Anushka, who you guess tried to stop Zoykov and got tossed for it, but she doesn''t look like she''s hurt. Valentin sits up with his back to the garage, his face bloodied and bruised.'
 		act 'Watch them fight':
 			*clr & cla
 			alyonaQW['meet_father'] = 1
-			'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zoykov2.jpg"></center>'
+			'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zuykov2.jpg"></center>'
 			'Zoykov lunges at Edward and they both go down as you stand there and watch them fight. They trade a few blows, but it doesn''t take long for Zoykov to end up pinned to the ground with Edward hitting him until he gives up fighting back. Once Edward is sure the fight is over, he gets off Zoykov and looks around at all of you before glaring again at Zoykov. "You touch one of these kids again and I''ll beat you within an inch of your sorry life."'
 			'He glances over at Anushka, who is checking on Valentin''s injuries before looking back at Zoykov again. "If you ever so much as look at my daughter again, I swear they''ll never find your body. We clear?" When Zoykov doesn''t respond, Edward repeats himself. "I said ''are we clear''?"'
 			'Zoykov looks up from where he lays. "Yeah... Yeah..."'
 			act 'Aftermath':
 				*clr & cla
-				'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zoykov3.jpg"></center>'
+				'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zuykov3.jpg"></center>'
 				'While Zoykov stays laying on the ground, Edward looks back over at Anushka and Alyona. "Alyona''s going to have a sleepover with Nush tonight. Got it?"'
 				'Zoykov clenches his jaw, but nods. "Yeah, whatever." He gets up and glares at Alyona, apparently blaming her for all this before he walks away muttering to himself and rubbing his jaw.'
 				'Edward first checks on Anushka, then Alyona and yourself before he finally checks on Valentin. Once he seems to be sure Valentin isn''t injured badly, he helps him up.'
@@ -349,7 +349,7 @@ if $ARGS[0] = 'edward_garage':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A158', 'like'
 			gs 'stat'
-			'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zoykov2.jpg"></center>'
+			'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zuykov2.jpg"></center>'
 			'Zoykov lunges at Edward and they both go down as you move over to Valentin and check on him. "You okay?" you ask.'
 			'He winces a bit, but nods. You check him out and he doesn''t seem to be badly injured, just bruised and a bit bloody. Anushka and Alyona also come over to check on him and he doesn''t seem to mind all the attention he''s getting. "I''m fine, girls. It''s nothing," he smiles, trying to act tough.'
 			*nl
@@ -358,7 +358,7 @@ if $ARGS[0] = 'edward_garage':
 			'Zoykov looks up from where he lays. "Yeah... Yeah..."'
 			act 'Aftermath':
 				*clr & cla
-				'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zoykov3.jpg"></center>'
+				'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zuykov3.jpg"></center>'
 				'While Zoykov stays laying on the ground, Edward looks back over at Anushka and Alyona. "Alyona''s going to have a sleepover with Nush tonight. Got it?"'
 				'Zoykov clenches his jaw, but nods. "Yeah, whatever." He gets up and glares at Alyona, apparently blaming her for all this before he walks away muttering to himself and rubbing his jaw.'
 				'Edward first checks on Anushka, then Alyona and yourself before he finally checks on Valentin. Once he seems to be sure Valentin isn''t injured badly, he helps him up.'
@@ -375,18 +375,18 @@ end
 if $ARGS[0] = 'edward_arrives':
 	menu_off = 0
 	*clr & cla
-	'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zoykov1.jpg"></center>'
+	'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zuykov1.jpg"></center>'
 	'As you watch the approaching figure, you realize that it;;s Edward, Anushka''s dad. He must have heard the commotion from his garage and come out to investigate. When he arrives, he picks Alyona''s dad off Valentin and tosses him to the ground, but the man quickly gets to his feet. "What the fuck? Ed? This isn''t any of your business!"'
 	'Edward responds by punching him in the face. "What the fuck is wrong with you, Zoykov? Beating on kids?"'
 	act 'Watch them fight':
 		*clr & cla
-		'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zoykov2.jpg"></center>'
+		'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zuykov2.jpg"></center>'
 		'Zoykov lunges at Edward and they both go down as you stand there and watch them fight. They trade a few blows, but it doesn''t take long for Zoykov to end up pinned to the ground with Edward hitting him until he gives up fighting back. Once Edward is sure the fight is over, he gets off Zoykov and looks around at all of you before glaring again at Zoykov. "You touch one of these kids again and I''ll beat you within an inch of your sorry life."'
 		'He glances over at Anushka, who is checking on Valentin''s injuries before looking back at Zoykov again. "If you ever so much as look at my daughter again, I swear they''ll never find your body. We clear?" When Zoykov doesn''t respond, Edward repeats himself. "I said ''are we clear''?"'
 		'Zoykov looks up from where he lays. "Yeah... Yeah..."'
 		act 'Aftermath':
 			*clr & cla
-			'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zoykov3.jpg"></center>'
+			'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zuykov3.jpg"></center>'
 			'While Zoykov stays laying on the ground, Edward looks back over at Anushka and Alyona. "Alyona''s going to have a sleepover with Nush tonight. Got it?"'
 			'Zoykov clenches his jaw, but nods. "Yeah, whatever." He gets up and glares at Alyona, apparently blaming her for all this before he walks away muttering to himself and rubbing his jaw.'
 			'Edward first checks on Anushka, then Alyona and yourself before he finally checks on Valentin. Once he seems to be sure Valentin isn''t injured badly, he helps him up.'
@@ -401,7 +401,7 @@ if $ARGS[0] = 'edward_arrives':
 		*clr & cla
 		gs 'npc_relationship', 'modify', 'A158', 'like'
 		gs 'stat'
-		'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zoykov2.jpg"></center>'
+		'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zuykov2.jpg"></center>'
 		'Zoykov lunges at Edward and they both go down as you move over to Valentin and check on him. "You okay?" you ask.'
 		'He winces a bit, but nods. You check him out and he doesn''t seem to be badly injured, just bruised and a bit bloody. Anushka and Alyona also come over to check on him and he doesn''t seem to mind all the attention he''s getting. "I''m fine, girls. It''s nothing," he smiles, trying to act tough.'
 		*nl
@@ -410,7 +410,7 @@ if $ARGS[0] = 'edward_arrives':
 		'Zoykov looks up from where he lays. "Yeah... Yeah..."'
 		act 'Aftermath':
 			*clr & cla
-			'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zoykov3.jpg"></center>'
+			'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zuykov3.jpg"></center>'
 			'While Zoykov stays laying on the ground, Edward looks back over at Anushka and Alyona. "Alyona''s going to have a sleepover with Nush tonight. Got it?"'
 			'Zoykov clenches his jaw, but nods. "Yeah, whatever." He gets up and glares at Alyona, apparently blaming her for all this before he walks away muttering to himself and rubbing his jaw.'
 			'Edward first checks on Anushka, then Alyona and yourself before he finally checks on Valentin. Once he seems to be sure Valentin isn''t injured badly, he helps him up.'

locations/radapt.qsrc

@@ -219,7 +219,7 @@ if $ARGS[0] = 'home':
 			act 'Enter':
 				*clr & cla
 				RadomirLoc = 2
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/radgirls/rgirl' + rand(1,4) + '.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_girls/rgirl' + rand(1,4) + '.jpg"></center>'
 				'You thank her and enter the apartment, she closes the door and then heads off to the kitchen, while you head down the hallway to Radomir''s room. Just then, Radomir''s door opens up and a girl with dyed hair and punk rock style clothing comes out of his room. She pauses a moment when she sees you then smirks. By the state of her clothes, messed up hair and smeared makeup, it is not hard to guess she just had sex with Radomir. A moment later Radomir steps out, when he sees you he just smiles real big and slap the girl on the ass which makes her giggle a bit. "See ya later doll."'
 				*nl
 				'She smiles back to him all coy. "Bye Rad." Then she walks past you and out the apartment. When you glance back to Rad he is looking all smug and stretches a bit leaving no doubt in your mind they just had sex.'
@@ -232,7 +232,7 @@ if $ARGS[0] = 'home':
 			act 'Enter':
 				*clr & cla
 				RadomirLoc = 2
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/radgirls/girl' + rand(1,4) + '.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_girls/girl' + rand(1,4) + '.jpg"></center>'
 				'You thank her and enter the apartment, she closes the door and then heads off to the kitchen, while you head down the hallway to Radomir''s room. Just then, Radomir''s door opens up and a girl you never seen before come out of his room. She pauses a moment when she sees you and blushes a bit. By the state of her clothes, messed up hair and smeared makeup, it is not hard to guess she just had sex with Radomir. A moment later Radomir steps out, when he sees you he just smiles real big and slap the girl on the ass which makes her giggle a bit. "See ya later doll."'
 				*nl
 				'She smiles back to him all coy. "Bye Rad." Then she walks past you and out the apartment. When you glance back to Rad he is looking all smug and stretches a bit leaving no doubt in your mind they just had sex.'
@@ -464,7 +464,7 @@ if $ARGS[0] = 'livingroom':
 	minut += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Living room</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/living.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/living_room.jpg"></center>'
 	'The room is very clean and tidy. A couch is against one wall with a tv stand and flatscreen tv sitting on it against the opposite wall. In front of the couch is to small coffee tables with plants on them. Large matching curtains hang on the wall next to the window, a matching recliner sits near the couch.'
 	act 'Leave':gt 'radapt', 'hallway'
 end
@@ -731,14 +731,14 @@ if $ARGS[0] = 'guitar':
 				minut += 10
 				pcs_mood += 10
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/anushroom/play_guitar.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/play_guitar.jpg"></center>'
 				'You decide to live out one of your fantasies. You''ve always wanted to play the guitar, so you grab hold of the guitar and pretend to play, putting on a show as if you were a real rock star. After a while, you need to catch your breath. Playing was a lot harder than you thought.'
 				act 'Put the guitar back':gt 'radapt', 'radroom'
 			end
 		end
 		act 'Try to play it':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/anushroom/play_guitar.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/play_guitar.jpg"></center>'
 			if pcs_instrmusic < 20 or instrmusic_lvl < 10:
 				gs 'exp_gain', 'instrmusic', rand(0,1)
 				pcs_mood += 5

locations/radchat.qsrc

@@ -6,7 +6,7 @@ if $ARGS[0] = 'chat':
 	*clr & cla
 	gs 'stat'
 	'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 	'You sit on the edge of his bed while he sits on his bean bag chair and talk about a variety of topics.'
 	act 'Stop talking': gt 'radapt', 'radroom'
 	act 'Make small talk':
@@ -14,7 +14,7 @@ if $ARGS[0] = 'chat':
 		minut += 5
 		gs 'npc_relationship', 'modify', 'A154', 'like'
 		'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 		'The two of you chat about a variety of things, mostly school, music, him and what has been going on in Pavlovsk lately.'
 		act 'Keep talking': gt 'radchat', 'chat'
 		act 'Stop talking': gt 'radapt', 'radroom'
@@ -24,7 +24,7 @@ if $ARGS[0] = 'chat':
 			*clr & cla
 			minut += 3
 			'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 			'You decide to ask him about dating Anushka to get his side of the story. "So you and Nush use to date right?"'
 			'He nods. "Yeah, she use to come listen to us play and sometime after we started dating. We was just fourteen when we started dating."'
 			'You listen to him and he seems to actual speak fondly of that time. "So she was your first girlfriend?"'
@@ -35,7 +35,7 @@ if $ARGS[0] = 'chat':
 				*clr & cla
 				minut += 2
 				'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 				'You roll your eyes slightly at him bragging about being her first in every sexual way. "So what happened? Why did you break up?"'
 				'He sighs a bit. "It''s complicated."'
 				'You press him and smile a bit. "Try me."'
@@ -52,7 +52,7 @@ if $ARGS[0] = 'chat':
 					minut += 3
 					anushkaQW['raddate'] = 2
 					'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 					'"So she caught you cheating and thats when you broke up?" You ask him.'
 					'He shakes his head no. "Nope, she forgave... every time. At the time I really didn''t get it, but I have had time to reflect and now I realize just how in love with me she was."'
 					'You nod to that. "So you cheated on her a lot?"'
@@ -69,7 +69,7 @@ if $ARGS[0] = 'chat':
 						*clr & cla
 						minut += 2
 						'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 						'Now you snort a laugh. "Well can you blame her? You proved she couldn''t trust you around other girls."'
 						'He just nods and looks solemn to that question. "I know and no I don''t blame her, not really."'
 						'"So thats the whole story on why you guys broke up?" You ask him.'
@@ -78,7 +78,7 @@ if $ARGS[0] = 'chat':
 							*clr & cla
 							minut += 3
 							'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 							'You look at him a moment and this was really not what you was expecting from him, he typically always acts so cocky and uncaring. "Do you regret it?"'
 							'He looks up at you at that question. "What cheating on her or breaking up with her?"'
 							'"Either, both." You respond to him.'
@@ -97,7 +97,7 @@ if $ARGS[0] = 'chat':
 			anushkaQW['raddate'] = 1
 			minut += 5
 			'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 			'You decide to ask about him and Anushka still hooking up. "So even though you and Nush broke up, you still hookup?"'
 			'He laughs a bit and grins. "Fuck yeah, she is a hottie and we both love to fuck. Not to mention she is a dirty little slut that likes it hard and rough, just the way I like em."'
 			'"So you like hot girls that are dirty little sluts?" You ask him.'
@@ -114,7 +114,7 @@ if $ARGS[0] = 'chat':
 			*clr & cla
 			minut += 5
 			'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 			'You wonder if you should even bring this up but your curiosity is more than you can handle. "Are you aware Val and Nush are smashing?"'
 			'He laughs and nods. "Yeah I know, she also hooks up with Arkadi sometimes too, it''s all good."'
 			'He doesn''t seem like he cares. "So you really don''t care your friend is hooking up with your ex?"'
@@ -129,7 +129,7 @@ if $ARGS[0] = 'chat':
 			anushkaQW['marspyknow'] = 1
 			minut += 5
 			'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 			'You wonder if you should even bring this up but your curiosity is more than you can handle. "Are you aware Marcus and Nush are smashing?"'
 			'He looks surprised for a moment but it passes. "The black guy from school?" Then he shakes his head as if to clear it. "Of course him, who else would you be talking about. No I didn''t know, but can''t say I am surprised."'
 			'He doesn''t seem like he really cares. "Why do you say you are not really surprised?"'
@@ -149,7 +149,7 @@ if $ARGS[0] = 'chat':
 		gopnikbandQW['practice_invite'] = 1
 		gs 'stat'
 		'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 		'"So how are things going with the band?" You ask.'
 		'He grins. "Great, fantastic, things could hardly be better with us still in school."'
 		'"So no problems?" You ask.'
@@ -164,7 +164,7 @@ if $ARGS[0] = 'chat':
 		*clr & cla
 		minut += 5
 		'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 		'"So how are things going with you and Val?" you ask.'
 		'He shrugs a bit. "Pretty good, he is my oldest friend, we have been friends since we were little kids. But sometimes... sometimes..."'
 		'Now you are curious. "Sometimes what?"'
@@ -175,14 +175,14 @@ if $ARGS[0] = 'chat':
 			*clr & cla
 			minut += 5
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 			'"Oh really? I didn''t know that Val had the hots for Nush?" you ask curiously.'
 			'"Yeah, but he''s too much of a pussy to admit it. I told him he could fuck her brains out all he wants, but we need her to be single. Too many of our fans, mostly guys but some of the bitches as well, want to fuck her brains out. They need to believe they have a shot." He smirks and shakes his head. "Hell with how big of slut she is, I imagine most of them do."'
 			act 'Just let him talk':
 				*clr & cla
 				minut += 5
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 				'You don''t feel like getting into it with him, so you just let him keep going. He''s soon talking about one of the after parties they had.'
 				act 'Stop talking': gt 'radapt', 'radroom'
 				act 'Keep talking': gt 'radchat', 'chat'
@@ -191,7 +191,7 @@ if $ARGS[0] = 'chat':
 				*clr & cla
 				minut += 5
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 				'"So you think Nush is just a big slut? I''m surprised you hang out with her then. I mean sluts are outcasts after all." you point out to him.'
 				'He frowns. "Hey, I didn''t say she was some worthless slut that won''t stand up for herself. Who can respect someone like that? No, Nush loves to get fucked, but she won''t just let any guy smash her and she''ll knock a guy on his ass if he gets too hands on with her when she isn''t in the mood. She decides who, when and where she fucks... well other than me of course. She''s my personal fuck toy that I can use anytime, anywhere." You roll your eyes slightly, but he doesn''t seem to notice as he goes back to telling you about the party they had.'
 				act 'Stop talking': gt 'radapt', 'radroom'
@@ -204,7 +204,7 @@ if $ARGS[0] = 'chat':
 		*clr & cla
 		minut += 5
 		'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 		'"So what do you think of Arkadi?" You ask him.'
 		'"He is a great drummer and most of the time he is cool, but sometimes he gets on my nerves..." Radomir says.'
 		'"What? Arkadi is great fun." you reply.'
@@ -223,7 +223,7 @@ if $ARGS[0] = 'chat':
 		radomirQW['nush_sex'] = 1
 		gs 'stat'
 		'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 		'"So what do you think of Nush?" You ask him.'
 		'"What can I say, she is the closest thing to a complete package as a girl can get. She is smart, funny, sexy, stands up for herself, great guitar player, amazing singer, beautiful as fuck, and she has a amazingly ass, that she happily lets guys fuck. If a guy was looking for a girl to settle down with, she would be the one... once she sows her wild oats a bit more of course." Radomir says in such a way, you actually believe he means every word of it.'
 		'You think about it a moment. "I guess, probably, yeah..."'
@@ -292,7 +292,7 @@ if $ARGS[0] = 'chat':
 		anushkaQW['Gerasim'] = 1
 		minut += 5
 		'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 		'"So what are your plans for the future?" You ask him.'
 		'He just gives you a look like you just asked the stupid question anyone has ever asked in the history of the world. "I''m going to be a rock star, what the hell else. We are still in school and already starting to become pretty famous. We have gigs fairly often and have almost half a million followers on YouTube already."'
 		'You are a bit surprised you didn''t know they had a Youtube channel or any social media. "Really? I didn''t know that."'
@@ -308,7 +308,7 @@ if $ARGS[0] = 'chat':
 			*clr & cla
 			minut += 5
 			'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 			'You shake your head. "Honestly? I don''t know yet, I guess I really havn''t given it that much thought yet."'
 			'He just shrugs and doesn''t really say much about it, so instead starts talking about how great things will be when they band becomes famous. He seems to think they are only a couple of years away from that.'
 			act 'Stop talking': gt 'radapt', 'radroom'
@@ -319,7 +319,7 @@ if $ARGS[0] = 'chat':
 			*clr & cla
 			minut += 5
 			'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 			'You nod your head. "I plan to go to the University in Saint Petersburg and get a degree, not sure in what yet, but something."'
 			'He just shrugs and doesn''t really say much about it, so instead starts talking about how great things will be when they band becomes famous. He seems to think they are only a couple of years away from that.'
 			act 'Stop talking': gt 'radapt', 'radroom'
@@ -344,7 +344,7 @@ if $ARGS[0] = 'chat':
 				minut += 5
 				gs 'stat'
 				'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 				'You excitedly tell him. "I want to find the perfect guy and get married and then have kids."'
 				'He rolls his eyes slightly. "Oh..." Then he just starts talking about how the band will get famous and what that will be like. Obviously he is not interested in your plans of having a family.'
 				act 'Stop talking': gt 'radapt', 'radroom'
@@ -357,7 +357,7 @@ if $ARGS[0] = 'chat':
 		*clr & cla
 		minut += 5
 		'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 		'"So whats the deal with your brother?" You ask him.'
 		'He sneers a bit. "You mean Mr Perfect, captain of the football team, good looking, athletic, charming, perfect grades, why can''t you be more like your other brother? You mean him?" He sounds bitter.'
 		'You are a bit taken aback by that. "Uh... yeah?"'
@@ -371,7 +371,7 @@ if $ARGS[0] = 'chat':
 			*clr & cla
 			minut += 5
 			'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 			'He shakes his head. "Not from lack of trying, I admit he got a few of them, asshole. But once Nush really started to blossom he tried so hard, she would tease him then shut him down hard, some of the funniest shit I have seen. He is still bitter about that, so don''t be surprised if he tries to fuck you just because I brought you over."'
 			'Not sure how to respond to that you just say. "Oh ok." Then you decide it might be best to just change the subject.'
 			act 'Stop talking': gt 'radapt', 'radroom'
@@ -383,7 +383,7 @@ if $ARGS[0] = 'chat':
 		*clr & cla
 		minut += 5
 		'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 		'"So what about your mother?" You ask him.'
 		'He looks confused. "What do you mean?"'
 		'"You know the sweet boy and all that." You explain.'
@@ -396,7 +396,7 @@ if $ARGS[0] = 'chat':
 		*clr & cla
 		minut += 5
 		'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 		'"So what was that all about, how your dad talked about girls?" You ask him.'
 		'He shrugs. "Just how he has always been, about as far back as I can remember he was saying stuff like that. At first just to my brother but about the time I started showing interest in girls he started saying the same thing to me."'
 		'"Really? What he didn''t want you to have a girlfriend? I mean dated Nush." You ask.'
@@ -415,7 +415,7 @@ if $ARGS[0] = 'chat':
 		*clr & cla
 		minut += 5
 		'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 		'You know he''s hooking up with a lot of girls, but you''re not sure if you should even ask, even if you''re curious. "Do you have a girlfriend?"'
 		'He shakes her head. "Nope, why would I? Right now bitches just throw themselves at me and once we make it big time even more will. No I plan to bang as many bitches as I can right now." He pauses for a second and gives you a smirk. "Why was you hoping I was single and looking?"'
 		act 'Maybe':
@@ -423,7 +423,7 @@ if $ARGS[0] = 'chat':
 			minut += 5
 			gs 'npc_relationship', 'modify', 'A154', 'like'
 			'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 			if hotcat >= 6:
 				'You feel put on the spot since that''s not what you meant. Or maybe subconsciously you did mean it, which is why you asked. Either way, a part of you would really like to be Radomir''s girlfriend. "I guess... maybe. I have been thinking about it a little..."'
 				'He looks all smug. "Well who could blame you, I am the complete package after all. But sorry I am flying solo for now." Then he gets up and covers over to sit next to you on the bed.'
@@ -440,7 +440,7 @@ if $ARGS[0] = 'chat':
 			*clr & cla
 			minut += 5
 			'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 			'You shake your head because this conversation really went off the rails and is not at all what you meant. "No, I was just curious is all."'
 			'"Sure sure..." He gives you a wink like you are just saying that and really was hoping. You decide it is best to just change the topic.'
 			act 'Stop talking': gt 'radapt', 'radroom'
@@ -455,7 +455,7 @@ if $ARGS[0] = 'chat':
 			*clr & cla
 			minut += 5
 			'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 			if radomirQW['nush3some'] = 0:
 				'You glance over at him. "Do you think Nush would be up for a threesome?."'
 				'Radomir laughs. "Do you even have to ask? That girl loves to fuck. I will ask her next time I see her, but I am sure she would down for it."'
@@ -471,7 +471,7 @@ end
 
 if $ARGS[0] = 'boyfriend_chat':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 	'"I have a boyfriend you know," you tell him.'
 	'He laughs. "So? Who are you dating again?"'
 	if NikoVolkovQW >= 5:
@@ -560,7 +560,7 @@ end
 
 if $ARGS[0] = 'tell_about_generic_boyfreind':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 	'"I have a boyfriend you know," you tell him.'
 	'"Right. Who are you dating again?" He asks.'
 	'"<<$ARGS[1]>>," you tell him.'
@@ -577,7 +577,7 @@ if $ARGS[0] = 'telling_marrige_dreams':
 	*clr & cla
 	minut += 5
 	'<center><h4><font color="maroon">Radomir''s Room</font></h4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rads_chat1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/rads_room/rad_chat1.jpg"></center>'
 	'You sigh in a way only those in love can sigh. "Hopefully <<$ARGS[1]>> and I can get married soon."'
 	'He rolls his eyes. "So predictable."'
 	'You briefly discuss why and as he points out that is what society expects of people. You meet someone fall in love get married have a family, but people should live a bit first. You''re not sure what more to say on the topic.'

locations/road.qsrc

@@ -314,7 +314,7 @@ if $ARGS[0] = 'drive_sex2':
 		nroad=0
 	end
 	'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
-	'<center><video autoplay loop src="images/locations/highway/sex/hj(1).mp4"></video></center>'
+	'<center><video autoplay loop src="images/locations/highway/sex/hj (1).mp4"></video></center>'
 	'When you get in the car, you immediately reach for his pants and take out his semi-erect cock. That''s what you promised him after all. You feel it slowly hardening between your fingers as the man drives off.'
 	if dick >= 14 and dick < 16: $road_text_sex = 'a normal size'
 	if dick >= 16 and dick < 18: $road_text_sex = 'a bit larger than average'

locations/salon.qsrc

@@ -123,7 +123,7 @@ if $ARGS[0] = 'services':
 
 	$epayments['method'] = ''
 	$epayments['item_variable'] = ''
-	epayments['quantity'] = ''
+	epayments['quantity'] = 0
 	$epayments['loc'] = 'salon'
 	$epayments['banner']  = 'locations/city/citycenter/mall/salon/xian.jpg'
 

locations/saveg.qsrc

@@ -16,6 +16,6 @@
 version_major = 0
 version_minor = 9
 version_revision = 3
-version_patch = 0
+version_patch = 1
 --- saveg ---------------------------------
 

locations/saveupdater.qsrc

@@ -3052,17 +3052,17 @@ if temp_current_save_version < 00090204:
 	if therapist_weekly_cheat	! 0 or $therapist_weekly_cheat	! '':		cheatVars['therapist_schedule']	= therapist_weekly_cheat	& killvar 'therapist_weekly_cheat'
 
 
-	if addictive_cheat	! 0 or $addictive_cheat		! '' or cheataddictive	! '':
+	if addictive_cheat	! 0 or $addictive_cheat		! '' or $cheataddictive	! '' or cheataddictive ! 0:
 		cheatVars['no_trait_addictive']	= addictive_cheat
 		killvar 'addictive_cheat'
 		killvar 'cheataddictive'
 	end
-	if cumeater_cheat	! 0 or $cumeater_cheat		! '' or cheatcumtrait	! '':
+	if cumeater_cheat	! 0 or $cumeater_cheat		! '' or $cheatcumtrait	! '' or cheatcumtrait	! 0:
 		cheatVars['no_trait_cumeater']	= cumeater_cheat
 		killvar 'cumeater_cheat'
 		killvar 'cheatcumtrait'
 	end
-	if exhib_cheat		! 0 or $exhib_cheat			! '' or cheatexhib		! '':
+	if exhib_cheat		! 0 or $exhib_cheat			! '' or $cheatexhib		! '' or cheatexhib		! 0:
 		cheatVars['no_trait_exhib']		= exhib_cheat
 		killvar 'exhib_cheat'
 		killvar 'cheatexhib'
@@ -3214,6 +3214,13 @@ if temp_current_save_version < 00090301:
 	if val($experimentQW['pill_pink_taken'])   > experimentQW['pill_pink_taken']   : experimentQW['pill_pink_taken']   = val($experimentQW['pill_pink_taken'])
 end
 
+!!------------------------------------!!Version 0.9.3.2!!-----------------------------------------------!!
+
+if temp_current_save_version < 00090302:
+!! use this for updates in 0.9.3.1
+
+end
+
 killvar 'temp_current_save_version'
 gs 'saveg'
 

locations/sex_ev_condoms.qsrc

@@ -219,7 +219,7 @@ end
 
 if $ARGS[0] = 'pc_condoms2':
 	if npc_no_condoms[$boy] > 0:
-		if npc_latex_allrg[$boy] = 1:
+		if npc_latex_allergy[$boy] = 1:
 			gs 'sex_ev_condoms', 'npc_latex_allergy'
 		else
 			sex_ev['npc_doesnt_want_condoms'] = 1
@@ -361,7 +361,7 @@ if $ARGS[0] = 'pc_condom_ask2':
 end
 
 if $ARGS[0] = 'pc_condom_ask3':
-	if npc_latex_allrg[$boy] = 1:
+	if npc_latex_allergy[$boy] = 1:
 		gs 'sex_ev_condoms', 'npc_latex_allergy'
 		gs 'sex_ev_condoms', 'no_condom1'
 	elseif rand(1,10) >= 7 and npc_bareback[$boy] ! 2:
@@ -890,7 +890,7 @@ end
 
 if $ARGS[0] = 'npc_doesnt_use_condoms':
 	!! boy says he doesn''t use condoms
-	if npc_latex_allrg[$boy] = 1:
+	if npc_latex_allergy[$boy] = 1:
 		gs 'sex_ev_condoms', 'npc_latex_allergy'
 	elseif npc_no_condoms_know[$boy] = 1:
 		if npc_selfish[$boy] = 1:
@@ -1111,7 +1111,7 @@ end
 
 if $ARGS[0] = 'no_condom1':
 	!! he says he doesn''t want to use a condom
-	if npc_latex_allrg[$boy] ! 1:
+	if npc_latex_allergy[$boy] ! 1:
 		act'No way':
 			cla & *clr
 			$sex_ev['bed_room']
@@ -1588,7 +1588,7 @@ if $ARGS[0] = 'reenable_condoms1_stop_bc':
 end
 
 if $ARGS[0] = 'reenable_condoms2':
-	if npc_latex_allrg[$boy] = 1:
+	if npc_latex_allergy[$boy] = 1:
 		if pc_know_npc_latex_allrg[$boy] = 1:
 			if npc_assertive[$boy] = 1:
 				'"Come on. You know I can''t do that because of my allergy," <<$npc_firstname[$boy]>> frowns.'

locations/spell.qsrc

@@ -161,9 +161,6 @@ if $ARGS[0] = 'teleport':
 
 	killvar '$randomLoc'
 	killvar '$NewLocation'
-
-	result = ""
-
 end
 
 if $ARGS[0] = 'regenerate':

locations/stat_display.qsrc

@@ -360,6 +360,22 @@ if hypnoAddict > 0:
 	end
 end
 
+if hypnoHair > 0 and (pcs_pubes > 3 or pcs_leghair > 3):
+	if $stat_hypno_msg ! '':
+		$stat_hypno_msg += '<br>'
+		$stat_hypno_tooltip += '<br>'
+	end
+
+	if pcs_pubes > 3 and pcs_leghair > 3:
+		$stat_hypno_msg += 'Your legs and pubic mound feel rough to the touch, lowering your mood.'
+	elseif pcs_pubes > 3:
+		$stat_hypno_msg += 'Your pubic mound feels rough to the touch, lowering your mood.'
+	else
+		$stat_hypno_msg += 'Your legs feel rough to the touch, lowering your mood.'
+	end
+	$stat_hypno_tooltip += 'You should shave.'
+end
+
 if hypnoSchedule = 1:
 	if therapist_weekly_block = 0 and week = 4 and therapistday ! daystart:
 		if $stat_hypno_msg ! '':

locations/street_event.qsrc

@@ -253,7 +253,7 @@ if $ARGS[1] = 'main':
 		gs 'exp_gain', 'prcptn', rand(1,2)
 		streetev_day = daystart
 		temp = rand(1,100) + pcs_observ
-		'<<$streetev_title>>'
+		$streetev_title
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/rapist.jpg"></center>'
 		if temp >= 100:
 			'You notice a hooded man standing in a darkened alleyway up ahead. Feeling he is up to no good you cross the street to the other side before you get to him. You see him look your direction before fading back into the darkness of the alleyway.'
@@ -320,7 +320,7 @@ if $ARGS[1] = 'main':
 			gs 'exp_gain', 'prcptn', rand(1,2)
 			gs 'stat'
 			temp = rand(1,100) + pcs_observ
-			'<<$streetev_title>>'
+			$streetev_title
 			'<center><img <<$set_imgh>> src="images/locations/shared/street/mugger.jpg"></center>'
 			if temp >= 100:
 				'You notice a hooded man standing in a darkened doorway up ahead. Feeling he is up to no good you cross the street to the other side before you get to him. You see him look your direction before fading back into the darkness of the doorway.'
@@ -401,7 +401,7 @@ if $ARGS[1] = 'main':
 			menu_off = 1
 			gs'stat'
 			streetev_day = daystart
-			'<<$streetev_title>>'
+			$streetev_title
 			'<center><img <<$set_imgh>> src="images/locations/shared/street/pursesnatch.jpg"></center>'
 			if rand(0,300) < (pcs_agil + pcs_stren):
 				'As you are walking down the street minding your own business, you are suddenly jerked sideways and nearly pulled off your feet. You quickly regain your balance, and instinctively, your fingers hold your purse tighter as you feel something tugging on it. A man is trying to snatch your purse, but he runs away when you don''t let go of it immediately.'
@@ -411,7 +411,7 @@ if $ARGS[1] = 'main':
 				act 'It''s only money and a bag':
 					dynamic $currentpursetype + '_purses[<<currentpursenumber>>] = 0'
 					$currentpursetype = ''
-					currentpursenumber = ''
+					currentpursenumber = 0
 					bag = 0
 					money = 0
 					gt $loc
@@ -421,18 +421,18 @@ if $ARGS[1] = 'main':
 					if (pcs_run + pcs_stam) < rand(120,250):
 						dynamic $currentpursetype + '_purses[<<currentpursenumber>>] = 0'
 						$currentpursetype = ''
-						currentpursenumber = ''
+						currentpursenumber = 0
 						bag = 0
 						money = 0
 						gs 'stat'
-						'<<$streetev_title>>'
+						$streetev_title
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/purselose.jpg"></center>'
 						'You chase after him, screaming at him to stop or for someone to stop him, but he quickly out paces you, and soon, you lose sight of him. After a couple of blocks of not seeing him anymore, you stop and lean against the wall to catch your breath.'
 						act 'Continue': gt $loc
 					else
 						gs 'npcgeneratec', 0, 'Purse Snatcher', rand(18,45)
 						gs 'boyStat', $npclastgenerated
-						'<<$streetev_title>>'
+						$streetev_title
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/pursechase.jpg"></center>'
 						'You chase after him, screaming at him to stop or for someone to stop him. All that working out is paying off, you are gaining on him. He keeps glancing back as you get closer, he turns and ducks down an alley when you are nearly on top of him. He leaps over an overturned trash can, obviously still hoping to get away from you. You easily leap over it as well, and a few steps later, you tackle him, sending both of you rolling on the ground. You both get back to your feet at the same time. Realising he can''t escape, he lunges at you.'
 						gs 'fight','initFight'
@@ -588,7 +588,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/guitarb'+ rand(1,2) +'.jpg"></center>'
 				'As you walk down the sidewalk, you notice a man playing a guitar. He has his guitar case open, and you can see some money in it already. Several other people have stopped to listen to him play. He isn''t half bad.'
 				act 'Ignore':gt $loc
@@ -623,7 +623,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/guitarg1.jpg"></center>'
 				'As you walk down the sidewalk, you notice a girl playing a guitar. She has her guitar case open, and you can see some money in it already. Several other people have stopped to listen to her play. She isn''t half bad.'
 				act 'Leave':gt $loc
@@ -632,7 +632,7 @@ if $ARGS[1] = 'main':
 					minut += 10
 					pcs_mood += 10
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/guitarg1.jpg"></center>'
 					'You stop and listen to her play several songs. She really is pretty good. You wonder why she is playing on the street. Perhaps the old adage about starving artists applies to musicians as well.'
 					act 'Leave':gt $loc
@@ -643,7 +643,7 @@ if $ARGS[1] = 'main':
 							money -= 50
 							pcs_mood += 10
 							gs 'stat'
-							'<<$streetev_title>>'
+							$streetev_title
 							'<center><img <<$set_imgh>> src="images/locations/shared/street/guitarg1.jpg"></center>'
 							'You reach into your purse and pull out some money. You drop it into her case. She looks up at you and smiles and nods her head, but keeps playing. With your good deed done you go on your way.'
 							act 'Leave':gt $loc
@@ -659,7 +659,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/violinb1.jpg"></center>'
 				'As you walk down the sidewalk, you notice a man playing a violin. He has his violin case open, and you can see some money in it already. Several other people have stopped to listen to him play. He isn''t half bad.'
 				act 'Leave':gt $loc
@@ -668,7 +668,7 @@ if $ARGS[1] = 'main':
 					minut += 10
 					pcs_mood += 10
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/violinb1.jpg"></center>'
 					'You stop and listen to him play several songs. He really is pretty good. You wonder why he is playing on the street. Perhaps the old adage about starving artists applies to musicians as well.'
 					act 'Leave':gt $loc
@@ -679,7 +679,7 @@ if $ARGS[1] = 'main':
 							money -= 50
 							pcs_mood += 10
 							gs 'stat'
-							'<<$streetev_title>>'
+							$streetev_title
 							'<center><img <<$set_imgh>> src="images/locations/shared/street/violinb1.jpg"></center>'
 							'You reach into your purse and pull out some money. You drop it into his case. He looks up at you and smiles and nods his head, but keeps playing. With your good deed done, you go on your way.'
 							act 'Leave':gt $loc
@@ -695,7 +695,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/violing1.jpg"></center>'
 				'As you walk down the sidewalk, you notice a girl playing a violin. She has her violin case open, and you can see some money in it already. Several other people have stopped to listen to her play. She isn''t half bad.'
 				act 'Leave':gt $loc
@@ -704,7 +704,7 @@ if $ARGS[1] = 'main':
 					minut += 10
 					pcs_mood += 10
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/violing1.jpg"></center>'
 					'You stop and listen to her play several songs. She really is pretty good. You wonder why she is playing on the street. Perhaps the old adage about starving artists applies to musicians as well.'
 					act 'Leave':gt $loc
@@ -715,7 +715,7 @@ if $ARGS[1] = 'main':
 							money -= 50
 							pcs_mood += 10
 							gs 'stat'
-							'<<$streetev_title>>'
+							$streetev_title
 							'<center><img <<$set_imgh>> src="images/locations/shared/street/violing1.jpg"></center>'
 							'You reach into your purse and pull out some money. You drop it into her case. She looks up at you and smiles and nods her head, but keeps playing. With your good deed done, you go on your way.'
 							act 'Leave':gt $loc
@@ -731,7 +731,7 @@ if $ARGS[1] = 'main':
 				*clr & cla
 				menu_off = 1
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/artist.jpg"></center>'
 				'As you walk down the street, you see a man sitting in a chair with a sign saying "Will draw portrait for 50 <b>₽</b>".'
 				act 'Leave':gt $loc
@@ -741,7 +741,7 @@ if $ARGS[1] = 'main':
 					money -= 50
 					pcs_mood += 10
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/artist.jpg"></center>'
 					'You stop next to her and smile. "I would like you to draw me please." She gives you a friendly smile in return, pointing towards the other chair. "Please take a seat," she says, following this with a glance to the can sitting next to the chair. You understand and pull out the money and put it in the can. You sit for a while as she draws your portrait. After some time, she is finished and shows it to you. It is really very good and might make a good gift to give someone. You thank her for it and go on your way.'
 					act 'Leave':gt $loc
@@ -754,13 +754,13 @@ if $ARGS[1] = 'main':
 			menu_off = 1
 			minut += 5
 			gs 'stat'
-			'<<$streetev_title>>'
+			$streetev_title
 			'<center><img <<$set_imgh>> src="images/locations/shared/street/assgrab.jpg"></center>'
 			'As you walk down the street, you feel a hand grab your ass and squeeze it hard. You jerk away and look over your shoulder, and you see a guy grinning at you.'
 			act 'Ignore':gt $loc
 			act 'Slap him':
 				*clr & cla
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/slapb.jpg"></center>'
 				'You turn around. and as you do, you swing your hand, palm open, and deliver a hard smack to his face. The pop is loud enough to draw attention, and the guy recoils from it rubbing his face, seemingly surprised you smacked him. "Don''t touch me asshole." With that, you turn and continue on your way.'
 				act 'Leave':gt $loc
@@ -771,7 +771,7 @@ if $ARGS[1] = 'main':
 			minut += 5
 			gs 'exp_gain', 'prcptn', rand(1,2)
 			gs 'stat'
-			'<<$streetev_title>>'
+			$streetev_title
 			'<center><img <<$set_imgh>> src="images/locations/shared/street/beatup.jpg"></center>'
 			'As you walk down the street, you pass a man that is badly beaten lying unconscious on the sidewalk. You stop a moment, unsure what to do, but everyone else just ignores him.'
 			act 'Ignore him':
@@ -785,7 +785,7 @@ if $ARGS[1] = 'main':
 				minut += 20
 				mood += 20
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/police/patrol.jpg"></center>'
 				'You call the police and are told to wait for the officers, it takes some time before the do. When a car finally pulls the officers get out and ask you a few questions then tell you to be on your way. You look back and they call in and start talking to the man, you continue on your way finally.'
 				act 'Continue':gt $loc
@@ -798,7 +798,7 @@ if $ARGS[1] = 'main':
 			!!all the getting partially stripped ones from 09:00 till 24:00
 					*clr & cla
 					minut += 5
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><video autoplay loop src="images/locations/shared/street/bottomed1.mp4"></video></center>'
 					'As you walk down the street, you are suddenly pushed forward hard. You nearly lose your balance and only barely catch yourself. While you are half bent over and trying to recover, you feel someone yank up your dress and yank down your panties, exposing your ass and pussy for everyone to see. You quickly regain your balance. As you do, you pull up your panties and smooth your dress back in place. By that time, whoever did this is long gone.'
 					*p 'You look around and notice several people staring at you. You are sure they''ve seen everything. '
@@ -820,7 +820,7 @@ if $ARGS[1] = 'main':
 				elseif PCloSkirt > 0 and $pantyworntype = 'none' and PCloOnePiece = 1:
 					*clr & cla
 					minut += 5
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><video autoplay loop src="images/locations/shared/street/sharkdress'+ rand(1,2) +'.mp4"></video></center>'
 					'As you walk down the street, someone comes up behind you, grabs the top of your dress and yanks it down around your ankles, which leaves you standing stark naked. You quickly squat down and grab your dress, pulling it back up and into place. By that time, who ever did this is long gone.'
 					*p 'You look around and notice several people staring at you. You are sure they''ve seen everything. '
@@ -841,7 +841,7 @@ if $ARGS[1] = 'main':
 				elseif PCloSkirt > 0 and $pantyworntype ! 'none':
 					*clr & cla
 					minut += 5
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><video autoplay loop src="images/locations/shared/street/bottomeds'+ rand(1,2) +'.mp4"></video></center>'
 					'As you walk down the street, someone comes up behind you and grabs your skirt and panties, yanking them down. Your skirt ends up around your ankles and your panties halfway down your thighs, which leaves your ass and pussy on fully display to everyone around. You quickly pull up your panties and then squat down and grab your skirt, pulling it back up and into place. By that time, whoever did this is long gone.'
 					*p 'You look around and notice several people staring at you. You are sure they''ve seen everything. '
@@ -863,7 +863,7 @@ if $ARGS[1] = 'main':
 				else
 					*clr & cla
 					minut += 5
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><video autoplay loop src="images/locations/shared/street/topped'+ rand(1,2) +'.mp4"></video></center>'
 					'As you walk down the street, someone comes up behind you and grabs your top, yanking it down, which leaves your tits on full display to everyone around. You quickly pull your top back up. By that time, whoever did this is long gone.'
 					*p 'You look around and notice several people staring at you. You are sure they''ve seen everything. '
@@ -892,7 +892,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><video autoplay loop src="images/locations/shared/street/breeze.mp4"></video></center>'
 				'As you walk down the street, a strong breeze suddenly blows down it, which causes your skirt to blow up, exposing your panty-clad ass to everyone on the street. You quickly push it back down, but as soon as you let go, the breeze blows it right back up. You fight against the breeze for almost a minute before it finally stops.'
 				if exhibitionist_lvl = 1:
@@ -915,7 +915,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><video autoplay loop src="images/locations/shared/street/breeze_rainy.mp4"></video></center>'
 				'A strong windy breeze blows down the street which causes your skirt to blow up entirely, exposing all of your crotch to the people around. You struggle pushing it back down where it belongs, as the breeze continues to expose you.'
 				if exhibitionist_lvl = 1:
@@ -941,7 +941,7 @@ if $ARGS[1] = 'main':
 				*clr & cla
 				menu_off = 1
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/street_groped'+ rand(1,2) +'.jpg"></center>'
 				'As you walk down the street, someone comes up behind you and grabs your ass, sqeezing it tightly. You flinch while quickly turning around angrily but only seeing your perpetrator running away.'
 				if exhibitionist_lvl = 1:
@@ -967,7 +967,7 @@ if $ARGS[1] = 'main':
 				*clr & cla
 				menu_off = 1
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><video autoplay loop src="images/locations/shared/street/couple1.mp4"></video></center>'
 				'As you walk down the street, you see a couple making out passionately. The guy reaches around and starts squeezing the girls ass. You can''t help but watch them as you walk by, feeling your own arousal growing.'
 				gs 'arousal', 'voyeur', 5
@@ -983,7 +983,7 @@ if $ARGS[1] = 'main':
 				*clr & cla
 				menu_off = 1
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><video autoplay loop src="images/locations/shared/street/street_no_bra1.mp4"></video></center>'
 				'As you walk down the street you feel your breasts wobbling freely under your outfit, which can probably be seen by people walking by too.'
 				if exhibitionist_lvl = 1:
@@ -1004,7 +1004,7 @@ if $ARGS[1] = 'main':
 				*clr & cla
 				menu_off = 1
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><video autoplay loop src="images/locations/shared/street/street_no_bra'+ rand(2,4) +'.mp4"></video></center>'
 				'As you walk down the street you feel your breasts wobbling freely under your thin outfit, stretching it, emphasizing the outline of your tits, which can definitely be seen by people walking by too. As you look closely both men and women are staring at your jiggling tits.'
 				if exhibitionist_lvl = 1:
@@ -1030,7 +1030,7 @@ if $ARGS[1] = 'main':
 				*clr & cla
 				menu_off = 1
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/lesbians.jpg"></center>'
 				'As you walk down the street, you see a couple of girls making out passionately. You can''t help but watch them as you walk by, feeling your own arousal growing.'
 				gs 'arousal', 'voyeur', 5
@@ -1048,7 +1048,7 @@ if $ARGS[1] = 'main':
 				pcs_horny += 5
 				gs 'exp_gain', 'prcptn', rand(1,2)
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/lostkey.jpg"></center>'
 				'As you pass by an alleyway, you glance down and see a woman wearing a very nice dress with nice high heels trying to jimmy a window. A few moments later, she slides the window open and then crawls through, giving a nice view of her ass as she does. Once inside, she quickly shuts the window. As you continue on, you wonder if maybe she lost her keys. Or maybe she was just a very well dressed burglar.'
 				act 'Continue':gt $loc
@@ -1060,7 +1060,7 @@ if $ARGS[1] = 'main':
 			menu_off = 1
 			minut += 5
 			gs 'stat'
-			'<<$streetev_title>>'
+			$streetev_title
 			'<center><img <<$set_imgh>> src="images/locations/shared/street/fightb.jpg"></center>'
 			'As you walk down the street, two guys just ahead of you start pushing each other. Seconds later, they are throwing punches. The fight escalates quickly.'
 			act 'Ignore it':gt $loc
@@ -1068,7 +1068,7 @@ if $ARGS[1] = 'main':
 				*clr & cla
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/fightb.jpg"></center>'
 				'You love a good fight, so you like many others stop and watch them duke it out. It goes on for a while as they trade blows. One of them finally gets the upper hand and gets the other one down and starts beating him. He doesn''t stop until one of his friends pulls him off. With the fight over, everyone leaves. You can hear police sirens and decide it is time to leave yourself.'
 				act 'Leave':gt $loc
@@ -1078,7 +1078,7 @@ if $ARGS[1] = 'main':
 			menu_off = 1
 			minut += 5
 			gs 'stat'
-			'<<$streetev_title>>'
+			$streetev_title
 			if $loc = 'pav_commercial' or $loc = 'pav_residential':
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/town/fightg1.jpg"></center>'
 			else
@@ -1089,7 +1089,7 @@ if $ARGS[1] = 'main':
 			act 'Stop and watch':
 				*clr & cla
 				minut += 5
-				'<<$streetev_title>>'
+				$streetev_title
 				if $loc = 'pav_commercial' or $loc = 'pav_residential':
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/town/fightg1.jpg"></center>'
 				else
@@ -1110,7 +1110,7 @@ if $ARGS[1] = 'main':
 				*clr & cla
 				menu_off = 1
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				if month >= 11 or month <= 3:
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/girlflashw'+ rand(1,2) +'.jpg"></center>'
 				else
@@ -1123,7 +1123,7 @@ if $ARGS[1] = 'main':
 					act 'Flash her back':
 						*clr & cla
 						gs 'flash', 'tits', 'outdoors', 1, 1
-						'<<$streetev_title>>'
+						$streetev_title
 						if PCloSkirt > 0:
 							'<center><img <<$set_imgh>> src="images/pc/activities/flashing/dress/outside/tits/' + rand(1,12) + '.jpg"></center>'
 							'You grin at her as she flashes you, and you lift your shirt, flashing your tits back at her, which makes her laugh.'
@@ -1144,7 +1144,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/girls1.jpg"></center>'
 				if hotcat > 6:
 					pcs_mood += 20
@@ -1167,13 +1167,13 @@ if $ARGS[1] = 'main':
 					act 'Ignore them':gt $loc
 					act 'Tell them off':
 						*clr & cla
-						'<<$streetev_title>>'
+						$streetev_title
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/girls1.jpg"></center>'
 						'You spin around to face them. "Just what''s your problem bitches?" One of the girls steps up to you. "You best back yourself up bitch before I smack the shit out of you."'
 						act 'Hurry away in shame':gt $loc
 						act 'Bring it Bitch!':
 							*clr & cla
-							'<<$streetev_title>>'
+							$streetev_title
 							$boydesc = 'The group of girls'
 							'<center><img <<$set_imgh>> src="images/locations/shared/street/girlgang.jpg"></center>'
 							'You give her a small shove to force her to step back. "Bring it on then, bitch." The words barely leave your mouth before she jumps you. Soon all of her friends join in, leaving you to fight them all.'
@@ -1195,7 +1195,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/flyerman.jpg"></center>'
 				'As you walk down the street, you run across a man handing out flyers. As you get near him, he waves you over, "Hello there young lady, would you like to earn a little extra money? All you have to do is take some of these flyers and hand them out for half an hour, and I will pay you 75 <b>₽</b>. What do you say?"'
 				act 'No thanks':gt $loc
@@ -1205,7 +1205,7 @@ if $ARGS[1] = 'main':
 					money += 75
 					pcs_mood -= 5
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					if month >= 11 or month <= 3:
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/flyerw.jpg"></center>'
 					else
@@ -1218,7 +1218,7 @@ if $ARGS[1] = 'main':
 						money += 75
 						pcs_mood -= 5
 						gs 'stat'
-						'<<$streetev_title>>'
+						$streetev_title
 						if month >= 11 or month <= 3:
 							'<center><img <<$set_imgh>> src="images/locations/shared/street/flyerw.jpg"></center>'
 						else
@@ -1237,7 +1237,7 @@ if $ARGS[1] = 'main':
 			menu_off = 1
 			minut += 5
 			gs 'stat'
-			'<<$streetev_title>>'
+			$streetev_title
 			'<center><img <<$set_imgh>> src="images/locations/shared/street/homelessg.jpg"></center>'
 			'As you walk down the street, you pass a girl sitting on a barrel just inside of an alleyway, holding up a sign saying that she is homeless, pleading for help.'
 			act 'Ignore her':gt $loc
@@ -1247,7 +1247,7 @@ if $ARGS[1] = 'main':
 					money -= 50
 					pcs_mood += 10
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/homelessg.jpg"></center>'
 					'You open your purse up and pull out the money you can spare and hand it to her. She thanks you profusely and gives you a heart warming smile.'
 					act 'Leave':gt $loc
@@ -1259,7 +1259,7 @@ if $ARGS[1] = 'main':
 					money -= 100
 					pcs_mood += 20
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/homelessg.jpg"></center>'
 					'You open your purse up and pull out the money you can spare and hand it to her. She thanks you profusely and gives you a heart warming smile.'
 					act 'Leave':gt $loc
@@ -1271,7 +1271,7 @@ if $ARGS[1] = 'main':
 					money -= 250
 					pcs_mood += 30
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/homelessg.jpg"></center>'
 					'You open your purse up and pull out the money you can spare and hand it to her. She thanks you profusely and gives you a heart warming smile.'
 					act 'Leave':gt $loc
@@ -1283,7 +1283,7 @@ if $ARGS[1] = 'main':
 					money -= 500
 					pcs_mood += 40
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/homelessg.jpg"></center>'
 					'You open your purse up and pull out the money you can spare and hand it to her. She thanks you profusely and gives you a heart warming smile.'
 					act 'Leave':gt $loc
@@ -1293,7 +1293,7 @@ if $ARGS[1] = 'main':
 				act 'Give her 1000 <b>₽</b>':
 					*clr & cla
 					money -= 1000
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/homelessg.jpg"></center>'
 					pcs_mood += 50
 					'You open your purse up and pull out the money you can spare and hand it to her. She thanks you profusely and gives you a heart warming smile.'
@@ -1306,7 +1306,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				if month >= 11 or month <= 3:
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/nakedgw1.jpg"></center>'
 				else
@@ -1326,7 +1326,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/nakedgmbike.jpg"></center>'
 				'As you walk down the street, a motorcycle drives by slowly. Several people are taking pictures. The man driving waves at them, while behind him sits a naked girl only wearing a motorcycle helmet. A few moments later, the traffic clears up a bit and they zoom off.'
 				gs 'arousal', 'erotic_nudity', 5
@@ -1341,7 +1341,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/nopanties.jpg"></center>'
 				'As you walk down the street, you pass a young girl sitting on the sidewalk with some friends next to her. You throw a glance at her and surprisingly see her spread her legs revealing her bare pussy to you, all while smiling.'
 				gs 'arousal', 'erotic_nudity', 5
@@ -1356,7 +1356,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/splitsread.jpg"></center>'
 				'As you walk down the street, you pass a young girl reading a magazine. All of a sudden she lifts her foot, doing a standing split. You look at her in confusement, wondering why she''s behaving oddly. As you''re about to step up to her, it''s like she wakes up from a daze. She blushes and quickly runs away from you.'
 				act 'Leave':gt $loc
@@ -1369,12 +1369,12 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/teens.jpg"></center>'
 				'As you walk down the street, you pass a group of teens. Just as you are about to pass them, one of the boys calls out. "Hey! Want a beer?" he says as he offers you one.'
 				act 'Decline':
 					*clr & cla
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/teens.jpg"></center>'
 					'You shake your head no and mumble thanks but no thanks and continue on your way.'
 					act 'Leave':gt $loc
@@ -1384,7 +1384,7 @@ if $ARGS[1] = 'main':
 					minut += 30
 					gs 'drugs', 'alcohol', 'beer'
 					gs'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/teens.jpg"></center>'
 					'You stop a moment and consider it then walk over and take the offered beer. You sit and talk with them for a while and drink the beer. After a bit, you decide you should be on your way. You thank them for the beer and say goodbye as you head out.'
 					act 'Leave':gt $loc
@@ -1399,7 +1399,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 				'As you walk down the street, you pass a young girl sitting on the sidewalk with some bags next to her, a cat in her lap and a sign saying that she is homeless, pleading for help.'
 				act 'Ignore her':gt $loc
@@ -1409,7 +1409,7 @@ if $ARGS[1] = 'main':
 						money -= 50
 						pcs_mood += 20
 						gs 'stat'
-						'<<$streetev_title>>'
+						$streetev_title
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 						'You open your purse up and pull out the money you can spare and hand it to her. She thanks you profusely and gives you a heartwarming smile as she hugs her cat close to her and whispers to him that they will get to eat tonight.'
 						act 'Leave':gt $loc
@@ -1419,7 +1419,7 @@ if $ARGS[1] = 'main':
 								money -= 5000
 								pcs_mood += 50
 								gs 'stat'
-								'<<$streetev_title>>'
+								$streetev_title
 								'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 								'You open your purse up and pull out the money you can spare and hand it to her. She breaks down and cries when she sees how much money you gave her. She gets up and hugs you tightly with one arm while holding her cat with the other, thanking you over and over. She smells like she hasn''t bathed for a while, but you don''t mind. She finally lets go of you, and as you walk away, she hugs her cat, and you hear her tell him that tonight they will sleep indoors and eat.'
 								act 'Leave':gt $loc
@@ -1433,7 +1433,7 @@ if $ARGS[1] = 'main':
 						money -= 100
 						pcs_mood += 30
 						gs 'stat'
-						'<<$streetev_title>>'
+						$streetev_title
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 						'You open your purse up and pull out the money you can spare and hand it to her. She thanks you profusely and gives you a heartwarming smile as she hugs her cat close to her and whispers to him that they will get to eat tonight.'
 						act 'Leave':gt $loc
@@ -1443,7 +1443,7 @@ if $ARGS[1] = 'main':
 								money -= 5000
 								pcs_mood += 50
 								gs 'stat'
-								'<<$streetev_title>>'
+								$streetev_title
 								'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 								'You open your purse up and pull out the money you can spare and hand it to her. She breaks down and cries when she sees how much money you gave her. She gets up and hugs you tightly with one arm while holding her cat with the other, thanking you over and over. She smells like she hasn''t bathed for a while, but you don''t mind. She finally lets go of you, and as you walk away, she hugs her cat, and you hear her tell him that tonight they will sleep indoors and eat.'
 								act 'Leave':gt $loc
@@ -1457,14 +1457,14 @@ if $ARGS[1] = 'main':
 						money -= 250
 						pcs_mood += 40
 						gs 'stat'
-						'<<$streetev_title>>'
+						$streetev_title
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 						'You open your purse up and pull out the money you can spare and hand it to her. She thanks you profusely and gives you a heartwarming smile as she hugs her cat close to her and whispers to him that they will get to eat tonight.'
 						act 'Leave':gt $loc
 						if money >= 5000:
 							act 'Give her another 5000 <b>₽</b>':
 								*clr & cla
-								'<<$streetev_title>>'
+								$streetev_title
 								'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 								money -= 5000
 								pcs_mood += 50
@@ -1481,7 +1481,7 @@ if $ARGS[1] = 'main':
 						money -= 500
 						pcs_mood += 50
 						gs 'stat'
-						'<<$streetev_title>>'
+						$streetev_title
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 						'You open your purse up and pull out the money you can spare and hand it to her. She thanks you profusely and gives you a heartwarming smile as she hugs her cat close to her and whispers to him that they will get to eat tonight.'
 						act 'Leave':gt $loc
@@ -1491,7 +1491,7 @@ if $ARGS[1] = 'main':
 								money -= 5000
 								pcs_mood += 50
 								gs 'stat'
-								'<<$streetev_title>>'
+								$streetev_title
 								'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 								'You open your purse up and pull out the money you can spare and hand it to her. She breaks down and cries when she sees how much money you gave her. She gets up and hugs you tightly with one arm while holding her cat with the other, thanking you over and over. She smells like she hasn''t bathed for a while, but you don''t mind. She finally lets go of you, and as you walk away, she hugs her cat, and you hear her tell him that tonight they will sleep indoors and eat.'
 								act 'Leave':gt $loc
@@ -1505,7 +1505,7 @@ if $ARGS[1] = 'main':
 						money -= 1000
 						pcs_mood += 50
 						gs 'stat'
-						'<<$streetev_title>>'
+						$streetev_title
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 						'You open your purse up and pull out the money you can spare and hand it to her. She thanks you profusely and gives you a heartwarming smile as she hugs her cat close to her and whispers to him that they will get to eat tonight.'
 						act 'Leave':gt $loc
@@ -1515,7 +1515,7 @@ if $ARGS[1] = 'main':
 								money -= 5000
 								pcs_mood += 50
 								gs 'stat'
-								'<<$streetev_title>>'
+								$streetev_title
 								'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 								'You open your purse up and pull out the money you can spare and hand it to her. She breaks down and cries when she sees how much money you gave her. She gets up and hugs you tightly with one arm while holding her cat with the other, thanking you over and over. She smells like she hasn''t bathed for a while, but you don''t mind. She finally lets go of you, and as you walk away, she hugs her cat, and you hear her tell him that tonight they will sleep indoors and eat.'
 								act 'Leave':gt $loc
@@ -1529,7 +1529,7 @@ if $ARGS[1] = 'main':
 					menu_off = 1
 					minut += 5
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/city/homeless.jpg"></center>'
 					'As you walk down the street, you pass a couple of homeless men lying on a metro gate, using it for warmth in the freezing conditions.'
 					act 'Ignore them':gt $loc
@@ -1542,7 +1542,7 @@ if $ARGS[1] = 'main':
 					menu_off = 1
 					minut += 5
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/city/gay.jpg"></center>'
 					'As you walk down the street, you pass a couple of boys holding hands and occasionally kissing. Soon a few other guys come over and start harassing them, calling them all sorts of names.'
 					act 'Leave':gt $loc
@@ -1555,7 +1555,7 @@ if $ARGS[1] = 'main':
 					menu_off = 1
 					minut += 5
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/city/sell.jpg"></center>'
 					'As you walk down the street, you pass an old couple all bundled up against the cold. They have several jars and other homemade food items, along with a couple of household items and jewelry they are trying to sell.'
 					act 'Leave':gt $loc
@@ -1573,7 +1573,7 @@ if $ARGS[1] = 'main':
 					menu_off = 1
 					minut += 5
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/town/hookers.jpg"></center>'
 					'As you walk down the street, you see a couple of half-naked women standing on a corner. They approach cars that slow down or men that walk by. It is clear they are prostitutes trying to find customers.'
 					act 'Leave':gt $loc
@@ -1586,13 +1586,13 @@ if $ARGS[1] = 'main':
 					menu_off = 1
 					minut += 5
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/town/nakedmarket.jpg"></center>'
 					'As you walk down the street, you pass a young girl standing in front of a table covered in various items in front of a house. Despite the cold, she is completely naked other than her boots and hat. She is calling for people to come over and take a look at the items for sale. You must admit her technique seems to be working. She and her items are getting a lot of attention.'
 					act 'Ignore her':gt $loc
 					act 'Browse her wares':
 						*clr & cla
-						'<<$streetev_title>>'
+						$streetev_title
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/town/nakedmarket.jpg"></center>'
 						'You walk over and look over several of the items she has for sale.'
 
@@ -1655,13 +1655,13 @@ if $ARGS[1] = 'main':
 					menu_off = 1
 					minut += 5
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/town/yardsale.jpg"></center>'
 					'As you walk down the street, you pass several tables full of various items. It seems several people have got together and set up an impromptu market here.'
 					act 'Ignore it':gt $loc
 					act 'Browse the wares':
 						*clr & cla
-						'<<$streetev_title>>'
+						$streetev_title
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/town/nakedmarket.jpg"></center>'
 						'You walk over and look over several of the items they have for sale.'
 
@@ -1724,7 +1724,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/oldladies.jpg"></center>'
 				'As you walk by a group of old women sitting on a bench next to one of the buildings, you overhear them talking loudly in your direction. "Look at that whore! She is walking around in a short skirt and no panties, everyone can see her ass!" Another one responds to the first. "She should be ashamed of herself, even whores have more decency than her."'
 				if $loc ! 'pav_residential' and $loc ! 'pav_commercial':

locations/talent_agency.qsrc

@@ -80,71 +80,76 @@ end
 if $ARGS[0] = 'hallway':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/hallway.jpg"></center>'
-	act 'Leave':gt 'talent_agency','start'
-	act 'Room 1':gt 'talent_agency','room1'
-	act 'Room 2':gt 'talent_agency','room2'
-	act 'Room 3':gt 'talent_agency','room3'
-	act 'Room 4':gt 'talent_agency','room4'
-	act 'Room 5':gt 'talent_agency','room5'
-	act 'General Audition Room':gt 'talent_agency','room6'
-
+	act 'Leave': gt 'talent_agency', 'start'
+	act 'Room 1': gt 'talent_agency', 'room1'
+	act 'Room 2': gt 'talent_agency', 'room2'
+	act 'Room 3': gt 'talent_agency', 'room3'
+	act 'Room 4': gt 'talent_agency', 'room4'
+	act 'Room 5': gt 'talent_agency', 'room5'
+	act 'General Audition Room': gt 'talent_agency', 'room6'
 end
 
 if $ARGS[0] = 'room1':
-	*clr & cla
-	if audition['room'] ! 1 or audition['day'] ! daystart: 
+	if audition['room'] ! 1 or audition['day'] ! daystart:
 		gt 'talent_agency', 'wrong_room'
 	else
-		gt 'auditions', 'setup'
+		!gt 'auditions', 'setup'
+		'Woops, this content doesn''t exist yet!'
+		act 'Step out': gt 'talent_agency', 'hallway'
 	end
 end
 
 if $ARGS[0] = 'room2':
-	*clr & cla
 	if audition['room'] ! 2 or audition['day'] ! daystart:
 		gt 'talent_agency', 'wrong_room'
 	else
-		gt 'auditions', 'setup'
+		!gt 'auditions', 'setup'
+		'Woops, this content doesn''t exist yet!'
+		act 'Step out': gt 'talent_agency', 'hallway'
 	end
 end
 
 if $ARGS[0] = 'room3':
-	*clr & cla
-	if casting = 3: 
+	if casting = 3:
 		gt 'talent_agency', 'SMTV_intro'
 	elseif audition['room'] ! 3 or audition['day'] ! daystart:
 		gt 'talent_agency', 'wrong_room'
 	else
-		gt 'auditions', 'setup'
+		!gt 'auditions', 'setup'
+		'Woops, this content doesn''t exist yet!'
+		act 'Step out': gt 'talent_agency', 'hallway'
 	end
 end
 
 if $ARGS[0] = 'room4':
-	*clr & cla
 	if audition['room'] ! 4 or audition['day'] ! daystart:
 		gt 'talent_agency', 'wrong_room'
 	else
-		gt 'auditions', 'setup'
+		!gt 'auditions', 'setup'
+		'Woops, this content doesn''t exist yet!'
+		act 'Step out': gt 'talent_agency', 'hallway'
 	end
 end
 
 if $ARGS[0] = 'room5':
-	*clr & cla
 	if audition['room'] ! 5 or audition['day'] ! daystart:
 		gt 'talent_agency', 'wrong_room'
 	else
-		gt 'auditions', 'setup'
+		!gt 'auditions', 'setup'
+		'Woops, this content doesn''t exist yet!'
+		act 'Step out': gt 'talent_agency', 'hallway'
 	end
 end
 
 if $ARGS[0] = 'room6':
-	*clr & cla
 	if audition['room'] > 0 and audition['room'] =< 5:
 		gt 'talent_agency', 'wrong_room2'
 	elseif $audition['role'] = '' and audition['day'] ! daystart:
 		gt 'talent_agency', 'wrongday'
 	else
-		gt 'auditions', 'setup'
+		!gt 'auditions', 'setup'
+		'Woops, this content doesn''t exist yet!'
+		act 'Step out': gt 'talent_agency', 'hallway'
 	end
 end
 
@@ -202,7 +207,7 @@ if $ARGS[0] = 'SMTV_intro':
 			end
 		else
 			act '"Wait, what?" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 
 		act '"Okay"':gt 'talent_agency', iif(pcs_inhib < 50, 'SMTV_shy', 'SMTV_confident')
 	end

locations/themes.qsrc

@@ -242,7 +242,7 @@ elseif $ARGS[0] = 'set_custom':
 	gs 'themes', 'check_custom_vars'
 	$theme['name'] = 'Custom'
 	$theme['type'] = $custom_theme['type']
-	theme['is_dark'] = val($custom_theme['is_dark'])
+	theme['is_dark'] = custom_theme['is_dark']
 
 	theme['bcolor'] = custom_theme['bcolor']
 	theme['fcolor'] = custom_theme['fcolor']
@@ -264,7 +264,7 @@ end
 
 if $ARGS[0] = 'check_custom_vars':
 	if $custom_theme['type'] = '': $custom_theme['type'] = 'static'
-	if $custom_theme['is_dark'] = '': $custom_theme['is_dark'] = str(1)
+	if custom_theme['is_dark'] ! theme['is_dark']: custom_theme['is_dark'] = theme['is_dark']
 
 	if custom_theme['bcolor'] = 0: custom_theme['bcolor'] = rgb(20, 20, 20)
 	if custom_theme['fcolor'] = 0: custom_theme['fcolor'] = rgb(255, 255, 255)
@@ -273,8 +273,8 @@ if $ARGS[0] = 'check_custom_vars':
 	if custom_theme['fsize'] = 0: custom_theme['fsize'] = 12
 	if $custom_theme['fname'] = '': $custom_theme['fname'] = 'Tahoma'
 
-	if custom_theme['table_bg'] = '': custom_theme['table_bg'] = rgb(32, 32, 32)
-	if custom_theme['table_bg_alt'] = '': custom_theme['table_bg_alt'] = rgb(48, 48, 48)
+	if custom_theme['table_bg'] = 0: custom_theme['table_bg'] = rgb(32, 32, 32)
+	if custom_theme['table_bg_alt'] = 0: custom_theme['table_bg_alt'] = rgb(48, 48, 48)
 end
 
 if $ARGS[0] = 'default_palette':

locations/therapist.qsrc

@@ -100,9 +100,9 @@ if $ARGS[0] = 'start':
 	'Stepping into the office of <a href="exec:dynamic $pavlov">Dr. Pavlov</a>, you are welcomed with a warm smile.'
 
 	*nl
-	
+
 	'When you look around the room, you are greeted by a warm and inviting atmosphere. The room is illuminated by large windows that overlook the forest beyond. At one end of the room there is a desk with a chair stacked with folders and books pertaining to hypnotherapy and other therapy materials. This includes a laptop that is closed and appears clean, as if it has been seldom used. You see an older <a href="exec: VIEW ''images/locations/pavlovsk/clinic/therapist/pavlovfamily.jpg''">photograph of Dr. Pavlov''s family</a> in which he appears to be about two decades younger.'
-	
+
 	gs 'stat'
 
 	if therapist_weekly_block = 0 or cheatVars['therapist_schedule'] > 0:
@@ -642,7 +642,7 @@ if $ARGS[0] = 'hypno':
 					*clr
 					if sound = 0: PLAY 'sound/rainstorm.mp3', 20 & PLAY 'sound/clock.mp3', 40
 
-					if PCloStyle2 = 4: 
+					if PCloStyle2 = 4:
 						'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/stripping<<rand(5,6)>>.mp4"></video></center>'
 
 					else
@@ -850,7 +850,7 @@ if $ARGS[0] = 'firstHypnoStage':
 		*clr & cla
 		hypnoStripped = 1
 		hypnoTimesResistedStage = 0
-		if PCloStyle2 = 4: 
+		if PCloStyle2 = 4:
 			'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/stripping<<rand(5,6)>>.mp4"></video></center>'
 
 		else
@@ -1054,7 +1054,7 @@ if $ARGS[0] = 'secondHypnoStage':
 	act 'Strip naked':
 		*clr & cla
 		hypnoStripped = 1
-		if PCloStyle2 = 4: 
+		if PCloStyle2 = 4:
 			'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/stripping<<rand(5,6)>>.mp4"></video></center>'
 
 		else
@@ -1132,7 +1132,7 @@ if $ARGS[0] = 'thirdHypnoStage':
 	act '"Yes, <i>Master</i>."':
 		*clr & cla
 		hypnoStripped = 1
-		if PCloStyle2 = 4: 
+		if PCloStyle2 = 4:
 			'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/stripping<<rand(5,6)>>.mp4"></video></center>'
 
 		else
@@ -1222,8 +1222,8 @@ if $ARGS[0] = 'sleepProblems':
 		var1 = 10 - (willpowermax/20)
 		if     var1 <= 1:
 			var1 = 2
-		
-		elseif var1 >= 9: 
+
+		elseif var1 >= 9:
 			var1 = 9
 		end
 
@@ -1236,15 +1236,15 @@ if $ARGS[0] = 'sleepProblems':
 		end
 		willpowermax -= rand(4,8)
 
-		
+
 		'<font color="<<$hypnocolour>>">'
 		'"<i>Cunt</i>, what do you know about the black room?</font>"<br>"I know that everything that happens here I will not remember, <i>Master</i>."'
-		
+
 		'<font color="<<$hypnocolour>>">'
 		'"Good. Now take off your clothes."'
 		'</font>'
 		gs 'stat'
-		
+
 		act 'Take off your clothes':
 			minut += 5
 			*clr & cla
@@ -1252,7 +1252,7 @@ if $ARGS[0] = 'sleepProblems':
 			cumprecheck = 0
 			dick = 13
 			$dick_girth = 'massive'
-			if PCloStyle2 = 4: 
+			if PCloStyle2 = 4:
 				'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/stripping<<rand(5,6)>>.mp4"></video></center>'
 
 			else
@@ -1262,7 +1262,7 @@ if $ARGS[0] = 'sleepProblems':
 			'<font color="<<$hypnocolour>>">'
 			'You get up from the couch and start to take off all of your clothing.'
 			'Sit down, <i>Cunt</i>.'
-			
+
 			act 'Sit down':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
@@ -1305,7 +1305,7 @@ if $ARGS[0] = 'sleepProblems':
 								'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/doggy1.mp4"></video></center>'
 								'<i>Master</i> grabs your hips. "Fuck! Cum <i>Cunt</i>! Cum now!" he yells out as he slams his dick painfully deep into you.'
 								'You cum hard on his cock and feel a huge amount of his cum flooding into you.'
-								
+
 								$cumdesciption3 = 'cum filled pussy'
 								$cumdesciption2 = 'pussy is full with fresh sperm, leaking out of you'
 
@@ -1318,7 +1318,7 @@ if $ARGS[0] = 'sleepProblems':
 									gt 'therapist', 'hypnoDress'
 								end
 							end
-						end		
+						end
 					end
 				end
 			end
@@ -1332,7 +1332,7 @@ if $ARGS[0] = 'hypnoResist':
 
 	if sound = 0: PLAY 'sound/rainstorm.mp3',20 & PLAY 'sound/clock.mp3',40
 	'<font color="<<$hypnocolour>>">'
-	
+
 	if hypnoTimesResistedStage = 0:
 		'Your body tenses, and you shake your head as you reject Dr. Pavlov''s suggestion to <<$ARGS[1]>>. Seeing that you might awaken, he quickly tells you to forget the command he gave you. As the suggestion fades from your memory, you once again relax.'
 		'"Hmmm," Dr. Pavlov muses. "Your will is quite strong. It may take some time to break you, but you will break."'
@@ -1608,7 +1608,7 @@ if $ARGS[0] = 'fuck':
 	end
 
 	!! 50% | 0% chance
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0, 1) = 0: 
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0, 1) = 0:
 		$therapistDoneFuckingDesc1 = '"This school girl pussy is too tight...! Cum now!"'
 
 	!! 17% | 33% chance
@@ -1637,7 +1637,7 @@ if $ARGS[0] = 'fuck':
 	killvar 'rand_num'
 
 	!! 50% | 0% chance
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0, 1) = 0: 
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0, 1) = 0:
 		$therapistDoneFuckingDesc3 = '"Your little school girl pussy was amazing, Miss <<$pcs_lastname>>."'
 
 	!! 17% | 33% chance
@@ -1765,7 +1765,7 @@ if $ARGS[0] = 'hypnoFuck':
 	end
 
 	!! 50% | 0% chance
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0,1) = 0: 
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0,1) = 0:
 		$therapistDoneFuckingDesc1 = '"This school girl pussy is too tight...! Cum now, <i>Cunt</i>!"'
 
 	!! 17% | 33% chance
@@ -1794,8 +1794,8 @@ if $ARGS[0] = 'hypnoFuck':
 	killvar 'rand_num'
 
 
-	!! 50% | 0% chance 
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0, 1) = 0: 
+	!! 50% | 0% chance
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0, 1) = 0:
 		$therapistDoneFuckingDesc3 = '"Your little schoolgirl pussy was amazing, <i>Cunt</i>."'
 
 	!! 17% | 33% chance
@@ -2042,7 +2042,7 @@ if $ARGS[0] = 'hypnoEnd':
 		else
 			$hypnoTxt0 += 'You feel aroused, and you try to close your legs as you walk out, subconsciously trying to keep your psychologist''s sperm inside your <<$cumdesciption3>> as long as possible.'
 		end
-		
+
 		if hypnoTouchWhenever = 1:
 			rand_num = rand(1,4)
 			if     rand_num = 1:
@@ -2108,7 +2108,7 @@ if $ARGS[0] = 'hypnoEnd':
 
 		! clean up hypnocolour as leaving
 		killvar $hypnocolour
-		
+
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/room.jpg"></center>'
 		*nl
 		if $hypnoTxt0 <> '': '<<$hypnoTxt0>>' & *nl
@@ -2225,7 +2225,7 @@ if $ARGS[0] = 'hypnoRandom':
 		*clr & cla
 		hypnoRandomCounter = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
-		'"Now that I''ve sufficiently broken your resistance, we need to make sure you show up more often. From now on, you will feel that you NEED my hypnotism treatment. You will feel that you NEED to scheduled therapy sessions every Thursday. I have clients until 18:00 so come after then but before 19:00, I''m not going to wait here all night for you. Do you understand, Cunt?"' 
+		'"Now that I''ve sufficiently broken your resistance, we need to make sure you show up more often. From now on, you will feel that you NEED my hypnotism treatment. You will feel that you NEED to scheduled therapy sessions every Thursday. I have clients until 18:00 so come after then but before 19:00, I''m not going to wait here all night for you. Do you understand, Cunt?"'
 		'You nod "Yes, Master."'
 		hypnoSchedule = 1
 
@@ -2303,6 +2303,16 @@ if $ARGS[0] = 'hypnoRandom':
 
 		act 'Continue': gt 'therapist', 'hypnoEnd'
 
+	! sveta will now hate having body hair
+	elseif hypnoHair ! 1:
+		*clr & cla
+		hypnoRandomCounter = 0
+		hypnoHair = 1
+		'"I noticed that you have some stubble on your pussy and legs. Remove it and never let me see it again. From this point on, if you have any hair in these areas, you will feel disappointed and ashamed of yourself. You will feel like the hair in these areas is ugly, so you will shave it. If not, you will feel bad. Do you understand, Cunt?" he asks'
+
+		'"Yes, <i>Master</i>."'
+
+		act 'Continue': gt 'therapist', 'hypnoEnd'
 
 	! svesta will now get commando lvl 3
 	elseif wornPanties > 5 and wornPanties < 100:
@@ -2814,7 +2824,7 @@ if $ARGS[0] = 'hypnoProstitute':
 												act 'Continue':
 													*clr & cla
 													'You dress and step out of the car before the man drives away, leaving you alone at the gas station.'
-													
+
 													act 'Continue waiting':
 														gt 'therapist', 'hypnoProstitute'
 													end
@@ -2937,7 +2947,7 @@ if $ARGS[0] = 'hypnoProstitute':
 										act 'Continue':
 											*clr & cla
 											'You dress and step out of the car before the man drives away, leaving you alone at the gas station.'
-											
+
 											act 'Continue waiting':
 												gt 'therapist', 'hypnoProstitute'
 											end
@@ -3165,7 +3175,7 @@ if $ARGS[0] = 'hypnoProstitute':
 
 				end
 			end
-		
+
 		elseif hypnoProstRand = 7:
 			if hypnoProstDates[7] = daystart:
 				jump 'hypnoProstNothingHappens'
@@ -3185,7 +3195,7 @@ if $ARGS[0] = 'hypnoProstitute':
 			gs 'boyStat', $npclastgenerated
 			gs 'stat'
 
-			if rand(0,1) = 1: 
+			if rand(0,1) = 1:
 				$vehicleName = 'car'
 
 			else
@@ -3233,14 +3243,14 @@ if $ARGS[0] = 'hypnoProstitute':
 
 				act 'Get fucked.':
 					'The man fucks you hard and fast. He grunts loudly with each thrust and the car fills with the sounds of your wet pussy being rythmically pounded.'
-					
+
 					act 'Get filled':
 						'The man soon finishes with a loud groan. He pumps his seed deep inside of your pussy.'
 
 						act 'Continue':
 							'The man pulls his cock out of you and stands up. He fixes his trousers. You follow his lead, crawling out of the car and standing up.'
 							'Cum leaks from your used hole as you stand up.'
-						
+
 							act 'Ask for payment.':
 								randomResponse = rand(1,3)
 								if randomResponse = 1:
@@ -3389,11 +3399,11 @@ if $ARGS[0] = 'therapistFucked':
 
 	'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/toSchool.mp4"></video></center>'
 
-	'You subconsciously notice your therapist''s sperm slowly leaking out of your cum filled pussy.' 
+	'You subconsciously notice your therapist''s sperm slowly leaking out of your cum filled pussy.'
 	'You feel happier because of this.'
 	pcs_mood += 1
 
-	act 'continue': 
+	act 'continue':
 		gt $menu_loc, $menu_arg
 	end
 end

locations/version.qsrc

@@ -2,6 +2,11 @@
 
 act 'Return': gt 'start'
 
+'0.9.3.1'
+'- Text edits by Vengeance11'
+'- Bug fixes from Felix, Myles Croft, Anjuna, Awesome, Derryth Love, Lusticon, hornguy6, bgkjdgbizgblzdgbr and Kevin Smarts'
+'- image pack updated and maintained by Anya'
+
 '0.9.3'
 '- Learnt how to spell Anjuna by Kevin Smarts'
 '- Cum clean up of more intimate areas now requires a private location thanks to Lusticon'

locations/wardrobe.qsrc

@@ -707,12 +707,12 @@ if $ARGS[0] = 'default_entry_set':
 	$defcoattype[i] = $coatworntype
 	defcoatnumber[i] = coatwornnumber
 
-	$def_clothing_temp = '<<$def_clothing_name[i]>>'
+	$def_clothing_temp = $def_clothing_name[i]
 	$def_clothing_name[i] = input ('<center>Enter a name for this outfit set<br><font color="grey">Leaving blank will reuse current name.</font></center>')
 	if $def_clothing_name[i] = '' and $def_clothing_temp = '':
 		$def_clothing_name[i] = 'Custom <<i>>'
 	elseif $def_clothing_name[i] = '':
-		$def_clothing_name[i] = '<<$def_clothing_temp>>'
+		$def_clothing_name[i] = $def_clothing_temp
 	end
 	gt 'wardrobe', $wloc
 end
@@ -721,12 +721,12 @@ if $ARGS[0] = 'default_entry_rename':
 	gs 'stat'
 	i = ARGS[1]
 
-	$def_clothing_temp = '<<$def_clothing_name[i]>>'
+	$def_clothing_temp = $def_clothing_name[i]
 	$def_clothing_name[i] = input ('<center>Enter a name for this outfit set<br><font color="grey">Leaving blank will reuse current name.</font></center>')
 	if $def_clothing_name[i] = '' and $def_clothing_temp = '':
 		$def_clothing_name[i] = 'Custom <<i>>'
 	elseif $def_clothing_name[i] = '':
-		$def_clothing_name[i] = '<<$def_clothing_temp>>'
+		$def_clothing_name[i] = $def_clothing_temp
 	end
 	gt 'wardrobe', $wloc
 end
@@ -758,7 +758,7 @@ if $ARGS[0] = 'default_entry_up':
 	tempcurrentpursenumber = defpursenumber[i]
 	$tempcurrentcoattype = $defcoattype[i]
 	tempcurrentcoatnumber = defcoatnumber[i]
-	$def_clothing_temp = '<<$def_clothing_name[i]>>'
+	$def_clothing_temp = $def_clothing_name[i]
 
 	$defclothingtype[i] = $defclothingtype[j]
 	defclothingnumber[i] = defclothingnumber[j]
@@ -781,7 +781,7 @@ if $ARGS[0] = 'default_entry_up':
 	defpursenumber[i] = defpursenumber[j]
 	$defcoattype[i] = $defcoattype[j]
 	defcoatnumber[i] = defcoatnumber[j]
-	$def_clothing_name[i] = '<<$def_clothing_name[j]>>'
+	$def_clothing_name[i] = $def_clothing_name[j]
 
 	$defclothingtype[j] = $tempclothingworntype
 	defclothingnumber[j] = tempclothingwornnumber
@@ -800,7 +800,7 @@ if $ARGS[0] = 'default_entry_up':
 	defpursenumber[j] = tempcurrentpursenumber
 	$defcoattype[j] = $tempcurrentcoattype
 	defcoatnumber[j] = tempcurrentcoatnumber
-	$def_clothing_name[j] = '<<$def_clothing_temp>>'
+	$def_clothing_name[j] = $def_clothing_temp
 
 	gt 'wardrobe', $wloc
 end
@@ -827,7 +827,7 @@ if $ARGS[0] = 'default_entry_down':
 	tempcurrentpursenumber = defpursenumber[i]
 	$tempcurrentcoattype = $defcoattype[i]
 	tempcurrentcoatnumber = defcoatnumber[i]
-	$def_clothing_temp = '<<$def_clothing_name[i]>>'
+	$def_clothing_temp = $def_clothing_name[i]
 
 	$defclothingtype[i] = $defclothingtype[j]
 	defclothingnumber[i] = defclothingnumber[j]
@@ -841,7 +841,7 @@ if $ARGS[0] = 'default_entry_down':
 	defpursenumber[i] = defpursenumber[j]
 	$defcoattype[i] = $defcoattype[j]
 	defcoatnumber[i] = defcoatnumber[j]
-	$def_clothing_name[i] = '<<$def_clothing_name[j]>>'
+	$def_clothing_name[i] = $def_clothing_name[j]
 
 	$defclothingtype[j] = $tempclothingworntype
 	defclothingnumber[j] = tempclothingwornnumber
@@ -855,7 +855,7 @@ if $ARGS[0] = 'default_entry_down':
 	defpursenumber[j] = tempcurrentpursenumber
 	$defcoattype[j] = $tempcurrentcoattype
 	defcoatnumber[j] = tempcurrentcoatnumber
-	$def_clothing_name[j] = '<<$def_clothing_temp>>'
+	$def_clothing_name[j] = $def_clothing_temp
 
 	gt 'wardrobe', $wloc
 end
@@ -864,27 +864,23 @@ if $ARGS[0] = 'default_entry_delete':
 	gs 'stat'
 	i = ARGS[1]
 	$defclothingtype[i] = ''
-	defclothingnumber[i] = ''
-	defunderwear[i] = ''
+	defclothingnumber[i] = 0
+	defunderwear[i] = 0
 	$defbodysuittype[i] = ''
-	defbodysuitnumber[i] = ''
+	defbodysuitnumber[i] = 0
 	$defbratype[i] = ''
-	defbranumber[i] = ''
+	defbranumber[i] = 0
 	$defpantytype[i] = ''
-	defpantynumber[i] = ''
+	defpantynumber[i] = 0
 	$defshoetype[i] = ''
-	defshoenumber[i] = ''
+	defshoenumber[i] = 0
 	$defpursetype[i] = ''
-	defpursenumber[i] = ''
+	defpursenumber[i] = 0
 	$defcoattype[i] = ''
-	defcoatnumber[i] = ''
+	defcoatnumber[i] = 0
 	$def_clothing_name[i] = ''
-	if default_sport_number = i:
-		default_sport_number = 0
-	end
-	if default_school_number = i:
-		default_school_number = 0
-	end
+	if default_sport_number  = i: default_sport_number = 0
+	if default_school_number = i: default_school_number = 0
 	gt 'wardrobe', $wloc
 end
 

tools/Parser/integration_npp.txt

@@ -0,0 +1,24 @@
+there is two ways to add qsp_parser to notepad++
+first set your path to qsp_parser.exe ("C:\qsp_parser\qsp_parser.exe")
+
+1 method
+click on Run > Run > paste this input
+cmd /Q /K ""C:\qsp_parser\qsp_parser.exe" "$(FULL_CURRENT_PATH)""
+and click Save... > Set name "QSP validate" (or something)
+also you can set hotkey for it
+done
+
+
+2 method
+open shortcuts.xml in notepad++ folder and add User Defined Command to it
+save file and restart notepad++
+
+    <UserDefinedCommands>
+
+        <Command name="QSP validate" Ctrl="no" Alt="no" Shift="no" Key="0">cmd /Q /K &quot;&quot;C:\qsp_parser\qsp_parser.exe&quot; &quot;$(FULL_CURRENT_PATH)&quot;&quot;</Command>
+
+    </UserDefinedCommands>
+
+
+click Run > QSP validate
+don't forget to save file before call

tools/Parser/integration_vscode.txt

@@ -0,0 +1,30 @@
+open tasks.json and add this task
+
+"tasks": [
+
+        {
+            "label": "QSP validate",
+            "group": "test",
+            "type": "shell",
+            "options": {
+                "shell": {
+                    "executable": "cmd.exe",
+                    "args": [
+                        "/q",
+                        "/c"
+                    ]
+                }
+            },
+            "command": "C:\\qsp_parser\\qsp_parser.exe",
+            "args": [
+                "${file}"
+            ],
+            "problemMatcher": []
+        }
+
+]
+
+
+where "C:\\qsp_parser\\qsp_parser.exe" is your path to qsp_parser.exe
+click Terminal > Run Task... > QSP validate
+don't forget to save file before call