Parcourir la source

Intermediate save.

HotMike il y a 1 an
Parent
commit
c9ab1f39aa

+ 1 - 1
locations/katja_chat.qsrc

@@ -418,7 +418,7 @@ if $ARGS[0] = 'coffee_hole_event':
 			'Natasha chimes in. "Pretty much the same here, I fancy aome window shopping but Natalia wants to see a film and we can''t decide so went for a coffee to have a chat and make up our minds."'
 			'You join the conversation. "Well the cinema is in the mall so maybe you could do both then you''ll both get to do what you want?"'
 			'This brings a smile to Natalia''s face. "Yes I''d love to see that film and it''s a cultural one so not likely to be on too long. Normally Natasha is happy to go with the flow except when it comes to clothes or makeup. Mention either of those and all other ideas are forgotten!"'
-			If NatbelQW['FriendLover'] < 2:
+			if NatbelQW['FriendLover'] < 2:
 				'This causes you to have a little giggle. "Yes I know that all too well with this one." You say indicating Katja who responds with a playful pout and sticks her tongue out at you. This leads to all four of you having a small laugh.'
 			else
 				'This causes you to have a little giggle. "Well that''s two of them Natalia!" You say indicating Katja. "Maybe we should let these two go shopping and we''ll go and see the film?!" Katja responds with a playful pout and sticks her tongue out at you. This leads to all four of you having a small laugh.'

+ 8 - 7
locations/natbelEv.qsrc

@@ -1,4 +1,5 @@
 # natbelEv
+! Natasha regular events
 
 !! Event handling for Natasha''s storyline
 if $ARGS[0] = 'natbelQuest':
@@ -65,6 +66,7 @@ if $ARGS[0] = 'natbelQuest':
 		end
 	end
 end
+
 if $ARGS[0] = 'natbel_go':
 	menu_off = 1
 	*clr & cla
@@ -75,17 +77,16 @@ if $ARGS[0] = 'natbel_go':
 		*clr & cla
 		minut += 10
 		if NatbelQW['VisitedHome'] = 0: NatbelQW['VisitedHome'] = 1
-		NatashaLoc = 2
 		gs 'stat'
 		'<center><b><font color="maroon"><<$npc_firstname[''A16'']>> <<$npc_lastname[''A16'']>></font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big16.jpg"></center>'
 		'It takes you 10 minutes to walk to Natasha''s apartment. You discuss all the small stuff in your lives that amuse you.'
-		'Before you know it, you are inside the hallway of her apartment.'
+		'Before you know it, you are inside her room.'
 		gs 'natbel_init', 'trackers'
 		! This will set a random location, and 0 is an option, or time might be wrong.
-		! Where do we go to with Natasha: her room straight away.
 		NatashaLoc = 2
-		act 'Enter her room': gs 'natbelapt' , 'natroom'
+		! Where do we go to with Natasha? her room straight away.
+		act 'Study together': gt 'natbelEv' , 'study_together'
 	end
 end
 
@@ -310,9 +311,9 @@ if $ARGS[0] = 'carrybooks':
 		end
 	else
 		'Natasha grabs both of your bags and you head to school.'
-		act 'Go to school': gt 'gschool_grounds', 'main'	
+		act 'Go to school': gt 'gschool_grounds', 'main'
 	end
-	act 'Go to school': gt 'gschool_grounds', 'main'	
+	act 'Go to school': gt 'gschool_grounds', 'main'
 end
 
 if $ARGS[0] = 'schoolwalk':
@@ -334,7 +335,7 @@ if $ARGS[0] = 'laundry':
 	$menu_loc = 'natbelEv'
 	$menu_arg = 'laundry'
 	menu_off = 0
-	CLOSE ALL
+	close all
 	*clr & cla
 	$locclass = ''
 	minut += 1

+ 24 - 15
locations/natbel_chat.qsrc

@@ -13,7 +13,13 @@ if $ARGS[0] = 'chat':
 	'<center><h4><font color="maroon">Natasha''s Room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
 	'The two of you lay on her bed and talk about a variety of topics.'
-
+	if NatbelQW['chatDay'] < daystart:
+		if NatbelQW['chat'] <= 0:
+			NatbelQW['chat'] = 1
+		else
+			NatbelQW['chat'] += 1
+		end
+	NatbelQW['chatDay'] = daystart
 	act 'Stop talking': gt 'natbelapt','natroom'
 
 	if npc_pregtalk['A16'] = 0 and kid = 0:
@@ -98,8 +104,9 @@ if $ARGS[0] = 'chat':
 			end
 		end
 	end
