Explorar o código

[changed] made it so leaving the circle is always the last item on the list of actions when you're in the teleporting tree circle instead of it being wherever the current location is in the array of circle locations

[text edit] fixed some typos in the teleporting tree circle text
Spackled Lanturn %!s(int64=3) %!d(string=hai) anos
pai
achega
00973eb17d
Modificáronse 2 ficheiros con 23 adicións e 20 borrados
  1. 1 1
      locations/treeCircActs.qsrc
  2. 22 19
      locations/treeCircle.qsrc

+ 1 - 1
locations/treeCircActs.qsrc

@@ -5,7 +5,7 @@
 
 
 if $EntryPoint = $ARGS[0]:
-	act 'Leave the circle to <<$treeCircName[$ARGS[0]]>>':
+	act 'Leave the circle':
 		if $treeCircArg['<<$ARGS[0]>>'] = '':
 			gt $treeCircLoc['<<$ARGS[0]>>']
 		else

+ 22 - 19
locations/treeCircle.qsrc

@@ -43,13 +43,28 @@ $EntryPoint = $ARGS[0]
 '<center><h2>Mysterious Circle of Trees</h2></center>'
 '<center><img <<$set_imgh>> src="images/locations/shared/park/tree_circle.jpg"></center>'
 
-'The small clearing in the center of the tree circle is two body lengths wide.  The ground is covered with a soft, sponging moss.  Everything is surprisingly visible considering you cna barely see the sky through the overhead cover of leaves and branches.  As you look to the outside of the circle, everything seems to be vague and indistinct.  This makes it hard to comprehend what lies outside the ring.'
+'The small clearing in the center of the tree circle is two body lengths wide.  The ground is covered with a soft, spongy moss.  Everything is surprisingly visible considering you can barely see the sky through the overhead cover of leaves and branches.  As you look to the outside of the circle, everything seems to be vague and indistinct.  This makes it hard to comprehend what lies outside the ring.'
 *nl
 
+if pcs_inhib >= 30 and pcs_horny > 60:
+	act 'Masturbate to clear your head':
+		*nl
+		'<center><video autoplay loop src="images/locations/shared/park/tree_masturb.mp4"></center>'
+		*nl
+		'That''s better!'
+		$orgasm_or = 'yes'
+		gs 'arousal', 'masturbate', 15
+		gs 'arousal', 'end'
+		gs 'stat'
+		cla
+		act 'Head cleared': gt 'treeCircle', $EntryPoint
+	end
+end
+
 ! Determine if this user can teleport at all.
 canTeleport = 0
 if spellKnown['teleport'] = 1:
-	'You take the Fairy''s advice and get to know this Circle.'
+	'You take the fairy''s advice and get to know this circle.'
 	minut += 15
 	if pcs_mana > spellMana['teleport']:
 		canTeleport = 1
@@ -58,7 +73,7 @@ if spellKnown['teleport'] = 1:
 		'You feel too tired to pull off a shift right now.'
 	end
 else
-	'You can feel something strange and powerful in this place, but you can''t quite put your finger on it.  It is intriguing, though, so you take your time and loook the place over to try to understand it.'
+	'You can feel something strange and powerful in this place, but you can''t quite put your finger on it.  It is intriguing though, so you take your time and look the place over to try to understand it.'
 	minut += 15
 end
 
@@ -69,25 +84,13 @@ tpKnown[$EntryPoint] = 1
 i = 0
 :LocLoop
 if i < ARRSIZE('$tpLocations'):
-	gs 'treeCircActs', $tpLocations[i]
+	if $EntryPoint ! $tpLocations[i]:
+		gs 'treeCircActs', $tpLocations[i]
+	end
 	i += 1
 	jump 'LocLoop'
 end
 killvar 'i'
-
-if pcs_inhib >= 30 and pcs_horny > 60:
-	act 'Masturbate to clear your head.':
-		*nl
-		'<center><video autoplay loop src="images/locations/shared/park/tree_masturb.mp4"></center>'
-		*nl
-		'That''s better!'
-		$orgasm_or = 'yes'
-		gs 'arousal', 'masturbate', 15
-		gs 'arousal', 'end'
-		gs 'stat'
-		cla
-		act 'Head Cleared.': gt 'treeCircle', $EntryPoint
-	end
-end
+gs 'treeCircActs', $EntryPoint
 
 --- treeCircle ---------------------------------