1
0
Переглянути джерело

Merge remote-tracking branch 'Anjuna/master'

Kevin_Smarts 1 місяць тому
батько
коміт
95d78641a8
3 змінених файлів з 27 додано та 26 видалено
  1. 22 22
      locations/body_structure.qsrc
  2. 1 1
      locations/gad_field.qsrc
  3. 4 3
      locations/gad_gpyard.qsrc

+ 22 - 22
locations/body_structure.qsrc

@@ -71,57 +71,57 @@ end
 
 
 
 
 if $ARGS[0] = 'body_img_totals':
 if $ARGS[0] = 'body_img_totals':
-	if ARGS[0] = 000:
+	if ARGS[1] = 000:
 		result = 2
 		result = 2
-	elseif ARGS[0] = 006:
+	elseif ARGS[1] = 006:
 		result = 2
 		result = 2
 
 
-	elseif ARGS[0] = 100:
+	elseif ARGS[1] = 100:
 		result = 4
 		result = 4
-	elseif ARGS[0] = 106:
+	elseif ARGS[1] = 106:
 		result = 3
 		result = 3
 
 
-	elseif ARGS[0] = 200:
+	elseif ARGS[1] = 200:
 		result = 2
 		result = 2
-	elseif ARGS[0] = 206:
+	elseif ARGS[1] = 206:
 		result = 4
 		result = 4
-	elseif ARGS[0] = 207:
+	elseif ARGS[1] = 207:
 		result = 3
 		result = 3
-	elseif ARGS[0] = 208:
+	elseif ARGS[1] = 208:
 		result = 1
 		result = 1
-	elseif ARGS[0] = 210:
+	elseif ARGS[1] = 210:
 		result = 1
 		result = 1
-	elseif ARGS[0] = 213:
+	elseif ARGS[1] = 213:
 		result = 1
 		result = 1
-	elseif ARGS[0] = 215:
+	elseif ARGS[1] = 215:
 		result = 1
 		result = 1
 
 
-	elseif ARGS[0] = 300:
+	elseif ARGS[1] = 300:
 		result = 3
 		result = 3
-	elseif ARGS[0] = 306:
+	elseif ARGS[1] = 306:
 		result = 3
 		result = 3
-	elseif ARGS[0] = 307:
+	elseif ARGS[1] = 307:
 		result = 1
 		result = 1
-	elseif ARGS[0] = 308:
+	elseif ARGS[1] = 308:
 		result = 1
 		result = 1
 
 
-	elseif ARGS[0] = 400:
+	elseif ARGS[1] = 400:
 		result = 2
 		result = 2
-	elseif ARGS[0] = 406:
+	elseif ARGS[1] = 406:
 		result = 2
 		result = 2
 
 
-	elseif ARGS[0] = 500:
+	elseif ARGS[1] = 500:
 		result = 3
 		result = 3
-	elseif ARGS[0] = 506:
+	elseif ARGS[1] = 506:
 		result = 2
 		result = 2
 
 
-	elseif ARGS[0] = 600:
+	elseif ARGS[1] = 600:
 		result = 1
 		result = 1
 
 
-	elseif ARGS[0] = 700:
+	elseif ARGS[1] = 700:
 		result = 2
 		result = 2
 
 
-	elseif ARGS[0] = 800:
+	elseif ARGS[1] = 800:
 		result = 1
 		result = 1
 
 
 	end
 	end

+ 1 - 1
locations/gad_field.qsrc

@@ -62,7 +62,7 @@ if $ARGS[0] = 'field':
 			gs 'stat'
 			gs 'stat'
 
 
 			act 'Continue': gt 'gad_field', 'field'
 			act 'Continue': gt 'gad_field', 'field'
-			act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gad_gphouse', 'grandpa'
+			act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gp_zlatek', 'talk'
 		end
 		end
 	end
 	end
 
 

+ 4 - 3
locations/gad_gpyard.qsrc

@@ -262,12 +262,13 @@ end
 
 
 if $ARGS[0] = 'chickens':
 if $ARGS[0] = 'chickens':
 	*clr & cla
 	*clr & cla
-	$loc_arg = 'chickens'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/chickens1.jpg"></center>'
-	'Ordinary chickens clucking about their pen.'
+	menu_off = 1
 	minut += 1
 	minut += 1
 	gs 'stat'
 	gs 'stat'
 
 
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/chickens1.jpg"></center>'
+	'Ordinary chickens clucking about their pen.'
+
 	act 'Leave': gt 'gad_gpyard', 'start'
 	act 'Leave': gt 'gad_gpyard', 'start'
 	!job Granny
 	!job Granny
 	if grandmaQW['chore_feed_chickens'] = 1:
 	if grandmaQW['chore_feed_chickens'] = 1: