Browse Source

- multiple small fixes, commented to make reverts easier
- i found the prompts for movie titles pretty annoying

test234 6 years ago
parent
commit
3386d1478d
6 changed files with 47 additions and 37 deletions
  1. 9 4
      locations/Cheatmenu_din
  2. 2 0
      locations/lover_change
  3. 7 7
      locations/lover_meet
  4. 1 1
      locations/poli
  5. 4 2
      locations/pornstudio
  6. 24 23
      locations/stat_display

+ 9 - 4
locations/Cheatmenu_din

@@ -911,16 +911,16 @@ $cheatmenu['reputation'] = {
 	if pcs_lovers[0] = 1:
 		nl
 		pl'You are dating <<$loverdesc[0]>>.'
-		if pcs_lovers_rel[0] < 0: pcs_lovers_rel[0] = 0
+		if loverrelation[0] < 0: loverrelation[0] = 0
 		if loverdays[0] < 0: loverdays[0] = 0
 		if haraklover[0] > 2: haraklover[0] = 0
 		if loverizvrat[0] > 1: loverizvrat[0] = 0
 		pl'Change lover''s personality: <a href="exec:haraklover[0] += 1 & dynamic $cheatmenu[''reputation'']"><<haraklover[0]>></a>'
 		pl'Change lover''s perversion: <a href="exec:loverizvrat[0] += 1 & dynamic $cheatmenu[''reputation'']"><<loverizvrat[0]>></a>'
-		pl'Relationship: <<pcs_lovers_rel[0]>> <a href="exec:pcs_lovers_rel[0] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:loverrelation[0] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
+		pl'Relationship: <<loverrelation[0]>> <a href="exec:loverrelation[0] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:loverrelation[0] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 		pl'You''ve been dating for <<loverdays[0]>> days. <a href="exec:loverdays[0] += 5 & dynamic $cheatmenu[''reputation'']">+5</a> <a href="exec:loverdays[0] -= 5 & dynamic $cheatmenu[''reputation'']">-5</a>'
 	end
-		if pcs_lovers[1] = 1:
+	if pcs_lovers[1] = 1:
 		nl
 		pl'You are dating <<$loverdesc[1]>>.'
 		if loverrelation[1] < 0: loverrelation[1] = 0
@@ -932,7 +932,7 @@ $cheatmenu['reputation'] = {
 		pl'Relationship: <<loverrelation[1]>> <a href="exec:loverrelation[1] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:loverrelation[1] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 		pl'You''ve been dating for <<loverdays[1]>> days. <a href="exec:loverdays[1] += 5 & dynamic $cheatmenu[''reputation'']">+5</a> <a href="exec:loverdays[1] -= 5 & dynamic $cheatmenu[''reputation'']">-5</a>'
 	end
-		if pcs_lovers[2] = 1:
+	if pcs_lovers[2] = 1:
 		nl
 		pl'You are dating <<$loverdesc[2]>>.'
 		if loverrelation[2] < 0: loverrelation[2] = 0
@@ -1374,6 +1374,11 @@ $cheatmenu['display'] = {
 	else
 		pl'Full morning routine enabled: Currently OFF - <a href="exec:enfullmorrout = 1 & dynamic $cheatmenu[''display'']">Turn ON</a>'
 	end
+	if editpornname = 1:
+		pl'Editing of the names of the porn movies you stared enabled: Currently ON - <a href="exec:editpornname = 0 & dynamic $cheatmenu[''display'']">Turn OFF</a>'
+	else
+		pl'Editing of the names of the porn movies you stared disabled: Currently OFF - <a href="exec:editpornname = 1 & dynamic $cheatmenu[''display'']">Turn ON</a>'
+	end
 	nl
 	pl '<center><B>Display Setting</B></center>'
 	if set_imgh > 0: set_imgw = 0

+ 2 - 0
locations/lover_change

@@ -835,6 +835,7 @@ end
 
 if $ARGS[0] = 'Lips':
 	act 'Enter clinic':
+		cla
 		'As you arrive at the clinic, <<$loverdesc[lover_number]>> walks up to the front desc and asks to speak with the plastic surgeon. After a couple of minutes the plastic surgeon comes out with a clipboard.'
 		'<<$loverdesc[lover_number]>> talks to the surgeon and after a brief exchange of words, <<$tXe>> hands the surgeon a respectable stack of bills. The surgeon discreetly puts the bills into his jacket and starts to walk toward you.'
 		'Even though you don''t know what <<$loverdesc[lover_number]>> said to the surgeon, you still jump when he starts to speak to you.'
@@ -947,6 +948,7 @@ if $ARGS[0] = 'Tits':
 					*nl
 					*nl
 					act 'Wake up':
+						cla
 						minut += 120
 						silicone += titAmount
 						gs 'stat'

+ 7 - 7
locations/lover_meet

@@ -168,7 +168,7 @@ if $ARGS[0] = 'start':
 			loverrelation[lover_number] += 0
 			'<<$loverdesc[lover_number]>> gets close to you, and you can tell by <<$tXyr>> body movements <<$tXe>> wants to kiss you.'
 			act 'Kiss with tongue':
-				*clr 
+				!! *clr 
 				'You take the initiative and when <<$tXe>> opens <<$tXyr>> mouth you thrust your tongue into <<$tXyr>> mouth.'
 				gs 'arousal', 'kiss', 5
 				pcs_dom += 1
@@ -252,7 +252,7 @@ if $ARGS[0] = 'start':
 				exit
 			end
 			act 'Kiss with lips':
-				*clr 
+				!! *clr 
 				'You press your <<$meetlip>> softly against <<$tXyr>>, and for a split second time seems to stop.'
 				pcs_mood += 10
 				if cumloc[11] = 0 and (cumloc[6] = 0 and cumloc[7] = 0):
@@ -353,7 +353,7 @@ if $ARGS[0] = 'start':
 				exit
 			end
 			act 'Hint for a kiss on the cheek':
-				*clr 
+				!! *clr 
 				'You make a cute pouty face and turn your cheek toward <<$loverdesc[lover_number]>>. <<$tXec>> understands and though <<$tXe>> wanted to kiss you, <<$tXe>> settles with giving you a peck on the cheek'
 				pcs_mood += 10
 				if cumloc[11] = 0 and (cumloc[6] = 0 and cumloc[7] = 0):
@@ -425,7 +425,7 @@ if $ARGS[0] = 'start':
 						exit
 					elseif (cumloc[6] = 1 or cumloc[7] = 1):
 						gs 'lover', 'remove', lover_number
-						'<<$tXec>> realizes your mouth smells like sperm, "H-Hey- <<$pcs_firstname>>! What the...?! You dirty whore!", <<$tXe>> then pushes you away. "We are through, I don''t want to see your face again!'
+						'<<$tXec>> realizes your mouth smells like sperm, "H-Hey- <<$pcs_firstname>>! What the...?! You dirty whore!", <<$tXe>> then pushes you away. "We are through, I don''t want to see your face again!"'
 						pcs_mood -= 20
 						dynamic $go_home
 						exit
@@ -439,7 +439,7 @@ if $ARGS[0] = 'start':
 				exit
 			end
 			act 'Push <<$tXyr>> face away':
-				*clr 
+				!! *clr 
 				didPushAway = 1
 				'Maybe you had a bad day, maybe you don''t want a kiss, you rudely push <<$tXyr>> face away, and by the looks of it, hurting <<$tXyr>> feelings in the process.'
 
@@ -482,7 +482,7 @@ if $ARGS[0] = 'likes':
 end
 	
 if $ARGS[0] = 'actions':
-	cls 
+	!! cls 
 
 	act 'Can I ask you how you think I look?':
 		'<<$loverdesc[lover_number]>> says "If you insist" and tells you exactly how <<$tXe>> thinks you look based on what <<$tXe>> likes:'
@@ -815,7 +815,7 @@ if $ARGS[0] = 'actions':
 					end
 					
 				else
-					'Erm... Nothing..."'
+					'Erm... Nothing...'
 					act 'Well then...':
 						xgt 'lover_meet', 'actions'
 						exit

+ 1 - 1
locations/poli

@@ -1385,7 +1385,7 @@ if $ARGS[0] = 'cosmetic1':
 	if money >= 90000 and pcs_eyesize ! 0:
 		'<a href="exec:gt ''poli'', ''eyeMin''">Eye reduction surgery</a> - 90,000 <b>₽</b>'
 		else
-		'Eye enlargement surgery - 90,000 <b>₽</b>' 
+		'Eye reduction surgery - 90,000 <b>₽</b>' 
 	end
 	if money >= 75000 and salo > 40:
 		'<a href="exec:gt ''poli'', ''lyposuction''">Liposuction</a> - 75,000 <b>₽</b>'

+ 4 - 2
locations/pornstudio

@@ -875,12 +875,14 @@ if $ARGS[0] = 'postvideo':
 		$porntitle[film] = 'Girls Jerk Guys #36 - '
 		$pornfilmstory[film] = '<<$pfname>>''s introduction to the world of porn, where she jerk off <<$pakter[1]>> on her tits.'
 	else
-		if $pstory = '':
+		if $pstory = '' and editpornname = 1:
 			$pornfilmstory[film] = input('You can enter the story of the porn movie. This action can be done only once, but you can choose to do it later! (Just hit Enter/Esc when blank)<br>Tags of the current movie: <font color=#541717 size=2><<$pfilmtags>></font>')
 		else
 			$pornfilmstory[film] = $pstory
 		end
-		$porntitle[film] = input("Enter the name of the porn movie. <i>This action can be done only once, but you can choose to do it later! (Just hit Enter/Esc when blank)</i>")
+		if editpornname = 1:
+			$porntitle[film] = input("Enter the name of the porn movie. <i>This action can be done only once, but you can choose to do it later! (Just hit Enter/Esc when blank)</i>")
+		end
 	end
 	
 	if pfilmNOPAY = 0:

+ 24 - 23
locations/stat_display

@@ -487,29 +487,30 @@ killvar 'stat_extra_msg'
 
 
 !!----------------Extra messages, End--------------------------
-
-if home_owned[1] = 1 and ArendHouseSL <= 0:
-	$stat_msg += '<br><font color="red"><b>The rent on your apartment is due today.</b></font>'
-	if money >= 6000 or stolmoney >= 6000 or money + stolmoney >= 6000 or karta + bankDebtLimit >= 6000:
-		$stat_msg += ' Renew with '
-		if money >= 6000:
-			$stat_msg += ' <a href="exec:money -= 6000 & home_owned[1] = 1 & ArendHouseSL += 30 & gs ''$menu_obnovit''">cash</a>'
-		elseif stolmoney >= 6000:
-			$stat_msg += ' <a href="exec:stolmoney -= 6000 & home_owned[1] = 1 & ArendHouseSL += 30 & gs ''$menu_obnovit''">cash from drawer</a>'
-		elseif money + stolmoney >= 6000:
-			!both < 6000, so money = money - 6000 + stolmoney
-			$stat_msg += ' <a href="exec:money -= 6000 - stolmoney & stolmoney = 0 & home_owned[1] = 1 & ArendHouseSL += 30 & gs ''$menu_obnovit''">cash from purse and drawer</a>'
-		end
-		!from purse, drawer or both
-		if karta >= 6000: 
-			$stat_msg += ' <a href="exec:karta -= 6000 & home_owned[1] = 1 & ArendHouseSL += 30 & gs ''$menu_obnovit''">bank account</a>'
-		elseif karta + bankDebtLimit >= 6000: 
-			$stat_msg += ' <a href="exec:karta -= 6000 & home_owned[1] = 1 & ArendHouseSL += 30 & gs ''$menu_obnovit''">bank account, but you will be overdrawn.</a>'
-		end	
-	else
-		$stat_msg += ' But you can''t afford to pay the rent.'
-	end
-end
+!! double with payment in cikl
+
+!! if home_owned[1] = 1 and ArendHouseSL <= 0:
+!! 	$stat_msg += '<br><font color="red"><b>The rent on your apartment is due today.</b></font>'
+!! 	if money >= 6000 or stolmoney >= 6000 or money + stolmoney >= 6000 or karta + bankDebtLimit >= 6000:
+!! 		$stat_msg += ' Renew with '
+!! 		if money >= 6000:
+!! 			$stat_msg += ' <a href="exec:money -= 6000 & home_owned[1] = 1 & ArendHouseSL += 30 & gs ''$menu_obnovit''">cash</a>'
+!! 		elseif stolmoney >= 6000:
+!! 			$stat_msg += ' <a href="exec:stolmoney -= 6000 & home_owned[1] = 1 & ArendHouseSL += 30 & gs ''$menu_obnovit''">cash from drawer</a>'
+!! 		elseif money + stolmoney >= 6000:
+!! 			!both < 6000, so money = money - 6000 + stolmoney
+!! 			$stat_msg += ' <a href="exec:money -= 6000 - stolmoney & stolmoney = 0 & home_owned[1] = 1 & ArendHouseSL += 30 & gs ''$menu_obnovit''">cash from purse and drawer</a>'
+!! 		end
+!! 		!from purse, drawer or both
+!! 		if karta >= 6000: 
+!! 			$stat_msg += ' <a href="exec:karta -= 6000 & home_owned[1] = 1 & ArendHouseSL += 30 & gs ''$menu_obnovit''">bank account</a>'
+!! 		elseif karta + bankDebtLimit >= 6000: 
+!! 			$stat_msg += ' <a href="exec:karta -= 6000 & home_owned[1] = 1 & ArendHouseSL += 30 & gs ''$menu_obnovit''">bank account, but you will be overdrawn.</a>'
+!! 		end	
+!! 	else
+!! 		$stat_msg += ' But you can''t afford to pay the rent.'
+!! 	end
+!! end
 
 if opPRE = 0: $stat_msg += '<BR><<$pcs_makeup>> and your hair is <<$pcs_hairbsh>>.' & !$stat_msg += '<BR>'