Bladeren bron

[fixed] missing 'start' $ARGS in grandmahelp

julzor 5 jaren geleden
bovenliggende
commit
0876a16edd
2 gewijzigde bestanden met toevoegingen van 48 en 47 verwijderingen
  1. 2 3
      locations/Gadhouse.qsrc
  2. 46 44
      locations/grandmahelp.qsrc

+ 2 - 3
locations/Gadhouse.qsrc

@@ -13,8 +13,7 @@ if $ARGS[0]='' or $ARGS[0] = 'Start':
 	*clr & cla
 	frost = 0
 	mira_temp = rand(1,5)
-	!125s
-	!execute before everything
+
 	if monthbabkapay ! month and monthgrandmahelp ! month and hour >= 6 and hour < 22:
 		monthbabkapay = month
 		monthgrandmahelp = month
@@ -300,7 +299,7 @@ if $ARGS[0] = 'grandma':
 	else
 		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to her about the flowers': gt 'grigory', 'flower4'
 		
-		if grandmahelpday ! daystart: act 'Offer to help out': grandmahelpday = daystart & gt'grandmahelp'
+		if grandmahelpday ! daystart: act 'Offer to help out': grandmahelpday = daystart & gt'grandmahelp', 'start'
 
 		if grandmatalkgad = 0:
 			act 'Ask about the village (0:10)':

+ 46 - 44
locations/grandmahelp.qsrc

@@ -9,38 +9,40 @@ frost = 0
 
 'You ask your grandmother if you there was something you could help out with something here at home. Your grandmother turns to you and says:'
 
-if month <= 4 or month >= 10:
-	grandmahelping = RAND(0,2)
-elseif month = 5 or month = 6:
-	grandmahelping = RAND(0,5)
-else
-	grandmahelping = RAND(0,6)
-end
+if $ARGS[0] = 'start':
+	if month <= 4 or month >= 10:
+		grandmahelping = rand(0,2)
+	elseif month = 5 or month = 6:
+		grandmahelping = rand(0,5)
+	else
+		grandmahelping = rand(0,6)
+	end
 
-if grandmahelping = 0: 
-	gt 'grandmahelp', 'cleanfloor'
-elseif grandmahelping = 1:
-	gt 'grandmahelp', 'washclothes'
-elseif grandmahelping = 2 and hour < 9 and hour > 20:
-	gt 'grandmahelp', 'milkcows'
-elseif grandmahelping = 3:
-	gt 'grandmahelp', 'feedchickens'
-elseif grandmahelping = 4 and sunWeather = 1:
-	gt 'grandmahelp', 'checkplants'
-elseif grandmahelping = 5 and sunWeather = 1:
-	gt 'grandmahelp', 'waterplants'
-elseif grandmahelping = 6 and sunWeather = 1:
-	gt 'grandmahelp', 'harvest'
-else
-	'"- There is nothing to do today <<$pcs_nickname>>, take a day off.'
-	act 'Go':gt'Gadhouse'			
+	if grandmahelping = 0: 
+		gt 'grandmahelp', 'cleanfloor'
+	elseif grandmahelping = 1:
+		gt 'grandmahelp', 'washclothes'
+	elseif grandmahelping = 2 and hour < 9 and hour > 20:
+		gt 'grandmahelp', 'milkcows'
+	elseif grandmahelping = 3:
+		gt 'grandmahelp', 'feedchickens'
+	elseif grandmahelping = 4 and sunWeather = 1:
+		gt 'grandmahelp', 'checkplants'
+	elseif grandmahelping = 5 and sunWeather = 1:
+		gt 'grandmahelp', 'waterplants'
+	elseif grandmahelping = 6 and sunWeather = 1:
+		gt 'grandmahelp', 'harvest'
+	else
+		'"There is nothing to do today <<$pcs_nickname>>, take a day off.'
+		act 'Go':gt'Gadhouse'			
+	end
 end
 
 if $ARGS[0] = 'cleanfloor':
-	'"- There is always something to do <<$pcs_nickname>>. I''ve gotten quite old and my strength is not what it used to be. Could you help me out by cleaning the floor?"'
+	'"There is always something to do <<$pcs_nickname>>. I''ve gotten quite old and my strength is not what it used to be. Could you help me out by cleaning the floor?"'
 
 	act 'Clean the floor (1:00)':
-		cls
+		*clr & cla
 		minut += 60
 		grandmahelp += 1
 		gs'stat'
@@ -53,10 +55,10 @@ if $ARGS[0] = 'cleanfloor':
 end
 
 if $ARGS[0] = 'washclothes':
