Browse Source

Merge https://git.catrenelle.com/Kevin_Smarts/glife

slanon 3 years ago
parent
commit
2b2c7582a1

+ 60 - 21
locations/_attributes_fancy_burlesque.qsrc

@@ -1,262 +1,301 @@
 # $attributes_fancy_burlesque
-!2020/10/12
-!Quality range is 3-6.
+!2021/05/12
+!Quality range is 3 to 4.
+
 if ARGS[1] = 1:
-	CloQuality = 4
+	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	
 elseif ARGS[1] = 2:
-	CloQuality = 4
+	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	
 elseif ARGS[1] = 3:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 3
+	
 elseif ARGS[1] = 4:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 3
+	
 elseif ARGS[1] = 5:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 3
+	
 elseif ARGS[1] = 6:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 2
+	
 elseif ARGS[1] = 7:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	
 elseif ARGS[1] = 8:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	
 elseif ARGS[1] = 9:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	
 elseif ARGS[1] = 10:
-	CloQuality = 6
+	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
+	
 elseif ARGS[1] = 11:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	
 elseif ARGS[1] = 12:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
+	
 elseif ARGS[1] = 13:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 5
+	
 elseif ARGS[1] = 14:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	
 elseif ARGS[1] = 15:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 5
+	
 elseif ARGS[1] = 16:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	
 elseif ARGS[1] = 17:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	
 elseif ARGS[1] = 18:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
+	
 elseif ARGS[1] = 19:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
+	
 elseif ARGS[1] = 20:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
+	
 elseif ARGS[1] = 21:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	
 elseif ARGS[1] = 22:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	
 elseif ARGS[1] = 23:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
+	
 elseif ARGS[1] = 24:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 6
+	
 elseif ARGS[1] = 25:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 2
+	
 elseif ARGS[1] = 26:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 3
+	
 elseif ARGS[1] = 27:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
+	
 elseif ARGS[1] = 28:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 5
+	
 elseif ARGS[1] = 29:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 5
+	
 elseif ARGS[1] = 30:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
+	
 elseif ARGS[1] = 31:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 3
+	
 elseif ARGS[1] = 32:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 5
+	
 elseif ARGS[1] = 33:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 5
+	
 elseif ARGS[1] = 34:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 5
+	
 elseif ARGS[1] = 35:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 5
+	
 elseif ARGS[1] = 36:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPanties = 1
-	CloOnePiece = 1
+	
 elseif ARGS[1] = 37:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPanties = 1
-	CloOnePiece = 1
+	
 elseif ARGS[1] = 38:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPanties = 1
-	CloOnePiece = 1
+	
 elseif ARGS[1] = 39:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloPanties = 1
-	CloOnePiece = 1
+
 elseif ARGS[1] = 40:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPanties = 1
-	CloOnePiece = 1
+
 elseif ARGS[1] = 41:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPanties = 1
-	CloOnePiece = 1
+
 elseif ARGS[1] = 42:
 	CloQuality = 6
 	CloThinness = 4
 	CloTopCut = 3
 	CloPanties = 1
-	CloOnePiece = 1
+
 elseif ARGS[1] = 43:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPanties = 1
-	CloOnePiece = 1
+
 elseif ARGS[1] = 44:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPanties = 1
-	CloOnePiece = 1
+
 elseif ARGS[1] = 45:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPanties = 1
-	CloOnePiece = 1
+
 elseif ARGS[1] = 46:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPanties = 1
-	CloOnePiece = 1
+
 elseif ARGS[1] = 47:
 	CloQuality = 6
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
+	
 elseif ARGS[1] = 48:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	
 elseif ARGS[1] = 49:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	
 elseif ARGS[1] = 50:
 	CloQuality = 4
 	CloThinness = 4

+ 16 - 0
locations/bed2.qsrc

@@ -199,6 +199,13 @@ if $ARGS[0] = 'sleep':
 			'You decide to leave your vibrator in.'
 		end
 	end
+	if $shoeworntype = 'none':
+		bed['shoetype'] = 'none'
+	else
+		$bed['shoetype'] = $shoeworntype
+		bed['shoenumber'] = shoewornnumber
+		gs 'shoes', 'strip'
+	end
 	if bedPanty = 1 and $pantyworntype = 'none' and $braworntype = 'none':
 		*nl
 		'You put on your bra and panties.'
@@ -424,6 +431,9 @@ if $ARGS[0] = 'wake_horny':
 		act 'Get out of bed and get dressed (0:15)':
 			minut += 15
 			gs 'clothing', 'wear_last_worn'
+			if bed['shoetype'] ! 'none':
+				gs 'shoes', 'wear', $bed['shoetype'], bed['shoenumber']
+			end
 			gs 'bed2', 'end'
 		end
 	end
@@ -483,6 +493,9 @@ if $ARGS[0] = 'wake':
 		act 'Get out of bed and get dressed (0:15)':
 			minut += 15
 			gs 'clothing', 'wear_last_worn'
+			if bed['shoetype'] ! 'none':
+				gs 'shoes', 'wear', $bed['shoetype'], bed['shoenumber']
+			end
 			gs 'bed2', 'end'
 		end
 	end
@@ -491,6 +504,9 @@ if $ARGS[0] = 'wake':
 			minut += 15
 			fullmorrout = 1
 			gs 'clothing', 'wear_last_worn'
+			if bed['shoetype'] ! 'none':
+				gs 'shoes', 'wear', $bed['shoetype'], bed['shoenumber']
+			end
 			gs 'bed2', 'end'
 		end
 		if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9:

+ 8 - 7
locations/brothel.qsrc

@@ -735,13 +735,13 @@ if $ARGS[0] = 'section1_play':
 			gt 'brothel', 'section1_tiedOnBack'
 		elseif stage = 3:
 			actionRand = rand (1, 7)
-			if actionRand = 1:gt 'brothel', 'tied_mouth'
-			if actionRand = 2:gt 'brothel', 'tied_anal'
-			if actionRand = 3:gt 'brothel', 'tied_vaginal'
-			if actionRand = 4:gt 'brothel', 'tied_tease'
-			if actionRand = 5:gt 'brothel', 'tied_analfisting'
-			if actionRand = 6:gt 'brothel', 'tied_vibrate'
-			if actionRand = 7:gt 'brothel', 'tied_whip'
+			if actionRand = 1:gt 'brothel', 'section1_tied_mouth'
+			if actionRand = 2:gt 'brothel', 'section1_tied_anal'
+			if actionRand = 3:gt 'brothel', 'section1_tied_vaginal'
+			if actionRand = 4:gt 'brothel', 'section1_tied_tease'
+			if actionRand = 5:gt 'brothel', 'section1_tied_analfisting'
+			if actionRand = 6:gt 'brothel', 'section1_tied_vibrate'
+			if actionRand = 7:gt 'brothel', 'section1_tied_whip'
 		end
 	end
 
@@ -764,6 +764,7 @@ if $ARGS[0] = 'section1_play':
 		end
 
 		if stage = 1:
+			stage = 2
 			gt 'brothel', 'section1_hangbyneck'
 		elseif stage = 2:
 			stage = 3

+ 2 - 0
locations/cikl.qsrc

@@ -236,6 +236,8 @@ end
 
 if bimbo < 0: bimbo = 0
 bimbo_tracker = 0
