1
0
Prechádzať zdrojové kódy

Merge branch 'exhibtoinhib' of ml/glife into master

Kevin_Smarts 6 rokov pred
rodič
commit
38577e13dd

+ 1 - 1
locations/gschool_lessons.qsrc

@@ -2943,7 +2943,7 @@ if $ARGS[0] = 'dress':
 		*clr & cla
 		*clr & cla
 		gs 'stat'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic<<rand(1,3)>>.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic<<rand(1,3)>>.jpg"></center>'
-		'While you are still naked, you hear a couple of girls giggling. You turn to look at them, but they are not looking at you. Confused, you follow their collective gaze and see Christina standing their with her phone out. Glancing back at them, you see them looking at you and giggling again - obviously, something happened that you missed; something that they thought was funny. You wonder what it was.'
+		'While you are still naked, you hear a couple of girls giggling. You turn to look at them, but they are not looking at you. Confused, you follow their collective gaze and see Christina standing there with her phone out. Glancing back at them, you see them looking at you and giggling again - obviously, something happened that you missed; something that they thought was funny. You wonder what it was.'
 		'You can choose another outfit while you''re here.'
 		'You can choose another outfit while you''re here.'
 	else
 	else
 		*clr & cla
 		*clr & cla

+ 2 - 1
locations/saveupdater.qsrc

@@ -343,13 +343,14 @@ if $home_town = '':
 end
 end
 
 
 !! exhibition to inhib
 !! exhibition to inhib
-if pcs_exhibition > 0 or exhibition_exp > 0:
+if exhibition_to_inhib = 0:
 	pcs_inhib = pcs_exhibition
 	pcs_inhib = pcs_exhibition
 	inhib_exp = exhibition_exp
 	inhib_exp = exhibition_exp
 	inhib_lvlst = pcs_exhibition
 	inhib_lvlst = pcs_exhibition
 	inhib_lvl = pcs_exhibition
 	inhib_lvl = pcs_exhibition
 	killvar 'pcs_exhibition'
 	killvar 'pcs_exhibition'
 	killvar 'exhibition_exp'
 	killvar 'exhibition_exp'
+	exhibition_to_inhib = 1
 end
 end
 
 
 --- saveupdater ---------------------------------
 --- saveupdater ---------------------------------