1
0
Ver Fonte

Merge remote-tracking branch 'netuttki/master'

Kevin_Smarts há 1 ano atrás
pai
commit
7b9570c1e5
3 ficheiros alterados com 26 adições e 26 exclusões
  1. 1 1
      locations/city_kafe.qsrc
  2. 6 6
      locations/vasily_home_sex.qsrc
  3. 19 19
      locations/vasilyhome.qsrc

+ 1 - 1
locations/city_kafe.qsrc

@@ -602,7 +602,7 @@ if $ARGS[0] = 'tips':
 	'You made <<workKafe[''tips_total'']>> rub in tips.'
 	*nl
 	'Fabi switches the lights off in the kitchen and with a smile ushers you out of the dinner so he can finish closing up.'
-	act 'Leave': gt 'pav_residential'
+	act 'Leave': gt 'city_residential'
 end
 
 

+ 6 - 6
locations/vasily_home_sex.qsrc

@@ -1,7 +1,7 @@
 #vasily_home_sex
 
 !!don''t know how the mom ones work exactly but can we make sure they can only fire once a day
-if $ARGS[0] = 'shulga_home_momgg1':
+if $ARGS[0] = 'vasily_home_momgg1':
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/momgg/ev1_1.jpg"></center>'
 	'Oops, uncle Sergey has a woman over! Just when you were about to leave them alone, you realize, "Wait a minute... that woman is your <<$npc_nickname[''A29'']>>!"'
@@ -58,9 +58,9 @@ if $ARGS[0] = 'shulga_home_momgg1':
 			end
 		end
 	end
-end &! --- shulga_home_momgg1 ---
+end &! --- vasily_home_momgg1 ---
 
-if $ARGS[0] = 'shulga_home_momgg2':
+if $ARGS[0] = 'vasily_home_momgg2':
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/momgg/ev2_1_'+rand(1,4)+'.jpg"></center>'
 	'When you carefully peek around the corner, you immediately recognize the woman uncle Sergey is with... it''s your <<$npc_nickname[''A29'']>>! Her head is bobbing up and down on his cock eagerly, and she''s making loud slurping sounds while she''s sucking him off.'
@@ -105,9 +105,9 @@ if $ARGS[0] = 'shulga_home_momgg2':
 			end
 		end
 	end
-end &! --- shulga_home_momgg2 ---
+end &! --- vasily_home_momgg2 ---
 
-if $ARGS[0] = 'shulga_home_momggbang':
+if $ARGS[0] = 'vasily_home_momggbang':
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/momgg/ev3_1_'+rand(1,3)+'.jpg"></center>'
 	'When you peek through the narrow door opening, you see your <<$npc_nickname[''A29'']>> sitting on her knees in between uncle Sergey and uncle Misha!'
@@ -173,7 +173,7 @@ if $ARGS[0] = 'shulga_home_momggbang':
 			end
 		end
 	end
-end &! --- shulga_home_momggbang ---
+end &! --- vasily_home_momggbang ---
 
 !Event in the kitchen with gopotoy, can we make sure it can only fire once a day
 if $ARGS[0] = 'gang_sex_ev1':

+ 19 - 19
locations/vasilyhome.qsrc

@@ -84,11 +84,11 @@ if $ARGS[0] = 'hallway':
 			if rand(1,5) = 1:
 				temprand = rand(1,5)
 				if temprand <= 2:
-					'You hear some strange sounds coming from uncle Sergey''s room. You could go <a href="exec: gt ''vasily_home_sex'',''shulga_home_momgg1''">see</a> what''s causing them.'
+					'You hear some strange sounds coming from uncle Sergey''s room. You could go <a href="exec: gt ''vasily_home_sex'',''vasily_home_momgg1''">see</a> what''s causing them.'
 				elseif temprand <= 4:
-					'You hear some strange sounds coming from uncle Sergey''s room, leaving no doubt as to what''s happening there. You could go <a href="exec: gt ''vasily_home_sex'',''shulga_home_momgg2''">see</a> who''s with him.'
+					'You hear some strange sounds coming from uncle Sergey''s room, leaving no doubt as to what''s happening there. You could go <a href="exec: gt ''vasily_home_sex'',''vasily_home_momgg2''">see</a> who''s with him.'
 				else