+if PShoStyle = 2: bimbosh = 1
+	
 
 !!------------------------------------------------------------------------------------------------------------
 !!	Exhibitionism

+ 1 - 1
locations/coats.qsrc

@@ -17,7 +17,7 @@ end
 if $ARGS[0] = 'wear':
 	$coatworntype = $ARGS[1]
 	coatwornnumber = ARGS[2]
-	FUNC('coat_attributes', $ARGS[1], ARGS[2])
+	gs 'coat_attributes', $ARGS[1], ARGS[2]
 	PCoatWarm = CoatWarm
 	PCoatQuality = CoatQuality
 

+ 2 - 2
locations/gschool_cheerleading.qsrc

@@ -649,7 +649,7 @@ if $ARGS[0] = 'shower':
 					minut += 5
 					gs 'stat'
 
-					act 'Walk home with Albina': gt 'pav_complex'
+					act 'Walk home with Albina': gt 'pav_complex', 'start'
 				end
 			end
 
@@ -684,7 +684,7 @@ if $ARGS[0] = 'shower':
 					minut += 5
 					gs 'stat'
 
-					act 'Walk home with Albina': gt 'pav_complex'
+					act 'Walk home with Albina': gt 'pav_complex', 'start'
 				end
 			end
 		end

+ 1 - 1
locations/hookup_sex.qsrc

@@ -1013,7 +1013,7 @@ if $ARGS[0] = 'fuck_cum':
 		
 		act'On my face!':hookup['facial_ask'] = 1 & gt'hookup_sex','cum_facial'
 		
-		act'In my mouth!':hookup['mouth_ask'] = 1 & gt'hookup_sex','mouth'
+		act'In my mouth!':hookup['mouth_ask'] = 1 & gt'hookup_sex','cum_mouth'
 		
 		if hookup['condom'] ! 1:
 			act'Cum inside me!':hookup['creampie_ask'] = 1 & gt'hookup_sex','cum_inside'

+ 39 - 38
locations/journal.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = 'records':
 	if home_owned[1] = 2:'You own a two room apartment in the city residential area. Your utility bills are due on the 25th of each month.'
 	if home_owned[1] = 3:'You own a two room apartment in the city residential area. It''s currently occupied by your tenants.'
 	if home_owned[2] > 0:'You live in a two room apartment in a large apartment complex. You live with your parents and siblings in Pavlovsk.'
-	if home_owned[3] > 0:'You own small holiday cottage with an adjacent allotment in the communal village.'
+	if home_owned[3] > 0:'You own a small holiday cottage with an adjacent allotment in the communal village.'
 	if home_owned[4] > 0:'You rent a two room apartment in Pushkin. Your rent for the apartment is subtracted automatically in the sum of <<home_rent[4]>> <b>₽</b> us electric bill on the 25th of each month. You are currently paid up for <b><<ArendHouseSL4>></b> days'
 	if home_owned[5] = 1:'You own a vacant block in the city suburbs. Your utility bills are due on the 25th of each month.'
 	if home_owned[5] = 2:'You own a block in the city suburbs, upon which you are building a house. Your utility bills are due on the 25th of each month.'
@@ -34,7 +34,7 @@ if $ARGS[0] = 'records':
 	
 	'<center><h2>Work</h2></center>'
 	
-	if workPTU > 2:'You work as a teacher at the Lycée and your schedule is Mon-Sat, teaching between 14:00 to 16:00. Your salary is 300r/day. The dress code is Office Clothes, Strict. The road from the apartment to the Lyceum takes 2 hours 10 minutes.'
+	if workPTU > 2:'You work as a teacher at the Lycée and your schedule is Monday to Saturday, teaching between 14:00 and 16:00. Your salary is 300 <b>₽</b> per day.'
 	if (work = 1 or cheatWork = 1) and workKafe > 0:'You are working as a waitress at The Roadhouse cafe. You need to come to work between 11:00-12:00 while your working days are: Tuesday, Wednesday, and Thursday. At work, you can receive tips from customers and your wages are received on 25th of each month.'
 	if (work = 1 or cheatWork = 1) and workhosp > 0:'You work as a nurse in the city residential area clinic. You need to come to work between 08:00-09:00 during the week. Salary is automatically transferred on the 25th of each month.'
 	if (work = 1 or cheatWork = 1) and worksalon > 0:'You work as a masseuse in the city at the Beauty Bar. You need to come to work between 09:00-10:00 while your working days are: Monday, Wednesday, and Friday. Salary is automatically transferred on 25th of each month.'
@@ -48,8 +48,8 @@ if $ARGS[0] = 'records':
 	if maidqw = 1:'You work in the Pavlovsk hotel as a maid. Your work schedule is every day from 16:00 to 19:00 and your salary is 250 <b>₽</b> plus tips.'
 	if postjobQW = 2 or postjobQW = 4:'You deliver mail for the postmaster. The work day starts each Saturday between 11:00 and 12:00. Salary is 450 <b>₽</b> .'
 	if (work = 1 or cheatWork = 1) and gpoliuborka > 1:'You work part-time as a cleaner in the Pavlovsk clinic. Your schedule is from 14:00 to 21:00.'
-	if stripwork >= 1:'You can work as a stripper in the city industrial region. You have an open schedule that can be every day from 18:00-00:00. No salary as you earn tips.'
-	if film > 0:'You are working in the city industrial region as a pornographic actress under the name <<$pfname>>.'
+	if stripwork >= 1:'You work as a stripper in the city''s red light district and can work every day from 18:00-00:00. No salary as you earn tips.'
+	if film > 0:'You are working as a pornographic actress under the name <<$pfname>>.'
 	if bumtolik = 4:'You have been asked to help the homeless at the Mercy Clinic in the city industrial region.'
 	if bumtolik >= 5:'You volunteer at the Mercy Clinic in the city industrial region and work with the homeless. Working hours are from 09:00 to 17:00 on Saturday and Sunday.'
 	
@@ -126,7 +126,7 @@ if $ARGS[0] = 'records':
 	end
 	if pornstack > 0 and pfilmday[0] = 0:
 		if pfilmday[1] = 0:
-			'<br><b>You will star in a porno in <<porndays>> days.</b>'
+			'<br><b>You are scheduled for a porn shoot in <<porndays>> days.</b>'
 		else
 			'<br><b>You have a porn shoot scheduled tomorrow.</b>'
 		end
@@ -142,11 +142,11 @@ if $ARGS[0] = 'records':
 	if prodcosttrue > 0: '<br><b>You owe money to the porn studio <<prodcost>>?</b>'
 	if firstkasting > 0 and pfilmNO < 1:
 		if pornstack <= 10:
-			'<br>You are currently unable to book any more porn shoots at the Porn Studio.'
+			'<br>You are currently unable to book any more porn shoots at the porn studio.'
 		elseif pornstack = 11:
-			'<br>You can contract <<10-pornstack>> porn shoot(s) at the Porn Studio.'
+			'<br>You can contract <<10-pornstack>> porn shoot(s) at the porn studio.'
 		else
-			'<br>You can contract up to <<10-pornstack>> porn shoot(s) at the Porn Studio.'
+			'<br>You can contract up to <<10-pornstack>> porn shoot(s) at the porn studio.'
 		end
 	end
 	
@@ -317,13 +317,14 @@ end
 if $ARGS[0] = 'locations':
 	*clr & cla
 	'<center><h2>Pavlovsk</h2></center>'
