Merge remote-tracking branch 'master/master'

locations/saveg.qsrc

@@ -15,7 +15,7 @@
 
 version_major = 0
 version_minor = 9
-version_revision = 3
-version_patch = 0
+version_revision = 2
+version_patch = 3
 --- saveg ---------------------------------
 

locations/saveupdater.qsrc

@@ -2624,7 +2624,7 @@ end
 
 !!------------------------------------!!Version 0.9.3.0!!-----------------------------------------------!!
 
-if temp_current_save_version < 00090300:
+if temp_current_save_version < 00090203:
 	!!updates the exp to the new scale so you don''t go down in stat
 	gs 'stat_sklattrib'
 
@@ -2809,6 +2809,11 @@ if temp_current_save_version < 00090300:
 	!! Introduction of lact_ev['poli_totaldonatemoney']
 	if lact_ev['poli_totaldonatemoney'] <= 0 and lact_ev['poli_totalmilkdonated'] >= 5: lact_ev['poli_totaldonatemoney'] = (lact_ev['poli_totalmilkdonated'] / 5) * 10
 
+	if soniaQW[soniafall_block] > 1 and soniaQW[soniafall_block] ! soniaQW['soniafall_block']:
+		soniaQW['soniafall_block'] = soniaQW[soniafall_block]
+		if soniaQW['homeinvite'] > 0: soniaQW['homeinvite'] = 1
+	end
+
 	if vladimirday > 0 or vladimirQW > 0 and vladimirQW['stage'] = 0:
 		temp_var1 = vladimirQW
 		killvar 'vladimirQW'

locations/soniadisco.qsrc

@@ -1,7 +1,7 @@
 # soniadisco
 !2021/22/12
 !!I changed Sonia fall to this so their is a total of 7 events so Sonia slowly falls. moved the automatically fall code here from cikl.
-!!We should update Sonia code to work like the rest. I already did it with the new code soniaQW[soniafall_block], but the rest like soniaPS or soniafall should be updated to soniaQW[soniaPS] and soniaQW[soniafall] I didn''t do it because last time I tried I messed some stuff up so I will leave it to one of you coders to update it.
+!!We should update Sonia code to work like the rest. I already did it with the new code soniaQW['soniafall_block'], but the rest like soniaPS or soniafall should be updated to soniaQW['soniaPS'] and soniaQW['soniafall'] I didn''t do it because last time I tried I messed some stuff up so I will leave it to one of you coders to update it.
 
 if $ARGS[0] = 'cikl':
 !!Making Sonia''s fall progress if the player do not see the scenes at the disco, by making it such that if at a Sunday her fall have not advanced this weekend it will automatically advance.
@@ -241,7 +241,7 @@ if $ARGS[0] = 'disco':
 				gt 'soniadisco', 'dance1'
 			end
 		end
-	elseif soniaQW[soniafall_block] >= 4:
+	elseif soniaQW['soniafall_block'] >= 4:
 		'Vitek notices you watching them and frowns. "What the fuck are you looking at, bitch? You had your chance to hang out with us and you blew it, so scram!" Then they all head out. Vasily glances back at you and shakes his head, letting you know not to follow them.'
 		act 'Watch them leave':
 			if soniafall <= 6:
@@ -543,7 +543,7 @@ if $ARGS[0] = 'pressuredforpanties':
 					*clr & cla
 					gs 'willpower', 'pay', 'resist'
 					grupvalue[4] -= 1
-					soniaQW[soniafall_block] += 1
+					soniaQW['soniafall_block'] += 1
 					gs 'npc_relationship', 'modify', 'A9', 'dislike'
 					gs 'npc_relationship', 'modify', 'A10', 'dislike'
 					gs 'npc_relationship', 'modify', 'A11', 'dislike'
@@ -578,7 +578,7 @@ if $ARGS[0] = 'pressuredforpanties':
 							*clr & cla
 							gs 'willpower', 'pay', 'resist'
 							grupvalue[4] -= 1
