12 次代碼提交 1826d66157 ... 1cfa3d7b25

作者 SHA1 備註 提交日期
  Kevin_Smarts 1cfa3d7b25 [added] new bimbo start from BBZ01 2 周之前
  Kevin_Smarts 54f0715dab Merge remote-tracking branch 'Lusticon/master' 2 周之前
  Lusticon 9f6771aa9f [fixed] dead end 2 周之前
  Lusticon 92aaed5a6d [fixed] clear restrictions music performing 2 周之前
  Lusticon 5138e5552d [removed] torgpred leftovers 2 周之前
  Lusticon 6a2e7b5693 [fixed] String vs Integer 2 周之前
  anjuna krokus 0d3a3d02c4 [added] Natasha school and disco chats. Written by BBZ01 2 周之前
  anjuna krokus 2bc2c2266e Merge remote-tracking branch 'master/master' 2 周之前
  Lusticon 56e621000f [fixed] face cum check 2 周之前
  anjuna krokus 1c68b6b829 [changed/removed] Removed duplicate entry in the blackmailer text chain. Changed the "send selfie" description to better stress that you can only send non-nude selfies (at the first part of the questline) 2 周之前
  Lusticon 9e7da27957 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 2 周之前
  Lusticon d287cecfeb [fixed] syntax errors 2 周之前
共有 54 個文件被更改,包括 600 次插入350 次删除
  1. 0 1
      glife-notepad++
  2. 14 14
      locations/DNA.qsrc
  3. 1 0
      locations/LOCA.qsrc
  4. 6 5
      locations/albina_wine_event.qsrc
  5. 0 2
      locations/bedrPar.qsrc
  6. 29 48
      locations/blackmailer.qsrc
  7. 11 9
      locations/boyStat.qsrc
  8. 1 1
      locations/clothing.qsrc
  9. 1 0
      locations/din_bad.qsrc
  10. 29 15
      locations/emp_functions.qsrc
  11. 3 0
      locations/emp_job_array.qsrc
  12. 1 1
      locations/father.qsrc
  13. 1 1
      locations/flash.qsrc
  14. 3 3
      locations/gadukino_event.qsrc
  15. 75 58
      locations/gschool_coolkid_chats.qsrc
  16. 81 46
      locations/gschool_gossip.qsrc
  17. 5 1
      locations/gschool_nerd_chats.qsrc
  18. 6 0
      locations/gschool_post_shower.qsrc
  19. 1 1
      locations/initg.qsrc
  20. 1 1
      locations/internet_mobile.qsrc
  21. 96 13
      locations/intro_city_select.qsrc
  22. 39 7
      locations/intro_initialization.qsrc
  23. 42 3
      locations/intro_initialization_city.qsrc
  24. 68 47
      locations/intro_sg_select.qsrc
  25. 1 0
      locations/journal.qsrc
  26. 1 1
      locations/music_actions.qsrc
  27. 7 2
      locations/natbel_chat.qsrc
  28. 3 3
      locations/nichTanya.qsrc
  29. 3 3
      locations/npc.qsrc
  30. 1 1
      locations/npcpreservec.qsrc
  31. 1 1
      locations/pav_complex.qsrc
  32. 5 1
      locations/pav_disco_coolkids.qsrc
  33. 1 1
      locations/pav_disco_sex.qsrc
  34. 5 1
      locations/pav_library_nerdstudy.qsrc
  35. 4 4
      locations/phone_selfies.qsrc
  36. 4 4
      locations/saveupdater.qsrc
  37. 1 1
      locations/sex_ev_after.qsrc
  38. 5 3
      locations/sex_ev_condoms.qsrc
  39. 2 2
      locations/sex_ev_dress_talking.qsrc
  40. 3 3
      locations/sex_ev_pillow_talk.qsrc
  41. 16 16
      locations/sex_ev_reactions.qsrc
  42. 1 1
      locations/sex_ev_reactions_creampie.qsrc
  43. 3 3
      locations/sex_ev_sex.qsrc
  44. 1 1
      locations/sex_ev_talk.qsrc
  45. 1 1
      locations/shoes.qsrc
  46. 3 3
      locations/shop.qsrc
  47. 3 3
      locations/shortgs.qsrc
  48. 7 5
      locations/show_table.qsrc
  49. 0 2
      locations/sitr.qsrc
  50. 0 2
      locations/sitr2x.qsrc
  51. 1 1
      locations/spell.qsrc
  52. 1 1
      locations/street_event.qsrc
  53. 2 2
      locations/telefon.qsrc
  54. 0 1
      locations/uni_dorm.qsrc

+ 0 - 1
glife-notepad++

@@ -1253,7 +1253,6 @@
 				<File name="locations\univer_din.qsrc" />
 				<File name="locations\univer.qsrc" />
 				<File name="locations\trashplace.qsrc" />
-				<File name="locations\torgpred.qsrc" />
 				<File name="locations\TimofeiMetro.qsrc" />
 				<File name="locations\Timofei.qsrc" />
 				<File name="locations\tanvanr.qsrc" />

+ 14 - 14
locations/DNA.qsrc

@@ -12,34 +12,34 @@ if $ARGS[0] = 'relate':
 !!Comparing two DNA string to determine genetic relation
 	!!First sample
 	!!own ID
-	temp1[0] = $mid ($ARGS[1], 1, 10)
+	temp1[0] = val($mid($ARGS[1], 1, 10))
 	!!mother ID
-	temp1[1] = $mid ($ARGS[1], 12, 10)
+	temp1[1] = val($mid($ARGS[1], 12, 10))
 	!!father ID
-	temp1[2] = $mid ($ARGS[1], 23, 10)
+	temp1[2] = val($mid($ARGS[1], 23, 10))
 	!!maternal grandmother ID
-	temp1[3] = $mid ($ARGS[1], 34, 10)
+	temp1[3] = val($mid($ARGS[1], 34, 10))
 	!!maternal grandfather ID
-	temp1[4] = $mid ($ARGS[1], 45, 10)
+	temp1[4] = val($mid($ARGS[1], 45, 10))
 	!!paternal grandmother ID
-	temp1[5] = $mid ($ARGS[1], 56, 10)
+	temp1[5] = val($mid($ARGS[1], 56, 10))
 	!!paternal grandfather ID
-	temp1[6] = $mid ($ARGS[1], 67, 10)
+	temp1[6] = val($mid($ARGS[1], 67, 10))
 	!!Second sample
 	!!own ID
-	temp2[0] = $mid ($ARGS[2], 1, 10)
+	temp2[0] = val($mid($ARGS[2], 1, 10))
 	!!mother ID
-	temp2[1] = $mid ($ARGS[2], 12, 10)
+	temp2[1] = val($mid($ARGS[2], 12, 10))
 	!!father ID
-	temp2[2] = $mid ($ARGS[2], 23, 10)
+	temp2[2] = val($mid($ARGS[2], 23, 10))
 	!!maternal grandmother ID
-	temp2[3] = $mid ($ARGS[2], 34, 10)
+	temp2[3] = val($mid($ARGS[2], 34, 10))
 	!!maternal grandfather ID
-	temp2[4] = $mid ($ARGS[2], 45, 10)
+	temp2[4] = val($mid($ARGS[2], 45, 10))
 	!!paternal grandmother ID
-	temp2[5] = $mid ($ARGS[2], 56, 10)
+	temp2[5] = val($mid($ARGS[2], 56, 10))
 	!!paternal grandfather ID
-	temp2[6] = $mid ($ARGS[2], 67, 10)
+	temp2[6] = val($mid($ARGS[2], 67, 10))
 	
 	killvar 'gen_relationship'
 	

+ 1 - 0
locations/LOCA.qsrc

@@ -7,6 +7,7 @@ if debug['trace_loc_change'] = 1:
 end
 
 if settingmode = 0: killvar 'cheatmenu'