-	'Pavlovsk is a small town. It is somewhat of a tourist spot thanks to Catharina Palace and the former palace grounds have been converted into a large park. The town of Pavlovsk is centered around the train station. There is an open air market near the train station that is open year round where many bargains can be found. The cafe where your mother works can also be found near the train station. It caters to the visitors coming in by train. The downtown area has most of the businesses and some middle class housing. The residential area is a mixture of houses and old Soviet era apartment blocks. Some of the wealthiest families live in houses near the park that''s on the outskirts of town, while the poorest homes are found near the old industrial area where several old factories have long since been closed down and lay abandoned. The only factory that is still open is the G&M clothing factory, which also has a local store front and a tailor that can adjust your clothing. The industrial area is now mostly a home to prostitutes and drugs dealers and is not considered a safe area to walk around at night. Despite being a tourist destination, the area is seen as fairly poor and without many jobs.'
+	'Pavlovsk is a small town. It is somewhat of a tourist trap thanks to the Catharina Palace and the former palace grounds, which have been converted into a large park and is centered around the train station. There is an open air market near the train station that is open year round where many bargains can be found. The cafe where your mother works can also be found near the train station. It caters to the visitors coming in by train. The downtown area contains businesses and some middle class housing, while the residential area is a mixture of houses and old Soviet era apartment blocks.' 
+	'The wealthier families live in large houses near the park that''s on the outskirts of town, while the poorest homes are found near the old industrial area where several old factories have long since been abandoned. The only factory that is still open is the G&M clothing factory, which also has a local store front and a tailor that can adjust your clothing. The industrial area is now mostly home to prostitutes and drug dealers and is not considered a safe area to walk around at night. Despite being a tourist destination, the area is seen as fairly poor and without many jobs.'
 
 	'<center><h2>Gadukino</h2></center>'
 	'You''ve spent several summers at your grandparents'' village. It''s a real small village where everyone is very tightly knit together. You remember spending your days playing with the local children at the river or visiting the little shop that had everything a kid needed. When your great grandparents were younger, they used to take you out into the woods where you picked mushrooms and berries. Your great grandfather also showed you around the hunting grounds and told you all kind of stories about the hunters that come and visit the sleepy little village.'
 
 	'<center><h2>St. Petersburg</h2></center>'
-	'You''ve heard many rumors about the city from both family members and school friends. They all say it''s both a great and bad place. The few memories you have are connected to the big city park that you and your family visited once. They had a large amusement park with lots of rides and fun to be had. You also know about the University because you''ve overheard Anya and your mom argue about it. Sometimes, your mother would drag you and Anya along to the big city mall while she was visiting the beauty salon. You even got to run around there among the shops asking your mother to buy you some of the clothes available there.'
+	'You''ve heard many rumors about the city from both family members and school friends. They all say it''s both a great and bad place. The few memories you have are connected to the big city park that you and your family visited once, which had a large amusement park with lots of rides. You also know about the University because you''ve overheard Anya and your mother argue about it. Sometimes, your mother would drag you and Anya along to the city mall while she was visiting the beauty salon. You remember running through the stores asking your mother to buy you clothes.'
 		
 	act 'Go back': gt 'journal', 'records'
 	act 'Put your notebook down': gt $loc, $loc_arg
@@ -332,37 +333,37 @@ end
 if $ARGS[0] = 'friends_family':
 	*clr & cla
 	'<center><img src="images/characters/shared/headshots_main/29.jpg"></center>'
-	'Mother Natasha - Your mother was born in Gadukino village. She is still quite young and attractive. You have done the math and know she had Anya when she was only sixteen years old. She works at the station cafe. Your grandmother died in child birth with your mother and your grandfather was killed a couple of years later in the Afghanistan war.'
+	'Natasha (Mother) - Your mother was born in Gadukino. She is still quite young and attractive, but you have done the math and know she had Anya when she was only sixteen years old. Your grandmother died in child birth with your mother and your grandfather was killed a few years later in the Afghanistan war. She works at the cafe near the train station.'
 	*nl
 	'<center><img src="images/characters/shared/headshots_main/35.jpg"></center>'
-	'Father Mikhail Kuznetsov - You''ve never seen your biological father since your parents divorced, so you have no real memory of him.'
+	'Mikhail Kuznetsov (Father) - You''ve never seen your biological father since your parents divorced, so you have no real memory of him.'
 	*nl
 	'<center><img src="images/characters/shared/headshots_main/28.jpg"></center>'
-	'Step Father Vladimir - Your stepfather is a greying, slightly flabby man working as a truck driver. Your mother divorced your biological father then married Vladimir when you were less than a year old. One year after being married, your parents welcomed your little brother Kolka, Vladimir''s first born child. Kolka is his only child that you know of. When not working, your stepfather can often be found working on his cars in the garage.'
+	'Vladimir (Stepfather) - Your stepfather is a greying, slightly flabby man working as a truck driver. Your mother divorced your biological father then married Vladimir when you were less than a year old. One year after being married, your parents welcomed your little brother Kolka, Vladimir''s first born child. Kolka is his only child that you know of. When not working, your stepfather can often be found working on his cars in the garage.'
 	*nl
 	'<center><img src="images/characters/shared/headshots_main/33.jpg"></center>'
-	'Sister Anya - She is your older sister, two years your senior, but she still lives at home and shares a bedroom with you. She works at the local supermarket instead of going to the University like your mother wanted. She spends most of her free time either partying, hanging out with her friends or with her boyfriend Roma.'
+	'Anya (Sister) - Anya is your older sister, two years your senior, but she still lives at home and shares a bedroom with you. She chose to work at the local supermarket instead of going to the University like your mother wanted and spends most of her free time either partying, hanging out with her friends or with her boyfriend Roma.'
 	*nl
 	'<center><img src="images/characters/shared/headshots_main/34.jpg"></center>'
-	'Brother Kolka - He is your younger brother, born about a year after you. While you share the same mother, Kolka''s dad is your stepfather. He is a student at the same school as you and enjoys football. When he is not playing football or doing homework, he spends much of his free time hanging out with his friends.'
+	'Kolka (Brother) - Kolka is your younger brother, born about a year after you. While you share the same mother, Kolka''s father is your stepfather. He is a student at the same school as you and enjoys football. When he is not playing football or doing homework, he spends much of his free time hanging out with his friends.'
 	*nl
 	'<center><img src="images/characters/shared/headshots_main/30.jpg"></center>'
-	'Aunt Lyudmila Knavs - Your aunt Luda works at the pharmacy in Pavlovsk. She is your mother''s older sister. She has a live in boyfriend named Olu that she meet while traveling. He is an African man, which causes more than a few rumors and sour looks at your aunt. Your aunt doesn''t seem to care about that, and if anything, seems to enjoy flaunting her boyfriend in front of others.'
+	'Lyudmila Knavs (Aunt) - Your mother''s older sister, who works at the local pharmacy and has a live in boyfriend called Olu whom she met while traveling. He is an African man, which has caused more than a few rumors and sour looks at your aunt. Your aunt doesn''t seem to care though, and if anything, seems to enjoy flaunting her boyfriend in front of others.'
 	*nl
 	'<center><img src="images/characters/shared/headshots_main/55.jpg"></center>'
