Explorar o código

[fixes] redundant end and missing argument in martinsex2, imagelinks in young_shop and small stuff in hotelhole

julzor %!s(int64=5) %!d(string=hai) anos
pai
achega
6b7e5c5d37
Modificáronse 3 ficheiros con 47 adicións e 52 borrados
  1. 20 24
      locations/HotelHole.qsrc
  2. 25 26
      locations/MartinSex2.qsrc
  3. 2 2
      locations/young_shop.qsrc

+ 20 - 24
locations/HotelHole.qsrc

@@ -9,13 +9,11 @@ $menu_arg = ''
 menu_off = 0
 $location_type = 'public_indoors'
 
-clr
 gs'stat'
 
 ! use this args if  some event  transfers you directly to the lobby  and it is can happen  between  midnight and 01:00.
-if $ARGS[0] = 'skip_resepevent' :
-jump 'skipresepevent'
-end
+if $ARGS[0] = 'skip_resepevent': jump 'skipresepevent'
+
 if hour = 0 and $prevloc ! 'HotelRoom':
 	*clr
 	'When you want to enter the hotel you notice the doors are closed.'
@@ -31,6 +29,7 @@ if hour = 0 and $prevloc ! 'HotelRoom':
 	act 'Go back to the High Street':minut += 3 & gt'pavtrain'
 	exit
 end
+
 if hour = 0 and $prevloc = 'HotelRoom':
 	if resepseen = 1:
 	hotresepQW = 3
@@ -103,31 +102,27 @@ if hour = 0 and $prevloc = 'HotelRoom':
 		'You get the feeling you interrupted something here.'
 	end
 end
+
 :skipresepevent
 '<center><H4>Pavlovsk hotel</H4></center>'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.hole.jpg"></center>'
 'As you enter the Pavlovsk hotel you''re always surprised by how fancy it looks on the inside, given the shabby exterior. You can approach the <a href="exec:minut += 1 & gt ''hotel_resep''">reception desk</a> of the hotel where a cute brunette is currently manning the desk, she gives you a friendly nod when you get into her sight range.'
+
 if hour >= 12 and hour < 20 and proshotelopen = 1: '<a href="exec:gt ''HotelHole'',''Pavlin''">Pavlin</a> is sitting in the lobby looking around for fresh prey.'
 
-if hour >= 12 and hour <= 13 and GermanQW > 0:
-	'Next to the reception desk, you see a door labeled <a href="exec:minut += 1 & gt ''hoteladmin''">"Administration"</a>. That must be where the hotel manager works. The door is currently open.'
-end
+if hour >= 12 and hour <= 13 and GermanQW > 0: 'Next to the reception desk, you see a door labeled <a href="exec:minut += 1 & gt ''hoteladmin''">"Administration"</a>. That must be where the hotel manager works. The door is currently open.'
 
-if hotwait = 1:
-'You go sit in one of the comfortable chairs in the lobby and watch the guests checking in an out.'
-hotwait = 0
-end
+if hotwait = 1: 'You go sit in one of the comfortable chairs in the lobby and watch the guests checking in an out.' & hotwait = 0
 
 act 'Leave the hotel':minut += 3 & gt'pavtrain'
 
 if maidqw >= 1 and hour >= 16 and hour < 17:
 	act'<b>Work as a maid</b>':
-		cls
+		*clr & cla
 		gs'stat'
 		'You report in for work at the front desk. The brunette manning the desk quickly makes sure no customers will need her for a minute, and then guides you to the locker room and gives you a maid uniform. She gives you a friendly smile: "You need to wear this, company policy. You can put your own clothes in a locker for safekeeping while you work. I have to get back to the desk now before I''m missed, good luck today!"'
 		act'Change into the maid costume':
