[changed] `gad_market` to `gad_store` in preparation for the introduction of the farmers market (to avoid confusion)

glife.qproj

@@ -1157,7 +1157,7 @@
 		<Location name="gad_beach"/>
 		<Location name="gad_prostitutes"/>
 		<Location name="gad_field"/>
-		<Location name="gad_market"/>
+		<Location name="gad_store"/>
 		<Location name="gad_road"/>
 		<Location name="gad_miroslava_home"/>
 		<Location name="gad_forest"/>

locations/gad_market.qsrc → locations/gad_store.qsrc

@@ -1,8 +1,8 @@
-# gad_market
+# gad_store
 
 
 *clr & cla
-gs 'shortgs', 'setloc', 'gad_market', ''
+gs 'shortgs', 'setloc', 'gad_store', ''
 $location_type = 'public_indoors'
 menu_off = 0
 
@@ -16,24 +16,24 @@ frost = 0
 *nl
 'As you approach the teller, you notice a rack full of magazines, cigarettes, and a few hygienic items.'
 *nl
-act 'Browse the aisles': gt 'gad_market', 'cart'
+act 'Browse the aisles': gt 'gad_store', 'cart'
 
-act 'Leave the market': minut += 5 & gt 'gadukino'
+act 'Leave the store': minut += 5 & gt 'gadukino'
 if grandmaQW['chore_groceries'] = 1:
 	act 'Gather the things on Grandma''s list (0:30)':
 		*clr & cla
 		minut += 30
 		gs 'stat'
-	
+
 		grandmaQW['chore_groceries'] = 2
 		grandmaQW['help_amount'] += 1
-	
+
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/market.jpg"></center>'
 		'You take out the list Grandma gave you and begin browsing the shelves for the items she needs. Finally, after about half an hour, you have gotten everything on the list.'
 		*nl
 		'You take your basket of goods to the teller and explain that you are getting these things for your grandmother.'
 		'"Of course! Go ahead and take these on home to her. Tell her I will be by this evening to pick up her payment. I know it''s hard for her to get out anymore..."'
-	
+
 		act 'Thank him and leave': minut += 5 & gt 'gadukino'
 		act 'Thank him and take the groceries back to your grandmother (0:10)': minut += 10 & gt 'gad_gphouse', 'grandma'
 	end
@@ -41,7 +41,7 @@ end
 
 
 if $ARGS[0] = 'cart':
-	$loc_s = 'gad_market'
+	$loc_s = 'gad_store'
 	$args_s = 'cart'
 	*clr & cla
 
@@ -52,15 +52,15 @@ if $ARGS[0] = 'cart':
 		exit
 	end
 
-	gs 'item_cart', 'shoppping_aisle', 'gad_market'
+	gs 'item_cart', 'shoppping_aisle', 'gad_store'
 	gs 'stat'
 	gs 'themes', 'indoors'
 	$backimage= 'images/locations/gadukino/village/market.jpg'
 
-	act 'Exit shopping cart': $backimage = '' & gt 'gad_market'
-	act 'Leave the market': minut += 5 & gt 'gadukino'
+	act 'Exit shopping cart': $backimage = '' & gt 'gad_store'
+	act 'Leave the store': minut += 5 & gt 'gadukino'
 end
 
 
---- gad_market ---------------------------------
+--- gad_store ---------------------------------
 

locations/gadukino.qsrc

@@ -127,12 +127,14 @@ if $ARGS[0] = '':
 		'In the center of the village is a small grass-covered square where villagers gather to meet and discuss or argue about politics or village life.'
 		'Near the square sits the old <a href="exec: minut += 3 & gt ''gad_church'',''start''">chapel</a>, it is not in the best shape, but it appears well-loved.'
 		if hour >= 8 and hour < 20:
-			'One of the buildings facing the square has a sign saying, <a href="exec: minut += 5 & gt ''gad_market''">General Store</a>. A sign on the door proclaims it "OPEN". It looks like the only place in the village to buy goods.'
-			act 'Go to the general store': minut += 5 & gt 'gad_market'
+			'One of the buildings facing the square has a sign saying, <a href="exec: minut += 5 & gt ''gad_store''">General Store</a>. A sign on the door proclaims it "OPEN". It looks like the only place in the village to buy goods.'
+			act 'Go to the general store': minut += 5 & gt 'gad_store'
 		else
 			'One of the buildings facing the square has a sign saying, General Store. A sign on the door proclaims it "CLOSED". It looks like the only place in the village to buy goods.'
 		end
 
+		if (week = 4 or week = 7) and hour >= 6 and hour <= 20: act 'Go to the nearby farmers market': gt 'gad_sundaymarket', 'start'
+
 		act 'Walk to the forest road (0:10)': minut += 10 & gt 'gad_road', 'start'
 		act 'Walk to the highway (0:15)': minut += 15 & nroad = 10 & gt 'road'
 		if hour >= 6 and hour < 20:

locations/grandmahelp.qsrc

@@ -128,7 +128,7 @@ if $ARGS[0] = 'groceries':
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/izba.jpg"></center>'
 		'Your grandmother shuffles around, looking for her list for a few minutes, finally finding it and giving it to you. You grab a basket and set out for the store.'
-		act 'Continue': gt 'gad_market'
+		act 'Continue': gt 'gad_store'
 	end
 end
 
@@ -255,7 +255,7 @@ if $ARGS[0] = 'feedchickens':
 		'You take the grain mix for the chickens and walk to the yard.'
 
 		act 'Continue': gt 'gad_gpyard','chickens'
-		
+
 	end
 end
 

locations/item_stock_db.qsrc

@@ -1075,7 +1075,7 @@ if $ARGS[0] = 'market':
 	$img_curr_aisle['<<item_idx>>'] = ''
 end
 
-if $ARGS[0] = 'gad_market':
+if $ARGS[0] = 'gad_store':
 	$shop_title = 'Village shop'
 	item_idx = 1
 	$item_curr_aisle['<<item_idx>>'] = 'Tea biscuits'