Browse Source

Fixed issues with pain going into negative values. Fixed typo so correct text appears in meadow (I forgot it is case sensitive). Fixed incorrect conditionals for church at night.

Ekay 7 years ago
parent
commit
e77c3032f2
3 changed files with 45 additions and 7 deletions
  1. 4 4
      locations/ParChurch
  2. 3 3
      locations/exercise
  3. 38 0
      locations/stat

+ 4 - 4
locations/ParChurch

@@ -167,7 +167,7 @@ if $ARGS[0] = 'candle':
 		pcs_mood += 10
 		moral += 1
 		'You approach the iconostasion and light your candle. It gives you a nice feeling and you say a little prayer while looking at the image of Christ the Savior.'
-	elseif hour > 20 and hour < 6: 
+	elseif hour >= 20 or hour <= 6: 
 		pcs_horny += 10
 		pcs_mood += 10
 		'You approach the iconostasion and light your candle in the dark church.  It gives you a nice feeling and decide to say a little prayer. The darkness, combined with the pleasant sight of fire makes you feel warm inside.'
@@ -199,14 +199,14 @@ if $ARGS[0] = 'pray':
 		moral += 1
 		minut += rand(30,60)
 		'You decide to pray. The beauty and glory of being in the body of God overwhelms you and you lose yourself in prayer. You are unsure of how much time has past when you finally become aware of your surroundings again, but it doesn''t matter as you are at peace with God and the world.'
-	elseif hour > 20 and hour < 6 and moral < 30:
+	elseif hour >= 20 or hour <= 6 and moral < 30:
 		pcs_horny -= 40
 		pcs_mood += 50
 		moral += 1 
 		minut += (60 - randtime)
 		'The Nave is lit only with candles and small presence lights and the darkness gives you some weird vibes. You get the urge to pray very intensely. Before you knew it, an hour went by and you feel a bit reborn.'
 		'"That felt refreshing," you mumble to yourself.'
-	elseif hour > 20 and hour < 6 and moral >= 30 and moral < 60:
+	elseif hour >= 20 or hour <= 6 and moral >= 30 and moral < 60:
 		pcs_horny = 0
 		pcs_mood += 50
 		moral += 1 
@@ -215,7 +215,7 @@ if $ARGS[0] = 'pray':
 		if nark > 1: nark = nark/2
 		'The Nave is lit only with candles and small presence lights and the darkness feels very comforting. You get the urge to pray very intensely. Before you knew it, an hour went by and you feel a bit reborn and cleansed.'
 		'"That felt refreshing," you mumble to yourself.'
-	elseif hour > 20 and hour < 6 and moral >= 60 and rand(1,100) > 90:
+	elseif hour >= 20 or hour <= 6 and moral >= 60 and rand(1,100) > 90:
 		pcs_horny = 50
 		orgasm += 1
 		pcs_mood = 100

+ 3 - 3
locations/exercise

@@ -15,13 +15,13 @@ $ARGS[2] and on are the stats to be affected by the workout NOTE: use the _exp v
 
 
 if $ARGS[0] = 'start':
-	if $loc = 'meadow':
+	if $loc = 'Meadow':
 		if sunWeather = 1:
 			if pcs_stam >=30:
 				if $clothingworntype ! 'exercise' and pcs_exhibition < 35:
 					'<center>You could do some exercises here if you were wearing workout clothes.</center>'
 				elseif $clothingworntype ! 'exercise' and pcs_exhibition >= 35 and Miraloc ! 2 and temper >= 10:
-					'<center>Your meadow is a perfect place to do some exercises. There is no one around, so you could do it <a href="exec: gt ''exercise'', ''workout'', ''nude'', ''meadow''"> in the nude</a>.</center>'
+					'<center>Your meadow is a perfect place to do some exercises. There is no one around, so you could do it <a href="exec: gt ''exercise'', ''workout'', ''nude'', ''Meadow''"> in the nude</a>.</center>'
 				else
 					'<center>Your meadow is a perfect place to do some <a href="exec: gt ''exercise'', ''workout''">exercises</a>.</center>'
 				end
@@ -29,7 +29,7 @@ if $ARGS[0] = 'start':
 				'<center>Your meadow is a perfect place to do some exercises, but you don''t have the energy right now.</center>'
 			end
 		end
-	elseif pcs_stam >=30 and $loc ! 'meadow': 
+	elseif pcs_stam >=30 and $loc ! 'Meadow': 
 		'<center>There is enough space in the room to <a href="exec: gt ''exercise'', ''workout''">exercise</a>.</center>'
 	else
 		'<center>There is enough space in the room for a variety of exercises, but you don''t have the energy to work out now.</center>'

+ 38 - 0
locations/stat

@@ -463,6 +463,44 @@ if minut >= 60:
 	if pain['urethra'] > 0:pain['urethra'] -= rand(0,1)
 	if pain['cervix'] > 0:pain['cervix'] -= rand(0,1)
 
+	! fix for pain going into negatives and "increasing"
+	if pain['head'] < 0:pain['head'] = 0
+	if pain['hair'] < 0:pain['hair'] = 0
+	if pain['ears'] < 0:pain['ears'] = 0
+	if pain['eyebrows'] < 0:pain['eyebrows'] = 0
+	if pain['eyes'] < 0:pain['eyes'] = 0
+	if pain['cheeks'] < 0:pain['cheeks'] = 0
+	if pain['nose'] < 0:pain['nose'] = 0
+	if pain['mouth'] < 0:pain['mouth'] = 0
+	if pain['lips'] < 0:pain['lips'] = 0
+	if pain['tongue'] < 0:pain['tongue'] = 0
+	if pain['throat'] < 0:pain['throat'] = 0
+	if pain['neck'] < 0:pain['neck'] = 0
+	if pain['back'] < 0:pain['back'] = 0
+	if pain['asscheeks'] < 0:pain['asscheeks'] = 0
+	if pain['asshole'] < 0:pain['asshole'] = 0
+	if pain['hips'] < 0:pain['hips'] = 0
+	if pain['thighs'] < 0:pain['thighs'] = 0
+	if pain['legL'] < 0:pain['legL'] = 0
+	if pain['legR'] < 0:pain['legR'] = 0
+	if pain['feet'] < 0:pain['feet'] = 0
+	if pain['toes'] < 0:pain['toes'] = 0
+	if pain['shoulders'] < 0:pain['shoulders'] = 0
+	if pain['armL'] < 0:pain['armL'] = 0
+	if pain['armR'] < 0:pain['armR'] = 0
+	if pain['hands'] < 0:pain['hands'] = 0
+	if pain['fingers'] < 0:pain['fingers'] = 0
+	if pain['chest'] < 0:pain['chest'] = 0
+	if pain['breasts'] < 0:pain['breasts'] = 0
+	if pain['nipples'] < 0:pain['nipples'] = 0
+	if pain['ribs'] < 0:pain['ribs'] = 0
+	if pain['tummy'] < 0:pain['tummy'] = 0
+	if pain['pubic'] < 0:pain['pubic'] = 0
+	if pain['vaginal'] < 0:pain['vaginal'] = 0
+	if pain['clitoris'] < 0:pain['clitoris'] = 0
+	if pain['urethra'] < 0:pain['urethra'] = 0
+	if pain['cervix'] < 0:pain['cervix'] = 0
+	
 	if aphrodisiac_timer >= 1:
 		if pcs_horny < 80:
 			pcs_horny = 80