Browse Source

Merge remote-tracking branch 'CroWke/master'

KevinSmarts 5 years ago
parent
commit
80dbc12e00
3 changed files with 25 additions and 21 deletions
  1. 2 3
      locations/NatBelGo.qsrc
  2. 22 17
      locations/natbelapt.qsrc
  3. 1 1
      locations/pod_ezd.qsrc

+ 2 - 3
locations/NatBelGo.qsrc

@@ -15,8 +15,7 @@ act 'Go with Natasha':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/16.jpg"></center>'
 	'It takes you 15 minutes to walk to Natasha''s home. You discuss all the small stuff in your lives that amuse you.'
 
-	act 'Go into the apartment':gt 'NatBelHome'
+	act 'Go into the apartment': gt 'natbelapt', 'study_together'
 end
 
---- NatBelGo ---------------------------------
-
+--- NatBelGo ---------------------------------

+ 22 - 17
locations/natbelapt.qsrc

@@ -335,9 +335,7 @@ if $ARGS[0] = 'bathroom':
 			'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 			'You take a quick shower.'
-			act 'Take a selfie':
-				gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
-			end
+			act 'Take a selfie': gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
 			act 'Get out of the shower': gt 'natbelapt','bathroom'
 		end
 	end
@@ -475,32 +473,36 @@ if $ARGS[0] = 'natroom':
 				gs 'willpower', 'exhib'
 				if will_cost <= pcs_willpwr:
 					act 'Make her lick your feet (<<will_cost>> Willpower)':
-					gs 'willpower', 'force'
-					gt 'natbelapt', 'lick_feet'
+						gs 'willpower', 'force'
+						gt 'natbelapt', 'lick_feet'
+					end
 				end
 			end
 			if NatashaQW > 6:
 				gs 'willpower', 'exhib'
 				if will_cost <= pcs_willpwr:
 					act 'Spit in face (<<will_cost>> Willpower)':
-					gs 'willpower', 'force'
-					gt 'natbelapt', 'spit_face'
+						gs 'willpower', 'force'
+						gt 'natbelapt', 'spit_face'
+					end
 				end
 			end
 			if NatashaQW > 7:
 				gs 'willpower', 'sex'
 				if will_cost <= pcs_willpwr:
 					act 'Make her lick your pussy (<<will_cost>> Willpower)':
-					gs 'willpower', 'force'
-					gt 'natbelapt', 'lick_pussy'
+						gs 'willpower', 'force'
+						gt 'natbelapt', 'lick_pussy'
+					end
 				end
 			end
 			if NatashaQW > 8 and hour >= 18 and hour < 21 and natsub >= 6 and natfuckday < daystart and kolkawantsnat = 1:
 				gs 'willpower', 'sex'
 				if will_cost <= pcs_willpwr:
 					act 'Make her fuck Kolka (<<will_cost>> Willpower)':
-					gs 'willpower', 'force'
-					gt 'natkolev', 'kolkabj'
+						gs 'willpower', 'force'
+						gt 'natkolev', 'kolkabj'
+					end
 				end
 			end
 !! nutluck pulled this for now
@@ -511,8 +513,9 @@ if $ARGS[0] = 'natroom':
 				gs 'willpower', 'anal'
                 if will_cost <= pcs_willpwr:
                     act 'Take her to see Olu (<<will_cost>> Willpower)':
-                    gs 'willpower', 'force'
-                    gt 'natpimp', 'go_see_olu'
+						gs 'willpower', 'force'
+						gt 'natpimp', 'go_see_olu'
+					end
                 end
 			end
 		end
@@ -825,14 +828,16 @@ if $ARGS[0] = 'afterhomework':
 			gs 'willpower', 'bj'
 			if will_cost <= pcs_willpwr:
 				act 'Lie down and open your legs (<<will_cost>> Willpower)':
-				gs 'willpower', 'resist'
-				gt 'natbelapt', 'openlegs'
+					gs 'willpower', 'resist'
+					gt 'natbelapt', 'openlegs'
+				end
 			end
 			gs 'willpower', 'bj'
 			if will_cost <= pcs_willpwr:
 				act 'Straddle her face (<<will_cost>> Willpower)':
-				gs 'willpower', 'resist'
-				gt 'natbelapt', 'straddleface'
+					gs 'willpower', 'resist'
+					gt 'natbelapt', 'straddleface'
+				end
 			end
 		end
 	end

+ 1 - 1
locations/pod_ezd.qsrc

@@ -185,7 +185,7 @@ if $ARGS[0] = 'etaj_4':
 	act 'Go up to the fifth floor': minut += 1 & gt 'pod_ezd','etaj_5'
 
 	if BeInNatBelHome = 1:
-		act 'Apartment 19: Natasha Belova': gt 'NatBelVhod'
+		act 'Apartment 19: Natasha Belova': gt 'natbelapt', 'home'
 	end
 
 	act 'Apartment 21: Aunt Luda':