Merge remote-tracking branch 'Anjuna/master'

locations/gad_gpbarn.qsrc

@@ -1,7 +1,7 @@
 # gad_gpbarn
 !2021/05/08
 
-$default_img_path = 'locations/gadukino/'
+$default_img_path = 'locations/gadukino'
 if $ARGS[0] = '':
 	gs 'shortgs', 'setloc', 'gad_gpbarn', ''
 	menu_off = 0
@@ -37,9 +37,9 @@ if $ARGS[0] = '':
 		act 'Gather firewood for Grandpa (0:10)':
 			*clr & cla
 			if month >= 4 and month <= 10:
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/firewood.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood.jpg"></center>'
 			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/firewood_winter.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood_winter.jpg"></center>'
 			end
 			'You decide to grab the firewood that your grandfather asked for, loading up as much as you can carry.'
 			grandpaQW['chore_fetch_firewood'] = 2
@@ -76,7 +76,7 @@ if $ARGS[0] = 'search':
 		BikeLoc = 1
 		gs 'exp_gain', 'observ', 3
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/findbike.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findbike.jpg"></center>'
 		*nl
 		'You find an old bicycle in the far corner of the barn. It''s in surprisingly good condition. You pull it out of the barn and clean it up.'
 	elseif findbag = 0 and bag = 0 and rand(0,10) >= 7:
@@ -97,7 +97,7 @@ if $ARGS[0] = 'search':
 		mc_inventory['vintage_card'] = 1
 		gs 'exp_gain', 'observ', 3
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/vcards.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vcards.jpg"></center>'
 		*nl
 		'"Hmm, what''s this?" You''ve found an unopened deck of vintage adult playing cards still in its original cellophane wrapper.'
 	elseif findbraclet = 0 and rand(0,10) >= 9:
@@ -105,7 +105,7 @@ if $ARGS[0] = 'search':
 		findbraclet = 1
 		gs 'exp_gain', 'observ', 3
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/bracelet.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bracelet.jpg"></center>'
 		*nl
 		'While looking through the barn, you spot a metal glint under a wood pile. Upon closer inspection, you see a silver bracelet crafted into a snake''s likeness. Strange, but fantastic that you would find something this valuable in the barn.'
 	elseif findbraclet > 0 and findneck = 0 and rand(0,10) >= 10:
@@ -113,7 +113,7 @@ if $ARGS[0] = 'search':
 		findneck = 1
 		gs 'exp_gain', 'observ', 3
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/necklace.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/necklace.jpg"></center>'
 		*nl
 		if $start_type[1] ! 'nomagic':
 			'While looking through the barn, your foot goes through a rotten floorboard. You suddenly feel the presence of something magical under the floor. You get on your belly and look through the hole in the floor. You find a small box made of black wood. You pick up the box and see it''s covered in strange writing and glyphs that look like serpents. A feeling of power is coming from within the box. You lift the box''s lid and see a black metal necklace that looks like a coiled snake with ruby eyes. You feel the power coming from the necklace, but it doesn''t feel like any power you have ever felt.'
@@ -123,7 +123,7 @@ if $ARGS[0] = 'search':
 	else
 		gs 'exp_gain', 'observ', rand(0,1)
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/junk_barn.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
 		*nl
 		'In the barn, you find many mouldy magazines, rusty tools and equipment, toys, and dusty, yellowed books. The entire barn reeks of mould and decay.'
 	end
@@ -136,7 +136,7 @@ if $ARGS[0] = 'horse':
 	gs 'stat'
 
 	'<center><h4>Grandparents'' Barn</h4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/horse.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse.jpg"></center>'
 	'Grandfather''s trusted workhorse, Desperado.'
 
 	act 'Leave': minut += 1 & gt 'gad_gpbarn'
@@ -149,7 +149,7 @@ if $ARGS[0] = 'horse':
 			gs 'exp_gain', 'hndiwrk', rand(1,3)
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/feed_horse.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_horse.jpg"></center>'
 			'You grab a sack of grain and fill Desperado''s feed bucket. Then, you hang the bucket from his stall and gently pat his nose as he begins to eat.'
 			'You watch him eat for a little while before moving on.'
 