-			cla
-			*clr
+			*clr & cla
 			maid_cloth = 1
 			if pcs_inhib < 30: inhib_exp += 1
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/maid.cloth'+rand(0,5)+'.jpg"></center>'
@@ -140,24 +135,25 @@ end
 
 if maidqw >= 1 and hour >= 15 and hour < 16:
 	act'Wait in the lobby until you can start your maid job':
+		*clr & cla
 		hour = 16
 		minut = 0
-		cls
 		gs'stat'
 		gt 'HotelHole'
 	end
 end
 
-if maidtime > 0:
-	act'Collect your salary':
-		hotelcollect = 1
-		gt'hotel_resep'
-	end
-end
+if maidtime > 0: act'Collect your salary': hotelcollect = 1 & gt'hotel_resep'
 
-if hotelcouple = 2 and week=4 and hour >=20 and hour <23 and hcday ! daystart:
-	act 'Go visit the couple in room 207':gt 'HotelWork','hotcouple'
-end
+if hotelcouple = 2 and week=4 and hour >=20 and hour <23 and hcday ! daystart: act 'Go visit the couple in room 207': gt 'HotelWork','hotcouple'
+
+!!if hour = 20 and IgorevnaBDSM >= 6 and IgorevnaBDSM < 20 and week < 3:
+!!	if lariskaMotherKnown = 1:
+!!		act 'Look for Anna': gt 'HotelAnna', 'AnnaRoad'
+!!	else
+!!		act 'Look for the woman': gt 'HotelAnna', 'AnnaRoad'
+!!	end
+!!end
 
 if HotelRoom > 0:
 	act 'Go to your room':

+ 25 - 26
locations/MartinSex2.qsrc

@@ -5,7 +5,7 @@ gs 'themes', 'indoors'
 menu_off = 1
 
 if $ARGS[0] = 'MartinSexPrep':
-	cls
+	*clr & cla
 	gs 'boyStat', 'A216'
 	
 	if $martinpos = 'cowgirl':	
@@ -68,7 +68,7 @@ if $ARGS[0] = 'MartinSexPrep':
 	elseif prezik > 0 and preziktype ! 2 and tabletkishot < 1 and pillcon2 < 30000 and ovulate > 0: 
 		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. And unless your count is off, today is a dangerous day to boot. You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', the condoms sitting in it materializing before your inner eye.' + iif(preziktype=1,' You usually prefer to have sex without condoms, but...', ' ')
 	elseif prezik > 0 and preziktype ! 2 and tabletkishot < 1 and pillcon2 < 30000: 
-		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. Today isn''t really a dangerous day, but it might be better to be safe than sorry. And while Martin doesn''t seem like the type who fucks random sluts, you can never be entirely sure of that, can you? You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', the condoms sitting in it materializing before your inner eye.' + iif(preziktype=1,' You usually prefer to have sex sans condoms, but...')
+		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. Today isn''t really a dangerous day, but it might be better to be safe than sorry. And while Martin doesn''t seem like the type who fucks random sluts, you can never be entirely sure of that, can you? You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', the condoms sitting in it materializing before your inner eye.' + iif(preziktype=1,' You usually prefer to have sex sans condoms, but...', ' ')
 	elseif prezik > 0 and preziktype = 2 and tabletkishot < 1 and pillcon2 < 30000 and ovulate > 0: 
 		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. And unless your count is off, today is a dangerous day to boot. You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', the sabotaged condoms sitting in it materializing before your inner eye. You could put one on Martin and get pregnant, and he would be none the wiser...'
 	elseif prezik > 0 and preziktype = 2 and tabletkishot < 1 and pillcon2 < 30000: 
@@ -85,7 +85,7 @@ if $ARGS[0] = 'MartinSexPrep':
 	gs 'stat'
 	
 	act 'Stop and get dressed':
-		cls
+		*clr & cla
 		'<center><video src="images/locations/city/industrial/bar/gettingdressed.mp4"></center>'
 		'It''s strange how things go sometimes: One moment you are about to have your pussy fucked, the next you are on your feet, collecting your clothes and putting them on. The thoughts that crossed your mind had killed the mood in an instant, even if your horniness is unchanged.'
 		*nl