-	'"- Of course, <<$pcs_nickname>>, you can help me wash your grandfathers dirty clothes."'
+	'"Of course, <<$pcs_nickname>>, you can help me wash your grandfathers dirty clothes."'
 	
 	act 'Wash clothes (1:00)':
-		cls
+		*clr & cla
 		minut += 60
 		grandmahelp += 1
 		gs'stat'
@@ -65,7 +67,7 @@ if $ARGS[0] = 'washclothes':
 		'You pick up grandfathers dirty clothes and take it with you outside where you soak them in the metal basin for an hour.'
 		
 		act 'Hang the Laundry':
-		    cls
+		    *clr & cla
 		    minut += 10
 		    gs'stat'
 		    '<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes2.jpg"></center>'
@@ -77,10 +79,10 @@ if $ARGS[0] = 'washclothes':
 end
 
 if $ARGS[0] = 'feedchickens':
-	'"- Of course <<$pcs_nickname>>, would you be kind and feed the chickens?"'
+	'"Of course <<$pcs_nickname>>, would you be kind and feed the chickens?"'
 	
 	act 'Feed the chickens (0:30)':
-		cls
+		*clr & cla
 		feed_chickens = 1
 		minut += 30
 		gs'stat'
@@ -93,10 +95,10 @@ if $ARGS[0] = 'feedchickens':
 end
 
 if $ARGS[0] = 'milkcows':
-	' "- <<$pcs_nickname>>, go to the barn and milk the cows."'
+	' "<<$pcs_nickname>>, go to the barn and milk the cows."'
 
 	act 'Go to the barn (0:10)':
-		cls
+		*clr & cla
 		minut += 10
 		milk_cow = 1
 		gs'stat'
@@ -109,10 +111,10 @@ if $ARGS[0] = 'milkcows':
 end
 
 if $ARGS[0] = 'checkplants':
-	'"- <<$pcs_nickname>>, go to the garden and check on the plants."'
+	'"<<$pcs_nickname>>, go to the garden and check on the plants."'
 
 	act 'Go to garden (0:10)':
-		cls
+		*clr & cla
         work_garden = 1
 		minut += 10
 		gs'stat'
@@ -125,10 +127,10 @@ if $ARGS[0] = 'checkplants':
 end
 
 if $ARGS[0] = 'waterplants':
-	'"- Dear <<$pcs_nickname>>, could you go and water the planted field in the garden?"'
+	'"Dear <<$pcs_nickname>>, could you go and water the planted field in the garden?"'
 
 	act 'Go to the garden (0:10)':
-		cls
+		*clr & cla
         water_garden = 1
 		minut += 10
 		gs'stat'
@@ -142,10 +144,10 @@ end
 
 if $ARGS[0] = 'harvest':
 	if month = 7:
-		'"- <<$pcs_nickname>> dear, the strawberries are ripe to pick. Could you go over to the plot and pick them today?"'
+		'"<<$pcs_nickname>> dear, the strawberries are ripe to pick. Could you go over to the plot and pick them today?"'
 		
 		act 'Go to the strawberry plot (0:15)':
-			cls
+			*clr & cla
 			collect_strawberries = 1
 			minut += 15
 			gs'stat'
@@ -156,10 +158,10 @@ if $ARGS[0] = 'harvest':
 			act 'Further':gt'Gadgarden','strawberry'
 		end
 	elseif month = 8:
-		'"- <<$pcs_nickname>> dear, the fruits are ripe and it is time to start collecting them, could you go and do it today?"'
+		'"<<$pcs_nickname>> dear, the fruits are ripe and it is time to start collecting them, could you go and do it today?"'
 
 		act 'Go to the garden (0:15)':
-			cls
+			*clr & cla
 			fruit_collect = 1
 			minut += 15
 			gs'stat'
@@ -170,10 +172,10 @@ if $ARGS[0] = 'harvest':
 			act 'Further':gt'Gadgarden','fruit_garden'
 		end
 	elseif month = 9:
-		'"- <<$pcs_nickname>> dear, could you go to the garden today, it''s time to collect the harvest."'
+		'"<<$pcs_nickname>> dear, could you go to the garden today, it''s time to collect the harvest."'
 
 		act 'Go to garden (0:10)':
-			cls
+			*clr & cla
 			harvest_garden = 1
 			minut += 10
 			gs'stat'
@@ -186,5 +188,5 @@ if $ARGS[0] = 'harvest':
 	end
 end
 
---- grandmahelp ---------------------------------
+--grandmahelp ---------------------------------