-
-	if NatbelQW['chrispaid'] <= 3 and NatbelQW['QWstage'] ! 99:
+	! Only start if you have chatted more than 3 times with her
+	! Todo this should probably depend on relationship/trust level.
+	if NatbelQW['chrispaid'] <= 3 and NatbelQW['QWstage'] ! 99 and NatbelQW['chat'] > 3:
 		act 'Talk about money':
 			minut += 15
 			gs 'stat'
@@ -107,13 +114,16 @@ if $ARGS[0] = 'chat':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
 			'You talk about the price of clothes and cosmetics for a while. Natasha seems to know a lot about the latest fashion, even though she can''t afford it.'
 			!! set up gates:
-			if NatbelQW['QWstage'] = 1:
-				'Natasha looks down in embarrassment. "<<$pcs_nickname>>, you have lots of money. Could you lend me 5000 <b>₽</b>? I will pay it back, I give you my word."'
-				gs 'natbel_chat', 'debttalk'
-			elseif NatbelQW['QWstage'] >= 2:
-				'Suddenly Natasha says: "Hey <<$pcs_nickname>>, you seem to have tons of cash, could you lend me some money, please? I swear I''ll pay you back before you even miss it."'
-				gs 'natbel_chat', 'debttalk'
+			!! Todo the text below is duplicated as the gs will also display text.
+!			if NatbelQW['QWstage'] = 1:
+!				'Natasha looks down in embarrassment. "<<$pcs_nickname>>, you have lots of money. Could you lend me 5000 <b>₽</b>? I will pay it back, I give you my word."'
+!				gs 'natbel_chat', 'debttalk'
+!			elseif NatbelQW['QWstage'] >= 2:
+!				'Suddenly Natasha says: "Hey <<$pcs_nickname>>, you seem to have tons of cash, could you lend me some money, please? I swear I''ll pay you back before you even miss it."'
+			gs 'natbel_chat', 'debttalk'
 			end
+		act 'Keep talking': gt 'natbel_chat', 'chat'
+		act 'Stop talking': gt 'natbelapt', 'natroom'
 		end
 	end		
 	if NatbelQW['chrispaid'] = 4:
@@ -399,18 +409,17 @@ if $ARGS[0] = 'debttalk':
 					'"Ok. I am sure I can think of more things for you to do for me." You get your purse and give Natasha the money.'
 					'"Thank you <<$pcs_nickname>>, you''re the best. I promise you''ll have it back within a month."'
 				end
-			end				
+			end	
+		! This one does appear 2x in the box and is confusing then.
 		elseif NatbelQW['Debt'] <= 0 and ((money < 2000 and NatbelQW['BestFriend'] < 3) or (money < 5000 and NatbelQW['BestFriend'] >= 3)):
-				'Suddenly Natasha says: "Hey <<$pcs_nickname>>, you seem to have tons of cash, could you lend me '+iif(NatbelQW['BestFriend'] >= 3, '5000', '2000')+', please? I swear I''ll pay you back before you even miss it."'
+				'Suddenly Natasha says: "Hey <<$pcs_nickname>>, you seem to have tons of cash, could you lend me '+iif(NatbelQW['BestFriend'] >= 3, '5000', '2000')+' <b>₽</b>, please? I swear I''ll pay you back before you even miss it."'
 				'You shake your head. "Sorry Natasha, I don''t have that much money with me."'
 		elseif NatbelQW['Debt'] > 0 and NatbelQW['DebtDay'] > daystart:
-				'Natasha promises you to repay the <<NatbelQW[''Debt'']>><b>₽</b> in <<NatbelQW[''DebtDay'']-daystart>> day(s).'
-		
+			'Natasha promises you to repay the <<NatbelQW[''Debt'']>><b>₽</b> in <<NatbelQW[''DebtDay'']-daystart>> day(s).'
 		end
-	end
-	
 	act 'Keep talking': gt 'natbel_chat', 'chat'
 	act 'Stop talking': gt 'natbelapt', 'natroom'
+	end
 end
 if $ARGS[0] = 'debt_forgive':
 	if NatbelQW['Debt'] > 0 and NatbelQW['DebtDay'] <= daystart:

+ 2 - 2
locations/natbel_cp_1.qsrc

@@ -1,5 +1,6 @@
 # natbel_cp_1
 !!2022/06/19
+!!This file holds the corruption path of Natasha Bel., Ev has the regular events that will be spread across the other paths
 
 !! To do: 
 !!add carrybooks to apartment hallway
@@ -7,9 +8,8 @@
 !! Natasha - Lily Collins, trying to use Holly Michaels for as much of the sex scenes as I can
 !! Natasha''s mother - India Summer
 