@@ -117,7 +117,7 @@ if $ARGS[0] = 'MartinSexPrep':
 end
 	
 if $ARGS[0] = 'MartinSexDyn':
-	cls
+	*clr & cla
 	gs 'boyStat', 'A216'
 	if $martinpos ! 'sideways':
 		pic_rand = rand(1,5)
@@ -247,15 +247,14 @@ if $ARGS[0] = 'MartinSexDyn':
 	end
 
 	act 'Continue':
-		cls
+		*clr & cla
 		:pic_loop
-			if $martinpos ! 'sideways':
-				pic_rand2 = rand(1,5)
-			else
-				pic_rand2 = rand(4,5)
-			end
-			if pic_rand = pic_rand2:jump 'pic_loop'
+		if $martinpos ! 'sideways':
+			pic_rand2 = rand(1,5)
+		else
+			pic_rand2 = rand(4,5)
 		end
+		if pic_rand = pic_rand2:jump 'pic_loop'
 			
 		if $martinpos = 'cowgirl' or $martinpos = 'rev_cowgirl':
 			if $martinpos = 'cowgirl':
@@ -429,7 +428,7 @@ if $ARGS[0] = 'MartinSexDyn':
 		act 'Let him cum on your face':gt 'MartinSex2', 'MartinCumshot_Face'
 		act 'Let him cum on your tits':gt 'MartinSex2', 'MartinCumshot_Tits'
 		act 'Let him cum inside you':
-			cls
+			*clr & cla
 			if MartinPrezik = 1:
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/cumshot/cum_prezik.jpg"></center>'
 				'But you make no attempts to pull him out of you and after a few more moments, you feel Martin tense and his penis grow inside you even more; two or three seconds later, he groans and cums, filling the condom with his seed.'
@@ -534,7 +533,7 @@ if $ARGS[0] = 'MartinSexDyn':
 			end
 			
 			act 'Get cleaned up':
-				cls
+				*clr & cla
 				'<center><video src="images/locations/city/industrial/bar/gettingdressed.mp4"></center>'
 				'It takes a little while, but eventually, both of you (and the bar) are somewhat clean and dressed again. You''re not being quiet about it, either: The two of you chat and exchange innuendos as you go, intimate as always.'
 				if MartinPrezik = 1 and sexcontra ! 3: 'The whole condom situation did leave a little of a sour aftertaste, though. Sure, Martin tries not to show that he''s worried but you can tell that he''s not as easygoing as usual, and the thought of being pregnant crosses your mind a little more than usual too.'
@@ -556,7 +555,7 @@ if $ARGS[0] = 'MartinSexDyn':
 end
 
 if $ARGS[0] = 'MartinAnalDyn':
-	cls
+	*clr & cla
 	gs 'boyStat', 'A216'
 	pic_rand = rand(1,3)
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/anal/anal_fore<<pic_rand>>.jpg"></center>'
@@ -657,7 +656,7 @@ if $ARGS[0] = 'MartinAnalDyn':
 	$orgasm_txt = ''
 	
 	act 'Time for anal':
-		cls
+		*clr & cla
 		killvar 'MartinPussyLick'
 		killvar 'MartinSurpAnal'
 		pic_rand = rand(1,2)
@@ -748,7 +747,7 @@ if $ARGS[0] = 'MartinAnalDyn':
 		end
 		
 		act 'Continue':