@@ -165,7 +165,7 @@ if $ARGS[0] = 'horse':
 			gs 'exp_gain', 'hndiwrk', rand(1,3)
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/horse_field.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
 			'You take Desperado by the bridle and lead him to the field. You let him free in the paddock area and watch him run about before moving on.'
 
 			act 'Continue': gt 'gad_field', 'field'
@@ -180,7 +180,7 @@ if $ARGS[0] = 'horse':
 			gs 'exp_gain', 'hndiwrk', rand(1,3)
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/horse_field.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
 			'You take Desperado by the bridle and lead him to the river.'
 
 			act 'Continue': gt 'gad_beach', 'start'
@@ -197,7 +197,7 @@ if $ARGS[0] = 'horse':
 			gs 'exp_gain', 'hndiwrk', rand(1,3)
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/comb_horse.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/comb_horse.jpg"></center>'
 			'You spend about an hour cleaning and brushing Desperado, scrubbing his coat and brushing his mane and tail. Finally, you are satisfied with the result - he looks as clean and healthy as ever.'
 
 			act 'Finish': gt 'gad_gpbarn','horse'
@@ -212,7 +212,7 @@ if $ARGS[0] = 'cow':
 	gs 'stat'
 
 	'<center><h4>Grandparents'' Barn</h4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/cow.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow.jpg"></center>'
 	*nl
 	'Grandma''s favorite animal, the cow, Dawn.'
 
@@ -226,7 +226,7 @@ if $ARGS[0] = 'cow':
 			gs 'exp_gain', 'hndiwrk', rand(1,3)
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/milk_cow.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/milk_cow.jpg"></center>'
 			'You start milking Dawn, improving each time you do it.'
 
 			act 'Finish': gt 'gad_gpbarn', 'cow'
@@ -241,7 +241,7 @@ if $ARGS[0] = 'cow':
 			gs 'exp_gain', 'hndiwrk', rand(1,3)
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/feed_cow.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_cow.jpg"></center>'
 			'Dawn is excited about feeding time, shaking her head and doing little cow tippy-taps with her feet. You dump some hay in her trough and watch as she digs in.'
 
 			act 'Finish': gt 'gad_gpbarn','cow'
@@ -255,7 +255,7 @@ if $ARGS[0] = 'cow':
 			gs 'exp_gain', 'hndiwrk', rand(1,3)
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/cow_field.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_field.jpg"></center>'
 			if grandpaQW['chore_lead_cow_to_field'] = 1:
 				'You lead Dawn to the field, where you let the shepherds take over.'
 				grandpaQW['chore_lead_cow_to_field'] = 2
@@ -274,7 +274,7 @@ if $ARGS[0] = 'boar':
 	gs 'stat'
 
 	'<center><h4>Grandparents'' Barn</h4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/boar.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/boar.jpg"></center>'
 	'One of your grandparents'' dearest possessions, the boar, Nickle.'
 
 	act 'Leave':minut += 1 & gt 'gad_gpbarn'
@@ -287,7 +287,7 @@ if $ARGS[0] = 'boar':
 			gs 'exp_gain', 'hndiwrk', rand(1,3)
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/feed_boar.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_boar.jpg"></center>'
 			'You grab the feed bag and fill Nickle''s trough. You stand there and watch for a few minutes as he eats like a... well, like a pig.'
 
 			act 'Finish': gt 'gad_gpbarn','boar'
@@ -299,7 +299,7 @@ end
 if $ARGS[0] = 'barn_room':
 	$location_type = 'private'
 	$setloc['StageTitle'] = 'Guest Room'
-	$setloc['StageImage'] =   '<<$default_img_path>>village/gad_room.jpg'
+	$setloc['StageImage'] = '<<$default_img_path>>/gp_dacha/gad_room.jpg'
 	gs 'shortgs', 'setloc', 'gad_gpbarn', $ARGS[0]
 	gs 'miroslava_schedule'
 	gs 'themes', 'indoors'

