Переглянути джерело

Missing apostrophe in bdsmclub, fixes for hotel in Pav and exit for bj in sexshop moved out of the if it got lost in.

KevinSmarts 9 роки тому
батько
коміт
aac65130e5
5 змінених файлів з 34 додано та 109 видалено
  1. 1 1
      locations/BDSM_training
  2. 2 2
      locations/HotelHole
  3. 17 103
      locations/HotelRoom
  4. 2 1
      locations/sexshop
  5. 12 2
      locations/stat

+ 1 - 1
locations/BDSM_training

@@ -3,7 +3,7 @@ if $ARGS[0] = 'start':
 	if BDSMpayDay < daystart - 30:
 		BDSMpayDay = daystart
 		money -= 10000
-		'You pay for another 30 days access to the club
+		'You pay for another 30 days access to the club.'
 		act 'Continue':gt 'BDSM_training', 'start'
 	elseif BDSMmeet = 1:
 		BDSMmeet += 1

+ 2 - 2
locations/HotelHole

@@ -8,7 +8,7 @@ gs'stat'
 
 '<center><H4>Pavlovsk hotel</H4></center>'
 '<center><img src="images/nigma/gor/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. The <a href="exec:minut += 1 & GT ''hotel_resep''">reception desk</a> of the hotel is near the <a href="exec:minut += 3 & GT ''vokzalG''">exit to the square</a>. A cute brunette is currently manning the desk, she gives you a friendly nod when you get into her sight range.'
+'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 <= 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.'
@@ -46,7 +46,7 @@ if HotelRoom > 0:
 	end
 end
 
-act 'Leave the hotel':gt'vokzalG'
+act 'Leave the hotel':minut += 3 & gt'vokzalG'
 
 --- HotelHole ---------------------------------
 

+ 17 - 103
locations/HotelRoom

@@ -11,16 +11,16 @@ $loc = $CURLOC
 	BColor = RGB(255,255,255)
 	LColor = RGB(106,90,205)
 	'<center><b><font color = maroon>Your normal hotel room</font></b></center>'
-	'<center>You have paid to stay for <<hotelroom1day>> more nights in the room.</center>'
+	'<center>You have paid to stay for <<hotelroom1day - daystart>> more nights in the room.</center>'
 	'<center><img src="images/nigma/gor/Hotel/hotel.room.normal.jpg"></center>'
-	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:GT ''hotelroom'',''bed''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">closet</a> for your clothes stands near the entrance of the room. Next to the door, you can find a <a href="exec:GT ''mirror'',''start''">mirror</a>. The door to the <a href="exec:GT ''hotelroom'',''shower1''">bathroom</a> is to the right.'
+	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">closet</a> for your clothes stands near the entrance of the room. Next to the door, you can find a <a href="exec:GT ''mirror'',''start''">mirror</a>. The door to the <a href="exec:GT ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a <a href="exec:GT ''hotelroom'',''tv''">TV</a>.'
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			gt'hotelHole'
 		else
 			msg'<b><font color = red>You need to get dressed before leaving your hotel room.</font></b>'
-			gt $locM,$metkaM
+			gt'hotelroom','normal'
 		end
 	end
 
@@ -39,16 +39,16 @@ $loc = $CURLOC
 	BColor = RGB(255,255,255)
 	LColor = RGB(106,90,205)
 	'<center><b><font color = maroon>Your luxury room</font></b></center>'
-	'<center>You paid <<hotelroom1day>>d. accommodation.</center>'
+	'<center>You have paid to stay for <<hotelroom1day - daystart>> more nights in the room.</center>'
 	'<center><img src="images/nigma/gor/Hotel/hotel.room.better.jpg"></center>'
-	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:GT ''hotelroom'',''bed''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">closet</a> for your clothes stands near the entrance of the room. Next to the door, you can find a <a href="exec:GT ''mirror'',''start''">mirror</a>. The door to the <a href="exec:GT ''hotelroom'',''shower1''">bathroom</a> is to the right.'
+	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">closet</a> for your clothes stands near the entrance of the room. Next to the door, you can find a <a href="exec:GT ''mirror'',''start''">mirror</a>. The door to the <a href="exec:GT ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a small flat-screen <a href="exec:GT ''hotelroom'',''tv''">TV</a>, right across the bed.'
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			gt'hotelHole'
 		else
 			msg'<b><font color = red>You need to get dressed before leaving your hotel room.</font></b>'
-			gt $locM,$metkaM
+			gt'hotelroom','better'
 		end
 	end
 end
@@ -64,16 +64,16 @@ $loc = $CURLOC
 	BColor = RGB(255,255,255)
 	LColor = RGB(106,90,205)
 	'<center><b><font color = maroon>Your royal suite</font></b></center>'
-	'<center>You paid <<hotelroom1day>>d. accommodation.</center>'
+	'<center>You have paid to stay for <<hotelroom1day - daystart>> more nights in the room.</center>'
 	'<center><img src="images/nigma/gor/Hotel/hotel.room.best.jpg"></center>'
