Explorar el Código

[changed] Revert change that used $loc instead of $locclass to check if in a park, use $loc and $metka in park_dog location

oldentree hace 5 años
padre
commit
069c7eb3e0
Se han modificado 2 ficheros con 6 adiciones y 6 borrados
  1. 1 1
      locations/mod_bestmod.qsrc
  2. 5 5
      locations/mod_bestmod_park_dog.qsrc

+ 1 - 1
locations/mod_bestmod.qsrc

@@ -25,7 +25,7 @@ if $curloc = 'bed' and ((bm_pet_dog_rel > 10 and pcs_horny > 60) or (pcs_horny >
 
 if $loc = 'glake' and $selact = 'Go sunbathing (30 minutes)' and $clothingworntype = 'nude' and bm_beast['exp'] > 0 and rand(1,10) = 5: gt 'mod_bestmod_lake_dog', 'start'
 
-if $loc = 'park' and $metka = 'start' and (hour >= 20 or hour < 6) and menu_off = 0:
+if $locclass = 'park' and $metka = 'start' and (hour >= 20 or hour < 6) and menu_off = 0:
 	*nl
 	'You see a stray dog sniffing around some trash.'
 	act 'Go up to the stray dog': gt 'mod_bestmod_park_dog', 'start', $loc

+ 5 - 5
locations/mod_bestmod_park_dog.qsrc

@@ -14,14 +14,14 @@ if $ARGS[0] = 'start':
 
 	if bm_know_parkdog = 1:
 		'Under construction!'
-		act 'Go back to the park': gt $loc, 'start'
+		act 'Go back to the park': gt $loc, $metka
 	else
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/locations/gadukino/village/baddog.jpg"></center>'
 		'It''s a rather large dog and you''re not sure what breed it is. But you figure something that size must be hungry if it hasn''t had something to eat in a while.'
 		''
 		'"Poor thing," you think to yourself, and walk towards it. As you approach, the dog looks up. You must have scared it because it turns around as soon as it sees you, and trots off into the darkness among the trees.'
 		act 'Follow him': gt 'mod_bestmod_park_dog', 'first_follow'
-		act 'Leave him be': gt $loc, 'start'
+		act 'Leave him be': gt $loc, $metka
 	end
 end
 
@@ -38,7 +38,7 @@ if $ARGS[0] = 'first_follow':
 			'You wonder why you even followed this dog. He looks like he is comfortable where he is and you don''t even have any food to give him.'
 			'Even worse, you realize that you have no idea where you are in the park and should probably get out as soon as you can. You don''t want to be known as "that girl who got lost in the park".'
 			'You finally find your way out, but you''re not sure you could find your way back to the dog. If you ever want to go back to his den, you''ll have to run into him somewhere in the park again.'
-			act 'Go back to the park': gt $loc, 'start'
+			act 'Go back to the park': gt $loc, $metka
 		end
 	else
 		buterbrod = 0
@@ -68,13 +68,13 @@ if $ARGS[0] = 'first_follow':
 				'You don''t have another place to stay, but you also weren''t looking to spend the night out somewhere in the middle of the park.'
 				'"Sorry, boy. I can''t stay here. But I hope I see you again. I''ll be sure to bring something better than a sandwich next time, too," you say, smiling at the dog. He happily wags his tail and keeps looking at you as you walk back through the trees.'
 			end
-			act 'Go back to the park': gt $loc, 'start'
+			act 'Go back to the park': gt $loc, $metka
 		end
 		act 'Leave':
 			*clr & cla
 			'You realize that you have no idea where you are in the park and should probably get out as soon as you can. You don''t want to be known as "that girl who got lost in the park".'
 			'You finally find your way out, but you''re not sure you could find your way back to the dog. If you ever want to go back to his den, you''ll have to run into him somewhere in the park again.'
-			act 'Go back to the park': gt $loc, 'start'
+			act 'Go back to the park': gt $loc, $metka
 		end
 	end
 end