+gs 'music_actions', 'clear_restrictions'
 
 !{
 msg "Changed Location 

+ 6 - 5
locations/albina_wine_event.qsrc

@@ -255,14 +255,15 @@ if $ARGS[0] = 'shave_talk':
 		!! clean shaven
 		'"I can''t believe how many girls at school don''t shave their pussy," Albina says with a disgusted look on her face. "How can they stand having all that hair down there?"'
 		gs 'albina_wine_event','shave_answer1'
-	elseif pcs_pubes <= 10:
+!!	elseif pcs_pubes <= 10:
+	elseif pcs_pubes <= 15:
 		!! stubbly
 		'"You need a shave," Albina says with a disgusted look on her face as she moves her head uncomfortably on your lap. "I can practically feel your stubble velcroing to my hair right now!"'
 		gs 'albina_wine_event','shave_answer2'
-	elseif pcs_pubes <= 15:
-		!! small patch
-		'"Ugh, how can you stand having hair down there?" Albina rants. "Why don''t you just shave it off? It''s not like you have much down there anyway."'
-		gs 'albina_wine_event','shave_answer3'
+!!	elseif pcs_pubes <= 15:
+!!		!! small patch
+!!		'"Ugh, how can you stand having hair down there?" Albina rants. "Why don''t you just shave it off? It''s not like you have much down there anyway."'
+!!		gs 'albina_wine_event','shave_answer3'
 	elseif pcs_pubes <= 25:
 		!! trimmed/styled bush
 		if (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:

+ 0 - 2
locations/bedrPar.qsrc

@@ -290,8 +290,6 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 				access['nocamshow'] = 1
 				$access['noporn'] = 'You shouldn''t watch porn with your sister in the room. She would notice for sure!'
 				$access['nocamshow'] = 'You can''t do any webcam activities with your sister in the room!'
-			else
-				gs 'music_actions', 'clear_restrictions'
 			end
 
 			if locat['Anya_inroom'] = 0 and mc_inventory['breast_pump'] = 1 and bp_unbox <= 0:

+ 29 - 48
locations/blackmailer.qsrc

@@ -387,9 +387,9 @@ if $ARGS[0] = 'Add_SMS_failure':
 		gs 'SMStext_builder', 'end'
 
 		if blackmailQW['stage'] < 9:
-			if blackmailQW['init_flashregion'] = 'city':
+			if $blackmailQW['init_flashregion'] = 'city':
 				fame['city_sex'] += 2 * blackmailQW['total_material']
-			elseif blackmailQW['init_flashregion'] = 'gad':
+			elseif $blackmailQW['init_flashregion'] = 'gad':
 				fame['gad_sex'] += 10 * blackmailQW['total_material']
 			else
 				fame['pav_sex'] += 5 * blackmailQW['total_material']
@@ -497,7 +497,7 @@ if $ARGS[0] = 'police1':
 	if $region = 'pav':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/police/pavrec.jpg" ></center>'
 		'You walk up to a bored looking cop shuffling about some paperwork.'
-	else:
+	else
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/police/cityrec.jpg"></center>'
 		'You walk up to a window, you pick up the phone and hear a buzzer sound on the other side. One of the officers picks it up without hesitation and looks at you.'
 	end
@@ -568,7 +568,7 @@ if $ARGS[0] = 'police1':
 
 			if $region = 'pav':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/police/pavext.jpg" ></center>'
-			else:
+			else
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/police/cityext.jpg"></center>'
 			end
 			'Sitting in the interrogation room with the police officer, the situation suddenly comes crashing into you. You''re going to have to show some proof. That you were flashing your <<$blackmailQW[''init_flashaction'']>> <<$blackmailQW[''init_flashloc_desc'']>>. They will see the texts, the photos. They will see you for who you must be on the inside. You can already feel their eyes judging you.'
@@ -589,7 +589,7 @@ if $ARGS[0] = 'police_deleted':
 
 	if $region = 'pav':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/police/pavext.jpg" ></center>'
-	else:
+	else
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/police/cityext.jpg"></center>'
 	end
 	'"Uhhmm" you stammer. "I, uhh, I deleted them."'
@@ -690,26 +690,26 @@ if $ARGS[0] = 'set_SMSTree':
 		$SMSTree['11b'] = 'or you could do something special for us'
 
 			$SMSTree['a12'] = 'fuck you'
-			$SMSTree['b12'] = 'Send a selfie from your galleray'
-			$SMSTree['c12'] = 'what?'
-			$SMSTree['d12'] = 'yes sir'
-
+			$SMSTree['b12'] = 'Send a (non-nude) selfie from your galleray'
+			$SMSTree['c12'] = 'Send a selfie from your galleray'
+			$SMSTree['d12'] = 'what?'
+			$SMSTree['e12'] = 'yes sir'
 
-		$SMSTree['a20'] = 'WTF! i said a pic of your tits, not this boring shit'
-			$SMSTree['a21'] = 'you better bring an additional 500 <b>₽</b>!'
-				$SMSTree['a22'] = 'drop <<blackmailQW[''next_payment''] + 500>> <b>₽</b> off in the park, or else!'
-		$SMSTree['b20'] = 'nice'
-			$SMSTree['b21'] = 'that''s worth about 500 <b>₽</b>'
-				$SMSTree['b22'] = 'don''t forget to drop <<blackmailQW[''next_payment''] - 500>> <b>₽</b> off in the park'
-		$SMSTree['c20'] = 'WOW'
-			$SMSTree['c21'] = 'that''s worth about 1000 <b>₽</b>'
-				$SMSTree['c22'] = 'don''t forget to drop <<blackmailQW[''next_payment''] - 1000>> <b>₽</b> off in the park'
-		$SMSTree['d20'] = 'DAMN! you really are a slut aren''t you'
-			$SMSTree['d21'] = 'definitely worth 2000 <b>₽</b>'
-				$SMSTree['d22'] = 'now you only need to drop <<blackmailQW[''next_payment''] - 2000>> <b>₽</b> off in the park'
 
+	$SMSTree['a20'] = 'WTF! i said a pic of your tits, not this boring shit'
+		$SMSTree['a21'] = 'you better bring an additional 500 <b>₽</b>!'
+			$SMSTree['a22'] = 'drop <<blackmailQW[''next_payment''] + 500>> <b>₽</b> off in the park, or else!'
+	$SMSTree['b20'] = 'nice'
+		$SMSTree['b21'] = 'that''s worth about 500 <b>₽</b>'
+			$SMSTree['b22'] = 'don''t forget to drop <<blackmailQW[''next_payment''] - 500>> <b>₽</b> off in the park'
+	$SMSTree['c20'] = 'WOW'
+		$SMSTree['c21'] = 'that''s worth about 1000 <b>₽</b>'
+			$SMSTree['c22'] = 'don''t forget to drop <<blackmailQW[''next_payment''] - 1000>> <b>₽</b> off in the park'
+	$SMSTree['d20'] = 'DAMN! you really are a slut aren''t you'
+		$SMSTree['d21'] = 'definitely worth 2000 <b>₽</b>'
+			$SMSTree['d22'] = 'now you only need to drop <<blackmailQW[''next_payment''] - 2000>> <b>₽</b> off in the park'
 
-				$SMSTree['x22'] = 'you''re all settled for now'
+			$SMSTree['x22'] = 'you''re all settled for now'
 
 
 	$SMSTree['30'] = 'We''ll send you a package with instructions, it''ll take a while though'
@@ -790,11 +790,15 @@ if $ARGS[0] = 'sms_repeat_switch1':
 		gs 'SMStext_builder', 'receive', $SMSTree['11' + $ARGS[1]]
 
 		gs 'SMStext_builder', 'add_reply', $SMSTree['a12'], 'blackmailer', 'sms_repeat_end1', 'a12'
-		gs 'SMStext_builder', 'send_selfie', $SMSTree['b12'], iif(blackmailQW['stage'] < 6, 'c|sw|u|ft|fa', 'c|sw|u|n|b|sh|ft|fa|fp'), 'blackmailer', 'sms_repeat_switch2'
+		if blackmailQW['stage'] < 6:
+			gs 'SMStext_builder', 'send_selfie', $SMSTree['b12'], 'c|sw|u|ft|fa', 'blackmailer', 'sms_repeat_switch2'
+		else
+			gs 'SMStext_builder', 'send_selfie', $SMSTree['c12'], 'c|sw|u|n|b|sh|ft|fa|fp', 'blackmailer', 'sms_repeat_switch2'
+		end
 		if $ARGS[1] = 'b': 
-			gs 'SMStext_builder', 'add_reply', $SMSTree['c12'], 'blackmailer', 'sms_repeat_switch3', 'c12'
+			gs 'SMStext_builder', 'add_reply', $SMSTree['d12'], 'blackmailer', 'sms_repeat_switch3', 'd12'
 		elseif $ARGS[1] = 'c':
-			gs 'SMStext_builder', 'add_reply', $SMSTree['c12'], 'blackmailer', 'sms_repeat_switch5', 'd12'
+			gs 'SMStext_builder', 'add_reply', $SMSTree['e12'], 'blackmailer', 'sms_repeat_switch5', 'e12'
 		end
 
 		gs 'SMStext_builder', 'show_sms', ARGS[3]
@@ -908,29 +912,6 @@ if $ARGS[0] = 'sms_repeat_switch4':
 	gs 'SMStext_builder', 'end'
 end
 
-if $ARGS[0] = 'sms_repeat_switch4':
-	gs 'blackmailer', 'set_SMSTree'
-
-	if blackmailQW['stage'] < 8: blackmailQW['stage'] = 8
-	blackmailQW['smsday'] = daystart + 14
-	blackmailQW['next_payment'] = 0
-
-	gs 'SMStext_builder', 'start'
-		gs 'SMStext_builder', 'send', $SMSTree[$ARGS[1] + '31']
-		gs 'SMStext_builder', 'show_sms', ARGS[2]
-
-		wait 250
-
-		gs 'SMStext_builder', 'receive', $SMSTree[$ARGS[1] + '32']
-
-		if $ARGS[1] = 'b':
-			!! penalty in the future when not using the proper speech
-		end
-		gs 'SMStext_builder', 'show_sms', ARGS[3]
-	gs 'SMStext_builder', 'end'
-end
-
-
 !! END OF CONTENT MESSAGE
 if $ARGS[0] = 'sms_repeat_switch5':
 	gs 'blackmailer', 'set_SMSTree'

+ 11 - 9
locations/boyStat.qsrc

@@ -12,7 +12,7 @@ if ($ARGS[0] = '' and ARGS[0] > 0) or mid($ARGS[0],1,1) < 10:
 	if ARGS[0] > 0:
 		npclastcalledn = ARGS[0]
 	else
-		npclastcalledn = $ARGS[0]
+		npclastcalledn = val($ARGS[0])
 	end
 	$npcboytemp = 'A' + npclastcalledn
 else
@@ -26,7 +26,7 @@ end
 
 if mid($npcboytemp,1,1) = 'A' or mid($npcboytemp,1,1) = 'B' or mid($npcboytemp,1,1) = 'C':
 	$npclastcalled = $npcboytemp
-	npclastcalledn = mid($npcboytemp, 2)
+	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 ...
 	$bstemp[1] = $npc_usedname[$npclastcalled]
 	bstemp[2] = npc_dick[$npclastcalled]
@@ -34,27 +34,28 @@ if mid($npcboytemp,1,1) = 'A' or mid($npcboytemp,1,1) = 'B' or mid($npcboytemp,1
 	bstemp[4] = npc_sexskill[$npclastcalled]
 	gs 'pronouns', npc_gender[$npclastcalled], $ARGS[1]
 elseif mid($npcboytemp,1,1) = 'D':
-	if mid($npcboytemp, 2) = 1:
+	npclastcalledn = val(mid($npcboytemp, 2))
+	if npclastcalledn = 1:
 		$bstemp[1] = 'small sized'
 		bstemp[2] = 10
 		$bstemp[3] = 'slim'
-	elseif mid($npcboytemp, 2) = 2:
+	elseif npclastcalledn = 2:
 		$bstemp[1] = 'medium sized'
 		bstemp[2] = 15
 		$bstemp[3] = 'well proportioned'
-	elseif mid($npcboytemp, 2) = 3:
+	elseif npclastcalledn = 3:
 		$bstemp[1] = 'large sized'
 		bstemp[2] = 20
 		$bstemp[3] = 'thicker than average'
-	elseif mid($npcboytemp, 2) = 4:
+	elseif npclastcalledn = 4:
 		$bstemp[1] = 'huge sized'
 		bstemp[2] = 25
 		$bstemp[3] = 'thick'
-	elseif mid($npcboytemp, 2) = 5:
+	elseif npclastcalledn = 5:
 		$bstemp[1] = 'giant sized'
 		bstemp[2] = 30
 		$bstemp[3] = 'massive'
-	elseif mid($npcboytemp, 2) = 6:
+	elseif npclastcalledn = 6:
 		$bstemp[1] = 'humongous sized'
 		bstemp[2] = 35
 		$bstemp[3] = 'monstrous'
@@ -113,8 +114,9 @@ else
 end
 
 killvar 'bstemp'
-killvar '$bstemp'
 killvar 'boyStat_i'
+killvar 'npclastcalledn'
+killvar 'npcboytemp'
 
 
 

+ 1 - 1
locations/clothing.qsrc

@@ -1511,7 +1511,7 @@ if $ARGS[0] = 'view_clothing_item':
 			if $ARGS[1] = 'coat' and ARGS[2] = 5:
 				price = ARGS[3]
 			else
-				price = ('<<ARGS[3]>>' * ((5 * CloQuality) + 100) / 100) * 1000 / (1250 - Clothingstock[ARGS[2]]) * 3 / 2
+				price = (ARGS[3] * ((5 * CloQuality) + 100) / 100) * 1000 / (1250 - Clothingstock[ARGS[2]]) * 3 / 2
 				price = price / 50 * 50
 			end
 			'Price: <<price>> <b>₽</b>'

+ 1 - 0
locations/din_bad.qsrc

@@ -744,6 +744,7 @@ $d_cycreport_actor = {
 		end
 		
 		killvar 'potfather_counter'
+		killvar 'potfather_temp'
 		
 		'<br>  <a href="exec:dynamic $d_cycreport_choice & gs ''stat''">Accept</a>'
 		'</td></tr></table></center>'

+ 29 - 15
locations/emp_functions.qsrc

@@ -64,12 +64,11 @@ if $ARGS[0] = 'gen_schedule':
 		elseif header_switch=2: 
 			header_switch = 1
 			$tableheader += '<th style="padding: 10px;"><font color="<<$font_theme>>">' + iif(display_hour < 10, '0<< display_hour>>', display_hour) + ':30</font></th>'
-		end		
+		end
 		i_hour += 1
 	if i_hour <=  mod_max_hour: jump 'jmp_header_create'
 	! Reset i_hour for next loop	
 	killvar 'display_hour'
-	killvar 'header_switch'
 	i_hour = ARGS[1]
 	header_switch = 1
 	!! Close out table header
@@ -97,11 +96,11 @@ if $ARGS[0] = 'gen_schedule':
 					dynamic $schedule_tracker 
 				elseif function_sw = 2:
                     flag_active  = 1
-                    j_id = emp_rota_week[i_day +  '_' + i_hour]
-                    if emp_rota_week[i_day +  '_' + i_hour] ! 0:							
-                        $transient_tb =  '<a  href="exec:gs ''emp_functions'', ''job_info'', <<j_id>>">' + $emp_job_title[j_id] + '</a>'
+                    j_id = emp_rota_week['<<i_day>>_<<i_hour>>']
+                    if emp_rota_week['<<i_day>>_<<i_hour>>'] ! 0:							
+                        $transient_tb = '<a  href="exec:gs ''emp_functions'', ''job_info'', <<j_id>>">' + $emp_job_title[j_id] + '</a>'
                     else
-                        $transient_tb  = 'Free'
+                        $transient_tb = 'Free'
                     end
 				elseif function_sw = 3:
 				else
@@ -113,8 +112,8 @@ if $ARGS[0] = 'gen_schedule':
 				else
 					$tablebody +=  '<td style="padding: 10px;">' + $transient_tb +'</td>'
 					flag_active = 0
-					killvar '$transient_tb'
 				end	
+				killvar '$transient_tb'
 			else
 				 i_day += 1
 				 jump 'jmp_day_create'
@@ -142,6 +141,10 @@ if $ARGS[0] = 'gen_schedule':
     !! Start the table constuction    
     '<center><table border=0 cellpadding=1 bgcolor="<<$body_theme>>" width="95%" align="center"><<$tableheader>><<$tablebody>></table>'
     '<<$msg_back>> | <<$msg_forward>>'
+	killvar '$tablebody'
+	killvar '$tableheader'
+	killvar '$msg_back'
+	killvar '$msg_forward'
     *nl
     if  function_sw = 1:
 	'<b>Note:</b> Times are approximate, some characters will appear at quarter past or quarter to the hour.</center>' 
@@ -152,7 +155,6 @@ if $ARGS[0] = 'gen_schedule':
     act 'Back':
 		killvar 'flag_schedule'
 		killvar 'school_group'
-		killvar 'j_id'
 		gt $loc, $loc_arg
 	end
 end
@@ -167,6 +169,7 @@ if $ARGS[0] = 'job_info':
 	$msg_body += '<p>Wages: ' + func('agentned', 'format_price_string', emp_job_wages[j_id]) + '<b>₽</b></p>'
 	
 	msg '<<$msg_body>>'
+	killvar '$msg_body'
 end
 
 !! --------------------- Event Generator
@@ -538,7 +541,7 @@ if $ARGS[0] = 'emp_booking':
 		:jmp_daily_book
 			j_idx = emp_job_start[j_id]
 			:jmp_hour_book
-				emp_rota_week[d_idx + '_' + j_idx]  = j_id
+				emp_rota_week['<<d_idx>>_<<j_idx>>'] = j_id
 				j_idx += 1
 			if j_idx <= j_finish: jump 'jmp_hour_book'	
 			d_idx += 1
@@ -563,7 +566,7 @@ if $ARGS[0] = 'emp_chk_clk':
 	:jmp_daily_chk
 		j_idx = emp_job_start[j_id]
 		:jmp_job_chk
-			if emp_rota_week[d_idx + '_' + j_idx]  >  0:
+			if emp_rota_week['<<d_idx>>_<<j_idx>>'] > 0:
 				!! booking failed					
 				emp_rota_fail = 1
 			else
@@ -583,7 +586,7 @@ if $ARGS[0] = 'emp_terminate':
 		:jmp_daily_book
 			j_idx = emp_job_start[j_id]
 			:jmp_hour_book
-				emp_rota_week[d_idx + '_' + j_idx] = 0
+				emp_rota_week['<<d_idx>>_<<j_idx>>'] = 0
 				j_idx += 1
 			if j_idx <= j_finish: jump 'jmp_hour_book'	
 			d_idx += 1
@@ -594,10 +597,6 @@ if $ARGS[0] = 'emp_terminate':
 	else
 		msg 'Job termination failed. Please ensure you set to  4 - Terminated or 5 - Fired'
 	end
-	killvar 'j_idx'
-	killvar 'j_finish'
-	killvar 'd_idx'
-	killvar 'd_end'	
 end
 
 if $ARGS[0] = 'loop_configure':	
@@ -612,4 +611,19 @@ if $ARGS[0] = 'loop_configure':
 		d_end= 7
 	end	
 end
+
+killvar 'i_day'
+killvar 'i_hour'
+killvar 'j_id'
+killvar 'j_idx'
+killvar 'j_day'
+killvar 'j_finish'
+killvar 'd_idx'
+killvar 'd_end'
+killvar 'evt_idx'
+killvar 'set_hour'
+killvar 'mod_max_day'
+killvar 'mod_max_hour'
+killvar 'header_switch'
+
 --- emp_functions ---------------------------------

+ 3 - 0
locations/emp_job_array.qsrc

@@ -121,4 +121,7 @@ if $ARGS[0] = 'emp_titran':
 	end
 end
 
+killvar 'j_id'
+killvar 'j_day'
+
 --- emp_job_array ---------------------------------

+ 1 - 1
locations/father.qsrc

@@ -174,7 +174,7 @@ act 'Chat':
     gs 'stat'
     '<center><B><font color=maroon>Your stepfather, Vladimir Mikhailovich Scriabin</font></B></center>'
     '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
-	if $loc = sitrPar:
+	if $loc = 'sitrPar':
 		'Your stepfather is sitting on the couch in the living room, he is watching TV. You decide to join him for a while and sit down next to him.'
 	else
 		'Your stepfather is sitting by the dinner table eating and reading the newspaper.'

+ 1 - 1
locations/flash.qsrc

@@ -92,7 +92,7 @@ if $ARGS[0] = 'get_image' and $flash_image = '':
 	end
 
 	flashVars['rand'] = rand(1, flashVars[$temp_id_text])
-	$flash_image += flashVars['rand']
+	$flash_image += str(flashVars['rand'])
 	$flashVars['image'] = $flash_image
 
 	killvar 'temp_id_text'

+ 3 - 3
locations/gadukino_event.qsrc

@@ -836,13 +836,13 @@ if $ARGS[0] = 'gadukino_2boys':
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
 			cla
-			if $ARGS[1] = 1:
+			if max(val($ARGS[1]),ARGS[1]) = 1:
 				npc_rel['A63'] -= 3
 				npc_rel['A61'] -= 3
-			elseif $ARGS[1] = '2':
+			elseif max(val($ARGS[1]),ARGS[1]) = 2:
 				npc_rel['A63'] -= 3
 				npc_rel['A62'] -= 3
-			elseif $ARGS[1] = '3':
+			elseif max(val($ARGS[1]),ARGS[1]) = 3:
 				npc_rel['A61'] -= 3
 				npc_rel['A62'] -= 3
 			end

+ 75 - 58
locations/gschool_coolkid_chats.qsrc

@@ -1038,35 +1038,11 @@ if $ARGS[0] = 'cherleading_notice':
 	cheerleadingQW['bella_stasya_gossip'] = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/bella/notice/bella_stasya1.jpg"></center>'
 	'As you walk into the cafeteria, Bella and Stasya gesture towards you to get your attention.'
-	if gruptipe = 1:
-		'"Hey sweetie, we were just by Albina''s table and..."'
-		'Bella trails off when she notices Natasha walking towards the table and flutters her eyelashes as she turns towards her. "Oh my god, I love your shirt! Where did you get it?"'
-		'Natasha isn''t sure how to react. "I-It was my mom''s... From the ''90s." she awkwardly mumbles.'
-		'Bella smiles sweetly. "Vintage, how adorable."'
-		act 'Nod in agreement':
-			gs 'npc_relationship', 'modify', 'A22', 'like'
-			gs 'npc_relationship', 'modify', 'A139', 'like'
-			pcs_mood += 5
-			gs 'stat'
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/bella/notice/bella_stasya2.jpg"></center>'
-			'You notice Natasha blushing slightly as she thanks Bella and continues on her way.'
-			'As soon as Natasha is outside hearing distance, Bella starts viciously mocking her. "That was the ugliest effing shirt I''ve ever seen."'
-			'Stasya quickly joins in. "I know, she''s like so pathetic! Did you see her blushing? She thinks you were actually being nice to her!" The girls start giggling.'
-			'"Yeah, and take this as a lesson. If you say nice things to people, then they will think you like them and then you can easily manipulate them." Bella tells Stasya.'
-			*nl
-			'Stasya just rolls her eyes. "Like, whatever..."'
-			'Seeing she''s getting nowhere with Stasya, Bella turns towards you. "Before I forget, I have something important to tell you. Long story short, Albina kicked some slut off the cheerleading squad, so keep your eyes open in the next few weeks for auditions. I''d like to see you there, otherwise Albina will choose one of her annoying sporty friends instead. Who knows, maybe you could lose a pound or three there." She points towards your stomach and grins.'
-			act 'Thank them and leave': gt 'gschool_lunch', 'lunch'
-		end
-	else
-		act 'Ignore': gt 'gschool_lunch', 'lunch'
-		act 'Investigate':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/bella/notice/bella_stasya1.jpg"></center>'
-			'"Hey, we were just by Albina''s table and..."'
+	if natbelQW['FriendLover'] < 7:
+		if gruptipe = 1:
+			'"Hey sweetie, we were just by Albina''s table and..."'
 			'Bella trails off when she notices Natasha walking towards the table and flutters her eyelashes as she turns towards her. "Oh my god, I love your shirt! Where did you get it?"'
-			'Natasha isn''t sure how to react. "I-It was my mom''s... From the 90s..." she awkwardly mumbles.'
+			'Natasha isn''t sure how to react. "I-It was my mom''s... From the ''90s..." she awkwardly mumbles.'
 			'Bella smiles sweetly. "Vintage, how adorable."'
 			act 'Nod in agreement':
 				gs 'npc_relationship', 'modify', 'A22', 'like'
@@ -1081,44 +1057,85 @@ if $ARGS[0] = 'cherleading_notice':
 				'"Yeah, and take this as a lesson. If you say nice things to people, then they will think you like them and then you can easily manipulate them." Bella tells Stasya.'
 				*nl
 				'Stasya just rolls her eyes. "Like, whatever..."'
-				'Seeing she''s getting nowhere with Stasya, Bella turns towards you. "Before I forget, I have something important to tell you. Long story short, Albina kicked some slut off the cheerleading squad and we thought it would suit you after all the rumours we''ve heard about your... flexible body."'
-				'Stasya chimes in. "We both know that she''s never gonna get picked. Albina hates town bicycles, and <<$pcs_nickname>> here is an even bigger slut than that last girl." Both girls then start mockingly laughing at you.'
-				gs 'willpower', 'misc', 'self', 'medium'
-				if will_cost <= pcs_willpwr:
-					act 'Leave(<<will_cost>> Willpower)':
-						*clr & cla
-						gs 'willpower', 'pay', 'self'
-						gs 'stat'
-						gt 'gschool_lunch', 'lunch'
-					end
-				else
-					act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end
-				act 'Cry':
-					pcs_mood += -20
+				'Seeing she''s getting nowhere with Stasya, Bella turns towards you. "Before I forget, I have something important to tell you. Long story short, Albina kicked some slut off the cheerleading squad, so keep your eyes open in the next few weeks for auditions. I''d like to see you there, otherwise Albina will choose one of her annoying sporty friends instead. Who knows, maybe you could lose a pound or three there." She points towards your stomach and grins.'
+				act 'Thank them and leave': gt 'gschool_lunch', 'lunch'
+			end
+		else
+			act 'Ignore': gt 'gschool_lunch', 'lunch'
+			act 'Investigate':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/bella/notice/bella_stasya1.jpg"></center>'
+				'"Hey, we were just by Albina''s table and..."'
+				'Bella trails off when she notices Natasha walking towards the table and flutters her eyelashes as she turns towards her. "Oh my god, I love your shirt! Where did you get it?"'
+				'Natasha isn''t sure how to react. "I-It was my mom''s... From the 90s..." she awkwardly mumbles.'
+				'Bella smiles sweetly. "Vintage, how adorable."'
+				act 'Nod in agreement':
+					gs 'npc_relationship', 'modify', 'A22', 'like'
+					gs 'npc_relationship', 'modify', 'A139', 'like'
+					pcs_mood += 5
 					gs 'stat'
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/pc/reactions/tears1.jpg"></center>'
-					'Stasya starts mocking you. "Boo hoo, look at her and her big crocodile tears!"'
-					'"I heard she lubes cocks with her slut tears when she''s out of lube." Bella jumps in.'
-					'"It totally runs in the family! I once saw her sister giving some random guy a blowjob in the street." Stasya piles on.'
-					'"It was her boyfriend Roma!" you blurt out through your sobs, trying to defend your sister''s honour.'
-					'The girls laugh even harder and start mimicking giving someone a blowjob and having sex.'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/bella/notice/bella_stasya2.jpg"></center>'
+					'You notice Natasha blushing slightly as she thanks Bella and continues on her way.'
+					'As soon as Natasha is outside hearing distance, Bella starts viciously mocking her. "That was the ugliest effing shirt I''ve ever seen."'
+					'Stasya quickly joins in. "I know, she''s like so pathetic! Did you see her blushing? She thinks you were actually being nice to her!" The girls start giggling.'
+					'"Yeah, and take this as a lesson. If you say nice things to people, then they will think you like them and then you can easily manipulate them." Bella tells Stasya.'
 					*nl
-					'"Does her mom work at Boris'' café, by the train station? I thought she seemed familiar..." Bella asks.'
-					'"Yeah, remember when she was called to the school last year?" Stasya replies.'
-					'"Oh yeah, now I remember. It was just after four when I stepped into the café for a drink before catching the train. I didn''t see anyone inside and raised my voice, and then it happened..." Bella pauses for dramatic effect.'
-					'"This woman, <<$pcs_nickname>>''s mom to be exact, rushes out from the backroom, her face blushing bright red as she tries buttoning up her messy shirt. Guess who comes out right behind her? The café owner, looking totally smug and satisfied. Fuck, I even remember her breath smelling like cum." Bella smirks.'
-					'The two girls continue to mock and laugh at you as you hang your head in tearful shame.'
-					act 'Leave':
-						pcs_mood += -15
-						pcs_horny += 20
+					'Stasya just rolls her eyes. "Like, whatever..."'
+					'Seeing she''s getting nowhere with Stasya, Bella turns towards you. "Before I forget, I have something important to tell you. Long story short, Albina kicked some slut off the cheerleading squad and we thought it would suit you after all the rumours we''ve heard about your... flexible body."'
+					'Stasya chimes in. "We both know that she''s never gonna get picked. Albina hates town bicycles, and <<$pcs_nickname>> here is an even bigger slut than that last girl." Both girls then start mockingly laughing at you.'
+					gs 'willpower', 'misc', 'self', 'medium'
+					if will_cost <= pcs_willpwr:
+						act 'Leave(<<will_cost>> Willpower)':
+							*clr & cla
+							gs 'willpower', 'pay', 'self'
+							gs 'stat'
+							gt 'gschool_lunch', 'lunch'
+						end
+					else
+						act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+					act 'Cry':
+						pcs_mood += -20
 						gs 'stat'
-						gt 'gschool_lunch', 'lunch'
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/pc/reactions/tears1.jpg"></center>'
+						'Stasya starts mocking you. "Boo hoo, look at her and her big crocodile tears!"'
+						'"I heard she lubes cocks with her slut tears when she''s out of lube." Bella jumps in.'
+						'"It totally runs in the family! I once saw her sister giving some random guy a blowjob in the street." Stasya piles on.'
+						'"It was her boyfriend Roma!" you blurt out through your sobs, trying to defend your sister''s honour.'
+						'The girls laugh even harder and start mimicking giving someone a blowjob and having sex.'
+						*nl
+						'"Does her mom work at Boris'' café, by the train station? I thought she seemed familiar..." Bella asks.'
+						'"Yeah, remember when she was called to the school last year?" Stasya replies.'
+						'"Oh yeah, now I remember. It was just after four when I stepped into the café for a drink before catching the train. I didn''t see anyone inside and raised my voice, and then it happened..." Bella pauses for dramatic effect.'
+						'"This woman, <<$pcs_nickname>>''s mom to be exact, rushes out from the backroom, her face blushing bright red as she tries buttoning up her messy shirt. Guess who comes out right behind her? The café owner, looking totally smug and satisfied. Fuck, I even remember her breath smelling like cum." Bella smirks.'
+						'The two girls continue to mock and laugh at you as you hang your head in tearful shame.'
+						act 'Leave':
+							pcs_mood += -15
+							pcs_horny += 20
+							gs 'stat'
+							gt 'gschool_lunch', 'lunch'
+						end
 					end
 				end
 			end
 		end
+	else
+		if gruptipe = 1:
+			'"Hey sweetie, we were just by Albina''s table and..."'
+			 'Bella looks at you quizzically. "I see Natasha is wearing a decent uniform; I presume that''s your doing?... No don''t answer that, I don''t want to know but you do realise she''ll never be considered one of us." With that she walks away shaking her head.'
+			act 'Thank them and leave': gt 'gschool_lunch', 'lunch'
+		else
+			act 'Ignore': gt 'gschool_lunch', 'lunch'
+			act 'Investigate':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/bella/notice/bella_stasya1.jpg"></center>'
+				'"Hey, we were just by Albina''s table and..."'
+				 'Bella looks at you quizzically. "I see Natasha is wearing a decent uniform; I presume that''s your doing?... No don''t answer that, I don''t want to know but you do realise she''ll never be considered one of us." With that she walks away shaking her head.'
+				act 'Thank them and leave': gt 'gschool_lunch', 'lunch'
+			end
+		end
 	end
 end
 

+ 81 - 46
locations/gschool_gossip.qsrc

@@ -161,7 +161,7 @@ if $ARGS[0] = 'mixed':
 		*nl
 	end
 	
-	chat_rand = rand(1,95)
+	chat_rand = rand(1, 95)
 	if chat_rand = 1:
 		'"Man, this town is so boring! We really need to graduate soon, so we can go live in the city!"'
 		'His friend heartily agrees. "Absolutely, I hear they have parties in the university hostel every day of the week!"'
@@ -291,8 +291,17 @@ if $ARGS[0] = 'mixed':
 		'"No I mean he was just walking around town all dressed up. I wasn''t sure it was him at first until he said something to me."'
 		'"Man, he is weird."'
 	elseif chat_rand = 49:
-		'"Natasha''s mom must be super poor. She''s wearing the same school uniform she had last year."'
-		'"She''s been wearing the same clothes for the last few years and always brings a lunch from home."'
+		if natbelQW['FriendLover'] < 7:
+			'"Natasha''s mom must be super poor. She''s wearing the same school uniform she had last year."'
+			'"She''s been wearing the same clothes for the last few years and always brings a lunch from home."'
+		else
+			'"I know Natasha''s mom must be super poor. Until recently, she''s been wearing the same school uniform she had last year."'
+			'"She''s been wearing the same clothes for the last few years and always brings a lunch from home."'
+			'"Yeah, I hear she''s been hanging out with <<$pcs_nickname>> recently, too. I think I saw them walking holding hands in the park a while back."'
+			'"I guess <<$pcs_nickname>> has been buying the stuff for her then?"'
+			'"Lesbians!"'
+			'I don''t know. Maybe but there were rumours awhile back that she was hanging around with Lazar."'
+		end
 	elseif chat_rand = 50:
 		if NatbelQW['chrispaid'] = 3:
 			'"Did you hear the latest? Apparently Natasha is repaying her debts!"'
@@ -511,7 +520,7 @@ if $ARGS[0] = 'mixed':
 		'"Is Lariska only on the cheerleading squad because Christina is there? She seems to enjoy volleyball more than dancing."'
 		'"Well she does follow Christina around like a lost puppy, so maybe you''re right."'
 	elseif chat_rand = 95:
-	    '"I really want to go down on Albina. Having those toned thighs squeeze my head in orgasm as I eat her pussy would be heaven!"'
+		'"I really want to go down on Albina. Having those toned thighs squeeze my head in orgasm as I eat her pussy would be heaven!"'
 	else
 		gs 'gschool_gossip', 'mixed', $ARGS[1]
 	end
@@ -531,7 +540,7 @@ if $ARGS[0] = 'boys':
 		*nl
 	end
 
-	chat_rand = rand(1,45)
+	chat_rand = rand(1, 45)
 	if chat_rand = 1:
 		'"Dude, you should''ve seen me in League of Legends yesterday. I totally carried my crappy team to victory!"' 
 		'His friend doesn''t seem impressed and scoffs back "Man, I''ve seen you play before. You couldn''t carry a paper bag to the litter bin if your life depended on it."'
@@ -762,24 +771,24 @@ if $ARGS[0] = 'boys':
 		'"I''m not talking about the game. I''m going there to watch Bella do her stuff. I know a good spot in the stands where you can get a nice view of that toned ass."'
 		'"Oh I''m definitely down to see that!"'
 	elseif chat_rand = 43:
-	    '"I heard Albina''s ass is fake and that her dad paid for implants."'
-        'The other boy laughs. "Oh believe me, it''s real. It''s too firm to be fake."'
-        '"How would you know how firm her ass is? She would rip your arm off and fist you with it if you tried to cop a feel."'
-        '"I''ve watched her enough in gym class and at cheerleading. It doesn''t jiggle like implants would. It''s solid, toned muscle."'
-    elseif chat_rand = 44:
-	    'You overhear two scrawny boys speaking to each other.'
-        '"Word is that Albina loves anal and makes people eat her ass," the first one whispers.'
-        'The other boy grins slyly. "The things I would do to have a shot with her... Wouldn''t you love to put your junk in her trunk?"'
-        'The first boy looks in Albina''s direction, who notices him staring at her, causing him to quickly look back at his friend. "In my wildest fucking dreams!"' 
+		'"I heard Albina''s ass is fake and that her dad paid for implants."'
+		'The other boy laughs. "Oh believe me, it''s real. It''s too firm to be fake."'
+		'"How would you know how firm her ass is? She would rip your arm off and fist you with it if you tried to cop a feel."'
+		'"I''ve watched her enough in gym class and at cheerleading. It doesn''t jiggle like implants would. It''s solid, toned muscle."'
+	elseif chat_rand = 44:
+		'You overhear two scrawny boys speaking to each other.'
+		'"Word is that Albina loves anal and makes people eat her ass," the first one whispers.'
+		'The other boy grins slyly. "The things I would do to have a shot with her... Wouldn''t you love to put your junk in her trunk?"'
+		'The first boy looks in Albina''s direction, who notices him staring at her, causing him to quickly look back at his friend. "In my wildest fucking dreams!"' 
 	elseif chat_rand = 45:
-	    'As you walk down the hallway, you see a group of boys from another class gawking at Albina, who has her back turned to them. As you get closer, you can hear them whispering to each other.'
-        '"Come on, you know you want it!" you hear one of them say.'
-        '"I don''t know. Is it worth the risk?"'
-        '"An ass like that is always worth it! Just go flirt with her. She might surprise you."'
-        *nl
-        'His friends push him towards her. "Uh, hey. Do you wear space pants to gym class... Because your ass is out of this world..." he asks with a crack in his voice, but still making a cringy attempt to act smooth by leaning against the locker and smiling.'
-        'Albina turns to face him. She''s unimpressed by his poor attempt at flirting, crossing her arms and just staring at him.'
-        'He quickly flees in a panic, his friends following close behind. You''ve never seen anyone run so fast in your life. Albina scoffs before turning back to what she was doing.'
+		'As you walk down the hallway, you see a group of boys from another class gawking at Albina, who has her back turned to them. As you get closer, you can hear them whispering to each other.'
+		'"Come on, you know you want it!" you hear one of them say.'
+		'"I don''t know. Is it worth the risk?"'
+		'"An ass like that is always worth it! Just go flirt with her. She might surprise you."'
+		*nl
+		'His friends push him towards her. "Uh, hey. Do you wear space pants to gym class... Because your ass is out of this world..." he asks with a crack in his voice, but still making a cringy attempt to act smooth by leaning against the locker and smiling.'
+		'Albina turns to face him. She''s unimpressed by his poor attempt at flirting, crossing her arms and just staring at him.'
+		'He quickly flees in a panic, his friends following close behind. You''ve never seen anyone run so fast in your life. Albina scoffs before turning back to what she was doing.'
 	else
 		gs 'gschool_gossip', 'boys', $ARGS[1]
 	end
@@ -799,7 +808,7 @@ if $ARGS[0] = 'girls':
 		*nl
 	end
 
-	chat_rand = rand(1,43)
+	chat_rand = rand(1, 43)
 	if chat_rand = 1:
 		'"I quit volleyball."'
 		'"Why?"'
@@ -933,7 +942,7 @@ if $ARGS[0] = 'girls':
 		'"I tried to talk to him after school, but he ignored me and stormed off towards the park."'
 		'"Hmm, I wonder what he does there?"'
 	elseif chat_rand = 32:
-        'You overhear some of the girls gossip with each other. "Which of the boys in the class do you think is the most feminine?" one of them asks.'
+		'You overhear some of the girls gossip with each other. "Which of the boys in the class do you think is the most feminine?" one of them asks.'
 		'"I don''t know, I haven''t really thought about it," the other one answers.'
 		'"Don''t be a drag, you have to pick one!" she keeps on pushing.'
 		'The other girl thinks for a second before answering. "I would say Igor. Sometimes he acts really strange and not like a real man."'
@@ -950,9 +959,19 @@ if $ARGS[0] = 'girls':
 			'You laugh to yourself as you move away. If they only knew...'
 		end
 	elseif chat_rand = 34:
-		'"Natasha asked where I bought my top and I had to stop myself from laughing in her face."'
-		'"Why?"'
-		'"Because she could never afford it! Why would she even bother asking? Does she not realize her family is poor?"'
+		if natbelQW['FriendLover'] < 7 and natbelQW['QWstage'] <= 2:
+			'"Natasha asked where I bought my top and I had to stop myself from laughing in her face."'
+			'"Why?"'
+			'"Because she could never afford it! Why would she even bother asking? Does she not realize her family is poor?"'
+		else
+			'"Natasha asked me where I bought my top and I had to stop myself from laughing in her face."'
+			'Why?"'
+			'"Because she could never afford it! Why would she even bother asking? Does she not realize her family is poor?"'
+			'"Well I''m not so sure that''s still the case as she''s got some new clothes recently including a nice new uniform."'
+			'"Yeah I''ve seen but her family are definitely poor. She''s been hanging around a lot with <<$pcs_nickname>>. I dunno but maybe <<$pcs_nickname>> is buying the stuff for her?"'
+			'"Don''t ask me I wouldn''t know; I guess maybe. I wonder if they''re more than friends?"'
+			'"Well if you find out let me know."'
+		end
 	elseif chat_rand = 35:
 		'"I left my sweater in my locker yesterday, you know the one. Anyway, I came back to school to get it and I saw Anushka running down the hall stark naked."'
 		'The other girl laughs. "Yeah, I''m honestly surprised she hasn''t done it during school yet. I swear that girl doesn''t like wearing clothes."'
@@ -985,23 +1004,23 @@ if $ARGS[0] = 'girls':
 		'"Yeah, I''m sure that they would''ve invited your unfit ass with open arms. Besides, they''re a bunch of sluts who enjoy teasing the perverts in the stands and sucking off the football team."'
 		'"Maybe I did dodge a bullet then..."'
 	elseif chat_rand = 41:
-	    '"I might work out more. I want a big butt just like Albina''s!"'
-        '"Girl please. Her ass is as fake as her ''sweet girl'' personality."'
-        '"I dare you to say that to her face!"'
-        'The girl turns silent. "Yeah, that''s what I thought..." the first one quips.'
+		'"I might work out more. I want a big butt just like Albina''s!"'
+		'"Girl please. Her ass is as fake as her ''sweet girl'' personality."'
+		'"I dare you to say that to her face!"'
+		'The girl turns silent. "Yeah, that''s what I thought..." the first one quips.'
 	elseif chat_rand = 42:
-	    'Albina walks past a group of girls who check her out. Once she''s out of earshot, they all start speaking.'
-        '"I wonder how much those butt implants cost!"'
-        '"Bitch, you''re just jealous because you have such a flat ass!"'
-        '"It just looks so big and firm!"'
-        '"I''m too scared to ask her what workout she does to get such a nice bum!"'
-        'You leave the girls to wallow in their envy of Albina.'
+		'Albina walks past a group of girls who check her out. Once she''s out of earshot, they all start speaking.'
+		'"I wonder how much those butt implants cost!"'
+		'"Bitch, you''re just jealous because you have such a flat ass!"'
+		'"It just looks so big and firm!"'
+		'"I''m too scared to ask her what workout she does to get such a nice bum!"'
+		'You leave the girls to wallow in their envy of Albina.'
 	elseif chat_rand = 43:
-	    'You overhear some girls whispering amongst themselves.'
-        '"I was told that Albina is a lesbian, which is why she doesn''t like guys hitting on her," one says.'
-        '"Told by who?" a second one asks.'
-        '"Lizeveta. Although I also heard she sometimes skips class to hook with some of the hot guys in the bathroom."'
-    else	
+		'You overhear some girls whispering amongst themselves.'
+		'"I was told that Albina is a lesbian, which is why she doesn''t like guys hitting on her," one says.'
+		'"Told by who?" a second one asks.'
+		'"Lizeveta. Although I also heard she sometimes skips class to hook with some of the hot guys in the bathroom."'
+	else	
 		gs 'gschool_gossip', 'girls', $ARGS[1]
 	end
 	if dimaRevenge = 4 and dimaRevChoice = 2 and hour >= 13:
@@ -1106,17 +1125,33 @@ if $ARGS[0] = 'Lizaveta':
 	elseif chat_rand = 42:
 		'"If Christina was half as good as she thinks she is, she would hold the women''s world record for all track events."'
 	elseif chat_rand = 43:
-		'"Natasha''s mom must be super poor. She''s wearing the same school uniform she had last year."'
+		if natbelQW['FriendLover'] < 7:
+			'"Natasha''s mom must be super poor. She''s wearing the same school uniform she had last year."'
+		else
+			'"Natasha''s mom must be super poor. Until recently she was wearing the same school uniform she had last year but now I see she''s wearing some nice clothes and a nice new uniform too."'
+			'After a brief pause she continues. "Erm... I''ve noticed she''s been hanging around with you recently and I''m not sure but think I saw you two walking holding hands in the park a while back." She looks at you seeking confirmation.'
+			'Knowing her reputation for gossip you keep your response simple. "Yeah well she''s helping me with school work so I''ve helped her by getting her some new clothing. Just being friendly..." You trail off'
+			'Deciding to end this conversation before it become too awkward you make your excuses and leave.'
+		end
 	elseif chat_rand = 44:
-		'"Whatever you do, don''t loan money to Natasha. She will never pay you back. I lent her 50<b>₽</b> and I doubt I will ever see it again."'
+		if natbelQW['FriendLover'] < 7:
+			'"Whatever you do, don''t loan money to Natasha. She will never pay you back. I lent her 50<b>₽</b> and I doubt I will ever see it again."'
+		else
+			'"Natasha recently repaid the money she owed me. I began to thing she''d never repay me!"'
+			'After a brief pause she continues "I know she''s been hanging out with you recently and I think I saw you two walking holding hands in the park a while back."'
+			'Knowing her reputation for gossip you keep your response simple. "Yeah well she''s helping me with school work so I''ve helped her out as she was getting stressed about owing people. Just being friendly..." You trail off'
+			'Deciding to end this conversation before it become too awkward you make your excuses and leave.'
+		end
 	elseif chat_rand = 45:
 		'"Radomir acts like he''s already the next Yuri Shatunov. I mean, he''s okay, but he''s nowhere near as good as he likes to think he is."'
 	elseif chat_rand = 46:
 		'"Lera is a lesbian. All you have to do is watch how she looks at Lena or other girls in the locker room."'
 	elseif chat_rand = 47:
-	    '"I''ve heard so many things about Albina''s ass that I don''t know what to tell people! She also likes anal, I mean <i>really</i> likes anal."'
+		'"I''ve heard so many things about Albina''s ass that I don''t know what to tell people! She also likes anal, I mean <i>really</i> likes anal."'
 	elseif chat_rand = 48:
-	    '"I think Albina is a lesbian. Why else would she hate all the hot guys hitting on her?"'
+		'"I think Albina is a lesbian. Why else would she hate all the hot guys hitting on her?"'
+	else
+		gs 'gschool_gossip', 'Lizaveta', $ARGS[1]
 	end
 end
 

+ 5 - 1
locations/gschool_nerd_chats.qsrc

@@ -402,7 +402,11 @@ if $ARGS[0] = 'natasha':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big16.jpg"></center>'
 	if npc_rel['A16'] >= 50 and fame['pav_slut'] < 200:
 		if grupTipe = 3:
-			'"Hey <<$pcs_nickname>>! Have you seen this new makeup line coming out? It''s expensive but I looove the colors!" Natasha says as she holds up the magazine ad for said makeup. She talks about how she can''t afford nice things like this and this ends up bringing her down. You quickly change the subject and start complimenting her on her sense of style and grades and reminding her she''s a top student in school, which brings a smile to her face.'
+			if natbelQW['chrispaid'] < 3:
+				'"Hey <<$pcs_nickname>>! Have you seen this new makeup line coming out? It''s expensive but I looove the colors!" Natasha says as she holds up the magazine ad for said makeup. She talks about how she can''t afford nice things like this and this ends up bringing her down. You quickly change the subject and start complimenting her on her sense of style and grades and reminding her she''s a top student in school, which brings a smile to her face.'
+			else
+				'"Hey <<$pcs_nickname>>! Have you seen this new makeup line coming out? It''s expensive but I looove the colors!" Natasha says as she holds up the magazine ad for said makeup. She talks about how she still finds it difficult to afford nice things like this and this ends up bringing her down until you remind her that she''s got rid of all her debts and now has some money and you''re happy to help her out. She smiles at this but you know that she doesn''t want to keep relying on you so you change the subject and start complimenting her on her sense of style and grades and reminding her she''s a top student in school, which brings a smile to her face.'
+			end
 		else
 			'Natasha greets you with a smile as you sit down beside her. The conversation is lighthearted as you talk about your day so far and what goes on in the apartment complex where you both live.'
 		end

+ 6 - 0
locations/gschool_post_shower.qsrc

@@ -636,6 +636,9 @@ if $ARGS[0] = 'post_shower':
 						'She is standing in front of her locker with the door open, apparently deciding on something. Seeing you staring, she smiles mischievously before pulling her socks out of her locker and proceeding to bend over and put them on. She is facing away from you, with her legs slightly spread and without any panties on, giving you a perfect view of her pussy.'
 						'Straightening back up, she smiles at you again and continues to dress, her face bright red, but looking pleased.'
 						'You should probably get dressed and leave before somebody notices her giving you such a good view.'
+					elseif natbelQW['FriendLover'] >= 3:
+						'She is standing in front of her locker with the door open, apparently deciding on something. Seeing you staring, she quickly scans over your body then smiles briefly at you before blushing and covering herself up. You can''t help but grin at her blushing; she does get embarassed easily!'
+						'You should probably get dressed and leave before anyone notices.'
 					elseif npc_rel['A16'] >= 50:
 						'She is standing in front of her locker with the door open, apparently deciding on something. Seeing you staring, she covers herself as best she can and turns away, her face red.'
 						'You should probably get dressed and leave before this gets more awkward.'
@@ -1510,6 +1513,9 @@ if $ARGS[0] = 'post_shower2':
 					'She seems to be enjoying her shower when she suddenly stops and looks in your direction. Seeing you staring, she smiles mischievously and lathers her hands in soap before bending over and washing her slightly spread legs, giving you a perfect view of her pussy.'
 					'Straightening back up, she smiles at you again and starts to rinse off, her face bright red, but looking pleased.'
 					'You should finish your shower and leave before somebody notices her giving you such a good view.'
+				elseif natbelQW['FriendLover'] >= 3:
+					'She seems to be enjoying her shower when she suddenly stops and looks in your direction. Seeing you staring, she smiles at you before blushing and turning away looking a little flustered.'
+					'You should finish your shower and leave before anyone notices.'
 				elseif npc_rel['A16'] >= 50:
 					'She seems to be enjoying her shower when she suddenly stops and looks in your direction. Seeing you staring, she covers herself as best she can and turns away, her face red.'
 					'You should finish your shower and leave before this gets more awkward.'

+ 1 - 1
locations/initg.qsrc

@@ -1,7 +1,7 @@
 # initg
 
 if $ARGS[0] = '':
-	$initext = $USER_TEXT
+	$initext = STR($usrtxt)
 	CMDCLEAR
 	SHOWINPUT 0
 	*clr

+ 1 - 1
locations/internet_mobile.qsrc

@@ -255,7 +255,7 @@ end
 !! Sets the date when the subscription will be cancelled if not paid.
 !!
 !! $ARGS[1] - the subscription name
-if ARGS[0] = 'set_suspension_date':
+if $ARGS[0] = 'set_suspension_date':
     temp_month = month
     if month = 2:
         if ((year mod 4 = 0) and (year mod 100 ! 0)) or (year mod 400 = 0):

+ 96 - 13
locations/intro_city_select.qsrc

@@ -151,6 +151,7 @@ if $ARGS[0] = 'charselect':
 		act 'I had a lot of friends': gt 'intro_city_select', 'socialite'
 		act 'I was beautiful': gt 'intro_city_select', 'beautiful'
 		act 'I was just hanging in there': gt 'intro_city_select', 'anorexic'
+		act 'I''m like, bubbly and hot': gt 'intro_city_select', 'bimbo'
 	end
 
 	act 'Gopnik':
@@ -176,7 +177,7 @@ if $ARGS[0] = 'charselect':
 	act 'Random personality':
 !! This allows the player to select a random personality.
 		*clr & cla
-		persrand = rand(0, 18)
+		persrand = rand(0, 19)
 		if persrand <= 3:
 		!! Nerd
 			gs 'intro_city_select', 'nerdinfo'
@@ -209,7 +210,7 @@ if $ARGS[0] = 'charselect':
 				killvar 'persrand'
 				gs 'intro_city_select', 'football'
 			end
-		elseif persrand <= 9:
+		elseif persrand <= 11:
 		!! Popular
 			gs 'intro_city_select', 'popularinfo'
 			if persrand = 8:
@@ -221,36 +222,39 @@ if $ARGS[0] = 'charselect':
 			elseif persrand = 10:
 				killvar 'persrand'
 				gs 'intro_city_select', 'anorexic'
+			elseif persrand = 11:
+				killvar 'persrand'
+				gs 'intro_city_select', 'bimbo'
 			end
-		elseif persrand <= 13:
+		elseif persrand <= 14:
 		!! Gopnik
 			gs 'intro_city_select', 'gopnikinfo'
-			if persrand = 11:
+			if persrand = 12:
 				killvar 'persrand'
 				gs 'intro_city_select', 'gopnikstart'
-			elseif persrand = 12:
+			elseif persrand = 13:
 				killvar 'persrand'
 				gs 'intro_city_select', 'troublemaker'
-			elseif persrand = 13:
+			elseif persrand = 14:
 				killvar 'persrand'
 				gs 'intro_city_select', 'alternative'
 			end
 		else
 		!! Outcast
 			gs 'intro_city_select', 'outcastinfo'
-			if persrand = 14:
+			if persrand = 15:
 				killvar 'persrand'
 				gs'intro_city_select', 'friendless'
-			elseif persrand = 15:
+			elseif persrand = 16:
 				killvar 'persrand'
 				gs 'intro_city_select', 'uglyduckling'
-			elseif persrand = 16:
+			elseif persrand = 17:
 				killvar 'persrand'
 				gs 'intro_city_select', 'goodgirl'
-			elseif persrand = 17:
+			elseif persrand = 18:
 				killvar 'persrand'
 				gs 'intro_city_select', 'slut'
-			elseif persrand = 18:
+			elseif persrand = 19:
 				killvar 'persrand'
 				gs 'intro_city_select', 'goth'
 			end
@@ -1040,7 +1044,7 @@ elseif $ARGS[0] = 'anorexic':
 	'Your family and some of your friends, especially <<$npc_nickname[''A15'']>> and <<$npc_nickname[''A148'']>>, became concerned and with their support, you were able to start recovering. You now have a good relationship with your mother and sister, as well as <<$npc_nickname[''A15'']>> and <<$npc_nickname[''A148'']>>, who defended you and prevented you from becoming an outcast. When you left school you were still a member of your clique, albeit only barely.'
 
 	act 'Confirm this starting option':
-		gs 'intro_sg_select', 'cool'
+		gs 'intro_city_select', 'cool'
 		$start_type['cat'] = 'anorexic'
 
 		!!----- SKILS -----!!
@@ -1091,7 +1095,86 @@ elseif $ARGS[0] = 'anorexic':
 	
 		gt $loc, $loc_arg
 	end
-	act 'Return to starting options': gt 'intro_sg_select', 'charselect'
+elseif $ARGS[0] = 'bimbo':
+	'<center><h4><font color="maroon">I''m like, bubbly and hot</font></h4></center>'
+	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/popular_4.jpg"></center>'
+	'In your younger years you loved playing with dolls and dressing them up in your favourite colour, pink. At high school you looked good and naturally ended up joining the cool crowd in school. You desire to be in the centre of attention and that has affected her relationship with others. You love dressing up and makeup which has taken up pretty much all of your spare time and gradually it also impacted your school work as you spent a lot of the time in lessons playing with your phone looking at the latest trends etc. This also meant that your relationship with your schoolmates suffered as a result. When you left school you were still a member of your clique but with a lower relationship with most of the other kids in your clique than would be ideal. In addition to which as your grades sufferred and although you managed to pass, your grades were only barely sufficient to allow you entry into university.'
+
+	act 'Confirm this starting option':
+		gs 'intro_city_select', 'cool'
+		$start_type['cat'] = 'bimbo'
+
+		!!----- SKILS -----!!
+		! Attributes
+		pcs_sprt		-= 5
+
+		! Sexual
+		pcs_inhib		= 25
+		willpowermax 	-= 15
+
+		! Dance
+		pcs_danc		+= 40
+
+
+		! Other
+		pcs_persuas		-= 5
+		pcs_makupskl	+= 80
+		pcs_heels		+= 75
+
+		!!----- APPEARANCE -----!!
+		pcs_skin		+= 100
+		pcs_haircol		= 3
+		pcs_hairlng		+= 50
+		pcs_eyecol		= 3
+		pcs_tan		+= 65
+		pcs_lashes	+= 1
+		pcs_lip		+= 1
+		pcs_mass['bust_gen']	= 22	& !D-Cup at ideal BMI
+		pcs_mass['butt_gen']	= 32	& !pcs_butt = 14
+		pcs_mass['body']		= 60
+
+		!!----- INVENTRORY -----!!
+		mc_inventory['comb']			= 1
+		mc_inventory['cosmetics']		= 150
+		mc_inventory['travel_makeup']	= 50
+		mc_inventory['suncream']		= 20
+		mc_inventory['razor']			= 50
+		mc_inventory['tampons']			= 10
+		mc_inventory['eyelash_fake']	= 20
+		mc_inventory['eyelash_mink']	= 5
+		pirsC = 2
+		PirsC2_owned = 1
+		pirsN = 1
+		PirsN1_owned = 1
+		pirsA = 2
+		PirsA2_owned = 1
+		$currentpursetype = 'cats'
+		currentpursenumber = 2
+		cats_purses[2] = 1
+		bag = 1
+
+		!!----- RELATIONSHIPS -----!!
+		gs 'npc_relationship', 'socialgroup_setting_boys', 20, 20, -10, 20, 20, 0
+		gs 'npc_relationship', 'socialgroup_setting_girls', -10, -10, -20, -10, -10, 0
+		gs 'fame', 'pav', 'sex', 60
+
+		!!----- SCHOOL GRADES ------!!
+		gs 'grades', 'grade_award', 'school', 'math', -35		& ! 20
+		gs 'grades', 'grade_award', 'school', 'rus',  -35		& ! 20
+		gs 'grades', 'grade_award', 'school', 'lit',  -35		& ! 20
+		gs 'grades', 'grade_award', 'school', 'art',  -35		& ! 20
+		gs 'grades', 'grade_award', 'school', 'bio',  -35		& ! 20
+		gs 'grades', 'grade_award', 'school', 'eng',  -35		& ! 20
+		gs 'grades', 'grade_award', 'school', 'geo',  -35		& ! 20
+		gs 'grades', 'grade_award', 'school', 'sci',  -35		& ! 20
+		gs 'grades', 'grade_award', 'school', 'his',  -35		& ! 20
+		gs 'grades', 'grade_award', 'school', 'comp', -35		& ! 20
+		gs 'grades', 'grade_award', 'school', 'mus',  -5		& ! 50
+		gs 'grades', 'grade_award', 'school', 'pe',   -5		& ! 50
+
+		gt $loc, $loc_arg
+	end
+	act 'Return to starting options': gt 'intro_city_select', 'charselect'
 end
 
 

+ 39 - 7
locations/intro_initialization.qsrc

@@ -274,6 +274,28 @@ elseif $start_type['cat'] = 'anorexic':
 	danilovich_swimsuit_b[8] = pcs_hips
 	sportsclothingnumber = 88
 	gs 'clothing', 'wear', 'cats_outfits', 90
+elseif $start_type['cat'] = 'bimbo':
+	!!bimbo start
+	gm_panties[14] = 1
+	gm_bras[14] = 1
+	$pantyworntype = 'gm'
+	pantywornnumber = 14
+	$braworntype = 'gm'
+	brawornnumber = 14
+	gm_dress[190] = 1
+	gm_dress_h[190] = 100
+	gm_dress_b[190] = pcs_hips
+	gm_outfits[181] = 1
+	gm_outfits_h[181] = 100
+	gm_outfits_b[181] = pcs_hips
+	gm_shoe[9] = 1
+	danilovich_outfits[124] = 1
+	danilovich_outfits_h[124] = 100
+	cats_outfits[86] = 1
+	cats_outfits_h[86] = 100
+	cats_outfits_b[86] = pcs_hips
+	sportsclothingnumber = 124
+	gs 'clothing', 'wear', 'cats_outfits', 86
 elseif $start_type['cat'] = 'beautiful':
 	!!Beautiful start
 	cats_outfits[56] = 1
@@ -497,9 +519,16 @@ else
 		market_outfits_h[17] = 60
 		market_outfits_b[17] = pcs_hips
 	elseif $start_type['cat'] = 'anorexic':
-		gm_school[18] = 1
-		gm_school_h[18] = 120
-		gm_school_b[18] = pcs_hips
+		gm_school[127] = 1
+		gm_school_h[127] = 120
+		gm_school_b[127] = pcs_hips
+	elseif $start_type['cat'] = 'bimbo':
+		cats_dress[127] = 1
+		cats_dress_h[127] = 100
+		cats_dress_b[127] = pcs_hips
+		danilovich_shoe[12] = 1
+		danilovich_shoe[21] = 0
+		sportsshoenumber = 12
 	elseif $start_type['cat'] = 'uglyduckling' or $start_type['cat'] = 'goodgirl':
 		gm_school[25] = 1
 		gm_school_h[25] = 120
@@ -519,7 +548,8 @@ else
 		danilovich_outfits[155] = 1
 		danilovich_outfits_h[155] = 100
 		danilovich_shoe[6] = 1
-
+		danilovich_shoe[21] = 0
+		sportsshoenumber = 6
 	elseif $start_type['group'] = 'gopnik':
 		gm_school[52] = 1
 		gm_school_h[52] = 120
@@ -537,14 +567,16 @@ else
 		sportsclothingnumber = 65
 		danilovich_shoe[17] = 1
 		danilovich_shoe[21] = 0
+		sportsshoenumber = 17
 	end
 end
 
-if danilovich_shoe[17] = 1:
-	sportsshoenumber = 17
-else
+if danilovich_shoe[21] = 1:
 	sportsshoenumber = 21
 end
+if danilovich_shoe[15] = 1:
+	sportsshoenumber = 15
+end
 
 $sportspursetype = $currentpursetype
 sportspursenumber = currentpursenumber

+ 42 - 3
locations/intro_initialization_city.qsrc

@@ -259,6 +259,7 @@ if $start_type['cat'] = 'goth':
 	danilovich_outfits_h[91] = 100
 	danilovich_shoe[21] = 0
 	danilovich_shoe[19] = 1
+	sportsshoenumber = 19
 	gm_shoe[9] = 0
 	gm_shoe[25] = 0
 	shoewornnumber = 25
@@ -298,6 +299,43 @@ elseif $start_type['cat'] = 'anorexic':
 	danilovich_swimsuit_b[8] = pcs_hips
 	sportsclothingnumber = 88
 	gs 'clothing', 'wear', 'cats_outfits', 90
+elseif $start_type['cat'] = 'bimbo':
+	!!bimbo start
+	gm_panties[14] = 1
+	gm_bras[14] = 1
+	eroto_panties[3] = 1
+	eroto_bras[3] = 1
+	$pantyworntype = 'gm'
+	pantywornnumber = 14
+	$braworntype = 'gm'
+	brawornnumber = 14
+	gm_shoe[6] = 0
+	cats_shoe[16] = 1
+	$shoeworntype = 'cats'
+	shoewornnumber = 16
+	gm_dress[190] = 1
+	gm_dress_h[190] = 100
+	gm_dress_b[190] = pcs_hips
+	gm_outfits[181] = 1
+	gm_outfits_h[181] = 100
+	gm_outfits_b[181] = pcs_hips
+	gm_shoe[9] = 1
+	danilovich_shoe[12] = 1
+	danilovich_shoe[21] = 0
+	sportsshoenumber = 12
+	coco_dress[139] = 1
+	coco_dress_h[139] = 100
+	coco_dress_b[139] = pcs_hips
+	danilovich_outfits[124] = 1
+	danilovich_outfits_h[124] = 100
+	cats_outfits[86] = 1
+	cats_outfits_h[86] = 100
+	cats_outfits_b[86] = pcs_hips
+	scandalicious_dress[20] = 1
+	scandalicious_dress_h[20] = 100
+	scandalicious_dress_b[20] = pcs_hips
+	sportsclothingnumber = 124
+	gs 'clothing', 'wear', 'cats_outfits', 86
 elseif pcs_inhib < 5:
 	gm_outfits[30] = 1
 	gm_outfits_h[30] = 100
@@ -533,11 +571,12 @@ elseif $start_type['group'] = 'jack':
 	danilovich_swimsuit_b[1] = pcs_hips
 end
 
-if danilovich_shoe[17] = 1:
-	sportsshoenumber = 17
-else
+if danilovich_shoe[21] = 1:
 	sportsshoenumber = 21
 end
+if danilovich_shoe[15] = 1:
+	sportsshoenumber = 15
+end
 $sportspursetype = $currentpursetype
 sportspursenumber = currentpursenumber
 $sports_clothing_name = 'default sports outfit'

+ 68 - 47
locations/intro_sg_select.qsrc

@@ -213,6 +213,7 @@ if $ARGS[0] = 'charselect':
 		act 'I have a lot of friends': gt 'intro_sg_select', 'socialite'
 		act 'I am beautiful': gt 'intro_sg_select', 'beautiful'
 		act 'I am just hanging in there': gt 'intro_sg_select', 'anorexic'
+		act 'I''m like, bubbly and hot': gt 'intro_sg_select', 'bimbo'
 	end
 
 	act 'Gopnik':
@@ -272,53 +273,53 @@ if $ARGS[0] = 'charselect':
 				killvar 'persrand'
 				gs 'intro_sg_select', 'football'
 			end
-		elseif persrand <= 10:
+		elseif persrand <= 11:
 		!! Popular
-			gs 'intro_sg_select', 'popularinfo'
+			gs 'intro_city_select', 'popularinfo'
 			if persrand = 8:
 				killvar 'persrand'
-				gs 'intro_sg_select', 'socialite'
+				gs 'intro_city_select', 'socialite'
 			elseif persrand = 9:
 				killvar 'persrand'
-				gs 'intro_sg_select', 'beautiful'
+				gs 'intro_city_select', 'beautiful'
 			elseif persrand = 10:
 				killvar 'persrand'
-				gs 'intro_sg_select', 'anorexic'
+				gs 'intro_city_select', 'anorexic'
+			elseif persrand = 11:
+				killvar 'persrand'
+				gs 'intro_city_select', 'bimbo'
 			end
 		elseif persrand <= 14:
 		!! Gopnik
-			gs 'intro_sg_select', 'gopnikinfo'
-			if persrand = 11:
-				killvar 'persrand'
-				gs 'intro_sg_select', 'gopnikstart'
-			elseif persrand = 12:
+			gs 'intro_city_select', 'gopnikinfo'
+			if persrand = 12:
 				killvar 'persrand'
-				gs 'intro_sg_select', 'troublemaker'
+				gs 'intro_city_select', 'gopnikstart'
 			elseif persrand = 13:
 				killvar 'persrand'
-				gs 'intro_sg_select', 'vitekgf'
+				gs 'intro_city_select', 'troublemaker'
 			elseif persrand = 14:
 				killvar 'persrand'
-				gs 'intro_sg_select', 'alternative'
+				gs 'intro_city_select', 'alternative'
 			end
 		else
 		!! Outcast
-			gs 'intro_sg_select', 'outcastinfo'
+			gs 'intro_city_select', 'outcastinfo'
 			if persrand = 15:
 				killvar 'persrand'
-				gs'intro_sg_select', 'friendless'
+				gs'intro_city_select', 'friendless'
 			elseif persrand = 16:
 				killvar 'persrand'
-				gs 'intro_sg_select', 'uglyduckling'
+				gs 'intro_city_select', 'uglyduckling'
 			elseif persrand = 17:
 				killvar 'persrand'
-				gs 'intro_sg_select', 'goodgirl'
+				gs 'intro_city_select', 'goodgirl'
 			elseif persrand = 18:
 				killvar 'persrand'
-				gs 'intro_sg_select', 'slut'
+				gs 'intro_city_select', 'slut'
 			elseif persrand = 19:
 				killvar 'persrand'
-				gs 'intro_sg_select', 'goth'
+				gs 'intro_city_select', 'goth'
 			end
 		end
 	end
@@ -1176,12 +1177,6 @@ elseif $ARGS[0] = 'anorexic':
 		mc_inventory['suncream']		= 10
 		mc_inventory['razor']			= 10
 		mc_inventory['tampons']			= 10
-		pirsC = 2
-		PirsC2_owned = 1
-		pirsN = 1
-		PirsN1_owned = 1
-		pirsA = 2
-		PirsA2_owned = 1
 		$currentpursetype = 'fashionista'
 		currentpursenumber = 4
 		fashionista_purses[4] = 1
@@ -1196,10 +1191,9 @@ elseif $ARGS[0] = 'anorexic':
 	act 'Return to starting options': gt 'intro_sg_select', 'charselect'
 
 elseif $ARGS[0] = 'bimbo':
-	'<center><h4><font color="maroon">Just Hanging in There</font></h4></center>'
-	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/popular_3.jpg"></center>'
-	'You had good looks growing up and naturally ended up falling in with the cool crowd. You enjoyed being the center of attention and became obsessed with looking like the models you''d seen on social media and in magazines. You started dieting, but took it too far and ended up losing a lot of weight, which caused some of your fellow students to start talking about you and make the odd joke at your expense. This led to a vicious cycle and as your looks deteriorated, the jokes got worse, which only spurred you on further.'
-	'Your family and some of your friends, especially <<$npc_nickname[''A15'']>> and <<$npc_nickname[''A148'']>>, became concerned and with their support, you were able to start recovering. You now have a good relationship with your mother and sister, as well as <<$npc_nickname[''A15'']>> and <<$npc_nickname[''A148'']>>, who defended you and prevented you from becoming an outcast. You''re still a member of your clique, albeit only barely.'
+	'<center><h4><font color="maroon">I''m like, bubbly and hot</font></h4></center>'
+	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/popular_4.jpg"></center>'
+	'In your younger years you loved playing with dolls and dressing them up in your favourite colour, pink. At high school you looked good and naturally ended up joining the cool crowd in school. You desire to be in the centre of attention and that has affected her relationship with others. You love dressing up and makeup which has taken up pretty much all of your spare time and gradually it also impacted your school work as you spent a lot of the time in lessons playing with your phone looking at the latest trends etc. This also meant that your relationship with your schoolmates suffered as a result. You''re still a member of your clique but with a lower relationship with most of the other kids in your clique than would be ideal.'
 
 	act 'Confirm this starting option':
 		gs 'intro_sg_select', 'cool'
@@ -1208,48 +1202,75 @@ elseif $ARGS[0] = 'bimbo':
 		!!----- SKILS -----!!
 		! Attributes
 		pcs_sprt		-= 10
+		pcs_intel		-= 10
 
 		! Sexual
-		pcs_inhib		-= 10
+		pcs_inhib		= 35
 		willpowermax 	-= 15
 
 		! Dance
-		pcs_danc		+= 10
+		pcs_danc		+= 20
 
-		! Sport
-		pcs_run			+= 15
 
 		! Other
-		pcs_humint		-= 5
-		pcs_persuas		+= 10
-		pcs_makupskl	+= 20
-		pcs_compskl		+= 5
+		pcs_persuas		-= 10
+		pcs_makupskl	+= 50
+		pcs_heels		+= 35
 
 		!!----- APPEARANCE -----!!
 		pcs_skin		-= 300
-		pcs_haircol		= 2
+		pcs_haircol		= 3
 		pcs_hairlng		-= 50
-		pcs_eyecol		= 2
-		pcs_lip			-= 1
-		pcs_teeth		-= 1
-		pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
-		pcs_mass['body']		= 15
+		pcs_eyecol		= 3
+		pcs_tan		+= 45
+		pcs_lashes	+= 1
+		pcs_lip		+= 1
+		pcs_teeth	-= 1
+		pcs_mass['bust_gen']	= 22	& !D-Cup at ideal BMI
+		pcs_mass['butt_gen']	= 32	& !pcs_butt = 14
+		pcs_mass['body']		= 60
 
 		!!----- INVENTRORY -----!!
 		mc_inventory['comb']			= 1
-		mc_inventory['cosmetics']		= 20
+		mc_inventory['cosmetics']		= 50
+		mc_inventory['travel_makeup']	= 20
 		mc_inventory['suncream']		= 10
 		mc_inventory['razor']			= 20
 		mc_inventory['tampons']			= 10
+		mc_inventory['eyelash_fake']	= 10
+		mc_inventory['eyelash_mink']	= 2
+		mc_inventory['suncream']		= 10
+		pirsC = 2
+		PirsC2_owned = 1
+		pirsN = 1
+		PirsN1_owned = 1
+		pirsA = 2
+		PirsA2_owned = 1
 		$currentpursetype = 'cats'
 		currentpursenumber = 2
 		cats_purses[2] = 1
 		bag = 1
 
 		!!----- RELATIONSHIPS -----!!
-		npc_rel['A15'] += 30
-		npc_rel['A148'] += 30
+		grupvalue[1] = 900
+		grupvalue[4] = 300
+		gs 'npc_relationship', 'socialgroup_setting_boys', 20, 20, -10, 20, 20, 0
+		gs 'npc_relationship', 'socialgroup_setting_girls', -10, -10, -20, -10, -10, 0
+		gs 'fame', 'pav', 'sex', 60
+
+		!!----- SCHOOL GRADES ------!!
+		gs 'grades', 'grade_award', 'school', 'math', -35		& ! 20
+		gs 'grades', 'grade_award', 'school', 'rus',  -35		& ! 20
+		gs 'grades', 'grade_award', 'school', 'lit',  -35		& ! 20
+		gs 'grades', 'grade_award', 'school', 'art',  -35		& ! 20
+		gs 'grades', 'grade_award', 'school', 'bio',  -35		& ! 20
+		gs 'grades', 'grade_award', 'school', 'eng',  -35		& ! 20
+		gs 'grades', 'grade_award', 'school', 'geo',  -35		& ! 20
+		gs 'grades', 'grade_award', 'school', 'sci',  -35		& ! 20
+		gs 'grades', 'grade_award', 'school', 'his',  -35		& ! 20
+		gs 'grades', 'grade_award', 'school', 'comp', -35		& ! 20
+		gs 'grades', 'grade_award', 'school', 'mus',  -5		& ! 50
+		gs 'grades', 'grade_award', 'school', 'pe',   -5		& ! 50
 
 		gt $loc, $loc_arg
 	end

+ 1 - 0
locations/journal.qsrc

@@ -54,6 +54,7 @@ if $ARGS[0]='journalmenu':
 	!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': 

+ 1 - 1
locations/music_actions.qsrc

@@ -196,7 +196,7 @@ if $ARGS[0] = 'stream_music':
         act 'Live stream (<font color="red">No internet access</font>)':  '<br><font color="red">You have no internet access.</font>'
     elseif ml_streaming['lastday'] = daystart: 
         act 'Live stream (<font color="red">Already streamed today</font>)': '<br><font color="red">You already streamed today.</font>'
-    elseif ml_not_alone = 1 and location_type = 'private' :
+    elseif ml_not_alone = 1 and $location_type = 'private' :
         act 'Live stream (<font color="red">You are not alone, can''t stream right now</font>)': '<br><font color="red">You are not alone in the room, which makes starting a stream impossible until they leave.</font>'
     elseif ml_performance['max_perform_minutes'] < 60:
         act 'Live stream (<font color="red">You are not able to play for an hour yet.</font>)': '<br><font color="red">You don''t have the endurance yet to play for an hour.</font>'

+ 7 - 2
locations/natbel_chat.qsrc

@@ -1020,8 +1020,13 @@ if $ARGS[0] = 'small_talk':
 	gs 'stat'
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
-	'Natasha knows that she lives in a very poor family. She has no father, and her mother works for a pittance at the garment factory. You feel sorry for her.'
-	'She is envious that other girls can dress smartly and buy cosmetics while she has to wear her mother''s things.'
+	if natbelQW['FriendLover'] < 7:
+		'Natasha knows that she lives in a very poor family. She has no father, and her mother works for a pittance at the garment factory. You feel sorry for her.'
+		'She is envious that other girls can dress smartly and buy cosmetics while she has to wear her mother''s things.'
+	else
+		'Natasha knows that she lives in a very poor family. She has no father, and her mother works for a pittance at the garment factory. You feel for her and have helped her out so she can now dress smartly and is able to buy some cosmetics and no longer has to wear her mother''s things.'
+	end
+
 	*nl
 	'You talk with Natasha about this and that, passing fifteen minutes with ease.'
 

+ 3 - 3
locations/nichTanya.qsrc

@@ -1356,11 +1356,11 @@ if $ARGS[0] = 'desc':
 	if month > nichTanyaBdM or (month = nichTanyaBdM and day > nichTanyaBdD):
 		'She is ' + (year - nichTanyaBdY) + ' years old.'
 	elseif month = nichTanyaBdM and day = nichTanyaBdD:
-		if mid(year - nichTanyaBdY,4,1) = 1:
+		if val(mid(year - nichTanyaBdY,4,1)) = 1:
 			'Today is her ' + (year - nichTanyaBdY) + 'st birthday.'
-		elseif mid(year - nichTanyaBdY,4,1) = 2:
+		elseif val(mid(year - nichTanyaBdY,4,1)) = 2:
 			'Today is her ' + (year - nichTanyaBdY) + 'nd birthday.'
-		elseif mid(year - nichTanyaBdY,4,1) = 3:
+		elseif val(mid(year - nichTanyaBdY,4,1)) = 3:
 			'Today is her ' + (year - nichTanyaBdY) + 'rd birthday.'
 		else
 			'Today is her ' + (year - nichTanyaBdY) + 'th birthday.'

+ 3 - 3
locations/npc.qsrc

@@ -25,9 +25,9 @@ if $ARGS[0] = 'cleanarrays':
 end
 
 if $ARGS[0] = 'age':
-	currnpc_year = mid(npc_dob[$ARGS[1]], 1, 4)
-	currnpc_month = mid(npc_dob[$ARGS[1]], 5, 2)
-	currnpc_day = mid(npc_dob[$ARGS[1]], 7, 2)
+	currnpc_year = val(mid(npc_dob[$ARGS[1]], 1, 4))
+	currnpc_month = val(mid(npc_dob[$ARGS[1]], 5, 2))
+	currnpc_day = val(mid(npc_dob[$ARGS[1]], 7, 2))
 	currnpc_age = year - currnpc_year
 	if currnpc_month < month:
 		currnpc_age -= 1

+ 1 - 1
locations/npcpreservec.qsrc

@@ -190,7 +190,7 @@ if mid($npctemp,1,1) = 'C':
 	gs 'npccleanc', $npctemp
 end
 !! Preserves npclastsavedn. Giving the last numerical B array saved.
-npclastsavedn = mid($npclastsaved, 2)
+npclastsavedn = val(mid($npclastsaved, 2))
 
 killvar 'npctemp2'
 killvar '$npctemp2'

+ 1 - 1
locations/pav_complex.qsrc

@@ -136,7 +136,7 @@ if $ARGS[0] = 'start':
 	act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pav_industrial'
 	act 'Walk to the Market (0:15)':minut += 15 & gt 'pav_market'
 	act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
-	act 'Walk to Pushkin (0:30)':minut += 30 gt 'pushkin'
+	act 'Walk to Pushkin (0:30)':minut += 30 & gt 'pushkin'
 	if mid($start_type,1,2) = 'sg' and func('homes_properties', 'has_access', 'parents_home'): 
 		act 'Go to your apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
 	elseif mid($start_type,1,2) = 'sg' and (func('homes_properties', 'has_access', 'parents_home') = 0 or pavSharedAptEnabled = 1):

+ 5 - 1
locations/pav_disco_coolkids.qsrc

@@ -1769,7 +1769,11 @@ if $ARGS[0] = 'natasha':
 			act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 		elseif npc_rel['A16'] >= 50 and fame['pav_slut'] < 200:
 			if grupTipe = 3:
-				'"Hey <<$pcs_nickname>>! Have you seen this new makeup line coming out? It''s expensive, but I looove the colors!" Natasha says as she holds up the magazine ad for said makeup. She talks about how she can''t afford nice things like this and this ends up bringing her down. You quickly change the subject and start complimenting her on her sense of style and grades and reminding her she''s a top student in school, which brings a smile to her face.'
+				if natbelQW['chrispaid'] < 3:
+					'"Hey <<$pcs_nickname>>! Have you seen this new makeup line coming out? It''s expensive but I looove the colors!" Natasha says as she holds up the magazine ad for said makeup. She talks about how she can''t afford nice things like this and this ends up bringing her down. You quickly change the subject and start complimenting her on her sense of style and grades and reminding her she''s a top student in school, which brings a smile to her face.'
+				else
+					'"Hey <<$pcs_nickname>>! Have you seen this new makeup line coming out? It''s expensive but I looove the colors!" Natasha says as she holds up the magazine ad for said makeup. She talks about how she still finds it difficult to afford nice things like this and this ends up bringing her down until you remind her that she''s got rid of all her debts and now has some money and you''re happy to help her out. She smiles at this but you know that she doesn''t want to keep relying on you so you change the subject and start complimenting her on her sense of style and grades and reminding her she''s a top student in school, which brings a smile to her face.'
+				end
 			else
 				'Natasha greets you with a smile as you sit down beside her. The conversation is lighthearted as you talk about your day and what goes on in the apartment complex where you both live.'
 			end

+ 1 - 1
locations/pav_disco_sex.qsrc

@@ -2318,7 +2318,7 @@ if $ARGS[0] = 'End':
 	'<center><video autoplay loop src="images/pc/activities/misc/dress_2.mp4"></video></center>'
 	'After you relax, you smile at <<$npc_firstname[$npclastsaved]>> and say, "That was fun, but I really should get going..."'
 	'<<$npc_firstname[$npclastsaved]>> stretches lazily on the bed, not bothering to get up. "You were great, <<$pcs_nickname>>! I hope I''ll run into you again next time I''m in Pavlovsk!"'
-	if arrpos('sparrloc', 11) ! -1: cumspclnt = 12 & gs 'cum_cleanup' & 'You look around the room and find a packet of wipes. You take one and quickly wipe the sperm off your face to make yourself presentable enough to go outside.'
+	if cumloc[11] > 0: cumspclnt = 12 & gs 'cum_cleanup' & 'You look around the room and find a packet of wipes. You take one and quickly wipe the sperm off your face to make yourself presentable enough to go outside.'
 	gs 'arousal', 'end'
 	gs 'stat'
 	act 'Leave the hotel': gt 'pav_market'

+ 5 - 1
locations/pav_library_nerdstudy.qsrc

@@ -199,7 +199,11 @@ if $ARGS[0] = 'nerd_study_night2':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big16.jpg"></center>'
 			if npc_rel['A16'] >= 60 and grupTipe = 3:
-				'"Hey <<$pcs_nickname>>! Have you seen this new makeup line coming out? It''s expensive but I looove the colors!" Natasha says as she holds up the magazine ad for said makeup. She talks about how she can''t afford nice things like this and this ends up bringing her down. You quickly change the subject and start complimenting her on her sense of style and grades and reminding her she''s a top student in school, which brings a smile to her face.'
+				if natbelQW['chrispaid'] < 3:
+					'"Hey <<$pcs_nickname>>! Have you seen this new makeup line coming out? It''s expensive but I looove the colors!" Natasha says as she holds up the magazine ad for said makeup. She talks about how she can''t afford nice things like this and this ends up bringing her down. You quickly change the subject and start complimenting her on her sense of style and grades and reminding her she''s a top student in school, which brings a smile to her face.'
+				else
+					'"Hey <<$pcs_nickname>>! Have you seen this new makeup line coming out? It''s expensive but I looove the colors!" Natasha says as she holds up the magazine ad for said makeup. She talks about how she still finds it difficult to afford nice things like this and this ends up bringing her down until you remind her that she''s got rid of all her debts and now has some money and you''re happy to help her out. She smiles at this but you know that she doesn''t want to keep relying on you so you change the subject and start complimenting her on her sense of style and grades and reminding her she''s a top student in school, which brings a smile to her face.'
+				end
 			elseif npc_rel['A16'] <= 20 or fame['pav_slut'] >= 250:
 				'Natasha isn''t really interested in talking to you, but you persist in trying to keep up a conversation for awhile before she says. "Hey, I''ve got to... study. Maybe we can talk later?" she says halfheartedly and goes back to studying.'
 			else

+ 4 - 4
locations/phone_selfies.qsrc

@@ -1356,7 +1356,7 @@ if $ARGS[0] = 'listretrieve2':
 		lr2_pic_i = 1
 		:temp_loopev
 			dynamic '$selfie = <<$selfienpc>>photo[<<lr2_pic_i>>]'
-			if $selfie = 1:
+			if val($selfie) = 1:
 				if temp_cnum = 5: $result += '</tr><tr>' & temp_cnum = 0
 				$temp_table += '<td width="20%">' + func('phone_selfies_popup', 'set_selfie2', $photoloc, lr2_pic_i) + '</td>'
 				temp_cnum += 1
@@ -1378,7 +1378,7 @@ if $ARGS[0] = 'listretrieve2':
 		lr2_regself_i = 1
 		:temp_loopselfies
 			dynamic '$selfie = <<$selfienpc>>[<<lr2_regself_i>>]'
-			if $selfie = 1:
+			if val($selfie) = 1:
 				if temp_cnum = 5: $result += '</tr><tr>' & temp_cnum = 0
 				$temp_table += '<td width="20%">' + func('phone_selfies_popup', 'set_selfie2', $imgloc, lr2_regself_i) + '</td>'
 				temp_cnum += 1
@@ -1400,7 +1400,7 @@ if $ARGS[0] = 'listretrieve2':
 		lr2_swm_i = 1
 		:temp_loopselfiessveta
 			dynamic '$selfie = <<$selfienpc>>sveta[<<lr2_swm_i>>]'
-			if $selfie = 1:
+			if val($selfie) = 1:
 				if temp_cnum = 5: $result += '</tr><tr>' & temp_cnum = 0
 				$temp_table += '<td width="20%">' + func('phone_selfies_popup', 'set_selfie2', '<<$imgloc>>sveta/', lr2_swm_i) + '</td>'
 				temp_cnum += 1
@@ -1422,7 +1422,7 @@ if $ARGS[0] = 'listretrieve2':
 		lr2_sex_i = 1
 		:temp_loopselfiessex
 			dynamic '$selfie = <<$selfienpc>>sex[<<lr2_sex_i>>]'
-			if $selfie = 1:
+			if val($selfie) = 1:
 				if temp_cnum = 5: $result += '</tr><tr>' & temp_cnum = 0
 				$temp_table += '<td width="20%">' + func('phone_selfies_popup', 'set_selfie2', '<<$imgloc>>sex/', lr2_sex_i) + '</td>'
 				temp_cnum += 1

+ 4 - 4
locations/saveupdater.qsrc

@@ -1633,7 +1633,7 @@ if temp_current_save_version < 00080804:
 	!! Setting the internet
 	if internet > 0:
 		old_internet_value = 10*internet
-		if $home['internet_enabled'] = 1:
+		if property['internet_enabled'] = 1:
 			gs 'internet_mobile', 'buy_subscription', $home['current'], 900
 
 			if (old_internet_value - 900) >= 0: money += (old_internet_value - 900)
@@ -1991,9 +1991,9 @@ if temp_current_save_version < 00090003:
 	$temp_makeup_routine = str(dyneval('$result = $routine<<makeup_routine_update_index>>'))
 	$temp_makeup_routine_name = str(dyneval('$result = $routine<<makeup_routine_update_index>>custname'))
 	if $temp_makeup_routine ! '':
-		makeup['routine_<<makeup_routine_update_index>>_makeup'] = mid($temp_makeup_routine,1,1)
-		makeup['routine_<<makeup_routine_update_index>>_lipbalm'] = mid($temp_makeup_routine,2,1)
-		makeup['routine_<<makeup_routine_update_index>>_lashes'] = mid($temp_makeup_routine,3,1)
+		makeup['routine_<<makeup_routine_update_index>>_makeup']  = val(mid($temp_makeup_routine,1,1))
+		makeup['routine_<<makeup_routine_update_index>>_lipbalm'] = val(mid($temp_makeup_routine,2,1))
+		makeup['routine_<<makeup_routine_update_index>>_lashes']  = val(mid($temp_makeup_routine,3,1))
 		$makeup['routine_<<makeup_routine_update_index>>'] = $temp_makeup_routine
 		$makeup['routine_<<makeup_routine_update_index>>_name'] = $temp_makeup_routine_name
 		killvar '$routine<<makeup_routine_update_index>>'

+ 1 - 1
locations/sex_ev_after.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'quit':
 				act'Leave':gt'sex_ev_leave', 'exit'
 			end
 			
-			if sex_ev['type'] ! 'hookup':
+			if $sex_ev['type'] ! 'hookup':
 				act'We''re through':
 					cla & *nl
 					'"We''re through," you sneer. The moment you''re fully dressed, you stalk out the door, shouting over your shoulder, "Don''t fucking call me again!"'

+ 5 - 3
locations/sex_ev_condoms.qsrc

@@ -1827,12 +1827,14 @@ if $ARGS[0] = 'father_check':
 	'List of potential fathers:'
 	:potfather_loop
 	if $wombpotfath[potfather_counter] ! 'unknown':
-		potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''"><<$npc_usedname[$wombpotfath[potfather_counter]]>> (<<$wombpotfath[potfather_counter]>>)</a>'
+		$potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''"><<$npc_usedname[$wombpotfath[potfather_counter]]>> (<<$wombpotfath[potfather_counter]>>)</a>'
 	else
-		potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''">Unknown (-)</a>'
+		$potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''">Unknown (-)</a>'
 	end
-	if $boy = potfather_temp[2]: potfather_counter += 1
+	if $boy = $potfather_temp[2]: potfather_counter += 1
 	if potfather_counter < arrsize('$wombpotfath'): jump 'potfather_loop'
+	killvar 'potfather_counter'
+	killvar 'potfather_temp'
 end
 
 if $ARGS[0] = 'npc_preg_react':

+ 2 - 2
locations/sex_ev_dress_talking.qsrc

@@ -1078,9 +1078,9 @@ if $ARGS[0] = 'break_up2':
 		act'Don''t text me anymore':
 			gs'sex_ev_leave', 'dress_loop'
 			gs'sex_ev_dress_talking', 'break_up3'
-			if npc_rel_type[$boy] = 'fuckbuddy':
+			if $npc_rel_type[$boy] = 'fuckbuddy':
 				'"Don''t text me to come over," you say, <<$sex_ev[''dress_describe'']>>. "We can''t be fuckbuddies anymore."'
-			elseif npc_rel_type[$boy] = 'sugar_daddy':
+			elseif $npc_rel_type[$boy] = 'sugar_daddy':
 				'"Don''t text me to come over," you say, <<$sex_ev[''dress_describe'']>>. "I can''t be your sugar baby anymore."'
 			end
 			'"Why not?" he asks.'

+ 3 - 3
locations/sex_ev_pillow_talk.qsrc

@@ -308,7 +308,7 @@ if $ARGS[0] = 'sweaty_sex':
 				end
 			else
 				'"Whew, I''m so sweaty after that," you pant, looking at the moisture running down your skin. "I didn''t realize we fucked that hard."'
-				if npc_gymrat[$boy] = 1 or npc_apt_spare[$boy] = 'gym':
+				if npc_gymrat[$boy] = 1 or $npc_apt_spare[$boy] = 'gym':
 					'"Sex is better cardio than most people think," <<$npc_firstname[$boy]>> grins back.'
 				else
 					sex_ev['weather_pillow_talk'] = 1
@@ -365,7 +365,7 @@ if $ARGS[0] = 'sore_pussy':
 								gs'sex_ev_pillow_talk', 'sex_talk'
 							end
 							
-							if npc_rel_type[$boy] ! 'boyfriend' and pcs_lover - pcs_girlfriends > 0:
+							if $npc_rel_type[$boy] ! 'boyfriend' and pcs_lover - pcs_girlfriends > 0:
 								act'Wish my boyfriend was that big':
 									npc_know_cheat[$boy] = 1
 									cla & *nl
@@ -1236,7 +1236,7 @@ if $ARGS[0] = 'thank_no_creampie':
 			'"Thanks for remembering to pull out," you say.'
 			if npc_dont_like_creampie[$boy] = 1:
 				!! '"Thanks for remembering to pull out," you say.'
-			elseif npc_cum_pref[$boy] = 'creampie':
+			elseif $npc_cum_pref[$boy] = 'creampie':
 				'"Wish I didn''t have to," he sighs. "Coming inside a girl is the best feeling in the world."'
 				act'Ew':
 					cla & *nl

+ 16 - 16
locations/sex_ev_reactions.qsrc

@@ -86,7 +86,7 @@ if $ARGS[0] = 'condom_reactions':
 end
 
 if $ARGS[0] = 'good_thing_condom':
-	if sex_ev['last_cum'] = 'creampie_surprise':
+	if $sex_ev['last_cum'] = 'creampie_surprise':
 		act'Good thing we used a condom':
 			if sex_ev['cock_inserted'] = 1:
 				cla & *clr
@@ -662,12 +662,12 @@ if $ARGS[0] = 'cum_mouth_like_that':
 end
 
 if $ARGS[0] = 'swallow_react1':
-	if sex_ev['swallow'] = 1 or sex_ev['last_cum'] = 'swallow':
+	if sex_ev['swallow'] = 1 or $sex_ev['last_cum'] = 'swallow':
 		if $npc_cum_pref[$boy] = 'mouth' and $pc_cum_pref_know[$boy] = '':
 			'"I love watching you swallow," <<$npc_firstname[$boy]>> says, looking at you with blissful satisfaction. '
 			act'You think it''s hot?':
 				cla & *nl
-				$pc_cum_pref_know[$boy]= npc_cum_pref[$boy]
+				$pc_cum_pref_know[$boy]= $npc_cum_pref[$boy]
 				'"Yeah?" you ask, licking your lips. "You think it''s hot?"'
 				'"The hottest thing a girl can do. Even better than coming inside."'
 				act'Good to know':
@@ -697,7 +697,7 @@ if $ARGS[0] = 'swallow_react1':
 			end
 			gs 'sex_ev_reactions', 'spit_quit'
 		else
-			if $npc_cum_pref[$boy] = 'mouth' and $pc_cum_pref_know[$boy] = npc_cum_pref[$boy]:
+			if $npc_cum_pref[$boy] = 'mouth' and $pc_cum_pref_know[$boy] = $npc_cum_pref[$boy]:
 				'"You''re so hot when you swallow my load like that," <<$npc_firstname[$boy]>> smiles at you.'
 				gs 'sex_ev_reactions', 'swallow_for_you'
 			else
@@ -714,7 +714,7 @@ if $ARGS[0] = 'swallow_react1':
 end
 
 if $ARGS[0] = 'swallow_for_you':
-	if sex_ev['swallow'] = 1 or sex_ev['last_cum'] = 'swallow':
+	if sex_ev['swallow'] = 1 or $sex_ev['last_cum'] = 'swallow':
 		act'I do it for you':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/cum/kiss_cock.mp4"></video></center>'
@@ -725,7 +725,7 @@ if $ARGS[0] = 'swallow_for_you':
 end
 
 if $ARGS[0] = 'swallow_not_for_you':
-	if sex_ev['swallow'] = 1 or sex_ev['last_cum'] = 'swallow':
+	if sex_ev['swallow'] = 1 or $sex_ev['last_cum'] = 'swallow':
 		act'I''m not doing it for you (I like it)':
 			cla & *nl
 			'"It''s not like I''m doing it for you," you smirk. "I like it."'
@@ -735,7 +735,7 @@ if $ARGS[0] = 'swallow_not_for_you':
 end
 
 if $ARGS[0] = 'spit_quit':
-	if sex_ev['swallow'] = 1 or sex_ev['last_cum'] = 'swallow':
+	if sex_ev['swallow'] = 1 or $sex_ev['last_cum'] = 'swallow':
 		act'Spitting is quitting':
 			cla & *nl
 			'"Spitting is quitting," you smile, giving him a no-big-deal shrug.'
@@ -745,7 +745,7 @@ if $ARGS[0] = 'spit_quit':
 end
 
 if $ARGS[0] = 'cum_bad_taste':
-	if sex_ev['swallow'] = 1 and sex_ev['last_cum'] = 'swallow':
+	if sex_ev['swallow'] = 1 and $sex_ev['last_cum'] = 'swallow':
 		act'You taste good':
 			cla & *nl
 			'"Spitting is quitting," you smile, giving him a no-big-deal shrug.'
@@ -1480,25 +1480,25 @@ if $ARGS[0] = 'bj_warning_next_time':
 		cla & *clr
 			$sex_ev['bed_room']
 		if sex_ev['bj_cum'] = 1:
-			if $pc_cum_pref_know[$boy]= npc_cum_pref[$boy]:
+			if $pc_cum_pref_know[$boy]= $npc_cum_pref[$boy]:
 				'"I don''t mind if you come in my mouth," you say, licking your lips with a smile. "I know how much you love it. But could you at least warn me before you do it?"'
 			else
 				'"A little warning next time?" you smile, wiping a loose drop of cum from your lip. "I barely had time to swallow."'
 			end
 		elseif sex_ev['bj_cum'] = 2:
-			if $pc_cum_pref_know[$boy]= npc_cum_pref[$boy]:
+			if $pc_cum_pref_know[$boy]= $npc_cum_pref[$boy]:
 				'"I don''t mind if you come in my mouth," you smile, wiping your lips. "I know how much you love it. But could you at least warn me before you do it?"'
 			else
 				'"A little warning next time?" you ask, with a cumglazed smile.'
 			end
 		elseif sex_ev['bj_cum'] = 3:
-			if $pc_cum_pref_know[$boy] = npc_cum_pref[$boy]:
+			if $pc_cum_pref_know[$boy] = $npc_cum_pref[$boy]:
 				'"I don''t mind if you come in my mouth," you smile, wiping your lips. "I know how much you love it. But could you at least warn me before you do it?"'
 			else
 				'"A little warning next time?" you ask, with a cumglazed smile.'
 			end
 		end
-		if npc_cum_pref[$boy] = 2 and $pc_cum_pref_know[$boy] = 0:
+		if npc_cum_pref[$boy] = 2 and $pc_cum_pref_know[$boy] = '':
 			if npc_generous[$boy] = 1:
 				npc_bj_cum_warn[$boy] = 1
 				'"Sorry," he smiles back apologetically. "I''ll try to remember next time. You''re just so good at this, it''s hard to hold back."'
@@ -1522,7 +1522,7 @@ if $ARGS[0] = 'bj_warning_next_time':
 			end
 
 			act'Really?':
-				$pc_cum_pref_know[$boy] = npc_cum_pref[$boy]
+				$pc_cum_pref_know[$boy] = $npc_cum_pref[$boy]
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/smile1.jpg"></center>'
 				'"Really?" you ask. "You like it that much?"'
@@ -1647,7 +1647,7 @@ if $ARGS[0] = 'bj_swallow_gross':
 end
 
 if $ARGS[0] = 'bj_swallow_gross2':
-	if npc_cum_pref[$boy] = 2 and $pc_cum_pref_know[$boy]= npc_cum_pref[$boy]:
+	if npc_cum_pref[$boy] = 2 and $pc_cum_pref_know[$boy] = $npc_cum_pref[$boy]:
 		act'Because I know you like it':
 			cla & *nl
 			'"Yeah, cause I know you''re a pervert who likes watching me drink your nasty cum," you say with a glare. "I''m generous like that."'
@@ -1703,7 +1703,7 @@ if $ARGS[0] = 'bj_spit_gross':
 end
 
 if $ARGS[0] = 'bj_spit_gross2':
-	if npc_cum_pref[$boy] = 2 and $pc_cum_pref_know[$boy]= npc_cum_pref[$boy]:
+	if npc_cum_pref[$boy] = 2 and $pc_cum_pref_know[$boy] = $npc_cum_pref[$boy]:
 		act'Compromise':
 			cla & *nl
 			'"Just because I don''t want to swallow doesn''t mean I don''t want you to feel good," you say with a raised eyebrow. "Good sex is all about good compromise, isn''t it?"'
@@ -1743,7 +1743,7 @@ if $ARGS[0] = 'cum_mouth_swallow_why':
 		'"Shut up," you roll your eyes.'
 		gs 'sex_ev_sex', 'sex_end'
 	end
-	if $sex_ev['cum_choice'] = 'facial' and sex_ev['last_cum'] ! 'face_mouth':
+	if $sex_ev['cum_choice'] = 'facial' and $sex_ev['last_cum'] ! 'face_mouth':
 		act'Too much mess':
 			cla & *clr
 			$sex_ev['bed_room']

+ 1 - 1
locations/sex_ev_reactions_creampie.qsrc

@@ -1462,7 +1462,7 @@ if $ARGS[0] = 'love_creampies':
 					'"I love it when guys come inside me," you sigh contently. "Something about it just turns me on so much."'
 				end
 				if $npc_cum_pref[$boy] = 'creampie':
-					 $pc_cum_pref_know[$boy] = npc_cum_pref[$boy]
+					 $pc_cum_pref_know[$boy] = $npc_cum_pref[$boy]
 					'"Coming inside is always the best," he says, looking at you. "We must be made to match."'
 					'"Must be," you say back, giving him a smile.'		
 				else

+ 3 - 3
locations/sex_ev_sex.qsrc

@@ -389,7 +389,7 @@ if $ARGS[0] = 'fuck_continue':
 			act'Fake some moans':sex_ev['moan'] = 2 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
 			act'Starting to feel good':sex_ev['fuck_pain'] = -1 & $orgasm_or = '' & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
 			
-			if $sex_ev['speed'] ! 3 and sex_ev['unique_npc'] = 1:
+			if sex_ev['speed'] ! 3 and sex_ev['unique_npc'] = 1:
 
 !!				gs 'sex_ev_sex_talk_<<$boy>>', 'completion_checker'
 				
@@ -413,7 +413,7 @@ if $ARGS[0] = 'fuck_continue':
 				sex_ev['dirty_talk'] = 1
 				gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
 			end}
-			if $sex_ev['speed'] ! 3 and sex_ev['unique_npc'] = 1:
+			if sex_ev['speed'] ! 3 and sex_ev['unique_npc'] = 1:
 
 !!				gs 'sex_ev_sex_talk_<<$boy>>', 'completion_checker'
 				
@@ -1146,7 +1146,7 @@ if $ARGS[0] = 'he_end_break':
 end
 
 if $ARGS[0] = 'keep_going':
-	if sex_ev['type'] ! 'prostitution_cust':
+	if $sex_ev['type'] ! 'prostitution_cust':
 		act'Keep going?':
 			if (rand(1,10) >= npc_sexdrive[$boy] or sex_ev['cum_count'] >= 5 + sex_ev['extra_cum']) and sex_ev['boy_cum'] = 1:
 				sex_ev['boy_cum'] = 0

+ 1 - 1
locations/sex_ev_talk.qsrc

@@ -1138,7 +1138,7 @@ if $ARGS[0] = 'bareback_pill_expense':
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
 					'You blink as he offers the cash to you.'
 					'"No, I couldn''t possibly," you say, pushing it back towards him. "I''d feel bad taking your money."'
-					if npc_rel_type[$boy] = 'boyfriend':
+					if $npc_rel_type[$boy] = 'boyfriend':
 						'"Why? I''m your boyfriend," he grins extending the money again. "You feel bad that the guy you''re dating wants to pay for something?"'
 					else
 						'"Why? I''m getting something out of it too," he grins extending the money again. "Just take it and let''s start going bareback."'

+ 1 - 1
locations/shoes.qsrc

@@ -303,7 +303,7 @@ if $ARGS[0] = 'view_shoe_item':
 			'You already own these shoes.'
 			act 'Leave': gt $loc, $loc_arg
 		else
-			price = ('<<ARGS[4]>>' * ((5 * ShoQuality) + 100) / 100) * 1000 / (1250 - Clothingstock[ARGS[3]]) * 3 / 2
+			price = (ARGS[4] * ((5 * ShoQuality) + 100) / 100) * 1000 / (1250 - Clothingstock[ARGS[3]]) * 3 / 2
 			price = price / 50 * 50
 			'Price: <<price>> <b>₽</b>'
 			act 'Leave': gt $loc, $loc_arg

+ 3 - 3
locations/shop.qsrc

@@ -27,7 +27,7 @@ if $shoplocation = 'main':
 
 		if $loc = 'shop':
 			if $loc_bak = 'shop':
-				$loc = torgpred
+				$loc = 'city_trademission'
 			else
 				$loc = $loc_bak
 			end
@@ -572,7 +572,7 @@ if $shoplocation = 'megafon':
 	if $home['current'] = 'parents_home':
 		$line = '<tr><td align="center">Your parents are paying for the internet at home, and you can''t take out a second internet subscriptions for the same address</td></tr>'
 
-	elseif home['internet_enabled'] = 0:
+	elseif property['internet_enabled'] = 0:
 		$line = '<tr><td align="center">You can''t buy an internet subscription for <<$home[''display'']>></td></tr>'
 
 	elseif subscription[$home['current']] = 1:
@@ -620,7 +620,7 @@ if $shoplocation = 'megafon':
 					end
 
 				elseif subscription[$property_code[i]] > 0:
-					line += '<tr><td align="center">You have an active internet subscription for the <<LCASE($property_name[i])>> that will renew next month on day <<subscription[''<<$property_code[i]>>-date'']>> for <<price>> <b>₽</b></td></tr>'
+					$line += '<tr><td align="center">You have an active internet subscription for the <<LCASE($property_name[i])>> that will renew next month on day <<subscription[''<<$property_code[i]>>-date'']>> for <<price>> <b>₽</b></td></tr>'
 				end
 			end
 			killvar '$property'

+ 3 - 3
locations/shortgs.qsrc

@@ -728,7 +728,7 @@ if $ARGS[0] = 'parse_string':
 					$ParserTmpArr[] = mid($ParserTmpStr, 1, ParserTmpIdx-1)
 					$ParserTmpStr = mid($ParserTmpStr, ParserTmpIdx+1)
 				else
-					ParserTmpArr[] = mid($ParserTmpStr, 1, ParserTmpIdx-1)
+					ParserTmpArr[] = val(mid($ParserTmpStr, 1, ParserTmpIdx-1))
 					$ParserTmpStr = mid($ParserTmpStr, ParserTmpIdx+1)
 				end
 				jump 'StringParser01'
@@ -737,13 +737,13 @@ if $ARGS[0] = 'parse_string':
 				$ParserTmpArr[] = $ParserTmpStr
 				copyarr $ARGS[1], '$ParserTmpArr'
 			else
-				ParserTmpArr[] = $ParserTmpStr
+				ParserTmpArr[] = val($ParserTmpStr)
 				copyarr $ARGS[1], 'ParserTmpArr'
 			end
 			killvar '$ParserTmpDelim'
 			killvar '$ParserTmpStr'
 			killvar 'ParserTmpIdx'
-			killvar 'ParserTmpArr' & killvar '$ParserTmpArr'
+			killvar 'ParserTmpArr'
 		else
 			msg '<b>Error: No delimited string found!</b>'
 		end

+ 7 - 5
locations/show_table.qsrc

@@ -1,6 +1,6 @@
 # show_table
 !{show table v2, by illume
-	this function will push $args[0] into $show_table with $args[1] column, min=1, and  count by st_count
+	this function will push $args[0] into $show_table with args[1] column, min=1, and  count by st_count
 
 	st_count=0 & $show_table=''
 		if kat > 0:gs'show_table','Kate <<kat>>','2'
@@ -8,11 +8,13 @@
 		......
 	if st_count > 0 :pl 'Relations:<BR><TABLE BORDER=1><<$show_table>></TR></TABLE>'
 }
-if $ARGS[1] < 1 : $ARGS[1] = 1
-if st_count-st_count/$ARGS[1]*$ARGS[1]=0:$show_table += "<TR>"
+tab_tmp = max(1, val($ARGS[1]), ARGS[1])
+
+if st_count - st_count/tab_tmp*tab_tmp = 0: $show_table += "<TR>"
 $show_table += "<TD><<$ARGS[0]>></TD>"
-if st_count-st_count/$ARGS[1]*$ARGS[1]+1=$ARGS[1]:$show_table += "</TR>"
-st_count+=1
+if st_count - st_count/tab_tmp*tab_tmp + 1 = tab_tmp: $show_table += "</TR>"
+st_count += 1
+killvar 'tab_tmp'
 
 --- show_table ---------------------------------
 

+ 0 - 2
locations/sitr.qsrc

@@ -66,8 +66,6 @@ if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 	if (week >= 6 and hour > 7 and hour < 17) or (hour > 17 and hour <= 22):
 		'Your <a href="exec:gt ''husb'', ''start''">husband</a> is sitting on the couch, watching television.'
 		gs 'music_actions', 'not_alone'
-	else
-		gs 'music_actions', 'clear_restrictions'
 	end
 end
 

+ 0 - 2
locations/sitr2x.qsrc

@@ -57,8 +57,6 @@ if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 	if (week >= 6 and hour > 7 and hour < 17) or (hour > 17 and hour <= 22):
 		'Your <a href="exec: gt''husb'',''start'' ">husband</a> is sitting on the couch watching television.'
 		gs 'music_actions', 'not_alone'
-	else
-		gs 'music_actions', 'clear_restrictions'
 	end
 end
 

+ 1 - 1
locations/spell.qsrc

@@ -15,7 +15,7 @@
 !	 ARGS[3] = Target party member number
 !	 ARGS[4] = Caster party member number
 
-SuccessValue = $ARGS[1]
+SuccessValue = max(val($ARGS[1]), ARGS[1])
 $SplTxtColGood = 'green'
 $SplTxtColBad = 'red'
 

+ 1 - 1
locations/street_event.qsrc

@@ -43,7 +43,7 @@ elseif $ARGS[0] = 'city_center':
 	streetev_hijack = 2
 	streetev_bf = 90
 	streetev_mistmeet = 20
-	if $home['current'] = 7:
+	if $home['current'] = 'maid_bedroom':
 		streetev_home = 1
 		$streetev_home = 'near the entrance to Nicholas'' Apartment'
 	elseif $home['current'] = '':

+ 2 - 2
locations/telefon.qsrc

@@ -969,9 +969,9 @@ if $ARGS[0] = 'send_sms':
 	$telefon['body'] = '
 	<font size=6>Send SMS</font><br>
 	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"><br>'
-	if $subscription['metered_calls'] = 1 and $subscription['sms_limit'] > 0: 
+	if subscription['metered_calls'] = 1 and subscription['sms_limit'] > 0: 
 		$telefon['body'] += '<br/>'
-		$telefon['body'] += '<b>You still can send <<$subscription[''sms_limit'']>> text messages on your contract</b>'
+		$telefon['body'] += '<b>You still can send <<subscription[''sms_limit'']>> text messages on your contract</b>'
 	end
 !! Colour correction for editor ''''
 	

+ 0 - 1
locations/uni_dorm.qsrc

@@ -1016,7 +1016,6 @@ if $ARGS[0] = 'dorm_room':
 	if mc_inventory['mag_porn'] > 0: 'You''ve hidden your porn magazines under the mattress of your bed.'
 	
 	vika_inroom = 0 & vika_sleep = 0
-	gs 'music_actions', 'clear_restrictions'
 	if hour > 14 and hour < func('bordel', 'open_hour'):
 		vika_inroom = 1
 		vika_sleep = 0