Merge remote-tracking branch 'Anjuna/master'

locations/bedrPar.qsrc

@@ -330,14 +330,13 @@ if $ARGS[0] = 'intro':
 					'Your mother shrugs. "You could, but then you might have to cut corners or even end up running late to school, and I won''t be having any of that. Your teachers won''t either," she warns before making her way towards the kitchen.'
 					if stat['think_virgin'] = 1: '"Oh, don''t forget; you need to head down to the clinic and see the gynecologist for a check up. Not just once, but every month!" she adds quickly.'
 					act 'But why do I--':
-						$loc_arg = 'start'
 						cla & *clr
 						minut += 2
 						gs 'stat'
 						'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
 						'Before you can finish, she cuts you off. "I''m not going to have you running around town like so many of those other girls I see! Opening their legs for any boy that comes around..." She shakes her head in disgust. "I want a referral every month and it better tell me you''re still a virgin or else, understand?" she says before she storms out of the room without giving you a chance to respond.'
-						act 'I understand...':gt 'alarmclock', 'start'
+						act 'I understand...': $menu_loc = 'bedrPar' & $menu_arg = 'start' & gt 'alarmclock', 'start'
 					end
 				end
 			end

locations/blackmailer.qsrc

@@ -122,6 +122,48 @@ end
 
 
 
+	!!=============================================!!
+	!!                                             !!
+	!!                   JOURNAL                   !!
+	!!                                             !!
+	!!=============================================!!
+
+	if $ARGS[0] = 'journal_quests':
+		if pcs_inhib >= 35:
+			'<center><h3>Blackmailer</h3></center>'
+			if blackmailQW['stage'] = 0:
+				'It would be rather unfortunate if somebody caught you while you were flashing.'
+				'<it>There is a small, small, chance of getting caught while flashing in a park, in a church, and while washing cars.</it>'
+			elseif blackmailQW['stage'] < 0:
+				'You have refused the blackmailer once too many times.'
+			elseif blackmailQW['stage'] > 0 and blackmailQW['stage'] <= 3:
+				'You got caught while flashing! Who knows what could happen in the future?'
+			elseif blackmailQW['stage'] >= 4:
+				if blackmailQW['next_payment'] = 0:
+					'You have paid your blackmailer, but how long will that keep them quiet?'
+				else
+					'Your blackmailer has demanded you to leave <<blackmailQW[''next_payment'']>> <b>₽</b> in the nearest park.'
+					if daystart < blackmailQW['smsday'] - 1:
+						'You have <<blackmailQW[''smsday''] - daystart>> days left'
+					elseif daystart = blackmailQW['smsday'] - 1:
+						'You have until tomorrow.'
+					elseif daystart = blackmailQW['smsday']:
+						'You have until tonight!'
+					else
+						'You were too late!!'
+					end
+					'<it>You can leave the cash in the city, pav, and pushkin parks, and the gadukino forest.</it>'
+				end
+			end
+		end
+	end
+
+
+
+
+
+
+
 	!!=============================================!!
 	!!                                             !!
 	!!                    CIKL                     !!

locations/gad_gphouse.qsrc

@@ -1720,13 +1720,11 @@ if $ARGS[0] = 'intro':
 						cla & *clr
 						minut += 2
 						gs 'stat'
-						$loc = 'gad_gphouse'
-						$loc_arg = 'start'
 						'<center><H4>Your Grandparents'' Cottage</H4></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
 						*nl
 						'Before you can finish, she cuts you off. "I''m not going to have you running around town like so many of those other girls I see! Opening their legs for any boy that comes around..." She shakes her head in disgust. "I want a referral every month and it better tell me you''re still a virgin or else, understand?" <<$npc_nickname[''A29'']>> says as she storms off towards your grandparent''s outside door. "Don''t forget to talk to your grandparents and ask if they need help!" she shouts. Then, without waiting for your response, she closes the door, and with that, she''s gone.'
