Merge remote-tracking branch 'rachels/master'

locations/AleksandraGo.qsrc

@@ -25,7 +25,7 @@ elseif npc_QW['A231'] > 5:
 	npc_rel[$static_num] += 5
 	npc_love[$static_num] += 2
 	npc_horny[$static_num] += 5
-	gs 'arousal', 'kiss', '5', 'futa'
+	gs 'arousal', 'kiss', 5, 'futa'
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></font></b></center>'
 !!Image needed	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big62.jpg"></center>'

locations/Snpc.qsrc

@@ -675,7 +675,7 @@ if numnpc = 231:
 			npc_rel['A<<numnpc>>'] += 10
 			npc_love['A<<numnpc>>'] += 5
 			npc_horny['A<<numnpc>>'] += 15
-			gs 'arousal', 'kiss', '5', 'futa'
+			gs 'arousal', 'kiss', 5, 'futa'
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 !!Image needed			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/aleksandra/school_kiss.jpg"></center>'

locations/bedrPar.qsrc

@@ -288,7 +288,7 @@ if hour > 8 and hour < 22:
 
 	if ml_guitar['hasguitar'] = 1:
 		act 'Play something on the guitar (10 minutes)':
-			mood += 10
+			pcs_mood += 10
 			minut += 10
 			gs 'stat'
 			'You pick up your guitar and start to play some songs you know, just for your own entertainment.'

locations/dachain.qsrc

@@ -60,7 +60,7 @@ if $args[0] = '':
 
 	if ml_guitar['hasguitar'] = 1:
 		act 'Play something on the guitar (10 minutes)':
-			mood += 10
+			pcs_mood += 10
 			minut += 10
 			gs 'stat'
 			'You pick up your guitar and start to play some songs you know, just for your own entertainment.'

locations/gschool_events.qsrc

@@ -2392,7 +2392,7 @@ end
 if $ARGS[0] = 'christinaphotos':
 	cla & *clr
 	menu_off = 1
-	mood -= 20
+	pcs_mood -= 20
 	grupvalue[1] -= 15
 	grupvalue[2] -= 10
 	grupvalue[3] -= 20

locations/music_actions.qsrc

@@ -28,7 +28,7 @@ if ARGS[0] = 'start':
 
 	if ml_guitar['carried'] = 1:
 		act 'Play something on the guitar (10 minutes)':
-			mood += 10
+			pcs_mood += 10
 			minut += 10
 			gs 'stat'
 			'You pick up your guitar and start to play some songs you know, just for your own entertainment.'

locations/sitr.qsrc

@@ -123,7 +123,7 @@ if hour > 8 and hour < 22:
 
 	if ml_guitar['hasguitar'] = 1:
 		act 'Play something on the guitar (10 minutes)':
-			mood += 10
+			pcs_mood += 10
 			minut += 10
 			gs 'stat'
 			'You pick up your guitar and start to play some songs you know, just for your own entertainment.'