Forráskód Böngészése

Ok, Working Version of Teleport System. Version 1

Mike Greene 5 éve
szülő
commit
e6f199d8df

+ 41 - 31
locations/MagEncounterFairy.qsrc

@@ -130,7 +130,7 @@ if $ARGS[0] = 'fairy_chat':
 			act 'Sure':
 				cla
 				fday_surprise += 1
-				fairy_surprise = RAND(1,10)
+				fairy_surprise = RAND(1,9)
 				if fairy_surprise =< 2:
 					pcs_nips += 5
 					pcs_horny += 10
@@ -176,34 +176,6 @@ if $ARGS[0] = 'fairy_chat':
 					'You hear a giggle and you feel a warm tingle at the top of your slit, you reach down and part your pussy lips with your fingers.'
 					'Your clitoris has shunk, and seems to more demure than before! You can''t help but rub all around it, feeling the warm tingling and the moisture build at the entrance.'
 				elseif fairy_surprise <= 6:
-					! Teleport
-					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.  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 step out of the circle...'
-						spellKnown['teleport'] = 1
-						gt 'gadforest', '1'
-					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.'
-
-						$tpRand[0]='GadForest'
-						$tpRand[1]='PushkinPark'
-						$tpRand[2]='Village'
-
-						gt 'treeCircle', $tpRand[rnd(0,2)]
-
-						killvar $tpRand
-					end
-				elseif fairy_surprise <= 7:
 					min_arousal += rand(1,5)
 					'You hear a giggle, then sparkles surround your body and you get all tingly.'
 					'You suddenly feel flustered and more aroused then before.'