-					'You hear some strange sounds coming from uncle Sergey''s room, leaving no doubt as to what''s happening there. It doesn''t sound like he''s the only person in there though! You could go <a href="exec: gt ''vasily_home_sex'',''shulga_home_momggbang''">see</a> who else is in there.'
+					'You hear some strange sounds coming from uncle Sergey''s room, leaving no doubt as to what''s happening there. It doesn''t sound like he''s the only person in there though! You could go <a href="exec: gt ''vasily_home_sex'',''vasily_home_momggbang''">see</a> who else is in there.'
 				end
 			end
 			sexev_momgg_day = daystart
@@ -185,12 +185,12 @@ if $ARGS[0] = 'livingroom':
 	if shulga_room_rnd = 1: $shulga_room_rnd = 'The boys are drinking beer and playing cards.'
 	if shulga_room_rnd = 2: $shulga_room_rnd = 'The boys are drinking beer while watching TV.'
 
-	if week < 5 and hour >= 20: '<<$shulga_room_rnd>> <a href="exec: gt ''vasilyhome'', ''vasily_bazar_night''">Vasily</a>, <a href="exec: gt ''vasilyhome'', ''dan_bazar''">Dan</a> and <a href="exec: gt ''vasilyhome'', ''vitek_bazar''">Vitek</a>, invites you to <a href="exec: gt ''vasilyhome'', ''shulga_beer''">have a drink with them</a>.'
+	if week < 5 and hour >= 20: '<<$shulga_room_rnd>> <a href="exec: gt ''vasilyhome'', ''vasily_bazar_night''">Vasily</a>, <a href="exec: gt ''vasilyhome'', ''dan_bazar''">Dan</a> and <a href="exec: gt ''vasilyhome'', ''vitek_bazar''">Vitek</a>, invites you to <a href="exec: gt ''vasilyhome'', ''vasily_beer''">have a drink with them</a>.'
 	if (week >= 6 and hour >= 10 and hour < 17) or (week = 7 and hour >= 20): '<a href="exec: gt ''vasilyhome'', ''vasily_bazar_day''">Vasily</a> is sitting on the big sofa.'
 
 	act 'Return to hallway': gt 'vasilyhome', 'hallway'
 	if week < 5 and hour >= 20:
-		act 'Drink beer with the guys': gt 'vasilyhome', 'shulga_beer'
+		act 'Drink beer with the guys': gt 'vasilyhome', 'vasily_beer'
 		act 'Play cards': gt 'cardgame_durak', 'start'
 	end
 	act 'Sit on the small sofa':
@@ -304,7 +304,7 @@ if $ARGS[0] = 'sh_hooker':
 	end
 end
 
-if $ARGS[0] = 'shulga_beer':
+if $ARGS[0] = 'vasily_beer':
 	menu_off = 1
 	if alko < 6:
 		minut += 5
@@ -320,7 +320,7 @@ if $ARGS[0] = 'shulga_beer':
 		else
 			act 'You''ve had enough (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-		act 'Have another drink': gt 'vasilyhome', 'shulga_beer'
+		act 'Have another drink': gt 'vasilyhome', 'vasily_beer'
 	else
 		minut += 5
 		gs 'stat'
@@ -518,7 +518,7 @@ if $ARGS[0] = 'vasily_bazar_night':
 		end
 		act 'Further': gt 'vasilyhome', 'vasily_bazar_night'
 	end
-	act 'Drink beer': gt 'vasilyhome', 'shulga_beer'
+	act 'Drink beer': gt 'vasilyhome', 'vasily_beer'
 	if npc_rel['A11'] >= 70 and alko >= 1 or npc_rel['A11'] >= 70 and pcs_horny > 50 or fame['pav_slut'] >= 200 and alko >= 1:
 		gs 'willpower', 'sex', 'self', 'easy'
 		if will_cost <= pcs_willpwr:
@@ -588,7 +588,7 @@ if $ARGS[0] = 'dan_bazar':
 		end
 		act 'Further': gt 'vasilyhome', 'dan_bazar'
 	end
-	act 'Drink beer': gt 'vasilyhome', 'shulga_beer'
+	act 'Drink beer': gt 'vasilyhome', 'vasily_beer'
 	if fame['pav_slut'] >= 200 and alko >= 1:
 		gs 'willpower', 'sex', 'self', 'easy'
 		if will_cost <= pcs_willpwr:
@@ -659,7 +659,7 @@ if $ARGS[0] = 'vitek_bazar':
 		end
 		act 'Further': gt 'vasilyhome', 'vitek_bazar'
 	end
