Browse Source

[Fixed] Various bug fixes from TESTER127, Sweet Little Sister and ParusMajors on the forum

KevinSmarts 4 years ago
parent
commit
6f536a7afd
3 changed files with 7 additions and 14 deletions
  1. 5 5
      locations/body_shape.qsrc
  2. 0 6
      locations/pavSharedApt.qsrc
  3. 2 3
      locations/pussykats.qsrc

+ 5 - 5
locations/body_shape.qsrc

@@ -87,17 +87,17 @@ bmi_calc = 10000 * (30 + salo / 2 + (pcs_hgt - 170) * 7 / 10) / (pcs_hgt * pcs_h
 	
 	
 	if strenbuf >= 80:
 	if strenbuf >= 80:
 		bodykoef += 8
 		bodykoef += 8
-	elseif >= 60:
+	elseif strenbuf >= 60:
 		bodykoef += 10
 		bodykoef += 10
-	elseif >= 40:
+	elseif strenbuf >= 40:
 		bodykoef += 8
 		bodykoef += 8
-	elseif >= 20:
+	elseif strenbuf >= 20:
 		bodykoef += 5
 		bodykoef += 5
 	else
 	else
 		bodykoef += 2
 		bodykoef += 2
 	end
 	end
 
 
-!![
+!!{
 put this in comment as old calculation so I don''t find out I need it later
 put this in comment as old calculation so I don''t find out I need it later
 	if wratio >= 85:
 	if wratio >= 85:
 		bodykoef = 0
 		bodykoef = 0
@@ -109,7 +109,7 @@ put this in comment as old calculation so I don''t find out I need it later
 		bodykoef = 8
 		bodykoef = 8
 	else
 	else
 		bodykoef = 4
 		bodykoef = 4
-	end]
+	end}
 
 
 !!For band to waist ratio
 !!For band to waist ratio
 	brtemp = (2 * strenbuf + vitalbuf + agilbuf) /4
 	brtemp = (2 * strenbuf + vitalbuf + agilbuf) /4

+ 0 - 6
locations/pavSharedApt.qsrc

@@ -699,12 +699,6 @@ if $ARGS[0] = 'pcsRoom':
 	'Beside the sofa bed, is an old cabinet, with your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on top.'
 	'Beside the sofa bed, is an old cabinet, with your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on top.'
 	*nl
 	*nl
 	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt $loc, $metka">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc, $metka">ON</a>.')
 	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt $loc, $metka">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc, $metka">ON</a>.')
-	
-	if budilnikOn = 0:
-		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 1 & gt ''pavSharedApt'',''pcsRoom''">off</a>.'
-	else
-		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 0 & gt ''pavSharedApt'',''pcsRoom''">on</a>.'
-	end
 	*nl
 	*nl
 	if TV = 0:$TV = 'a great place for a TV, if you had one.'
 	if TV = 0:$TV = 'a great place for a TV, if you had one.'
 	if TV = 1:$TV = 'an old CRT <a href="exec:gt ''TV'', ''start''">TV</a> sits on the shelf'
 	if TV = 1:$TV = 'an old CRT <a href="exec:gt ''TV'', ''start''">TV</a> sits on the shelf'

+ 2 - 3
locations/pussykats.qsrc

@@ -310,10 +310,9 @@ if $ARGS[0] = '4':
 			KILLVAR '$boy'
 			KILLVAR '$boy'
 			'You take the guys to the back room where you let them have their way with you.'
 			'You take the guys to the back room where you let them have their way with you.'
 			gs 'npcgeneratec', 0, 'a cute guy', rand(17,25)
 			gs 'npcgeneratec', 0, 'a cute guy', rand(17,25)
-			gs 'boyStat', $npclastgenerated
-			$boy[0] = $boy
+			gs 'boyStat', $npclastgenerated, '0'
 			gs 'npcgeneratec', 0, 'a flirty guy', rand(17,25)
 			gs 'npcgeneratec', 0, 'a flirty guy', rand(17,25)
-			$boy[1] = $npclastgenerated
+			gs 'boyStat', $npclastgenerated, '1'
 			guy += 2
 			guy += 2
 			picrand = 16
 			picrand = 16
 			gs 'willpower', 'pay', 'resist'
 			gs 'willpower', 'pay', 'resist'