Procházet zdrojové kódy

[fixed] Conditions de-merged to hide unuseable action for some social groups

Kevin_Smarts před 2 roky
rodič
revize
373dbbaea3
1 změnil soubory, kde provedl 19 přidání a 17 odebrání
  1. 19 17
      locations/gschool_lessonsev1.qsrc

+ 19 - 17
locations/gschool_lessonsev1.qsrc

@@ -67,24 +67,26 @@ if $ARGS[0] = 'fiz_rand':
 		else
 			act 'Kick him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-		gs 'willpower', 'misc', 'self', 'hard'
-		if will_cost <= pcs_willpwr and (grupTipe = 2 or grupTipe = 4):
-			act 'Beat his ass (<<will_cost>> Willpower)':
-				*clr & cla
-				gs 'willpower', 'misc', 'self', 'hard'
-				gs 'willpower', 'pay', 'self'
-				gs 'stat'
-				grupvalue[4] +=1
-				demerit += 20
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/beathisass.jpg"></center>'
-				'Your first kick catches him on the shin, causing him to hop around on one leg. Not expecting any more, his attention wanders and he doesn''t see you charging him. You bash into him, knocking him to the floor, and quickly climb on top of him. You start furiously punching him in the face, beating him senseless in front of everyone.'
-				*nl
-				'He is stunned by this sudden and vicious attack and tries to block your incoming blows, to no avail. Luckily for him, the coach arrives just in time. The coach grabs you by the back of the neck and effortlessly pulls you off of Dan with a powerful yank, causing you to stumble backwards and almost fall on your back. He then steps between the two of you, stopping you from going at it again, and turns to you. "Go to the principal''s office, NOW!" You try to protest, but he doesn''t want to hear it and points sternly at the door.'
-				'You begrudingly walk out as the coach helps Dan to his feet. Everyone is stunned or amused by your actions - some of the gopniks even look a little impressed.'
-				act 'Go to the principal''s office': gt 'gschool_office', 'principal'
+		if grupTipe = 2 or grupTipe = 4:
+			gs 'willpower', 'misc', 'self', 'hard'
+			if will_cost <= pcs_willpwr:
+				act 'Beat his ass (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'misc', 'self', 'hard'
+					gs 'willpower', 'pay', 'self'
+					gs 'stat'
+					grupvalue[4] +=1
+					demerit += 20
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/beathisass.jpg"></center>'
+					'Your first kick catches him on the shin, causing him to hop around on one leg. Not expecting any more, his attention wanders and he doesn''t see you charging him. You bash into him, knocking him to the floor, and quickly climb on top of him. You start furiously punching him in the face, beating him senseless in front of everyone.'
+					*nl
+					'He is stunned by this sudden and vicious attack and tries to block your incoming blows, to no avail. Luckily for him, the coach arrives just in time. The coach grabs you by the back of the neck and effortlessly pulls you off of Dan with a powerful yank, causing you to stumble backwards and almost fall on your back. He then steps between the two of you, stopping you from going at it again, and turns to you. "Go to the principal''s office, NOW!" You try to protest, but he doesn''t want to hear it and points sternly at the door.'
+					'You begrudingly walk out as the coach helps Dan to his feet. Everyone is stunned or amused by your actions - some of the gopniks even look a little impressed.'
+					act 'Go to the principal''s office': gt 'gschool_office', 'principal'
+				end
+			else
+				act 'Beat his ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else
-			act 'Beat his ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	elseif fizperand = 9:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/hanging.jpg"></center>'