-						act 'I understand...': gt 'alarmclock', 'start'
+						act 'I understand...': $menu_loc = 'gad_gphouse' & $menu_arg = 'start' & gt 'alarmclock', 'start'
 					end
 				end
 			end

locations/journal_quests.qsrc

@@ -534,33 +534,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 	end
-	if pcs_inhib >= 35:
-		'<center><h3>Blackmailer</h3></center>'
-		if blackmailQW['stage'] = 0:
-			'It would be rather unfortunate if somebody caught you while you were flashing.'
-			'<it>There is a small, small, chance of getting caught while flashing in a park, in a church, and while washing cards.</it>'
-		elseif blackmailQW['stage'] < 0:
-			'You have refused the blackmailer once too many times.'
-		elseif blackmailQW['stage'] > 0 and blackmailQW['stage'] <= 3:
-			'You got caught while flashing! Who knows what could happen in the future?'
-		elseif blackmailQW['stage'] >= 4:
-			if blackmailQW['next_payment'] = 0:
-				'You have paid your blackmailer, but how long will that keep them quiet?'
-			else
-				'Your blackmailer has demanded you to leave <<blackmailQW[''next_payment'']>> <b>₽</b> in the nearest park.'
-				if daystart < blackmailQW['smsday'] - 1:
-					'You have <<blackmailQW[''smsday''] - daystart>> days left'
-				elseif daystart = blackmailQW['smsday'] - 1:
-					'You have until tomorrow.'
-				elseif daystart = blackmailQW['smsday']:
-					'You have until tonight!'
-				else
-					'You were too late!!'
-				end
-				'<it>You can leave the cash in the city, pav, and pushkin parks, and the gadukino forest.</it>'
-			end
-		end
-	end
+	gs 'blackmailer', 'journal_quests'
 end
 
 if yearstart > 1 and university['enrolled_in_semester'] > university['semester_passed']:

locations/newspaper_pages.qsrc

@@ -2,11 +2,9 @@
 
 
 if $ARGS[0] = 'init':
-	killvar 'np_front_pages'
-	killvar 'np_pages'
+	! For MODS: Add to the $np_pages and $np_front_pages ahead of the cikl call!
 
 	gs 'newspaper_pages', 'add_event_pages'
-	gs 'newspaper_pages', 'cikl_mod'
 	gs 'newspaper_pages', 'fill_arrays'
 end
 
@@ -35,21 +33,6 @@ if $ARGS[0] = 'add_event_pages':
 
 end
 
-
-if $ARGS[0] = 'cikl_mod':
-	$old_curloc = $curloc
-	$old_loc = $loc
-	$curloc = 'newspaper_cikl'
-	$loc = 'newspaper_cikl'
-
-	gs 'LOCA', 'newspaper', 'cikl'
-
-	$curloc = $old_curloc
-	$loc = $old_loc
-	killvar 'old_curloc'
-	killvar 'old_loc'
-end
-
 if $ARGS[0] = 'fill_arrays':
 	if arrsize('np_front_pages') = 0:
 		gs 'newspaper_pages', 'add_generic_frontpage'

locations/stat_explanations.qsrc

@@ -3,6 +3,8 @@
 
 if $ARGS[0] = 'start':
 	gs 'obj_din', 'settingtabs'
+	menu_off = 1
+	gs 'stat'
 	'<center><b><font color="maroon">Glossary</font></b></center>'
 	'Here we want to explain the different stats your player character has, and give other useful information about the play mechanics.'
 	*nl
@@ -19,6 +21,8 @@ end
 	
 if $ARGS[0] = 'icons':
 	gs 'obj_din', 'settingtabs'
+	menu_off = 1
+	gs 'stat'
 	cla
 	'<center><b><font color="maroon">Introduction and Icons</font></b></center>'
 	'We will go through the stat display, which is the window, that your QSP-player probably calls additional description. '
@@ -82,6 +86,8 @@ end
 
 if $ARGS[0] = 'attributes':
 	gs 'obj_din', 'settingtabs'