-	'Oluuosegun "Olu" Maina - You don''t know much about your aunt''s live-in boyfriend, only that he is from Africa and doesn''t speak Russian very well. He''s a very large and muscular man. You know many in the area that find it disgraceful that your aunt lives with him.'
+	'Oluuosegun "Olu" Maina - You don''t know much about your aunt''s live-in boyfriend, only that he is from Africa and doesn''t speak Russian very well. He''s a very large and muscular man and you know many people in the area that find it disgraceful that your aunt lives with him.'
 	*nl
 	'<center><img src="images/characters/shared/headshots_main/31.jpg"></center>'
-	'Great Grandpa Zlatek Knavs - Your great grandfather is a grumpy old man. He is always complaining about the village elders and how they have neglected the village to the point where it is now barely fit to live in. He can walk, but requires a cane. He doesn''t really leave the house anymore, unless he really has to. Your mother and aunt were raised by your great grandparents.'
+	'Zlatek Knavs (Great Grandfather) - Your great grandfather is a grumpy old man. He is always complaining about the village elders and how they have neglected the village to the point where it is now barely fit to live in. He can walk, but requires a cane. He doesn''t really leave the house anymore, unless he really has to. Your mother and aunt were raised by your great grandparents.'
 	*nl
 	'<center><img src="images/characters/shared/headshots_main/32.jpg"></center>' 
-	'Great Grandma Elena Knavs - Your great grandma is extremely old and almost never leaves the house. Most of the time, she just sits on her bed watching TV or slowly cleans the house. Having raised your mother and aunt Luda, she is like a grandmother to you and a mother to your mother. She has raised two generations of kids, so your great grandparents are now content with the peace and quiet of the village.'
+	'Elena Knavs (Great Grandmother) - Your great grandma is extremely old and almost never leaves the house. Most of the time, she just sits on her bed watching TV or slowly cleans the house. Having raised your mother and aunt Luda, she is like a grandmother to you and a mother to your mother. She has raised two generations of children and is now content with the peace and quiet of the village.'
 	*nl
 	'<center><img src="images/characters/shared/headshots_main/54.jpg"></center>'
-	'Mikhail "Misha" - Your neighbor''s name is Mikhail, but everyone calls him "Uncle Misha". He lives in the apartment across the hall from you. Your mother always forbade you to talk to him by warning you that he used to be a local crime lord and that you shouldn''t get involved with him. However, he has always been polite and nice to you. He is close friends with your stepfather, but both have been evasive about how they met and became friends.'
+	'Mikhail "Misha" - Your neighbor''s name is Mikhail, but everyone calls him "Uncle Misha". He lives in the apartment across the hall from you, but your mother always forbade you from talking to him by warning you that he used to be a local crime lord and that you shouldn''t get involved with him. However, he has always been polite and nice to you. He is close friends with your stepfather, but both have been evasive about how they met and became friends.'
 	*nl
 	'<center><img src="images/characters/shared/headshots_main/112.jpg"></center>'
-	'Sergey Shulgin - He lives in the same building as you with his son, your childhood friend Vasily. He has gray hair and a small beer belly, but still hearty looking. His wife, Vasily''s mother, left when Vasily was still a small child. He has been close friends with your stepfather and mother for as long as you can remember. Oddly enough, he never re-married after being left by his ex-wife.'
+	'Sergey Shulgin - Sergey lives in the same building as you with his son, your childhood friend Vasily. He has gray hair and a small beer belly, but is still hearty looking. His wife, Vasily''s mother, left when Vasily was young. He has been close friends with your stepfather and mother for as long as you can remember. Oddly enough, he never re-married after being left by his ex-wife.'
 	
 	act 'Go back': gt 'journal', 'records'
 	act 'Put your notebook down': gt $loc, $loc_arg
@@ -371,13 +372,13 @@ end
 if $ARGS[0] = 'school':
 	*clr & cla
 	'<center><h2>School</h2></center>'
-	'You attend the secondary school in Pavlovsk and you have known most of your classmates your whole life. You are on friendly terms with some of them and less so with others. The relationships you''ve had have changed over the years. The school is fairly new, built only a few years ago along with a new sports field that some students use after school. When the school was built it was state of the art, but as the years have passed, it is starting to fall into disrepair. The old school building was left to rot and is now a shell of its former self. It''s sometimes used by the students as a place to hang out. There are four different cliques at the school that most of the students belong to while the rest are the outcasts who no one wants to have anything to do with unless it involves bullying them.'
+	'You attend the secondary school in Pavlovsk and have known most of your classmates your whole life. You are on friendly terms with some of them and less so with others. The relationships you''ve had have changed over the years. The school is fairly new, built only a few years ago along with a new sports field that some students use after school. When the school was built it was state of the art, but as the years have passed, it is starting to fall into disrepair. The old school building was left to rot and is now a shell of its former self. It''s sometimes used by the students as a place to hang out. There are four different cliques at the school that most of the students belong to while the rest are the outcasts who no one wants to have anything to do with unless it involves bullying them.'
 	*nl
 	'There are the cool kids. They are the ones with that IT factor. Maybe they are wealthy, charming, possess a good sense of style, are just good looking, or all of the above. They are mostly concerned with appearances above all things. If you don''t look good, then they don''t consider you worthy. Next are the jocks. They are all into one or more sports and spend most of their time working out or playing sports and look down on those with no athletic ability. There is some overlap between them and the cool kids and they mostly get along with each other. Following them are the nerds, who are all into what many consider ''nerdy'' or ''geeky'' stuff like cosplay, role playing games, or other fringe activities. Most of them are also very smart and do well in school. They tend to keep their heads down and focus on doing their school work. The last group are the gopniks. They are a rowdy bunch that range from small time criminals, to party animals and trouble makers. They thumb their nose at authority and are often barely passing their classes, leaving many to wonder why they bother coming to school at all.'
 	*nl
 	'<center><h2>Social Group</h2></center>'
 	if grupTipe = 1:
-		'You are a member of the cool clique in school. They are the royalty of the school. You get along with your fellow cool kids and most of the jocks. The nerds fear and live in awe of you while the gopniks are just losers without a sense of style. They try to act tough, but in reality everyone knows they are just jealous. On the weekends, you and your friends often go to the disco at the community center to hang out and dance the night away. Other times, you hang out in small groups at each others houses or have the occasional house party.'
+		'You are a member of the cool clique in school, the royalty of the school. You get along with your fellow cool kids and most of the jocks. The nerds fear and live in awe of you while the gopniks are just losers without a sense of style. They try to act tough, but in reality everyone knows they are just jealous. On the weekends, you and your friends often go to the disco at the community center to hang out and dance the night away. Other times, you hang out in small groups at each others houses or have the occasional house party.'
 	elseif grupTipe = 2:
 		'You are a member of the jock clique in school. You get along with your fellow jocks and most of the cool kids as well. The nerds live in fear and awe of you while the gopniks are wannabe toughs that just can''t physically keep up with you and your fellow jocks. Your clique often get together at the school field or community center for pickup games for fun. At least, when you are not working out. Sometimes you and some of the other jocks will attend some of the cool kids get togethers.'
 	elseif grupTipe = 3:
@@ -461,7 +462,7 @@ if $ARGS[0] = 'teachers':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/135.jpg"></center>'
 	'<center>Yeva Sokoloff</center>'
 	if grupTipe = 4:
-		'Yeva Sokoloff is the school''s geography and history teacher. She is the oldest teacher at school and she likes to think she is tough, often giving those in her class a hard look. It''s funny coming from someone that looks like the little old lady in the market. She is quick to send you to the Headmistress if you misbehave too much.'
+		'Yeva Sokoloff is the school''s geography and history teacher. She is the oldest teacher at school and likes to think she is tough, often giving those in her class a hard look. It''s funny coming from someone that looks like the little old lady in the market. She is quick to send you to the Headmistress if you misbehave too much.'
 	else
 		'Yeva Sokoloff is the school''s geography and history teacher. She is the oldest teacher at school and has a very firm no-nonsense teaching style, but can also be very kind and motherly to students that work hard and behave.'
 	end
@@ -471,7 +472,7 @@ if $ARGS[0] = 'teachers':
 	if grupTipe = 3:
 		'Serafim Ivanov is the school''s science and computer science teacher. He''s a former student of the school that returned to the town after college. He is a no-nonsense teacher that is known to pile on the homework, have many pop quizzes, and is brutal when it comes to his grading. This is to push his students to their greatest potential. He always has time to answer questions or help out if a student has trouble as long as they put in the effort. Many of the other students complain about how he picks on them, but the truth is he only accepts the best from his students and has no sympathy for those that refuse to put in the work.'
 	else
-		'Serafim Ivanov is the school''s science and computer science teacher. He''s a former student of the school that returned to the town after college. He is a no-nonsense, bitter teacher that is known to pile on the homework, have many pop quizzes, and is brutal when it comes to his grading. He is also known to be unfair, giving the nerds a free pass with homework or even quizzes, which he never does with the other cliques. He seems to take delight in catching the cool kids, jocks and gopniks out by ridiculing them on how little they know.'
+		'Serafim Ivanov is the school''s science and computer science teacher. He''s a former student of the school that returned to the town after college. He is a no-nonsense, bitter teacher that is known to pile on the homework, have many pop quizzes, and is brutal when it comes to his grading. He is also known to be unfair, giving the nerds a free pass with homework and quizzes, which he never does with the other cliques. He seems to take delight in catching the cool kids, jocks and gopniks out by ridiculing them on how little they know.'
 	end
 
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/128.jpg"></center>'
@@ -480,7 +481,7 @@ if $ARGS[0] = 'teachers':
 
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/137.jpg"></center>'
 	'<center>Raven Braakman</center>'
-	'Raven Braakman is the school''s Social Sciences and English teacher. She is from South Africa, but married a Russian man and moved to Pavlovsk. Her husband died in a car accident a few years ago. She has a strict teaching style and accepts only the best out of her students. It is rumored that she is a bit of a party goer in her free time.'
+	'Raven Braakman is the school''s social sciences and English teacher. She is from South Africa, but married a Russian man and moved to Pavlovsk. Her husband died in a car accident a few years ago. She has a strict teaching style and accepts only the best out of her students. It is rumored that she is a bit of a party goer in her free time.'
 
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/130.jpg"></center>'
 	'<center>Ilya Yenotin</center>'
@@ -489,15 +490,15 @@ if $ARGS[0] = 'teachers':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/131.jpg"></center>'
 	'<center>Viktor Pavlovich</center>'
 	if grupTipe = 3:
-		'Viktor Pavlovich is the school''s P.E. teacher. He is also the coach for the basketball and track teams. He looks like a former weight lifter, having a muscular build with massive upper body strength. He keeps a black painted paddle he calls the "Black Widow" hanging from a wall in his office. He is tough on anyone that isn''t athletically gifted and often yells at those lacking any athletic ability to the point of bringing them to tears. He is one of the meanest, if not the meanest, teacher in school.'
+		'Viktor Pavlovich is the school''s P.E. teacher and the coach for the basketball and track teams. He looks like a former weight lifter, having a muscular build with massive upper body strength. He keeps a black painted paddle he calls the "Black Widow" hanging from a wall in his office. He is tough on anyone that isn''t athletically gifted and often yells at those lacking any athletic ability to the point of bringing them to tears. He is one of the meanest, if not the meanest, teacher in school.'
 	else
-		'Viktor Pavlovich is the school''s P.E. teacher. He is also the coach for the basketball and track teams. He looks like a former weight lifter, having a muscular build with massive upper body strength. He keeps a black painted paddle he calls the "Black Widow" hanging from a wall his office. He likes to use it on students, especially female students. He is single and rumored to be a player. You''ve often seen him with different women around town.'
+		'Viktor Pavlovich is the school''s P.E. teacher and the coach for the basketball and track teams. He looks like a former weight lifter, having a muscular build with massive upper body strength. He keeps a black painted paddle he calls the "Black Widow" hanging from a wall his office. He likes to use it on students, especially female students. He is single and rumored to be a player. You''ve often seen him with different women around town.'
 	end
 
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/69.jpg"></center>'
 	'<center>Mikhail Nikolaevich</center>'
 	if grupTipe = 3:
-		'Mikhail Nikolaevich is the school''s assistant P.E. teacher and the coach of the Pavlovsk girls volleyball team and the football team. He is almost as bad as Mr Pavlovich with how he treats the students, except he almost worships the best of the jocks by always talking and laughing with them.'
+		'Mikhail Nikolaevich is the school''s assistant P.E. teacher and the coach of the Pavlovsk girls volleyball team and the football team. He is almost as bad as Mr. Pavlovich with how he treats the students, except he almost worships the best of the jocks by always talking and laughing with them.'
 	elseif grupTipe = 2:
 		'Mikhail Nikolaevich is the school''s assistant P.E. teacher and the coach of the Pavlovsk girls volleyball team and the football team. He was heading towards the big leagues as a footballer and almost became a pro himself, but an injury shattered those dreams. He knows how to push you to get the most of yourself, because he''s enormously competitive. He always wants to win no matter what. If you want to be a part of the squad, you''ll have to put in work one way or another.'
 	else
@@ -620,7 +621,7 @@ if $ARGS[0] = 'jocks':
 
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/150.jpg"></center>'
 	'<center>Erast Vagin</center>'
-	'Erast Vagin is a huge boy and is very strong. He is not a looker or even clever, but is always polite and a little shy. When he is playing sports he changes into a demon, always fighting to win, putting his all into winning and nothing else. He is an average athlete and relies on his size and strength to win the day for him. Other than playing sports, he sometimes boxes with Ivan.'
+	'Erast Vagin is a huge boy and is very strong. He is not a looker or even clever, but is always polite and a little shy. However, when he is playing sports he changes into a demon, putting his all into winning and nothing else. He is an average athlete and relies on his size and strength to win the day for him. Other than playing sports, he sometimes boxes with Ivan.'
 
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/19.jpg"></center>'
 	'<center>Avelina "Lina" Starov</center>'
@@ -645,11 +646,11 @@ if $ARGS[0] = 'outcasts':
 	'<center><h2>Outcast</h2></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/7.jpg"></center>'
 	'<center>Lesco Tsarev</center>'