locations/nerd_game_night.qsrc

@@ -171,50 +171,48 @@ end
 
 if $ARGS[0] = 'game_on':
 	menu_off = 1
-	act 'Game on':
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/playing.jpg"></center>'
+	'Feofan clears his throat. "Now then, the last time we stopped at the turn when Zinaida was supposed to make her move."'
+	'Artem sighs deeply. "Do we need to have this discussion again? It''s obvious that we should attack the dragon. She is our tank after all."'
+	'Gerasim looks a little irritated. "We should buff the warrior first before taking on the dragon. It''s a more sound strategy."'
+	'Artem sighs again. "And if the dragon hears Julia casting, it will attack us first! We should attack now while we still have the element of surprise."'
+	*nl
+	'The whole room erupts in a frenzy with everyone talking over each other to get their point across. Feofan tries to calm everyone down, but it''s futile. After a while, they decide that they should vote on what to do next.'
+	'"How about we let <<$pcs_nickname>> decide? She''s new and should be objective," Artem suggests and the others nod approvingly.'
+	'You first ask what they mean by buffing and learn that it will make Zinaida''s character tougher and able to take more damage.'
+	act 'Side with Artem':
 		*clr & cla
+		gs 'npc_relationship', 'modify', 'A2', 'like'
+		gs 'npc_relationship', 'modify', 'A153', 'dislike'
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/playing.jpg"></center>'
-		'Feofan clears his throat. "Now then, the last time we stopped at the turn when Zinaida was supposed to make her move."'
-		'Artem sighs deeply. "Do we need to have this discussion again? It''s obvious that we should attack the dragon. She is our tank after all."'
-		'Gerasim looks a little irritated. "We should buff the warrior first before taking on the dragon. It''s a more sound strategy."'
-		'Artem sighs again. "And if the dragon hears Julia casting, it will attack us first! We should attack now while we still have the element of surprise."'
-		*nl
-		'The whole room erupts in a frenzy with everyone talking over each other to get their point across. Feofan tries to calm everyone down, but it''s futile. After a while, they decide that they should vote on what to do next.'
-		'"How about we let <<$pcs_nickname>> decide? She''s new and should be objective," Artem suggests and the others nod approvingly.'
-		'You first ask what they mean by buffing and learn that it will make Zinaida''s character tougher and able to take more damage.'
-		act 'Side with Artem':
-			*clr & cla
-			gs 'npc_relationship', 'modify', 'A2', 'like'
-			gs 'npc_relationship', 'modify', 'A153', 'dislike'
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
-			'You think about it for a few seconds before answering. "I think Artem is right. The element of surprise shouldn''t be wasted."'
-			'"See? I told you I was making sense!" Artem proudly proclaims. You notice Gerasim frowning and Zinaida doesn''t seem too happy either, but Petka seems exicted by your decision.'
-			act 'Continue': gt 'nerd_game_night', 'keep_playing_on1'
-		end
-		act 'Side with Gerasim':
-			*clr & cla
-			gs 'npc_relationship', 'modify', 'A2', 'dislike'
-			gs 'npc_relationship', 'modify', 'A153', 'like'
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big153.jpg"></center>'
-			'You think about it for a few seconds before answering. "I think it''s more important to make Zindaida''s character as tough as we can, so she can survive the dragon''s attack."'
-			'"See? I told you I was making sense!" Gerasim proudly proclaims. Zinaida also seems to like your decision, as does Julia, while Artem shakes his head slightly and Petka sighs.'
-			act 'Continue': gt 'nerd_game_night', 'keep_playing_on1'
-		end
-		act 'Side with no one':
-			*clr & cla
-			gs 'npc_relationship', 'modify', 'A2', 'dislike'
-			gs 'npc_relationship', 'modify', 'A153', 'dislike'
-			npc_rel['A2'] -= 1
-			npc_rel['A153'] -= 1
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
-			'You excuse yourself as you explain that it wouldn''t be fair for you to make this kind of decision as you''re new at this and don''t even know how tough a dragon is, though it sounds dangerous. "I mean, it''s a dragon right? Should we even be attacking it? Can we win?"'
-			'They assure you that it''s something the group can beat, but only if only they take it by surprise or are ready with buffs, which launches yet another heated debate. They go back and forth until Feofan demands they decide and they take a vote. Gerasim, Julia and Zinaida vote to buff up first while Artem and Petka vote to attack now. The two boys sigh and mutter about how it''s going to be harder now as Julia''s character starts buffing up Zinaida''s character.'
-			act 'Continue': gt 'nerd_game_night', 'keep_playing_on1'
-		end
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
+		'You think about it for a few seconds before answering. "I think Artem is right. The element of surprise shouldn''t be wasted."'
+		'"See? I told you I was making sense!" Artem proudly proclaims. You notice Gerasim frowning and Zinaida doesn''t seem too happy either, but Petka seems exicted by your decision.'
+		act 'Continue': gt 'nerd_game_night', 'keep_playing_on1'
+	end
+	act 'Side with Gerasim':
+		*clr & cla
+		gs 'npc_relationship', 'modify', 'A2', 'dislike'
+		gs 'npc_relationship', 'modify', 'A153', 'like'
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big153.jpg"></center>'
+		'You think about it for a few seconds before answering. "I think it''s more important to make Zindaida''s character as tough as we can, so she can survive the dragon''s attack."'
+		'"See? I told you I was making sense!" Gerasim proudly proclaims. Zinaida also seems to like your decision, as does Julia, while Artem shakes his head slightly and Petka sighs.'
+		act 'Continue': gt 'nerd_game_night', 'keep_playing_on1'
+	end
+	act 'Side with no one':
+		*clr & cla
+		gs 'npc_relationship', 'modify', 'A2', 'dislike'
+		gs 'npc_relationship', 'modify', 'A153', 'dislike'
+		npc_rel['A2'] -= 1
+		npc_rel['A153'] -= 1
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
+		'You excuse yourself as you explain that it wouldn''t be fair for you to make this kind of decision as you''re new at this and don''t even know how tough a dragon is, though it sounds dangerous. "I mean, it''s a dragon right? Should we even be attacking it? Can we win?"'
+		'They assure you that it''s something the group can beat, but only if only they take it by surprise or are ready with buffs, which launches yet another heated debate. They go back and forth until Feofan demands they decide and they take a vote. Gerasim, Julia and Zinaida vote to buff up first while Artem and Petka vote to attack now. The two boys sigh and mutter about how it''s going to be harder now as Julia''s character starts buffing up Zinaida''s character.'
+		act 'Continue': gt 'nerd_game_night', 'keep_playing_on1'
 	end
 end
 

