Explorar el Código

[fixed] 'if' checks

Lusticon hace 5 meses
padre
commit
1a1ed8463e
Se han modificado 2 ficheros con 17 adiciones y 16 borrados
  1. 12 9
      locations/ender.qsrc
  2. 5 7
      locations/pushkin_ballet_res.qsrc

+ 12 - 9
locations/ender.qsrc

@@ -203,7 +203,7 @@ if $ARGS[0] = 'loss':
 		gs 'pain', 5, 'thighs', 'kick'
 		gs 'pain', 5, 'hair', 'stretch'
 		dynamic '<<$clothingworntype>>_h[<<clothingwornnumber>>] = 0'
-		'<<$streetev_title>>'
+		$streetev_title
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/lostfight.jpg"></center>'
 		'You do your best, but there are just too many of them. Eventually they get you down on the ground and beat you, ripping out handfuls of your hair and tearing your clothes.'
 		'After what feels like an eternity, they finally stop hitting you. "That''s what you get, you stupid bitch." Then the girl spits on you, with the rest of the gang following suit and spitting on you as well. Finally they get bored of tormenting you further and leave, laughing about how they beat the ugly girls ass.'
@@ -283,10 +283,11 @@ if $ARGS[0] = 'loss':
 			act 'Run!(<<will_cost>> Willpower)':			
 				gs 'willpower', 'pay', 'self'
 				AlexandriaMissionQW += 1
+				dummy = rand(1,100)
 				gs 'stat'
-                if rand(1,100) <= pcs_run: 
+                if dummy <= pcs_run:
                     gt 'alexandriaEv', 'anachase3'
-	            elseif rand(1,100) > (pcs_run and 89): 
+	            elseif dummy >= pcs_run and dummy >= 90:
                     gt 'alexandriaEv', 'anacrash1'
 	            else 
                     gt 'alexandriaEv', 'anachase4'
@@ -535,7 +536,7 @@ if $ARGS[0] = 'win':
 	elseif fightEnding = 14:
 		fightEnding = 0
 		Win += 1
-		'<<$streetev_title>>'
+		$streetev_title
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/girlgang.jpg"></center>'
 		'Even though it was four against one, you beat their asses triumphantly. They got in some hits of their own, but in the end you are the only one standing while the four of them lay around your feet curled up, bloody and crying. You straighten your clothes the best you can and proudly continue on your way to the claps of several onlookers that watched the fight.'
 
@@ -598,10 +599,11 @@ if $ARGS[0] = 'win':
 			act 'Run!(<<will_cost>> Willpower)':			
 				gs 'willpower', 'pay', 'self'
 				AlexandriaMissionQW += 1
+				dummy = rand(1,100)
 				gs 'stat'
-                if rand(1,100) <= pcs_run: 
+                if dummy <= pcs_run:
                     gt 'alexandriaEv', 'anachase3'
-	            elseif rand(1,100) > (pcs_run and 89): 
+	            elseif dummy >= pcs_run and dummy >= 90:
                     gt 'alexandriaEv', 'anacrash1'
 	            else 
                     gt 'alexandriaEv', 'anachase4'
@@ -907,7 +909,7 @@ if $ARGS[0] = 'surrender':
 		fightEnding = 0
 		Loss += 1
 		gs 'pain', 5, 'hair', 'stretch'
-		'<<$streetev_title>>'
+		$streetev_title
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/lostfight.jpg"></center>'
 		if fightPStats['Health'] = pcs_health:
 			'Just the mere thought of a fight, your knees go weak and you feel yourself being out of breath. Before even the first punch is thrown you raise up your hands and squeak out in fear. "Don''t hurt me, I give up."'
@@ -997,10 +999,11 @@ if $ARGS[0] = 'surrender':
 			act 'Run!(<<will_cost>> Willpower)':			
 				gs 'willpower', 'pay', 'self'
 				AlexandriaMissionQW += 1
+				dummy = rand(1,100)
 				gs 'stat'
-                if rand(1,100) <= pcs_run: 
+                if dummy <= pcs_run:
                     gt 'alexandriaEv', 'anachase3'
-	            elseif rand(1,100) > (pcs_run and 89): 
+	            elseif dummy >= pcs_run and dummy >= 90:
                     gt 'alexandriaEv', 'anacrash1'
 	            else 
                     gt 'alexandriaEv', 'anachase4'

+ 5 - 7
locations/pushkin_ballet_res.qsrc

@@ -402,13 +402,13 @@ if $ARGS[0] = 'make_up':
 		mod_homework[week] += 1 
 		mod_daily_score[week] += 1
 		gs 'exp_gain', 'makupskl', rand(1,3)
-		if pcs_makupskl < 30:
+		if pcs_makupskl <= 30:
 			mc_inventory['cosmetics'] -= 9
 			pcs_makeup = 0
-		elseif pcs_makupskl >=31 <= 74:
+		elseif pcs_makupskl <= 69:
 			mc_inventory['cosmetics'] -= 5
 			pcs_makeup = 3
-		elseif pcs_makupskl >= 75:
+		else
 			mc_inventory['cosmetics'] -= 3
 			pcs_makeup = 5
 		end
@@ -419,12 +419,10 @@ if $ARGS[0] = 'make_up':
 
 		if pcs_makupskl <= 30:
 			'You struggle to master the basics of applying your look, wasting a lot of your expensive make-up. You begin to wonder if you need to get help with practicing.'
-		elseif pcs_makupskl >= 31 or pcs_makupskl <= 69:
+		elseif pcs_makupskl <= 69:
 			'You try to replicate the deft strokes that you was taught in school as you apply the basic foundations and contouring. You struggle briefly with the eyelashes before they settle in place. It takes you a few attempts to finalise the blending of your final look but at the end of your practice you are happy with the results even though it won''t win any awards.'
-		elseif pcs_makupskl >= 70:
-			'You artfully apply the make-up look with a quick, practiced ease that would leave most girls jealous with envy. The final look is almost flawless and you criticaly review the final result trying to find any imperfections.'
 		else
-			$ballet['error'] += 'Makeup skill failed check'
+			'You artfully apply the make-up look with a quick, practiced ease that would leave most girls jealous with envy. The final look is almost flawless and you criticaly review the final result trying to find any imperfections.'
 		end
 		act 'Finish practicing': gt 'pushkin_ballet_res', 'bedroom'
 end