Browse Source

Eliminated SiSonWork and SisGdk variables

Eliminated SiSonWork and SisGdk variables and passed parameters into the
gt 'sister' calles instead.
Thekingofsweden 9 years ago
parent
commit
4f193ede5a
6 changed files with 24 additions and 27 deletions
  1. 1 1
      locations/annafrends
  2. 1 1
      locations/annafrends2
  3. 1 1
      locations/annafrendtoilet
  4. 2 5
      locations/gdk
  5. 1 1
      locations/shop
  6. 18 18
      locations/sister

+ 1 - 1
locations/annafrends

@@ -236,6 +236,6 @@ end
 
 'Finally turned into beer cups and you also gave a plastic cup with a cold beer. Are you drunk with all beer.'
 
-act 'Further':SiSonWork = 0 & SiSgdk = 0 & gt 'annafrends2'
+act 'Further':gt 'annafrends2'
 
 --- annafrends ---------------------------------

+ 1 - 1
locations/annafrends2

@@ -26,6 +26,6 @@ if temarand = 5:''
 if temarand = 6:''
 if temarand = 7:''
 
-act 'Leave':SiSonWork = 0 & SiSgdk = 0 & gt 'gdk'
+act 'Leave':gt 'gdk'
 
 --- annafrends2 ---------------------------------

+ 1 - 1
locations/annafrendtoilet

@@ -9,6 +9,6 @@ if gennpc = 2:$annafrendname = 'Ira' & $annafrendname2 = 'Ira'
 '<center><img src="images/qwest/alter/Ev/piss.jpg"></center>'
 'You went with <<$annafrendname>> in the bushes behind the club. <<$annafrendname2>> looked around, lifted her skirt, pulled down pantyhose and squatted. Between the legs of a flood of gushing jet on the ground.'
 
-act 'Leave':SiSonWork = 0 & SiSgdk = 0 & gt 'gdk'
+act 'Leave':gt 'gdk'
 
 --- annafrendtoilet ---------------------------------

+ 2 - 5
locations/gdk

@@ -33,10 +33,7 @@ end
 if hour < 9:'<center><img src="images/etogame/dk_night.jpg"></center>'
 
 
-if week < 6:
-	if hour >= 16 and hour < 18:'Your sister <a href="exec:SiSgdk = 1 & gt ''sister''">Anja</a> sitting in the company of beautiful girls and guys drinking beer.'
-elseif week >= 6:
-	if hour >= 11 and hour < 18:'Your sister <a href="exec:SiSgdk = 1 & gt ''sister''">Anja</a> sitting in the company of beautiful girls and guys drinking beer.'
-end
+if hour >= 16 and hour < 18:'Your sister <a href="exec:gt ''sister'', ''drinking''">Anja</a> sitting in the company of beautiful girls and guys drinking beer.'
+
 
 --- gdk ---------------------------------

+ 1 - 1
locations/shop

@@ -35,7 +35,7 @@ if $shoplocation = 'main':
 	!! The store in the town and in the altstart only
 	if $loc = 'gorodok' and StoryLine = 1:
 		if week < 6 and hour >= 8 and hour < 16:
-			'Your sister <a href="exec:SiSonWork = 1 & gt ''sister''">Anja</a> sits at the checkout.'
+			'Your sister <a href="exec:gt ''sister'', ''work''">Anja</a> sits at the checkout.'
 		end
 	end
 

+ 18 - 18
locations/sister

@@ -14,16 +14,16 @@ if sister >= 80:'You have a great relationship with his sister.'
 
 if cumlip > 1 or cumface > 0 or cumfrot > 0:'Sister looks at you, "<<$name>>, what is it?" Suddenly her eyes rounded "<<$name>>, yes it''s sperm! That''s little sister, well, well. Look, if the nurse know, you do not plight."'
 
-if SiSonWork = 1:
+if $ARGS[0] = 'work':
 	!!at work
 	'<<$nickname>> does not bother me, I do not see buyers.'
 