@@ -222,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,14)
+	frandchat = rand(0,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.'
@@ -252,8 +224,46 @@ if $ARGS[0] = 'fairychattopic':
 		'You have a scary thought while talking to the fairy. Since she''s real, you ask her how many other mythical creatures are real as well. She tells you that she''s sure that there are others out there, but she usually doesn''t stray far from the park.'
 	elseif frandchat = 14:
 		'You get into a pretty heated discussion with the fairy over whether dogs or cats are better. Well, it''s mostly the fairy that gets heated. It would be a mundane discussion for anyone else, but she takes it very seriously.'
-	else
+	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."'
+			''
+			'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':
+				''
+				'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', '1'
+			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.'
+
+			$tpRand[0]='GadForest'
+			$tpRand[1]='PushkinPark'
+			$tpRand[2]='Village'
+
+			gt 'treeCircle', $tpRand[rnd(0,2)]
+
+			killvar $tpRand
+		end
 	end
 
 	act 'Go on your way': killvar 'frandchat' & gt $loc, $metka

+ 7 - 6
locations/castSpell.qsrc

@@ -1,4 +1,5 @@
 # castSpell
+
 ! Used to cast a spell
 !
 ! ARGS[0] is the spell being cast
@@ -14,15 +15,15 @@ spellMana['glamour'] = 500
 spellTime['glamour'] = 1
 spellWill['glamour'] = 15
 
-if spellKnown[ARGS[0]] = 1:
-	pcs_manna -= spellMana[ARGS[0]]
-	pcs_willpwr -= spellWill[ARGS[0]]
-	arouseVal = spellMana[ARGS[0]] / 50
+if spellKnown[$ARGS[0]] = 1:
+	pcs_manna -= spellMana[$ARGS[0]]
+	!pcs_willpwr -= spellWill[$ARGS[0]]
+	arouseVal = spellMana[$ARGS[0]] / 50
 	gs 'arousal', 'voyeur', arouseVal
 	minut -= arouseVal
-	killvar arouseVal
+	killvar 'arouseVal'
 end
 
-minut += spellTime[ARGS[0]]
+minut += spellTime[$ARGS[0]]
 
 --- castSpell ---------------------------------

+ 20 - 11
locations/treeCircActs.qsrc

@@ -1,4 +1,5 @@
 #treeCircActs
+
 ! Handles making Action Entries for Different Tree Circle Entry Points
 !	Call as a GoSub with ARGS:
 !	ARGS[0] = Location Identifier	['CentralPark']
@@ -6,20 +7,28 @@
 !	ARGS[2] = location leaving to	['park']
 !	ARGS[3] = parameter for prev	['start']
 
+if $EntryPoint = $ARGS[0]:
+	act 'Leave the circle to <<$treeCircName[$ARGS[0]]>>':
+		if $treeCircArg['<<$ARGS[0]>>'] = '':
+			gt $treeCircLoc['<<$ARGS[0]>>']
+		else:
+			gt $treeCircLoc['<<$ARGS[0]>>'], $treeCircArg['<<$ARGS[0]>>']
+		end
+	end
+else:
+	if canTeleport = 1 and tpKnown[$ARGS[0]] = 1:
+		act 'Will yourself to <<$treeCircName[$ARGS[0]]>>':
+			gs 'castSpell', 'teleport'
+			'The blur you see just outside the ring seems to shift.  You step outside the ring.'
+			wait 750
 
-if tpKnown[ARGS[0]] = 1:
-	if $EntryPoint = ARGS[0]:
-		act 'Leave the cirlce to <<ARGS[1]>>':gt ARGS[2], ARGS[3]
-	else:
-		if canTeleport = 1:
-			act 'Will yourself to <<ARGS[1]>>':
-				gs 'castSpell', 'teleport'
-				'The blur you see just outside the ring seems to shift.  You step outside the ring.'
-				wait 750
-				gt ARGS[2], ARGS[3]
+			if $treeCircArg['<<$ARGS[0]>>'] = '':
+				gt $treeCircLoc['<<$ARGS[0]>>']
+			else:
+				gt $treeCircLoc['<<$ARGS[0]>>'], $treeCircArg['<<$ARGS[0]>>']
 			end
 		end
-	end;
+	end
 end
 
 --- treeCircActs ---------------------------------

+ 45 - 16
locations/treeCircle.qsrc

@@ -1,40 +1,69 @@
 #treeCircle
+
 ! The Magical Teleport Tree Circle
 !
-! ARGS[0] is your entrance point as those listed below.  If the user doesn't have the magical ability,
+! ARGS[0] is your entrance point as those listed below.  If the user doesn''t have the magical ability,
 !		they will only be allowed to leave back from their entry point.
 
-$EntryPoint = ARGS[0]
+! Build Info Arrays for Locations
+!	treeCircName = The Pretty Name of the Location
+!	treeCircLoc  = The Location to send the user to when leaving Circle
+!	treeCircArg  = An argument to get the user to the right spot in the location.
+!Central Park Location
+$treeCircName['CentralPark'] = 'Central Park'
+$treeCircLoc['CentralPark'] = 'park'
+$treeCircArg['CentralPark'] = 'start'
+!Pavlovsk Park Location
+$treeCircName['PavlovskPark'] = 'Pavlovsk Park'
+$treeCircLoc['PavlovskPark'] = 'placer_gskver'
+$treeCircArg['PavlovskPark'] = ''
+!Gadukino Forest Location
+$treeCircName['GadForest'] = 'Gadukino Forest'
+$treeCircLoc['GadForest'] = 'gadforest'
+$treeCircArg['GadForest'] = '1'
+!Pushkin Park Location
+$treeCircName['PushkinPark'] = 'Pushkin Park'
+$treeCircLoc['PushkinPark'] = 'lug'
+$treeCircArg['PushkinPark'] = 'prut2'
+!Communal Village Spring Location
+$treeCircName['Village'] = 'Communal Village Spring'
+$treeCircLoc['Village'] = 'etoexhib'
+$treeCircArg['Village'] = 'pos6'
 
-! Learn the current entry point
-tpKnown[$EntryPoint] = 1
+$EntryPoint = $ARGS[0]
 
 *clr & cla
 
-'<center><img <<$set_imgh>> src="images/locations/shared/someimage.jpg"></center>'
+'<center><h2>Mysterious Circle of Trees</h2></center>'
+'<center><img <<$set_imgh>> src="images/locations/shared/treeCircle.jpg"></center>'
 
-'Description of Circle'
+'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.'
+''
 
 ! 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.'
+	minut += 15
 	if pcs_manna > spellMana['teleport']:
 		canTeleport = 1
-		'Instructions for concentrating on Locations'
 	else:
-		'Text for being too tired.'
+		''
+		'You feel too tired to pull off a shift right now.'
 	end
 else:
-	'Text for this circle of trees feeling important'
+	'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.'
+	minut += 15
 end
 
-! Setup Actions for locations when applicable
-gs 'treeCircActs', 'CentralPark', 'Central Park', 'park', 'start'
-gs 'treeCircActs', 'PavlovskPark', 'Pavlovsk Park', 'placer_gskver', ''
-gs 'treeCircActs', 'GadForest', 'Gadukino Forest', 'gadforest', '1'
-gs 'treeCircActs', 'PushkinPark', 'Pushkin Park', 'lug', 'prut2'
-gs 'treeCircActs', 'Village', 'Communal Village Spring', 'etoexhib', 'pos6'
+! Learn the current entry point
+tpKnown[$EntryPoint] = 1
 
-killvar canTeleport
+! Setup Actions for locations when applicable
+gs 'treeCircActs', 'CentralPark'
+gs 'treeCircActs', 'PavlovskPark'
+gs 'treeCircActs', 'GadForest'
+gs 'treeCircActs', 'PushkinPark'
+gs 'treeCircActs', 'Village'
 
 --- treeCircle ---------------------------------