-	act 'Drink beer': gt 'vasilyhome', 'shulga_beer'
+	act 'Drink beer': gt 'vasilyhome', 'vasily_beer'
 	if fame['pav_slut'] >= 200 and alko >= 1:
 		gs 'willpower', 'sex', 'self', 'easy'
 		if will_cost <= pcs_willpwr:
@@ -690,7 +690,7 @@ if $ARGS[0] = 'vasily_bazar_day':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/vasya/vasya.jpg"></center>'
 	'Vasily is always with Dan and Vitek, who are his best friends. He''s physically the weakest one of the three, but is a bit of a prankster and always makes the others laugh. He was raised by just his father, after his mother left when he was still an infant.'
-	act 'Move away': gt 'vasilyhome'
+	act 'Move away': gt 'vasilyhome', 'livingroom'
 	act 'Talk':
 		*clr & cla
 		minut += 10
@@ -701,13 +701,13 @@ if $ARGS[0] = 'vasily_bazar_day':
 		vasyan_textb_day = rand(0,8)
 		if vasyan_textb_day = 0: $vasyan_textb_day = ' "Life is like a Matryoshka doll", Vasily says mysteriously.<br> "What the hell is that supposed to mean?", you ask.<br> "Think about it", is all he says.<br> You roll you eyes and give him a sarcastic: "Oh, I will."'
 		if vasyan_textb_day = 1: $vasyan_textb_day = ' He tells you a story about his trip to the city: "I lost my wallet in the city and had no way to get home. The only way I could earn money for the train was by washing dishes at the barbecue. It turned out great though. The cute barmaid was flirting with me all night, and I even got to make out with her before I left. The next time I make it up there I''m going to rock her world."<br> "You go get her tiger", you encourage him.'