-	act 'Move away':SiSonWork = 0 & SiSgdk = 0 & gt $loc, $metka
+	act 'Move away':gt 'shop'
 
 	exit
 end
 
-if SiSgdk = 1:
+if $ARGS[0] = 'drinking':
 	!!Outside the club with friends
 	if sister < 40:
 		'"What do you want? Wali come on!" Anja told you chuckle under her friends.'
@@ -47,11 +47,11 @@ if SiSgdk = 1:
 				'You met friends they. They are all former classmates. Little Lena and moving constantly confuses Ira High athletic guy whose name is Rex and all the red-haired skinny guy by the name Roma. After dating you sat drinking beer and chatted with friends Anja.'
 			end
 
-			act 'Move away':SiSonWork = 0 & SiSgdk = 0 & gt $loc, $metka
+			act 'Move away':gt $loc, $metka
 		end
 	end
 
-	act 'Move away':SiSonWork = 0 & SiSgdk = 0 & gt $loc, $metka
+	act 'Move away':gt $loc, $metka
 
 	exit
 end
@@ -86,7 +86,7 @@ act 'Chat':
 	if sistalkrand = 17:'Anja asks you, do not you think, that her left eyebrow much sexual rights?'
 	if sistalkrand = 18:'Anja recognizes you, that they are with friends at work sometimes make intimate pictures on the camera, and put them back in the window.'
 
-	act 'Finish':SiSonWork = 0 & SiSgdk = 0 & gt'sister'
+	act 'Finish':gt 'sister'
 end
 if trfatherQW = 0 and sister >= 30:
 	act 'Ask about the real father':
@@ -97,7 +97,7 @@ if trfatherQW = 0 and sister >= 30:
 		'<center><img src="images/qwest/alter/sister.jpg"></center>'
 		'You asked about Anja real father. She grinned. "<<$name>>. I was 4 years old when they broke up. I do not remember him and never vidila. Nurse does not like to talk details. But like with you as our real father left somewhere in another city."'
 
-		act 'Move away':SiSonWork = 0 & SiSgdk = 0 & gt $loc, $metka
+		act 'Move away':gt $loc, $metka
 	end
 end
 if sisboyQW = 0 and sister >= 40:
@@ -114,7 +114,7 @@ if sisboyQW = 0 and sister >= 40:
 		'-Awesome, Now when I found out about it, you simply must introduce me to him.'
 		'-Good sister, we hang out in the evening at the house of culture, Come, there and introduce you to them.'
 
-		act 'Finish':SiSonWork = 0 & SiSgdk = 0 & gt 'sister'
+		act 'Finish':gt 'sister'
 	end
 elseif (sisboyQW = 2 or sisboyQW = 4 or sisboyQW = 6) and sister >= 40:
 	act 'Talk about Roma':
@@ -143,7 +143,7 @@ elseif (sisboyQW = 2 or sisboyQW = 4 or sisboyQW = 6) and sister >= 40:
 			if talkrand = 9:'Anja long talks about their company, about Romkinyh friends, and asks you if you wanted to whom any of them meet.'
 			if talkrand = 10:'Anja says, what you liked Roma, and asks if he likes you.'
 
-			act 'Finish':SiSonWork = 0 & SiSgdk = 0 & gt'sister'
+			act 'Finish':gt 'sister'
 		elseif sisboyrand >= 8 and sisboyQW = 2 and sisboyday ! day:
 			'<center><b><font color = maroon>Anja</font></b></center>'
 			'<center><img src="images/qwest/alter/sisterQW/sisboyQW_01.jpg"></center>'
@@ -164,7 +164,7 @@ elseif (sisboyQW = 2 or sisboyQW = 4 or sisboyQW = 6) and sister >= 40:
 				'-Certainly sister, i understand, I will walk until late, just do not make noise loud, You do not want to destroy the psyche of our brother, hee-hee.'
 				'-You`re my best", your sister with a cry of joy hugs you.'
 
-				act 'Finish':SiSonWork = 0 & SiSgdk = 0 & gt 'sister'
+				act 'Finish':gt 'sister'
 			end
 
 			act 'No':