-	'Your hotel room is quite spacious, and is beautifully furnished. For a second, you wonder why a hotel in a town like Pavlovsk even has such a luxurious suite. The room is filled with expensive appliances. The gorgeous <a href="exec:GT ''hotelroom'',''bed''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">closet</a> for your clothes stands near the entrance of the room. Next to the door, you can find a <a href="exec:GT ''mirror'',''start''">mirror</a>. The door to the <a href="exec:GT ''hotelroom'',''shower1''">bathroom</a> is to the right.'
+	'Your hotel room is quite spacious, and is beautifully furnished. For a second, you wonder why a hotel in a town like Pavlovsk even has such a luxurious suite. The room is filled with expensive appliances. The gorgeous <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">closet</a> for your clothes stands near the entrance of the room. Next to the door, you can find a <a href="exec:GT ''mirror'',''start''">mirror</a>. The door to the <a href="exec:GT ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a huge flat-screen <a href="exec:GT ''hotelroom'',''tv''">TV</a>, right across the bed.'
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			gt'hotelHole'
 		else
 			msg'<b><font color = red>You need to get dressed before leaving your hotel room.</font></b>'
-			gt $locM,$metkaM
+			gt'hotelroom','best'
 		end
 	end
 end
@@ -131,7 +131,7 @@ if $args[0] = 'shower1':
 			'<center><img src="images/etogame/frotsp.jpg"></center>'
 			'You wash all traces of semen from your clothes.'
 
-			act 'Finish':gt $locM, $metkaM
+			act 'Finish':gt 'hotelroom', 'shower1'
 		end
 	end
 
@@ -147,7 +147,7 @@ if $args[0] = 'shower1':
 			'<center><img src="images/picV/klisma.jpg"></center>'
 			'You give yourself an enema, feeling clean down there. Your ass is now ready for anal sex without any awkward surprises.'
 
-			act 'Finish':gt $curloc
+			act 'Finish':gt 'hotelroom', 'shower1'
 		end
 	end
 
@@ -163,7 +163,7 @@ if $args[0] = 'shower1':
 			'<center><img src="images/etogame/vibrator.jpg"></center>'
 			'You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.'
 
-			act 'Finish':gt 'vanr'
+			act 'Finish':gt 'hotelroom', 'shower1'
 		end
 	elseif vibrator = 1 and vibratorIN = 0:
 		act 'Insert the vibrator in your vagina (0:05)':
@@ -177,7 +177,7 @@ if $args[0] = 'shower1':
 			'<center><img src="images/etogame/vibrator.jpg"></center>'
 			'You spread your legs and slowly insert the vibrator in your pussy, wondering if anyone will notice you wearing it today.'
 
-			act 'Finish':gt 'vanr'
+			act 'Finish':gt 'hotelroom', 'shower1'
 		end
 	end
 	if analplug = 1 and analplugin = 1:
@@ -193,7 +193,7 @@ if $args[0] = 'shower1':
 
 			'You squat and tug gently at the butt plug, gasping as you push it out of you. You can''t help but feel a bit empty, now that it''s out.' & !!0.2.6: Removed unneccessary var check
 
-			act 'Finish':gt $curloc
+			act 'Finish':gt 'hotelroom', 'shower1'
 		end
 	elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
 		act 'Insert a butt plug (0:05)':
@@ -211,7 +211,7 @@ if $args[0] = 'shower1':
 			if butpluguse > 0:'You squat and gently rub the butt plug against your anus, after lubricating it with a bit of saliva. After a short while, you''ve relaxed enough to be able to push it in. Once it''s in you give it a few gentle tugs, wondering if anyone will catch you wearing it today.'
 			if butpluguse = 0:butpluguse = 1 & '"If I''m not going to use it, then why did I buy it?" you ask yourself. You look at the butt plug for a while, thinking "It is necessary to start developing my ass, so I could have great adventures someday... you could even say huge and thick adventures with crimson heads, uh, now I got carried away..." You''re slightly embarrassed at the thought for a second, but are then overcome by your horny fantasies. Determined to get the plug all the way in, you slowly press it against your asshole after lubricating it with a bit of saliva. It hurts a bit at first, but once the thickest part is in the rest follows rather easily. Patting yourself on your ass once it''s in, you wonder if anyone will notice you''re wearing it today and then immediately feel naughty for even having thought that.'
 
-			act 'Finish':gt $curloc
+			act 'Finish':gt 'hotelroom', 'shower1'
 		end
 	end
 
@@ -223,7 +223,7 @@ if $args[0] = 'shower1':
 			mosol -= 5
 			'You take the tube of ointment and rub some of it onto your itchy vulva.'
 
-			act 'Finish':gt $curloc
+			act 'Finish':gt 'hotelroom', 'shower1'
 		end
 	end
 
@@ -242,7 +242,7 @@ if $args[0] = 'shower1':
 				'The test shows one band. You''re not pregnant'
 			end
 
-			act 'Finish':gt $curloc
+			act 'Finish':gt 'hotelroom', 'shower1'
 		end
 	end
 end