-			cls
+			*clr & cla
 			$orgasm_txt = iif(dominance > 20,'Wresting control from','Submitting to') + ' Martin and the intense feeling of him filling your ass drive you ever closer to the edge until you can no longer take it. You cum loudly, shivering all over' + iif(exhibitionist_lvl > 1 or exhibitionism['pref']>50,' as your mind basks in your exhibitionist fantasy','') + ', your ass clenching around and massaging Martin''s cock with its contractions as if it wanted to squeeze the cum out of him as' + iif($martinpos='doggystyle',' he fucks you',' you fuck him') + '. Your anal orgasm lasts for what feels like an eternity, but when it has passed and you look back at him, Martin gives you a smug, self-satisfied look that makes you chuckle. You''re not done with each other yet, though, and before long, you''ve resumed your fast, hard rhythm.'
 			
 			if $martinpos = 'rev_cowgirl':
@@ -817,7 +816,7 @@ if $ARGS[0] = 'MartinAnalDyn':
 			act 'Let him cum on your face':gt 'MartinSex2', 'MartinCumshot_Face'
 			act 'Let him cum on your tits':gt 'MartinSex2', 'MartinCumshot_Tits'
 			act 'Let him cum in your ass':
-				cls
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/cumshot/cum_anal.jpg"></center>'
 				'You could have taken his cum anywhere you wanted but, really, you have him right where you want him - deep inside your ass.'
 				*nl
@@ -835,7 +834,7 @@ if $ARGS[0] = 'MartinAnalDyn':
 end
 
 if $ARGS[0] = 'PainalDyn':
-	cls
+	*clr & cla
 	'<center><video src="images/locations/city/industrial/bar/sex/bar/martin/anal/painal1.mp4"></center>'
 	'Feeling as brave and well-lubricated as spit can ever make you, you grab Martin''s cock, hold it against your anus and push against it.'
 	*nl
@@ -846,7 +845,7 @@ if $ARGS[0] = 'PainalDyn':
 	'Or... well, maybe you don''t want to continue at all?'
 			
 	act 'Force his dick inside your ass':
-		cls
+		*clr & cla
 		'<center><video src="images/locations/city/industrial/bar/sex/bar/martin/anal/painal2.mp4"></center>'
 		if $martinpos = 'rev_cowgirl':
 			'No, you don''t want to quit, not now. Maybe it''s because of the position you''re in, just a bad angle for penetration, right? You climb off Martin and bend over in front of him. When you look back at him to give him an inviting look, you do feel a little intimidated by his size, though...'
@@ -873,7 +872,7 @@ if $ARGS[0] = 'PainalDyn':
 			gs 'stat'
 			
 			act 'Continue':
-				cls
+				*clr & cla
 				'<center><video src="images/locations/city/industrial/bar/sex/bar/martin/anal/painal3.mp4"></center>'
 				'But as patient as Martin has proven so far, you eventually push him too far, your <<$pcdesc_anusrandom>> asshole too snug and arousing around him for him to stay idle.'
 				*nl
@@ -892,7 +891,7 @@ if $ARGS[0] = 'PainalDyn':
 				gs 'stat'
 				
 				act 'Get cleaned up':
-					cls
+					*clr & cla
 					'<center><video src="images/locations/city/industrial/bar/gettingdressed.mp4"></center>'
 					'Now that it''s over, you are starting to think that you''re going to regret this.'
 					'It takes a little while, but eventually, both of you (and the bar) are somewhat clean and dressed again, though it really hurts as you put on your panties and pants. You try to chat and exchange innuendos as always, and you really make it as obvious as you can that you liked what Martin did, that you enjoyed it... but you''re not sure he can truly believe that when you wince every now and again, gingerly rubbing your butt and moving extra slow and careful to avoid any unnecessary pain.'
@@ -932,7 +931,7 @@ if $ARGS[0] = 'PainalDyn':
 	act 'Get him off with your mouth':MartinSexStop = 1 & gt 'MartinSex3', 'MartinBlowjob'
 			
 	act 'Stop and get dressed':
-		cls
+		*clr & cla
 		'<center><video src="images/locations/city/industrial/bar/gettingdressed.mp4"></center>'
 		'It''s strange how things go sometimes: One moment you are about to have your ass fucked, the next you are on your feet, collecting your clothes and putting them on. The thoughts that crossed your mind had killed the mood in an instant, even if your horniness is unchanged.'
 		*nl