locations/pav_lake_nude.qsrc

@@ -52,7 +52,7 @@ if mid($start_type,1,2) = 'sg' and month >= 3 and month <= 8 and week >= 6 and h
 		act 'Run away': ivanfedorseennaked = daystart & gt 'pav_lake_nude'
 		act 'Greet them': ivanfedorseennaked = daystart & gt 'gschool_socialchg1', 'ivan_fedor_naked'
 	else
-		'You''re walking down the secluded beach, enjoying the tranquility when you suddenly hear someone running up behind you. Expecting the worst, you turn around only to see a sweaty <a href="exec:gt ivanfedorseennaked = daystart &''gt gschool_socialchg1'', ''tIvan''">Ivan</a>, closely followed by <a href="exec:ivanfedorseennaked = daystart & gt ''gschool_socialchg1'', ''tFedor''">Feodor</a>.'
+		'You''re walking down the secluded beach, enjoying the tranquility when you suddenly hear someone running up behind you. Expecting the worst, you turn around only to see a sweaty <a href="exec:ivanfedorseennaked = daystart & gt ''gschool_socialchg1'', ''tIvan''">Ivan</a>, closely followed by <a href="exec:ivanfedorseennaked = daystart & gt ''gschool_socialchg1'', ''tFedor''">Feodor</a>.'
 	end
 end