+	menu_off = 1
+	gs 'stat'
 	cla
 	'<center><b><font color="maroon">Attributes</font></b></center>'
 	'Attributes are the basic stat of the player character. They with few exceptions explained below are on a scale from 1 to 100. 1 meaning the player character barely can do anything in that area and 100 means that the player character is one of the best in in that attribute in the area of the game.'
@@ -95,8 +101,9 @@ if $ARGS[0] = 'attributes':
 	'It has nothing to do with the player character''s attitude towards sex. The player character can have 0 inhibition and still be completely asexual and even disgusted by sex.'
 	'Just to repeat, it is not a measure of the player character''s corruption.'
 	'This attribute is a little special since it is inverted: 0 experience points will give an inhibition of 100, while maximum experience points result in an inhibition of 0.'
-	'Experience points are earned by doing things the player character normally wouldn''t do. For example, if inhibition is above a certain threshold, the player character won''t sunbathe naked. If it is between two thresholds, experience points will be earned by sunbathing naked.'
-	'If inhibition is below that value, no experience points will be earned for sunbathing naked. The most common way to earn experience is by wearing clothes your character considers risqué but not too risqué. Whether your character considers clothes risqué or not can be seen in the wardrobe when dressing.'
+	'Experience points are earned by doing things the player character normally wouldn''t do.'
+	'For example, if inhibition is above a certain threshold, the player character won''t sunbathe naked. If it is between two thresholds, experience points will be earned by sunbathing naked. If inhibition is below that value, no experience points will be earned for sunbathing naked.'
+	'The most common way to earn experience is by wearing clothes your character considers risqué but not too risqué. Whether your character considers clothes risqué or not can be seen in the wardrobe when dressing.'
 	*nl
 	'"Strength" is the attribute that describes how strong the player character is. It is used for many sports, and to determine how hard the player character hits. Getting experience point for it is mainly done by doing different kinds of sports or exercises.'
 	'This attribute is special in that through normal means it can only be raised to 100. But with doing dedicated weightlifting training (which will say so) you can increase it to 150, and if you take steroids while doing the weightlifting training it can be raised to 200.'
@@ -114,6 +121,9 @@ if $ARGS[0] = 'attributes':
 	'"Spirit" is the mental resilience of your character. It is used when you try to resist somebody forcing your player character to do something; succeeding in this will also reward experience for spirit. This will be explained in more detail when willpower is explained.'
 	'Another way to gain experience for spirit is by doing yoga exercises.'
 	*nl
+	'"Reaction" is the attribute that describes how quick your player character is to react to things happening. It is very important in fights very it determines you initiative and thereby how quick you get a turn to act. It is also used in some sports.'
+	'YOu gain experience in reaction is by fighting, doing sports and other exercises.'
+	*nl
 	'"Charisma" is the attribute that affects how people experience being around your player character and talking to them. Higher charisma makes better outcomes of social interactions more likely.'
 	'Experience for charisma is mainly earned by talking to other people and being active in social settings.'
 	*nl
@@ -139,6 +149,8 @@ end
 
 if $ARGS[0] = 'skill':
 	gs 'obj_din', 'settingtabs'
+	menu_off = 1
+	gs 'stat'
 	cla
 	'<center><b><font color="maroon">Skills</font></b></center>'
 	'In the stat display, skills are grouped into different categories: "Mental," "Sport," "Beauty," "Artistic," and "Jobs," so remember to have them all enabled. While the categories contain similar skills, they are just for display purposes. There are no mechanical aspects associated with the categories.'
@@ -240,6 +252,8 @@ end
 
 if $ARGS[0] = 'status':
 	gs 'obj_din', 'settingtabs'
+	menu_off = 1
+	gs 'stat'
 	cla
 	'<center><b><font color="maroon">Status bars</font></b></center>'
 	'The status bars represent different parts of the player''s physical and mental status. They are different from attributes and skills in that they can fluctuate rapidly, acting as resources that the player uses and replenishes throughout gameplay. They are not tied to any experience points but generally have maximum values determined by different stats, which then decrease as they are used.'