@@ -955,7 +954,7 @@ if $ARGS[0] = 'PainalDyn':
 end
 
 if $ARGS[0] = 'MartinCumshot_Mouth':
-	cls
+	*clr & cla
 	gs 'boyStat', 'A216'
 	'<center><video src="images/locations/city/industrial/bar/sex/bar/martin/cumshot/cum_mouth.mp4"></center>'
 	if $martinpos ! 'MartinBlowjob_dressed' or $martinpos ! 'MartinBlowjob_undressed': 'You quickly move off Martin''s cock and get on your knees in front of him, taking his dick into your mouth and savoring the taste of yourself on your man as you get him off.'
@@ -973,7 +972,7 @@ if $ARGS[0] = 'MartinCumshot_Mouth':
 end
 
 if $ARGS[0] = 'MartinCumshot_Face':
-	cls
+	*clr & cla
 	gs 'boyStat', 'A216'
 	'<center><video src="images/locations/city/industrial/bar/sex/bar/martin/cumshot/cum_facial.mp4"></center>'
 	
@@ -990,7 +989,7 @@ if $ARGS[0] = 'MartinCumshot_Face':
 end
 
 if $ARGS[0] = 'MartinCumshot_Tits':
-	cls
+	*clr & cla
 	gs 'boyStat', 'A216'
 	'<center><video src="images/locations/city/industrial/bar/sex/bar/martin/cumshot/cum_tits.mp4"></center>'
 	if $martinpos ! 'MartinBlowjob_dressed' or $martinpos ! 'MartinBlowjob_undressed': 'You quickly move off Martin''s cock and get on your knees in front of him, stroking his dick as you point it at your bust and savoring the expression of bliss on your man''s face.'
@@ -1002,7 +1001,7 @@ if $ARGS[0] = 'MartinCumshot_Tits':
 end	
 
 if $ARGS[0] = 'MartinCleanup':
-	cls
+	*clr & cla
 	'<center><video src="images/locations/city/industrial/bar/gettingdressed.mp4"></center>'
 	'It takes a little while, but eventually, both of you (and the bar) are somewhat clean and dressed again. You''re not being quiet about it, either: The two of you chat and exchange innuendos as you go, intimate as always.'
 	*nl

+ 2 - 2
locations/young_shop.qsrc

@@ -447,7 +447,7 @@ if $ARGS[0] = '11':
 	*clr & cla
 	i = rand(1, 522)
 	'<b><center><font size="4"><font color="black">Employee Perks</font></center></b>'
-	'<center><img <<$set_imgh>> src="images/pc/clothing/<<i>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/clothing/2average/<<i>>.jpg"></center>'
 	'"<<$pcs_nickname>>, look here," Nastya approaches you. "I''ve got a nice, new blouse but it''s got a slight defect. The manager is just going to put it in the <b>70%</b> off discount bin, but maybe you want to take it yourself?"'
 	'The store is selling it for <b>2400₽</b> , but you can buy it for <b>720₽</b>.'
 	if average[i] = 1:
@@ -664,7 +664,7 @@ end
 if $ARGS[0] = '15':
 	*clr & cla
 	'<b><center><font size="4"><font color="black">The Shirt Off Her Back</font></center></b>'
-	'<center><img <<$set_imgh>> src="images/pc/clothing/<<i>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/clothing/1cheap/<<i>>.jpg"></center>'
 	'You go to the changing booths and find that someone has left an outfit behind. You remember that it belongs to a girl who just 5 minutes ago bought an outfit and left the store. Apparently, she decided she no longer needs this and just left it in the booth.'
 	'You decide to wait until the end of the shift, as the shopper may return. An hour passes and your shift ends, but nobody comes for it. You carefully look at it: it is an ordinary outfit from G&M, almost new, no holes, fairly clean. Could you just keep it for yourself?'