Browse Source

Minor cleanup

Thekingofsweden 9 years ago
parent
commit
62bf56ee2f
2 changed files with 4 additions and 8 deletions
  1. 0 2
      locations/albinahome
  2. 4 6
      locations/gschool

+ 0 - 2
locations/albinahome

@@ -140,7 +140,6 @@ if hour < 20:
 					agil += rand (1, 3)
 					agil += rand (1, 3)
 					manna -= 8
 					manna -= 8
 					sweat += 3
 					sweat += 3
-					!!stripdance += 1
 					gs 'stat'
 					gs 'stat'
 					'<center><img src="images/pic/stripdance.jpg"></center>'
 					'<center><img src="images/pic/stripdance.jpg"></center>'
 
 
@@ -167,7 +166,6 @@ if hour < 20:
 					vital += rand (1, 3)
 					vital += rand (1, 3)
 					manna -= 5
 					manna -= 5
 					sweat += 3
 					sweat += 3
-					!!poledance += 1
 					gs 'stat'
 					gs 'stat'
 					'<center><img src="images/pic/poledance.jpg"></center>'
 					'<center><img src="images/pic/poledance.jpg"></center>'
 
 

+ 4 - 6
locations/gschool

@@ -81,9 +81,8 @@ if week = 6 and schoolSorev = 2 and hour = 10:
 			gs 'stat'
 			gs 'stat'
 			'<center><img src="images/etogame/begsor.jpg"></center>'
 			'<center><img src="images/etogame/begsor.jpg"></center>'
 			'Girls, on the 400 meters race. You change clothes and go out on the treadmill. Get up at the start. Distributed starting shot.'
 			'Girls, on the 400 meters race. You change clothes and go out on the treadmill. Get up at the start. Distributed starting shot.'
-			begplus = beg + speed + vital + rand(1, 20)
-			begminus = salo + rand(1, 20)
-			begresult = begplus - begminus
+			
+			begresult = beg + speed + vital + rand(1, 20) - salo - rand(1, 20)
 
 
 			if begresult <= 0:'You barely managed to reach the finish line, what place is really there, of course you are the last.'
 			if begresult <= 0:'You barely managed to reach the finish line, what place is really there, of course you are the last.'
 			if begresult > 0 and begresult < 70:'You are not bad ran for dilettante course, as ranked last 8th place.'
 			if begresult > 0 and begresult < 70:'You are not bad ran for dilettante course, as ranked last 8th place.'
@@ -135,9 +134,8 @@ if week = 6 and schoolSorev = 1 and hour = 10:
 			gs 'stat'
 			gs 'stat'
 			'<center><img src="images/etogame/begsor.jpg"></center>'
 			'<center><img src="images/etogame/begsor.jpg"></center>'
 			'Girls, on the 400 meters race. You change clothes and go out on the treadmill. Get up at the start. Distributed starting shot.'
 			'Girls, on the 400 meters race. You change clothes and go out on the treadmill. Get up at the start. Distributed starting shot.'
-			begplus = beg + speed + vital + rand(1, 20)
-			begminus = salo + rand(1, 20)
-			begresult = begplus - begminus
+			
+			begresult = beg + speed + vital + rand(1, 20) - salo - rand(1, 20)
 
 
 			if begresult <= 0:'You barely managed to reach the finish line, what place is really there, of course you are the last.'
 			if begresult <= 0:'You barely managed to reach the finish line, what place is really there, of course you are the last.'
 			if begresult > 0 and begresult < 10:'You are not bad ran for dilettante course, as ranked last 8th place.'
 			if begresult > 0 and begresult < 10:'You are not bad ran for dilettante course, as ranked last 8th place.'