@@ -273,91 +273,5 @@ act 'Watch TV (1:00)':dynamic $din_wath_tv_h2
 act 'Get up from the bed':gt $locM, $metkaM
 end
 
-
-if $ARGS[0] = 'bed':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
-	gs'stat'
-	if $clothingworntype ! 'nude':'<center><img src="images/pics/bed.jpg"></center>'
-	if $clothingworntype = 'nude':'<center><img src="images/pics/son.jpg"></center>'
-	'You''re lying on the bed. Your alarm is currently set at <<timer>> hours, <<timerM>> minutes. (<<$budilnikInfo>>)'
-
-	act 'Switch your alarm on':gt'budilnik','start'
-
-	!if son < 10:
-	act 'Undress and go to bed':
-		if disable_autosave = 0:
-			if StoryLine = 0:
-				SAVEGAME 'autosave.sav'
-			else
-				SAVEGAME 'autosave_alt.sav'
-			end
-		end
-
-		cls
-		notathomesleep += 1
-		health = health + 5
-		hapri = 0
-		InSleep = 1
-		:loopson
-		minut = minut + 1
-		stime = stime + 1
-		if stime = 60:stime = 0 & son += 15
-		clr
-		cls
-		gs'stat'
-
-		'<center><img src="images/pics/son.jpg"></center>'
-		if analplugIN = 1:analplugIN = 0 & 'Before going to bed, you take out your butt plug with a wistful sigh.'
-		if vibratorIN = 1:vibratorIN = 0 & 'Before going to bed, you take out your vibrator with some regret. It felt great, but there''s no way you can sleep with it in.'
-		if mop > 1:mop = 0 & vidageday = vidageday - 1 & 'When you''re about to go to bed, you realize you should probably remove your make-up first. It''s very bad for your skin if you don''t remove it before going to bed.'
-		'You quickly fall asleep. You have a good night''s rest, not having any dreams.'
-
-		if hour = timer and minut = timerM and budilnikOn = 1:
-			manna = manna - 10
-
-			'Alarum'
-
-			act 'Get out of bed and get dressed (0:15)':
-				cla
-				!numdress = odedosna
-				InSleep = 0
-				minut += 15
-				tanga = 1
-				!$clothingworntype ! 'nude'
-				if hotelroom=1:gt'hotelroom','normal'
-				if hotelroom=2:gt'hotelroom','better'
-				if hotelroom=3:gt'hotelroom','best'
-			end
-			exit
-		end
-
-		if son > 100 and dosip = 0:
-			'You have a good night''s sleep, and wake up fully rested.'
-
-			act 'Get out of bed and get dressed (0:15)':
-				cla
-				!numdress = odedosna
-				InSleep = 0
-				minut += 15
-				tanga = 1
-				!$clothingworntype ! 'nude'
-				if hotelroom=1:gt'hotelroom','normal'
-				if hotelroom=2:gt'hotelroom','better'
-				if hotelroom=3:gt'hotelroom','best'
-			end
-			exit
-		end
-
-		jump 'loopson'
-	end
-	act 'Get up from the bed':
-		cla
-		if hotelroom=1:gt'hotelroom','normal'
-		if hotelroom=2:gt'hotelroom','better'
-		if hotelroom=3:gt'hotelroom','best'
-	end
-end
-
 --- HotelRoom ---------------------------------
 

+ 2 - 1
locations/sexshop

@@ -537,8 +537,9 @@ if $ARGS[0] = 'pip':
 						if mistressqwest > 0:
 							mistressqwest += 1
 							'You have sucked <<mistressqwest - 1>> cocks for Mistress.'
-							act 'Wipe your face':gt 'sexshop', 'pip'
 						end
+
+						act 'Wipe your face':gt 'sexshop', 'pip'
 					end
 				end
 			end

+ 12 - 2
locations/stat

@@ -1276,12 +1276,22 @@ end
 
 if hotelroom > 0:
 	if hotelroom1day = daystart: pl 'You have 1 night left on your hotel booking.'
-	if hotelroom1day > daystart and hour < 12: pl 'Your hotel booking has expired and you cannot return to your room after 11:00'
-	if hotelroom1day > daystart and hour >= 12: hotelroom = 0
+	if hotelroom1day < daystart and hour <= 11: pl 'Your hotel booking has expired and you cannot return to your room after 11:00'
+	if hotelroom1day < daystart and hour > 11: hotelroom = 0
 end
 
 if insleep ! 0:exit &!no need to display status in sleep. skip them to improve performance by illume
 
+!!!!!!!!!!!!!!!!!!!!!
+!!!Pain calculation!!!
+!!!!!!!!!!!!!!!!!!!!!
+
+pain[pir] = pirs_pain_ton*8 + nippain*20 + painpub*20
+pain[gape] = vgape*2 + agape*4
+
+pain[total] = pain[pir] + pain[gape]
+
+
 !!!!!!!!!!!!!!!!!!!!!
 !!!Beginning Description!!!
 !!!!!!!!!!!!!!!!!!!!!