-!!This file holds the corruption path, Ev has the regular events that will be spread across the other paths
-
 !{ Natasha Quest Line
+!! To be changed next dev cycle into s_stage for slave route and l_stage for the love route to make quest management easier.
 NatbelQW['QWstage'] = 0:
 NatbelQW['QWstage'] = 1: You can study with Natasha after school.
 NatbelQW['QWstage'] = 2: Natasha borrowed money for the first time.

+ 2 - 1
locations/natbel_init.qsrc

@@ -123,7 +123,8 @@ if $ARGS[0] ='quests':
         if NatbelQW['pregday'] > 0 and daystart-NatbelQW['pregday'] > 90 and NatbelQW['askedbaby'] ! daystart:
 			gs 'natbel_init'. 'pregnancy'
 		end
-	if $loc_arg = 'natroom' and NatbelQW['QWstage'] > 1 :
+	! Setting this to > 0 will enable the chat function in her room. That way you can progress the quest. Otherwise > 1
+	if $loc_arg = 'natroom' and NatbelQW['QWstage'] > 0 :
         if lernHome > 0:  act 'Study together': gs 'natbelEv', 'study_together'
 		act 'Talk with her': gs 'natbel_chat', 'chat'
     end

+ 26 - 10
locations/natbelapt.qsrc

@@ -32,6 +32,22 @@ NatbelQW['chrispaid'] = 4: Sveta tells Natasha she''s done so.
 
 NatbelQW['panty_stuff_day'] is set to daystart each morning you stuff Natasha''s panties into her pussy when going to school.
 NatbelQW['evt_day'] day tracker for events, set to daystart used to control quest timings.
+
+NatbelQW['KolkaWantsNat'] ?
+NatbelQW['seethroughwearing'] = 0: 
+NatbelQW['seethroughwearing'] = 1:
+NatbelQW['Debt']
+NatbelQW['FriendLover']: int on a stage
+NatbelQW['training']
+NatbelQW['MotherHome']
+NatbelQW['MotherDoor']
+NatbelQW['MetMother'] = 0: Sveta has not yet met the mother of Natasha
+NatbelQW['MetMother'] = 1: She has met the mother
+NatbelQW['seethroughkitchen']
+NatbelQW['NoTV']
+NatbelQW['cucumber']
+NatbelQW['chat']: Number of time you chatted with Natasha
+NatbelQW['chatDay']: day you had a chat with Natasha
 }
 
 !!this is the text and chances anyone is at Natasha''s apartment.
@@ -494,7 +510,7 @@ if $ARGS[0] = 'natroom':
 			'You look into the room and see that Natasha is sleeping soundly on her bed. Not wanting to disturb her you close the door and leave.'
 		end
 		gs 'stat'
-		act 'Leave':gt 'natbelapt','hallway'
+		!act 'Leave':gt 'natbelapt','hallway'
 	elseif NatbelQW['seethroughwearing'] = 1 and natstayroom = 0:
 		NatashaLoc = 2
 		if NatbelQW['seethroughworn'] < 5:
@@ -507,13 +523,12 @@ if $ARGS[0] = 'natroom':
 		NatashaLoc = 2
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/seethrough00.jpg"></center>'
 		'Natasha is standing there in the lingerie you gave her, looking at you with interest.'
-	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/natroom.jpg"></center>'
-		'Natasha''s room looks very tidy. What it lacks in decorations is made up by how well she''s using her available space. On the right side, there''s a narrow bed in the corner with a bed stand next to it and a big closet for all of her clothes.'
-		'On the left side, right behind the door is a small sofa, her desk and computer are in the back corner. Everything is cleaned and neatly organized.'
-	end
 
-	if NatashaLoc = 2 and hour > 6 and hour < 23:
+!	end
+	! we arrived her with Natasha
+	elseif NatashaLoc = 2 and hour > 6 and hour < 23:
+		! TODO find a picture of Nat reading a magazine, or use any other
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/natroom.jpg"></center>'
 		if NatbelQW['seethroughwearing'] = 0:
 			'Natasha is sitting on the bed, looking at some fashion magazines.'
 
@@ -528,7 +543,6 @@ if $ARGS[0] = 'natroom':
 		killvar '$statusM'
 		gs 'natbel_init', 'quests'
 
-
 	elseif NatashaShower = 1 and NatashaLoc ! 2:
 		*clr & cla
 		menu_off = 1
@@ -553,9 +567,11 @@ if $ARGS[0] = 'natroom':
 			end
 		end
 	else
-		cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/natroom.jpg"></center>'
+		'Natasha''s room looks very tidy. What it lacks in decorations is made up by how well she''s using her available space. On the right side, there''s a narrow bed in the corner with a bed stand next to it and a big closet for all of her clothes.'
+		'On the left side, right behind the door is a small sofa, her desk and computer are in the back corner. Everything is cleaned and neatly organized.'
 		'You poke around in Natasha''s room for a bit.'
-		act 'Leave': gt 'natbelapt', 'hallway'
+		!act 'Leave her room': gt 'natbelapt', 'hallway'
 	end
 end