Browse Source

[fixed/changed] Added an act so you will actually get the text before the Fairy teleports you if you already know the spell. Changed it such that it wont be posiible to choose to have the Fairy change you body after the text says you teleported and the Fairy flew away, and by that avoid being teleported.

bgkjdgbizgblzdgbr 2 years ago
parent
commit
10f924d340
1 changed files with 39 additions and 34 deletions
  1. 39 34
      locations/MagEncounterFairy.qsrc

+ 39 - 34
locations/MagEncounterFairy.qsrc

@@ -194,7 +194,7 @@ killvar '$din_fairy_chat_no1' & killvar '$din_fairy_shoo' & killvar '$din_fairy_
 
 if $ARGS[0] = 'fairychattopic':
 !!	These are the random chat texts for the Fairy from UsagiTripleSix
-	frandchat = rand(0,16)
+	frandchat = rand(1,16)
 
 	if frandchat = 1:
 		'You spend a while chatting with the fairy. She openly wonders why human children need to go to school, and brags about how fairies already know everything there is to know.'
@@ -227,48 +227,53 @@ if $ARGS[0] = 'fairychattopic':
 	elseif frandchat = 15:
 		'Today the fairy introduces you to fairy knock-knock jokes. She spends almost half an hour telling joke after joke, but you failed to understand a single one. By the time you''re ready to leave, she''s complaining about how humans have no sense of humor.'
 	else
-		! Teleport event
-		if spellKnown['teleport'] = 0:
-			!show and teach Teleport spell
-			'The Fairy wraps her arms around your thumb and lightly tugs you over to a mysterious circle of trees.'
-			''
-			'She says, "You may have seen these circles of trees around the lands. Fairies planted them long ago and used their magic to tether them together. Since you also have Fae magic, I can show you how to use them."'
+		killvar 'frandchat' & gt 'MagEncounterFairy', 'teleport'
+	end
+
+	act 'Go on your way': killvar 'frandchat' & gt $loc, $loc_arg
+
+end
+
+if $ARGS[0] = 'teleport':
+	! Teleport event
+	if spellKnown['teleport'] = 0:
+		!show and teach Teleport spell
+		'The Fairy wraps her arms around your thumb and lightly tugs you over to a mysterious circle of trees.'
+		''
+		'She says, "You may have seen these circles of trees around the lands. Fairies planted them long ago and used their magic to tether them together. Since you also have Fae magic, I can show you how to use them."'
+		''
+		'She continues, "Most of the work was already done in the binding. In a way, the trees of each circle are the same trees. You just have to stand inside the circle, then hold in your mind a picture of another circle that you have been to before. Then you say the word <i>inla</i>. If your will is strong enough and you have enough magical energy, your energy can be used to enact your will."'
+		''
+		'She giggles. "This lets you dance through any field you like! "Let''s go!"'
+		''
+		'She grunts and give you a nudge into the circle.'
+		act 'Stumble into Circle':
 			''
-			'She continues, "Most of the work was already done in the binding. In a way, the trees of each circle are the same trees. You just have to stand inside the circle, then hold in your mind a picture of another circle that you have been to before. Then you say the word <i>inla</i>. If your will is strong enough and you have enough magical energy, your energy can be used to enact your will."'
+			'The view outside the circle seems blurry and a little indistinct.  The Fairy''s face scrunches up in concentration as she incants "inla", and the world outside seems to shimmer a little. You feel like you understand how she did that.  Though you can''t tell exactly where you are now in the blurriness, it does look different.'
 			''
-			'She giggles. "This lets you dance through any field you like! "Let''s go!"'
+			'The Fairy says, "It''s important to take the time to feel each Fairy Ring, that''s how you can find your way back."  She flies off.'
 			''
-			'She grunts and give you a nudge into the circle.'
-			act 'Stumble into Circle':
-				''
-				'The view outside the circle seems blurry and a little indistinct.  The Fairy''s face scrunches up in concentration as she incants "inla", and the world outside seems to shimmer a little. You feel like you understand how she did that.  Though you can''t tell exactly where you are now in the blurriness, it does look different.'
-				''
-				'The Fairy says, "It''s important to take the time to feel each Fairy Ring, that''s how you can find your way back."  She flies off.'
-				''
-				'You decide it would be wise to memorize your surroundings.'
-				spellKnown['teleport'] = 1
-				tpKnown['GadForest'] = 1
-				cla
-				act 'You step out of the circle...':gt 'gadforest', 'forest_edge'
-			end
-		else
-			!take the user to random location
+			'You decide it would be wise to memorize your surroundings.'
+			spellKnown['teleport'] = 1
+			tpKnown['GadForest'] = 1
+			cla
+			act 'You step out of the circle...':gt 'gadforest', 'forest_edge'
+		end
+	else
+		!take the user to random location
 
-			'The Fairy nudges you into the nearby tree circle, and giggles as you hear her incant "inla", then flies out of the ring.'
+		'The Fairy nudges you into the nearby tree circle, and giggles as you hear her incant "inla", then flies out of the ring.'
 
-			$tpRand[0]='GadForest'
-			$tpRand[1]='PushkinPark'
-			$tpRand[2]='Village'
+		$tpRand[0]='GadForest'
+		$tpRand[1]='PushkinPark'
+		$tpRand[2]='Village'
 
-			gt 'treeCircle', $tpRand[rand(0,2)]
+		act 'See where the Fairy teleports you to': gt 'treeCircle', $tpRand[rand(0,2)]
 
-			killvar '$tpRand'
-		end
+		killvar '$tpRand'
 	end
-
-	act 'Go on your way': killvar 'frandchat' & gt $loc, $loc_arg
-
 end
 
+
 --- MagEncounterFairy ---------------------------------