-	'Everyone bullies Lesco about anything and everything. He is the nephew of Mr. Tsarev and the cousin of Lera. He resides with the Tsarev''s after his mother abandoned him for a week on one of her drug binges. He is very ugly and not very socialable. He always seems be sad and just wants to be left alone.'
+	'Everyone bullies Lesco about anything and everything. He is the nephew of Mr. Tsarev and the cousin of Lera. He resides with the Tsarevs after his mother abandoned him for a week on one of her drug binges. He is very ugly and not very sociable. He always seems be sad and just wants to be left alone.'
 
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/159.jpg"></center>'
 	'<center>Petia Alkaev</center>'
-	'Petia Alkaev is the class mooch. He persistently asks others for food, money and cigarettes. He can''t take a hint and doesn''t know the meaning of "personal space", which is made worse by the fact that he seems to be unaware of what soap is. He is an unattractive, overweight loser who makes girls uncomfortable by repeatedly hitting on them. No matter how many beatdowns he suffers or how many cruel pranks are pulled on him, he doesn''t seem to learn his lesson.'
+	'Petia Alkaev is the class mooch, persistently asking others for food, money and cigarettes. He can''t take a hint and doesn''t know the meaning of "personal space", which is made worse by the fact that he seems to be unaware of what soap is. He is an unattractive, overweight loser who makes girls uncomfortable by repeatedly hitting on them. No matter how many beatdowns he suffers or how many cruel pranks are pulled on him, he never seems to learn his lesson.'
 
 	if npc_grupTipe['A25'] = 5:
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/25.jpg"></center>'
@@ -666,7 +667,7 @@ if $ARGS[0] = 'outcasts':
 	if npc_grupTipe['A18'] = 5:
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/18.jpg"></center>'
 		'<center>Christina Zvereva</center>'
-		'Since your fight with Christina, she has been avoiding you. She has been humiliated ever since you told the whole school about how she sucked the P.E. teacher''s dick, and beat her up when she tried to fight you over it. Barely a shade of her former self, she stands timidly in a corner, her head still wrapped in bandages. Whenever she opens her mouth, people can see the broken teeth she hasn''t had a chance to get fixed yet.'
+		'Ever since your fight with Christina, she has been avoiding you. She was humiliated when you told the whole school about how she sucked the P.E. teacher''s dick and then beat her up when she tried to fight you over it. Barely a shade of her former self, she stands timidly in a corner, her head still wrapped in bandages. Whenever she opens her mouth, people can see the broken teeth she hasn''t had a chance to get fixed yet.'
 	end
 	
 	act 'Go back': gt 'journal', 'school'
@@ -686,7 +687,7 @@ if $ARGS[0] = 'popular':
 
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/22.jpg"></center>'
 	'<center>Elžbieta "Bella" Artamonov</center>'
-	'Bella Artamonov is the most beautiful girl in school and knows it, which makes her come off as arrogant. You don''t know her very well since she doesn''t want to deal with "kids." She seems to consider herself an adult already and the rest of her classmates as being beneath her, too young and childish for her to be around. You''ve heard some rumors about her only hanging around with people much older than herself.'
+	'Bella Artamonov is the most beautiful girl in school and knows it, which makes her come off as arrogant. You don''t know her very well since she doesn''t want to deal with "kids". She seems to consider herself an adult already and the rest of her classmates as being beneath her, too young and childish for her to be around. You''ve heard some rumors about her only hanging around with people much older than herself.'
 	
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/147.jpg"></center>'
 	'<center>Andrey Aleksandrov</center>'
@@ -718,14 +719,14 @@ if $ARGS[0] = 'popular':
 
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/14.jpg"></center>'
 	'<center>Ekaterina "Katja" Meynold</center>'
-	'Katja Meynold is a very attractive and petite girl, a redhead with a keen interest in fashion and cosmetics. She and her twin sister, Vicky, are like two sides of the same coin. As a quiet and sensible girl, Katja is shy and intelligent, but at times can also be impulsive. She can often be found at the disco with her sister.'
+	'Katja Meynold is a very attractive and petite girl, a redhead with a keen interest in fashion and cosmetics. She and her twin sister, Vicky, are like two sides of the same coin. As a quiet and sensible girl, Katja is shy and intelligent, but can also be impulsive at times. She can often be found at the disco with her sister.'
 
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/146.jpg"></center>'
 	'<center>Marcus Larson</center>'
 	if grupTipe = 1:
-		'Marcus Larson is an African American exchange student. He arrived at the school last year and opted to stay for a second year. He does well in school and is a good athlete. He seems to really enjoy Russia and has an eye for Russian girls, always going on about how they are so much more beautiful than the girls back home. He is a decent looking guy which, combined with his exotic looks, accent, athletic ability and different views, has made him pretty popular with the cool kids and jocks. He is friendly and outgoing and if he wasn''t such close friends with Andrey, he would have likely been a jock instead.'
+		'Marcus Larson is an African American exchange student who arrived at the school last year and opted to stay for a second year. He does well in school, is a good athlete and seems to really enjoy Russia. He has an eye for Russian girls, always going on about how they are much more beautiful than the girls back home and is a decent looking guy himself which, combined with his exotic looks, accent, athletic ability and different views, has made him popular with the cool kids and jocks. He is friendly and outgoing and if he wasn''t such close friends with Andrey, he would have likely been a jock instead.'
 	else
-		'Marcus Larson is an African American exchange student. He arrived at the school last year and opted to stay for a second year. He does well in school and is a good athlete. He seems to really enjoy Russia and has an eye for Russian girls, always going on about how they are so much more beautiful than the girls back home. He is a decent looking guy which, combined with his exotic looks, accent, athletic ability and different views, has made him pretty popular with the cool kids and jocks. He is friendly and outgoing, and stays with Andrey''s family, whom he has become close friends with.'
+		'Marcus Larson is an African American exchange student who arrived at the school last year and opted to stay for a second year. He does well in school, is a good athlete and seems to really enjoy Russia. He has an eye for Russian girls, always going on about how they are much more beautiful than the girls back home and is a decent looking guy himself which, combined with his exotic looks, accent, athletic ability and different views, has made him popular with the cool kids and jocks. He is friendly and outgoing, and stays with Andrey''s family, whom he has become close friends with.'
 	end
 
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/148.jpg"></center>'
@@ -758,7 +759,7 @@ if $ARGS[0] = 'gopniks':
 
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/154.jpg"></center>'
 	'<center>Radomir Popov</center>'
-	'Radomir Popov is the lead singer, backup guitarist and leader of a local underground rock/punk band named Pizdá Buystvo (Pussy Riot). They are considered fairly talented. He is more or less an asshole who thinks he should already be a star. Thus, he can be arrogant to almost everybody. Some of the girls obviously adore him because they think he is cool or are just groupies that latch onto his limited fame. He is more than happy to use his small amount of fame to let him use as many girls as he can, as often as he can. He seems to think girls only exist to provide him with sexual gratification.'
+	'Radomir Popov is the lead singer, backup guitarist and leader of a local underground rock/punk band named Pizdá Buystvo (Pussy Riot). They are considered fairly talented, but he is more or less an asshole who thinks he should already be a star. Thus, he can be arrogant to almost everybody. Some girls adore him because they think he is cool or are just groupies that latch onto his limited fame, but he is more than happy to use his small amount of fame to let him use as many girls as he can, as often as he can. He seems to think girls only exist to provide him with sexual gratification.'
 
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/157.jpg"></center>'
 	'<center>Roman Yakovlev</center>'

+ 2 - 2
locations/kseniyaQW.qsrc

