Browse Source

use pcs_instrmusic instead instrmusic_lvl

rachels 3 years ago
parent
commit
2283270cfe
3 changed files with 13 additions and 13 deletions
  1. 8 8
      locations/anushapt.qsrc
  2. 4 4
      locations/music_bedroompractice.qsrc
  3. 1 1
      locations/music_guitarlesson.qsrc

+ 8 - 8
locations/anushapt.qsrc

@@ -102,7 +102,7 @@ if $ARGS[0] = 'home':
 		elseif nushdoor <= 9:
 			*clr & cla
 			AnushkaLoc = 1
-			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big144.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/characters/shared/photos/big144.jpg"></center>'
 			'You stand outside the Konstantinov household and hope that Anushka will be the one to come open the door.'
 			'Anushka opens the door smiling, "Hi <<$pcs_nickname>>. Come in."'
 			act 'Leave': gt 'pav_complex','start'
@@ -111,7 +111,7 @@ if $ARGS[0] = 'home':
 			*clr & cla
 			AnushkaLoc = 5
 			anushka_tv_day = daystart
-			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big144.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/characters/shared/photos/big144.jpg"></center>'
 			'You stand outside the Konstantinov household and hope that Anushka will be the one to come open the door.'
 			'Anushka opens the door smiling, "Hi <<$pcs_nickname>>. Come in, I was just watching some TV." As you go inside, she closes the door and heads for the living room where some action movie is playing on the TV. She practically falls down on the couch as she takes a seat.'
 			act 'Take a seat next to her': gt 'anushapt','nushlivroom'
@@ -127,7 +127,7 @@ if $ARGS[0] = 'home':
 			act 'Enter':
 				*clr & cla
 				AnushkaLoc = 2
-				'<center><img <<$set_imgh>> src="images/characters/shared/photos/big154.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/characters/shared/photos/big154.jpg"></center>'
 				'You ignore his comment and step around to enter the apartment. Just then, you see Radomir walking up the hall towards the door. He''s buckling his belt back in place. He gives you a huge grin and a wink. "Hey <<$pcs_nickname>>, bad timing because you just missed out. Nush is in her room recovering from the ass fucking I just gave her."'
 				'He then reaches over and ruffles Maksim''s hair with his hand. "Your sister has a real nice tight ass, or at least it was since I doubt it is anymore." With that, he walks past both of you and leaves the apartment.'
 				'Maksim gives you an <i>I told you so</i> look and sneers, "See?" He walks back to his room.'
@@ -166,7 +166,7 @@ if $ARGS[0] = 'home':
 			act 'Enter':
 				*clr & cla
 				AnushkaLoc = 2
-				'<center><img <<$set_imgh>> src="images/characters/shared/photos/big158.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/characters/shared/photos/big158.jpg"></center>'
 				'You ignore his comments and step around to enter the apartment. Just then, you see Valentin walking up the hall towards the door zipping his pants up. He gives you a huge grin and a wink. "Hey <<$pcs_nickname>>, what''s up?"'
 				'You look at him and say, "What were you two doing?"'
 				'He grins a bit. It''s the kind of grin guys get after getting laid. "Oh you know, just hanging out and having fun." He then asks Maksim, "Are you going to come by later and help me work on my bike?"'
@@ -207,7 +207,7 @@ if $ARGS[0] = 'home':
 			act 'Enter':
 				*clr & cla
 				AnushkaLoc = 2
-				'<center><img <<$set_imgh>> src="images/characters/shared/photos/big146.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/characters/shared/photos/big146.jpg"></center>'
 				'You ignore his comments and step around to enter the apartment. Just then, you see Marcus walking up the hall towards the door. He freezes in place, looking obviously embarrassed. He looks down to not meet your eyes. "Hey <<$pcs_nickname>>, I was just hanging out... anyways I need to get going... see you at school yeah?" Without waiting for a reply, he hurries out of the apartment.'
 				'Maksim gives him a disgusted look as he walks by then looks to you with an <i>I told you so</i> look and sneers, "See?" It''s all he says before he walks back to his room'
 				
@@ -989,7 +989,7 @@ if $ARGS[0] = 'guitar':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/guitar.jpg"></center>'
 		'You check out the two guitars. One of them is an acoustic guitar that looks fairly old, but well cared for. The other is an electric guitar that looks a lot newer and more expensive.'
 		act 'Look at something else':gt 'anushapt','anushroom'