-		if vasyan_textb = 2 and SchoolAtestat = 0: $vasyan_textb_day = ' He gives you some advice: "If you have a phone it will make school go by much faster, just be careful not to let the teacher catch you playing with it."<br> "Nobody is getting my phone without a fight", you declare with a smile.'
-		if vasyan_textb = 2 and SchoolAtestat = 1: $vasyan_textb_day = ' You tell Vasily a story from gym class: "This one time after gym class I was all sweaty and Katja tried to drag me into the shower. It was really weird."<br> Vasily adds: "She told me to take a shower a few weeks ago too."<br> "Well, that''s just cause you stink", you say sticking you tongue out at him.'
-		if vasyan_textb = 3: $vasyan_textb_day = ' He tells you a story about a fight: "I got into a scrap with Dimka behind the community center once. I totally whipped his ass, but be careful around him he''s a nasty piece of work."'
-		if vasyan_textb = 4: $vasyan_textb_day = ' He tells you a story about magic fairies, who live in the countryside. He swears it''s true, but you just roll you eyes.'
-		if vasyan_textb = 5: $vasyan_textb_day = ' Vasily complains: "The economy is broken, and none of these idiots is doing anything about it."<br> "What should be done to fix it?", you ask curiously.<br> "Oh, I don''t care. I can use my laptop to hack the banks, and get money whenever I need it", he says.<br> "Then why the hell are you complaining", you say frustrated'
-		if vasyan_textb = 6: $vasyan_textb_day = ' He talks about his trip to the city: "I got lost in the old section of the city. I nearly starved to death, before I found my way out. If you ever end up there be careful. That place is like a Byzantine labyrinth."<br> "Did you find anything interesting?", you ask.<br> Not really, there was lot''s of grass and abandoned buildings. I did see a leather clad woman get out of a cab, but she disappeared like a puff of smoke.'
-		if vasyan_textb = 7: $vasyan_textb_day = ' "Hey <<$pcs_nickname>>, the guys and I were trying to figure something out. How big are your tits? I said they look like <<$titsize>>s, but I figured I''d ask you to be sure."<br> You cross your arms over your chest, and glare at him in response.<br> "So, bigger then?", he quirks an eyebrow.<br> You give him a little slug in the arm for an answer.'
+		if vasyan_textb_day = 2 and SchoolAtestat = 0: $vasyan_textb_day = ' He gives you some advice: "If you have a phone it will make school go by much faster, just be careful not to let the teacher catch you playing with it."<br> "Nobody is getting my phone without a fight", you declare with a smile.'
+		if vasyan_textb_day = 2 and SchoolAtestat = 1: $vasyan_textb_day = ' You tell Vasily a story from gym class: "This one time after gym class I was all sweaty and Katja tried to drag me into the shower. It was really weird."<br> Vasily adds: "She told me to take a shower a few weeks ago too."<br> "Well, that''s just cause you stink", you say sticking you tongue out at him.'
+		if vasyan_textb_day = 3: $vasyan_textb_day = ' He tells you a story about a fight: "I got into a scrap with Dimka behind the community center once. I totally whipped his ass, but be careful around him he''s a nasty piece of work."'
+		if vasyan_textb_day = 4: $vasyan_textb_day = ' He tells you a story about magic fairies, who live in the countryside. He swears it''s true, but you just roll you eyes.'
+		if vasyan_textb_day = 5: $vasyan_textb_day = ' Vasily complains: "The economy is broken, and none of these idiots is doing anything about it."<br> "What should be done to fix it?", you ask curiously.<br> "Oh, I don''t care. I can use my laptop to hack the banks, and get money whenever I need it", he says.<br> "Then why the hell are you complaining", you say frustrated'
+		if vasyan_textb_day = 6: $vasyan_textb_day = ' He talks about his trip to the city: "I got lost in the old section of the city. I nearly starved to death, before I found my way out. If you ever end up there be careful. That place is like a Byzantine labyrinth."<br> "Did you find anything interesting?", you ask.<br> Not really, there was lot''s of grass and abandoned buildings. I did see a leather clad woman get out of a cab, but she disappeared like a puff of smoke.'
+		if vasyan_textb_day = 7: $vasyan_textb_day = ' "Hey <<$pcs_nickname>>, the guys and I were trying to figure something out. How big are your tits? I said they look like <<$titsize>>s, but I figured I''d ask you to be sure."<br> You cross your arms over your chest, and glare at him in response.<br> "So, bigger then?", he quirks an eyebrow.<br> You give him a little slug in the arm for an answer.'
 		if vasyan_textb_day = 8 and npc_rel['A11'] < 30: $vasyan_textb_day = ' "I love <<$pcs_haircol>> hair, and it looks so good on you <<$pcs_nickname>>."<br> "Thanks Vasily, that''s very sweet", you say blushing.<br> "Does the carpet match the drapes?", he asks with a smirk.<br> "Typical", is all you answer with an exasperated sigh.'
 		if vasyan_textb_day = 8 and npc_rel['A11'] >=30 and webcamera = 1: $vasyan_textb_day = ' Don''t you sometimes do homework at Julia Milova''s place after school?, he asks.<br> "Maybe", you say suspiciously.<br> "Well, if you ever do please put in a good word for me. I think she''s cute", he finishes.'
 		if vasyan_textb_day = 8 and npc_rel['A11'] >=30 and npc_rel['A11'] <50 and webcamera = 0: $vasyan_textb_day = ' Vasily says: "Have you heard about all the webcam sites that are popping up? Apparently girls can make a lot of money on them. If you have a computer, webcam, and are willing to show a little skin I bet you could do very well <<$pcs_nickname>>."<br> "I''m not sure I would be comfortable doing something like that", you say.<br> "You should think about it. It''s not like you would be selling it on the street. All you have to do is lie around on a bed and talk to a bunch of lonely guys. Then you show them a little skin and the money starts rolling in. It would be so easy", he finishes.'
@@ -715,7 +715,7 @@ if $ARGS[0] = 'vasily_bazar_day':
 		if vasyan_textb_day = 8 and npc_rel['A11'] >=100: $vasyan_textb_day = ' "Hey <<$pcs_nickname>>, have you checked out the webcam I bought?", Vasily asks.<br> "Yea, I may have checked it out a little", you say.<br> "Well, If you ever want to get on there during the weekend let me know. We could do a show together, and rake in some big bucks", he says with a wink and a smile.<br> "That''s not a bad idea. I''ll have to think about it", you blush.'
 		if bazar_count <= 0: 'Vasily says: "<<$pcs_nickname>>, I''m tired of your talk. Leave me alone."'
 		if bazar_count > 0: '<<$vasyan_textb_day>>'
-		act 'Further': gt 'vasilyhome', 'shulga_bazar_day'
+		act 'Further': gt 'vasilyhome', 'vasily_bazar_day'
 		gs 'stat'
 	end