@@ -1,5 +1,5 @@
 # kseniyaQW
-
+!2021/05/12
 if $ARGS[0] = 'event1':
 	$location_type = 'public_outdoors'
 	cls
@@ -218,7 +218,7 @@ if $ARGS[0] = 'event3_1':
 							'"I know I tricked you there but I find special customers for a very private shop. The address is on the card."'
 							'""You have a lovely body by the way." Kseniya blows you a kiss and leaves. By the time you are dressed she is long gone.'
 							*nl
-							'You look at the card again, "Expression of You," just off Pushkin High Street. Open Mon-Sat, 08:00 - 18:00'
+							'You look at the card again, "Expression of You," just off Pushkin Okhlopkov Square. Open Mon-Sat, 08:00 - 18:00'
 
 							act 'Leave': gt $loc, $loc_arg
 						end

+ 3 - 3
locations/liam.qsrc

@@ -1,5 +1,5 @@
 # liam
-!!2021/04/15
+!!2021/05/12
 $loc_arg = ''
 $loc = 'liam'
 $location_type = 'public_outdoors'
@@ -18,7 +18,7 @@ obMir = 0
 obLoker = 0
 houseob = 0
 borMir = 0
-'<center><B>Old town center</B></center>'
+'<center><B>Pushkin Town Center</B></center>'
 if month >= 11 or month <= 3:
 	if hour >= 8 and hour <= 21:
 		'<center><img <<$set_imgh>> src="images/locations/pushkin/townwinter.jpg"></center>'
@@ -37,7 +37,7 @@ end
 'Later, the rich bought the land off the poor and knocked down the wooden shacks and farm houses to build large estates. The city began to grow rapidly, and it became a desirable suburb.'
 'Since then, even the old houses have been improved, extended, and modernized. The old buildings and beautiful park made it popular with tourists, and it has become part of Pavlovsk.'
 
-'Not far from here is the quiet <a href="exec:minut += 5 & gt ''liames''">High Street</a>.'
+'Not far from here is the <a href="exec:minut += 5 & gt ''liames''">Okhlopkov Square</a>.'
 'Close by is a narrow street leading to a <a href="exec:gt ''dvor'',''start''">vacant house</a>.'
 'You see a <a href="exec:gt ''ugol'',''start''">passage</a> between the houses leading to a courtyard.'
 if car > 0 and cardrive = 14:

+ 7 - 5
locations/liames.qsrc

@@ -1,5 +1,6 @@
 # liames
-!!2021/04/15
+!!2021/05/12
+
 $loc_arg = ''
 $loc = 'liames'
 $location_type = 'public_outdoors'
@@ -19,11 +20,12 @@ set houseob=0
 set borMir=0
 set borLoker=0
 
-'<center><B>High Street</B></center>'
+'<center><B>Okhlopkov Square</B></center>'
 '<center><img <<$set_imgh>> src="images/locations/pushkin/liames.jpg" ></center>'
-'High Street is a square serving as the joining point of several smaller streets.  There are many small cafes and shops.'
+'Okhlopkov Square serves as the main intersection of several smaller streets.'  
+'There are many small cafes and shops also a flourishing nightlife and entertainment activities.'
 'Another street runs straight to the <a href="exec:minut += 5 & gt ''liam''">Town Center</a>.'
-'High Street itself leads to the Old Town <a href="exec:minut += 5 & gt ''parks'',''start''">Park</a>.'
+'Okhlopkov Square itself leads to the Pushkin <a href="exec:minut += 5 & gt ''parks'',''start''">Park</a>.'
 if hour >= 8 and hour <= 20:
 	'A small <a href="exec:gt ''larek'',''start''">grocery store</a> is currently open.'
 else
@@ -97,7 +99,7 @@ if rand(1,100) >= 95:
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pushkin/liamhud1.jpg"></center>'
 
-	'Making your way down High Street, you see a woman waiting patiently while an artist paints her portrait.'
+	'Making your way down Okhlopkov Square, you see a woman waiting patiently while an artist paints her portrait.'
 
 	act 'Continue': gt'liames'
 end

+ 6 - 5
locations/parks.qsrc

@@ -1,5 +1,6 @@
 # parks
-!!2021/04/15
+!!2021/05/12
+
 if $ARGS[0] = 'start':
 	*clr & cla
 	$location_type = 'public_outdoors'
@@ -10,15 +11,15 @@ if $ARGS[0] = 'start':
 	$locclass = 'city_park'
 	menu_off = 0
 	gs'stat'
-	'<center><B>Old Town Park</B></center>'
+	'<center><B>Pushkin Town Park</B></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pushkin/park/parkus.jpg" ></center>'
 	'The gardens of the old palace have been sculpted over many years into a wonder landscape with a tranquil atmosphere.'
-	'The old park is a favourite vacation spot for tourists and servers as the main feature of Old Town.'
+	'The Pushkin Park is a must-see for tourists and servers as the main attraction of Pushkin.'
 
 	'Wander deeper into the <a href="exec:gt ''lug'',''start''">park</a>.'
 
 
-	act 'Go to High Street (0:05)': minut += 5 &  gt 'liames'
+	act 'Go to Okhlopkov Square (0:05)': minut += 5 &  gt 'liames'
 
 	act 'Go to Town Center (0:10)': minut += 10 & gt 'liam'
 
@@ -28,7 +29,7 @@ if $ARGS[0] = 'start':
 		minut += 60
 		pcs_mood += 10
 		gs'stat'
-		'You leisurely stroll through Old Town Park, breathing in the fresh air, and reflecting on the vicissitudes of fate.'
+		'You leisurely stroll through Pushkin Park, breathing in the fresh air, and reflecting on the vicissitudes of fate.'
 
 		act 'Complete outing.':gt 'parks','start'
 	end

+ 1 - 1
locations/pav_industrial.qsrc

@@ -28,7 +28,7 @@ boynumBlock = 0
 if streetevent_hour + 2 < hour:gt'street_event','pav_industrial', 'main'
 
 '<center><h2>Pavlovsk Industrial District</h2></center>'
-'<center><img <<$set_imgh>> src="images/locations/pavlovsk/factory/gshveyfab.jpg"></center>'
+'<center><img <<$set_imgh>> src="images/locations/pavlovsk/factory/pav_factory.jpg"></center>'
 *nl
 'This is the Industrial region of Pavlovsk. It houses some factories and warehouses, along with the old houses that are small and run down.'
 *nl

+ 2 - 1
locations/pav_park.qsrc

@@ -1,4 +1,5 @@
 # pav_park
+!2021/05/12
 CLOSE ALL
 
 if $ARGS[0] = 'start':
@@ -94,7 +95,7 @@ if $ARGS[0] = 'start':
 
 	act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pav_residential'
 	act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
-	act 'Walk to the Old Town (0:10)':minut += 10 & gt 'liam'
+	act 'Walk to Pushkin (0:10)':minut += 10 & gt 'liam'
 
 	if hour > 8 and hour < 19:'There''s a small <a href="exec:minut += 5 & gt ''gskino''">movie theater</a> in the park. It only has a single screen.'
 	'The newly opened cafe <a href="exec:gt''cafe_parco'',''start''">"Del Parco"</a>, with eye-catching facade, lots of tables and a summer terrace. Two paths lead out of the park. One brings you to the <a href="exec:minut += 5 & gt ''pav_commercial''">commercial</a> the other to the <a href="exec:minut += 5 & gt ''pav_residential''">residential</a> area.'