@@ -178,7 +178,7 @@ elseif (sisboyQW = 2 or sisboyQW = 4 or sisboyQW = 6) and sister >= 40:
 				'-Sorry Anja, I need to study in the evenings'
 				'-Oh well, Anja turned angrily away, and buried in his book.'
 
-				act 'Finish':SiSonWork = 0 & SiSgdk = 0 & gt 'sister'
+				act 'Finish':gt 'sister'
 			end
 		elseif sisboyrand >= 8 and (sisboyQW = 4 or sisboyQW = 6) and sisboyday ! day:
 			'<center><b><font color = maroon>Anja</font></b></center>'
@@ -201,7 +201,7 @@ elseif (sisboyQW = 2 or sisboyQW = 4 or sisboyQW = 6) and sister >= 40:
 				'-Certainly sister, i understand, I will walk until late, just do not make noise loud, You do not want to destroy the psyche of our brother, hee-hee.'
 				'-You`re my best", your sister with a cry of joy hugs you.'
 
-				act 'Finish':SiSonWork = 0 & SiSgdk = 0 & gt 'sister'
+				act 'Finish':gt 'sister'
 			end
 			act 'No':
 				cls
@@ -214,7 +214,7 @@ elseif (sisboyQW = 2 or sisboyQW = 4 or sisboyQW = 6) and sister >= 40:
 				'-Sorry Anja, I need to study in the evenings'
 				'-Oh well, Anja turned angrily away, and buried in his book.'
 
-				act 'Finish':SiSonWork = 0 & SiSgdk = 0 & gt 'sister'
+				act 'Finish':gt 'sister'
 			end
 		end
 	end
@@ -229,11 +229,11 @@ if sisuniQW = 0:
 		'<center><img src="images/qwest/alter/sister.jpg"></center>'
 		'You asked about Anja University. She grinned. "I almost came, gleaning points. Who scored on guys need it the whole university. What I will give this piece of paper?"'
 
-		act 'Finish':SiSonWork = 0 & SiSgdk = 0 & gt 'sister'
+		act 'Finish':gt 'sister'
 	end
 end
 
-act 'Move away':SiSonWork = 0 & SiSgdk = 0 & gt $loc, $metka
+act 'Move away':gt $loc, $metka
 if sisboyQW = 10:
 	cls
 	if sisboyQW = 10:sisboyQW = 11
@@ -245,7 +245,7 @@ if sisboyQW = 10:
 	'You blushing look at Anja, - Forgive me, I seriously started up, and did not control myself, I do not know what came over me...'
 	'-Well, I do not mind, so you sometimes so loses control..., smiled slyly, you smiled back at her...'
 
-	act 'Finish':SiSonWork = 0 & SiSgdk = 0 & gt 'sister'
+	act 'Finish':gt 'sister'
 end
 
 if ((sisboyday + 1 = day and hour > 18) or sisboyday ! day) and sisThank = 1:
@@ -261,7 +261,7 @@ if ((sisboyday + 1 = day and hour > 18) or sisboyday ! day) and sisThank = 1:
 	'-Sister, i adore you, we spent a lovely evening with Romka.'
 	'-Yes, I am glad for you, Get off of me already, strangle, Anja and happy to let you go, a kiss on the cheek'
 
-	act 'Finish':SiSonWork = 0 & SiSgdk = 0 & gt 'sister'
+	act 'Finish':gt 'sister'
 end
 
 if SisterKnowMastr = 1 and sisterQW = 0:
@@ -272,7 +272,7 @@ if SisterKnowMastr = 1 and sisterQW = 0:
 	'<center><img src="images/qwest/alter/sister.jpg"></center>'
 	'Anja looks at you and laughs "Well <<$nickname>>, and you give! I come into the room, and she''d play. Man himself Establishments, whether that."'
 
-	act 'Move away':SiSonWork = 0 & SiSgdk = 0 & gt $loc, $metka
+	act 'Move away':gt $loc, $metka
 end
 
 --- sister ---------------------------------