-		if instrmusic_lvl < 5:
+		if pcs_instrmusic < 5:
 			act 'Pretend to play':
 				*clr & cla
 				minut += 10
@@ -1003,7 +1003,7 @@ if $ARGS[0] = 'guitar':
 		end
 		act 'Try to play it':
 			*clr & cla
-			if instrmusic_lvl < 10:
+			if pcs_instrmusic < 10:
 				instrmusic_exp += rand(0,2)
 				pcs_mood += 5
 				minut += 20
@@ -1014,7 +1014,7 @@ if $ARGS[0] = 'guitar':
 				'Unfortunately, playing the guitar is a lot harder than it looks. It takes you several minutes to hit the right notes and several more to play even the tiny first fraction of the song without making a mistake. The strings cut into your tender, uncalloused fingertips, and after about 20 minutes, you decide to stop for now.'
 				'Learning how to play the guitar can be a frustrating, painful experience you realize... Yet, you cannot help but to gently stroke the guitar once more before putting it back on its stand. You look forward to trying to play again.'
 				act 'Put the guitar back':gt 'anushapt','anushroom'
-			elseif instmusic_lvl < 20:
+			elseif pcs_instrmusic < 20:
 				instrmusic_exp += rand(0,20)
 				pcs_mood += 5
 				minut += 20

+ 4 - 4
locations/music_bedroompractice.qsrc

@@ -9,21 +9,21 @@ if $ARGS[0] = 'guitar':
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/pc/activities/music/guitarpractice_1.jpg"></center>'
-	if ml_guitarlesson['lessoncount'] = 0 and ml_guitar['chordbook'] = 1 and instrmusic_lvl <= 10:
+	if ml_guitarlesson['lessoncount'] = 0 and ml_guitar['chordbook'] = 1 and pcs_instrmusic <= 10:
 		instrmusic_exp += rand(1,3)
 		gs 'pain', 1, 'fingers', 'ache'
 		gs 'stat'
 		'You open the book you got from Jimmy and start to practice the chords and basic techniques on the guitar.'
 		'It goes slowly, your fingers get in the way and they start to hurt after a short time as the strings dig into them, but you soldier on until.'
 		'The strings still either buzz, or don''t ring but by the end you start to get a feel for how to do it better. '				
-	elseif ml_guitarlesson['lessoncount'] = 0 and ml_guitar['chordbook'] = 1 and instrmusic_lvl > 10 and instrmusic_lvl < 25 and internet < 1:
+	elseif ml_guitarlesson['lessoncount'] = 0 and ml_guitar['chordbook'] = 1 and pcs_instrmusic > 10 and pcs_instrmusic < 25 and internet < 1:
 		'You open the chordbook you got from Jimmy and start to practice, but you feel that you don''t really improve that much.'
 		instrmusic_exp += rand(1,2)	
-	elseif ml_guitarlesson['lessoncount'] = 0 and ml_guitar['chordbook'] = 1 and instrmusic_lvl > 15 and internet > 0:
+	elseif ml_guitarlesson['lessoncount'] = 0 and ml_guitar['chordbook'] = 1 and pcs_instrmusic > 15 and internet > 0:
 		'<center><video autoplay loop src="images/pc/activities/music/onlineguitarlesson.mp4"></video></center>'
 		'You look at the book you got from Jimmy, then decide to turn to the internet for new lessons.'
 		instrmusic_exp += rand(1,3)	
-	elseif ml_guitarlesson['lessoncount'] > 0 and instrmusic_lvl >= 25 and internet > 0:
+	elseif ml_guitarlesson['lessoncount'] > 0 and pcs_instrmusic >= 25 and internet > 0:
 		instrmusic_exp += rand(2,3)
 		'<center><video autoplay loop src="images/pc/activities/music/onlineguitarlesson.mp4"></video></center>'
 		'You work through the practices from your guitarlesson then turn to the internet to learn some more new songs.'

+ 1 - 1
locations/music_guitarlesson.qsrc

@@ -72,7 +72,7 @@ if $ARGS[0] = 'lesson':
 	npc_rel['ML1'] += 1
 
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/guitarlesson/guitarteach_'+ rand(1,2) +'.jpg"></center>'	
-	if instrmusic_lvl < 15:
+	if pcs_instrmusic < 15:
 		instrmusic_exp += rand(1,3)
 		'You spend the next 45 minutes learning the basics of the guitar and some chords. At the end of the lesson your fingers and hands hurt, but you feel that you have learned a lot.'
 	else