+ 2 - 2
locations/pav_train.qsrc

@@ -1,5 +1,5 @@
 # pav_train
-
+!2021/05/12
 $loc = 'pav_train'
 $loc_arg = ''
 $menu_loc = 'pav_train'
@@ -269,7 +269,7 @@ gs 'family'
 
 act 'Walk to the Commercial area (0:10)':minut += 10 & gt 'pav_commercial'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
-act 'Walk to the Old Town (0:15)':minut += 15 & nroad = 19 & gt 'liam'
+act 'Walk to Pushkin (0:15)':minut += 15 & nroad = 19 & gt 'liam'
 
 act 'Enter the station building': minut += 3 & gt 'pav_train_hall'
 

+ 3 - 2
locations/shop_fancy_pancy.qsrc

@@ -1,5 +1,6 @@
 # shop_fancy_pancy
-!!2021/04/15
+!!2021/05/12
+
 if $ARGS[0] = 'start':
 	$loc_arg = $ARGS[0]
 	$loc = 'shop_fancy_pancy'
@@ -12,7 +13,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Fancy Pancy</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pushkin/fancypancy/shop_name.png"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pushkin/fancypancy/shop.jpg"></center>'
 	*nl
 	'This small boutique shop looks more like a dressing room at the burlesque club nearby. Satin, leather, ruffles and glamour make it clear this is not a place to buy a practical outfit. It is the only place to buy outfits suitable for the burlesque club or perhaps spice up things in the bedroom.'
 	*nl

+ 49 - 47
locations/stat.qsrc

@@ -743,53 +743,55 @@ else
 			if pcs_horny < 100:pcs_horny += 2
 		end
 !!SECTION: Commando trait (15 minute interval update checks)
-		if trait['commando_lvl'] = 0 and $clothingworntype ! 'nude' and $pantyworntype = 'none':
-			if PCloSkirt > 0:
-				trait['commando_exp'] += 2
-			else
-				trait['commando_exp'] += 1
-			end
-			if trait['commando_exp'] >= 1000:
-				trait['commando_exp'] = 0
-				trait['commando_lvl'] += 1
-				msg'You have gained the Commando trait! You have become accustomed to the idea you don''t have to wear panties all the time and can now comfortably wear skirts without panties. Pants are still a little itchy though...'
-			end
-		elseif trait['commando_lvl'] = 1 and $clothingworntype ! 'nude' and $pantyworntype = 'none':
-			trait['commando_exp'] += 2
-			if trait['commando_exp'] >= 1000:
-				trait['commando_exp'] = 0
-				trait['commando_lvl'] += 1
-				msg'You have gained the 2nd level of the Commando trait! You have become very comfortable without panties and the raw insides of your pants no longer irritate your pussy.'
-			end
-		elseif trait['commando_lvl'] = 2 and $clothingworntype ! 'nude' and $pantyworntype = 'none':
-			mosol = 0
-			trait['commando_exp'] += 2
-			if trait['commando_exp'] >= 1000:
-				trait['commando_exp'] = 0
-				trait['commando_lvl'] += 1
-				msg'You have gained the 3nd level of the Commando trait! You have become so accustomed to going commando that any kind of underwear over your hips just feels <i>wrong</i>. You suffer mood penalties while wearing panties.'
-			end
-		elseif trait['commando_lvl'] = 3 and $clothingworntype ! 'nude' and $pantyworntype = 'none':
-			trait['commando_exp'] += 1
-		elseif trait['commando_lvl'] = 3 and $clothingworntype ! 'nude' and $pantyworntype ! 'none':
-			trait['commando_exp'] -= 1
-			pcs_mood -= 1
-		end
-	
-	
-	
-		if trait['commando_lvl'] > 0 and trait['commando_lvl'] < 3 and $clothingworntype ! 'nude' and $pantyworntype ! 'none':
-			trait['commando_exp'] -= 1
-			if trait['commando_exp'] <= 0:
-				trait['commando_exp'] = 999
-				trait['commando_lvl'] -= 1
-			end
-		elseif trait['commando_lvl'] > 0 and trait['commando_lvl'] = 3 and $clothingworntype ! 'nude' and $pantyworntype ! 'none':
-			trait['commando_neg_exp'] += 1
-			if trait['commando_neg_exp'] >= 1000 + trait['commando_exp']:
-				trait['commando_neg_exp'] = 0
-				trait['commando_exp'] = 0
-				trait['commando_lvl'] -= 1
+		if $clothingworntype ! 'nude':
+			if $pantyworntype = 'none':
+!! Addition to trait exp/lvls
+				if trait['commando_lvl'] = 0:
+					if PCloSkirt > 0:
+						trait['commando_exp'] += 2
+					else
+						trait['commando_exp'] += 1
+					end
+					if trait['commando_exp'] >= 1000:
+						trait['commando_exp'] = 50
+						trait['commando_lvl'] = 1
+						msg'You have gained the Commando trait! You have become accustomed to the idea you don''t have to wear panties all the time and can now comfortably wear skirts without panties. Pants are still a little itchy though...'
+					end
+				elseif trait['commando_lvl'] = 1:
+					trait['commando_exp'] += 2
+					if trait['commando_exp'] >= 1000:
+						trait['commando_exp'] = 50
+						trait['commando_lvl'] = 2
+						msg'You have gained the 2nd level of the Commando trait! You have become very comfortable without panties and the raw insides of your pants no longer irritate your pussy.'
+					end
+				elseif trait['commando_lvl'] = 2:
+					mosol = 0
+					trait['commando_exp'] += 2
+					if trait['commando_exp'] >= 1000:
+						trait['commando_exp'] = 500
+						trait['commando_lvl'] = 3
+						msg'You have gained the 3rd level of the Commando trait! You have become so accustomed to going commando that any kind of underwear over your hips just feels <i>wrong</i>. You suffer mood penalties while wearing panties.'
+					end
+				elseif trait['commando_lvl'] = 3:
+					trait['commando_exp'] += 1
+				end
+			elseif trait['commando_lvl'] > 0:
+!!Reduction from exp/lvls
+				if trait['commando_lvl'] = 3:
+					trait['commando_exp'] -= 1
+					pcs_mood -= 1
+					if trait['commando_exp'] <= 0:
+						trait['commando_exp'] = 500
+						trait['commando_lvl'] = 2
+						msg'You have lost the 3rd level of the Commando trait! You are now only comfortable not wearing panties and will not suffer irritation from wearing pants while going commando.'
+					end
+				else
+					trait['commando_exp'] -= 1
+					if trait['commando_exp'] <= -0:
+						trait['commando_exp'] = 900
+						trait['commando_lvl'] -= 1
+					end
+				end
 			end
 		end
 

+ 1 - 1
locations/underwear.qsrc

@@ -11,7 +11,7 @@ end
 
 if $ARGS[0] = 'remove':
 	!!check for swimwear to prevent duplicate stripping stopping Sveta putting underwear on when she puts her clothes on
-	if $clothingworntype ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis' and $pantyworntype ! 'none' and $braworntype ! 'none':
+	if $clothingworntype ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis' and ($pantyworntype ! 'none' or $braworntype ! 'none'):
 		if $pantyworntype = 'none':
 			panty_none = 1
 		else