Merge remote-tracking branch 'Anjuna/master'

locations/gp_elene_schedule.qsrc

@@ -156,7 +156,7 @@ if $ARGS[0] = 'getLocation':
 	elseif locat['A31'] / 10 = 11:
 		$npcLocation['A31'] = 'Your grandmother is in her livingroom'
 	elseif locat['A31'] / 10 = 12:
-		$npcLocation['A31'] = 'Your grandmother is in her kitcher'
+		$npcLocation['A31'] = 'Your grandmother is in her kitchen'
 
 	elseif locat['A31'] / 10 = 20:
 		$npcLocation['A31'] = 'Your grandmother is in her garden'
@@ -172,4 +172,17 @@ if $ARGS[0] = 'getLocation':
 end
 
 
+if $ARGS[0] = 'get_locarg':
+	gs 'gp_elene_schedule', 'update_locat'
+
+	if locat['A31'] / 100 = 1:
+		$locat['A31_loc'] = 'gad_gphouse'
+		$locat['A31_arg'] = 'start'
+	else
+		$locat['A31_loc'] = 'gad_gpyard'
+		$locat['A31_arg'] = 'start'
+	end
+end
+
+
 --- gp_elene_schedule ---------------------------------

locations/gp_zlatek_schedule.qsrc

@@ -196,7 +196,7 @@ if $ARGS[0] = 'getLocation':
 	elseif locat['A32'] / 10 = 11:
 		$npcLocation['A32'] = 'Your grandfather is in his livingroom'
 	elseif locat['A32'] / 10 = 12:
-		$npcLocation['A32'] = 'Your grandfather is in his kitcher'
+		$npcLocation['A32'] = 'Your grandfather is in his kitchen'
 
 	elseif locat['A32'] / 10 = 20:
 		$npcLocation['A32'] = 'Your grandfather is in his garden'