-							soniaQW[soniafall_block] += 1
+							soniaQW['soniafall_block'] += 1
 							gs 'npc_relationship', 'modify', 'A9', 'dislike'
 							gs 'npc_relationship', 'modify', 'A10', 'dislike'
 							gs 'npc_relationship', 'modify', 'A11', 'dislike'
@@ -675,7 +675,7 @@ if $ARGS[0] = 'pressuredfortits':
 					*clr & cla
 					gs 'willpower', 'pay', 'resist'
 					grupvalue[4] -= 1
-					soniaQW[soniafall_block] += 1
+					soniaQW['soniafall_block'] += 1
 					gs 'npc_relationship', 'modify', 'A9', 'dislike'
 					gs 'npc_relationship', 'modify', 'A10', 'dislike'
 					gs 'npc_relationship', 'modify', 'A11', 'dislike'
@@ -754,7 +754,7 @@ if $ARGS[0] = 'pressuredforpussy':
 					*clr & cla
 					gs 'willpower', 'pay', 'resist'
 					grupvalue[4] -= 1
-					soniaQW[soniafall_block] += 1
+					soniaQW['soniafall_block'] += 1
 					gs 'npc_relationship', 'modify', 'A9', 'dislike'
 					gs 'npc_relationship', 'modify', 'A10', 'dislike'
 					gs 'npc_relationship', 'modify', 'A11', 'dislike'
@@ -820,6 +820,7 @@ if $ARGS[0] = 'pressuredforblowjob':
 	act 'Go back to the disco': gt 'soniadisco', 'dance'
 	act 'Watch':
 		*clr & cla
+		soniaQW['vitek_bj_watched'] = 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/popsicle2.jpg"></center>'
 		'Sonia obediently pulls her hands away and opens her mouth, Vitek slowly puts the popsicle against her lips and tongue. She closes her lips around it and sucks on it, while looking at Vitek seductively.'
 		'Vitek grins and lowers the popsicle, further and further, until it is at the same level as his groin. All this time, Sonia has never taken her mouth off it, and eventually, she gets down on her knees after bending over awkwardly and nearly falling over once or twice. The way she''s sucking and licking the popsicle has definitely made Vitek aroused, and you see his cock straining against the fabric of his pants. Meanwhile, Dan and Vasily are looking at the two of them with their mouths open, somewhat awkwardly hiding their erections.'
@@ -844,7 +845,7 @@ if $ARGS[0] = 'pressuredforblowjob':
 					*clr & cla
 					gs 'willpower', 'pay', 'self'
 					grupvalue[4] -= 20
-					soniaQW[soniafall_block] += 5
+					soniaQW['soniafall_block'] += 5
 					gs 'npc_relationship', 'modify', 'A9', 'loathe'
 					gs 'npc_relationship', 'modify', 'A10', 'loathe'
 					gs 'npc_relationship', 'modify', 'A11', 'loathe'
@@ -903,7 +904,7 @@ if $ARGS[0] = 'pressuredforblowjob':
 										*clr & cla
 										gs 'willpower', 'pay', 'resist'
 										grupvalue[4] -= 1
-										soniaQW[soniafall_block] += 1
+										soniaQW['soniafall_block'] += 1
 										gs 'npc_relationship', 'modify', 'A9', 'dislike'
 										gs 'npc_relationship', 'modify', 'A10', 'loathe'
 										gs 'npc_relationship', 'modify', 'A11', 'dislike'
@@ -1012,7 +1013,7 @@ if $ARGS[0] = 'pressuredforgangbang':
 				*clr & cla
 				gs 'willpower', 'pay', 'self'
 				grupvalue[4] -= 20
-				soniaQW[soniafall_block] += 5
+				soniaQW['soniafall_block'] += 5
 				gs 'npc_relationship', 'modify', 'A9', 'loathe'
 				gs 'npc_relationship', 'modify', 'A10', 'loathe'
 				gs 'npc_relationship', 'modify', 'A11', 'loathe'