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

Additional functions

illumes many functional updates. Too many to list.
KevinSmarts 8 éve
szülő
commit
95779cc0e3
19 módosított fájl, 1184 hozzáadás és 597 törlés
  1. 2 4
      locations/Nord
  2. 4 0
      locations/alterStart
  3. 1 0
      locations/bedr
  4. 2 1
      locations/cikl
  5. 20 10
      locations/down
  6. 1 1
      locations/gorodok
  7. 30 13
      locations/gschool
  8. 101 98
      locations/gschool2
  9. 11 4
      locations/house
  10. 2 0
      locations/indik
  11. 8 1
      locations/korrPar
  12. 174 10
      locations/onobjsel
  13. 20 37
      locations/park
  14. 10 1
      locations/pod_ezd
  15. 18 0
      locations/show_table
  16. 125 3
      locations/spalnya
  17. 177 36
      locations/stat
  18. 51 378
      locations/street
  19. 427 0
      locations/street_event

+ 2 - 4
locations/Nord

@@ -20,6 +20,8 @@ gs 'stat'
 gs 'time'
 '<center><b>Northern region</b></center>'
 '<center><img src="images/etogame/nord.jpg"></center>'
+!call random events from [street_events], and display them before show location.
+gs'street_event','Nord' & if streetrand=-1:exit
 
 if marudatestinterface = 1:
 	!!!!!
@@ -194,9 +196,5 @@ if marudatestinterface = 0:
 end
 !!!!! End of marudatestinterface
 
-dynamic $din_street_cum
-
-if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
-
 --- Nord ---------------------------------
 

+ 4 - 0
locations/alterStart

@@ -327,6 +327,7 @@ $din_alter_start_ev15 = {
 		addobj '<img src="images/pic/icon/Proch.png">'
 		addobj '<img src="images/pic/icon/menu.png">'
 		addobj '<img src="images/pic/icon/Phone.png">'
+		kanicont = 3
 		if altQS = 1:
 			gt'altPRE','scene1'
 		else
@@ -352,6 +353,7 @@ $din_alter_start_ev15 = {
 		month = 6
 		day = 1
 		week = 5
+		kanicont = 92
 		if altQS = 1:
 			gt'altPRE','scene1'
 		else
@@ -379,6 +381,7 @@ $din_alter_start_ev = {
 		addobj '<img src="images/pic/icon/Proch.png">'
 		addobj '<img src="images/pic/icon/menu.png">'
 		addobj '<img src="images/pic/icon/Phone.png">'
+		kanicont = 3
 		if altQS = 1:
 			gt'altPRE','scene1'
 		else
@@ -401,6 +404,7 @@ $din_alter_start_ev = {
 		month = 6
 		day = 1
 		week = 5
+		kanicont = 92
 		if altQS = 1:
 			gt'altPRE','scene1'
 		else

+ 1 - 0
locations/bedr

@@ -1,6 +1,7 @@
 # bedr
 CLOSE ALL
 
+if housr ! 1:gt'street'
 $metkaM = $ARGS[0]
 $locM = $CURLOC
 $metka = $ARGS[0]

+ 2 - 1
locations/cikl

@@ -261,7 +261,7 @@ lipkoef -= 1
 !!!!!!!!!!!!
 !!!jobs!!!
 !!!!!!!!!!!!
-if isprok = 1:isprok = 0 & 'You threw away your used tampon.'
+if Enable_autotampon = 0 and isprok = 1:isprok = 0 & 'You threw away your used tampon.'
 
 if preg = 1 and pregtime < 280:
 	pregtime += 1
@@ -380,6 +380,7 @@ elseif nark > 0:
 end
 
 if pregtime > 10:fat += 1
+if kanicont > 0:kanicont -= 1 & !kanicont countdown. set and display in [stat]
 
 --- cikl ---------------------------------
 

+ 20 - 10
locations/down

@@ -27,6 +27,11 @@ gs 'time'
 '<center><b>City center</b></center>'
 '<center><img src="images/etogame/down.jpg"></center>'
 
+!call random events from [street_events], and display them before show location.
+gs'street_event','down' & if streetrand = -1:exit
+if tanwork = 1:act '<b>GO HOME</b> (Tanyas apartment)':gt 'house'
+if student > 0:act '<b>GO HOME</b> (University dorm)':gt 'dorm', 'start'
+
 if marudatestinterface = 1:
 	!!!!!
 	!!! Transportation
@@ -240,12 +245,21 @@ gs 'taxi'
 if marudatestinterface = 0:
 	if hour >= 8 and hour <= 22:'A kiosk is selling <a href="exec:dynamic $kiosksig">cigarettes</a>.'
 
-	if tanya > 0 and tanwork = 0 and hour >= 16 and hour <= 21 and tanday ! daystart:'<a href="exec:gt ''tanhouse''">Apartment where Tanya lives</a>'
-	if tanwork = 1:'<a href="exec:gt ''house''">Tanyas</a> apartment'
-	if izoldaQW >= 1:'<a href="exec:gt ''qwIzoldaApp''">Isoldes</a> apartment'
-	if mainQW >= 1:'<a href="exec:gt ''lab'', ''start''">Karinas</a> secret hideout'
-	if yaq = 1:'<a href="exec:gt ''yarik'', ''start''">Yaroslavs</a> apartment'
-	if peter > 0:'<a href="exec:gt ''peterroom'', ''start_door''">Peters</a> apartment'
+	if Enable_tablemap = 0:
+		if tanya > 0 and tanwork = 0 and hour >= 16 and hour <= 21 and tanday ! daystart:'<a href="exec:gt ''tanhouse''">Apartment where Tanya lives</a>'
+		if tanwork = 1:'<a href="exec:gt ''house''">Tanyas</a> apartment'
+		if izoldaQW >= 1:'<a href="exec:gt ''qwIzoldaApp''">Isoldes</a> apartment'
+		if mainQW >= 1:'<a href="exec:gt ''lab'', ''start''">Karinas</a> secret hideout'
+		if yaq = 1:'<a href="exec:gt ''yarik'', ''start''">Yaroslavs</a> apartment'
+		if peter > 0:'<a href="exec:gt ''peterroom'', ''start_door''">Peters</a> apartment'
+	else
+		if tanya > 0 and tanwork = 0 and hour >= 16 and hour <= 21 and tanday ! daystart:gs'show_table','<a href="exec:gt ''tanhouse''">Apartment where Tanya lives</a>','3'
+		if tanwork = 1:gs'show_table','<a href="exec:gt ''house''">Tanyas</a> apartment','3'
+		if izoldaQW >= 1:gs'show_table','<a href="exec:gt ''qwIzoldaApp''">Isoldes</a> apartment','3'
+		if mainQW >= 1:gs'show_table','<a href="exec:gt ''lab'', ''start''">Karinas</a> secret hideout','3'
+		if yaq = 1:gs'show_table','<a href="exec:gt ''yarik'', ''start''">Yaroslavs</a> apartment','3'
+		if peter > 0:gs'show_table','<a href="exec:gt ''peterroom'', ''start_door''">Peters</a> apartment','3'
+	end
 	if hour >= 4 and hour <= 23:'The <a href="exec:gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
 	if week >= 4 and hour >= 18:'The trendy <a href="exec:gt ''club'', ''start''">Nightclub</a>, with it''s shining lights, attracts young people from all over the city.'
 	if hour >= 15 or hour <= 2:'The <a href="exec:gt ''stripclub'', ''start''">Strip Clubs</a> red lights, attracting men from all over the city.'
@@ -273,9 +287,5 @@ if marudatestinterface = 0:
 end
 !!!! End of marudatestinterface
 
-dynamic $din_street_cum
-
-if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
-
 --- down ---------------------------------
 

+ 1 - 1
locations/gorodok

@@ -21,7 +21,7 @@ alkoblock = 0
 boynumBlock = 0
 !music_on = 0
 
-'<center><h4>Pavlovsky</h4></center>'
+'<center><h4>Pavlovsky<a href="exec:dynamic $objnewmenu">.</a></h4></center>'
 '<center><img src="images/etogame/gorodok.jpg"></center>'
 '<center>A quiet province town in a rural area of Russia. Population: about 10000 inhabitants.</center>'
 '<center>It has nothing in particular going for it, and looks just like all the other towns in the area. The tallest building in town is the church tower.</center>'

+ 30 - 13
locations/gschool

@@ -301,23 +301,40 @@ if hour = 16 and week < 6 and kanikuli = 0:
 		if randLina < 3:'You see Lina, Dan and Vasily leaving the school together.'
 	end
 
-	if LariskaHomeIn > 0:'<a href="exec:minut += 1 & GT ''LariskaGo''">Larissa Gruzdev</a> impatiently walks back and fourth across the courtyard, as if she''s waiting for someone.'
-	if JuliaMilLernQW >= 1:'<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milova</a> is sitting somewhere on the school courtyard, reading a book.'
-	if NatBelLernQW >= 1:'<a href="exec:minut += 1 & gt ''NatBelGo''">Natasha Belova</a> is standing in a corner.'
-	if artemLernQW >= 1 and artemVitokQW ! 2:'<a href="exec:minut += 15 & gt ''artemEv'', ''start''">Artem Chebotarev</a> is waiting for you near the school entrance.'
+	if Enable_tablemap = 0:
+		if LariskaHomeIn > 0:'<a href="exec:minut += 1 & GT ''LariskaGo''">Larissa Gruzdev</a> impatiently walks back and fourth across the courtyard, as if she''s waiting for someone.'
+		if JuliaMilLernQW >= 1:'<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milova</a> is sitting somewhere on the school courtyard, reading a book.'
+		if NatBelLernQW >= 1:'<a href="exec:minut += 1 & gt ''NatBelGo''">Natasha Belova</a> is standing in a corner.'
+		if artemLernQW >= 1 and artemVitokQW ! 2:'<a href="exec:minut += 15 & gt ''artemEv'', ''start''">Artem Chebotarev</a> is waiting for you near the school entrance.'
+
+		if katjaMeynoldday ! daystart and meynoldQW >= 2:'<a href="exec:minut += 15 & gt ''katjaEv''">Katja Meynold</a> is walking across the school courtyard, getting ready to go home.'
+		if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:
+			'<a href="exec:minut += 15 & gt ''dimaGoHome2''">Dimka Nosov</a> is deep in thought, as he leans against a lamp post.'
+		elseif DimaRudeQW > 0 and dimarudeday ! daystart and DimaRudeBlock = 0:
+			'<a href="exec:minut += 15 & gt ''dimaRudeEv''">Dimka Nosov</a> is deep in thought, as he leans against a lamp post.'
+		end
+		if IgorLoverQW > 0 and igorkruglovday ! daystart and IdorBlock = 0:'<a href="exec:minut += 15 & gt ''IgorEv''">Igor Kruglov</a> is talking to some of his friends on the courtyard.'
+		if fedorKozlovQW >= 10:'<a href="exec:minut += 15 & gt ''FedorEv''">Fedor Kozlov</a> is standing by himself, far away from the school entrance. When he sees you, he happily waves you over to him.'
+	else
+		!display friends in table if switch is on. 
+		st_count=0 & $show_table=''
+		if LariskaHomeIn > 0:gs'show_table','<a href="exec:minut += 1 & GT ''LariskaGo''">Lariska Gruzdev</a>.','5'
+		if JuliaMilLernQW >= 1:gs'show_table','<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milov</a>.','5'
+		if NatBelLernQW >= 1:gs'show_table','<a href="exec:minut += 1 & gt ''NatBelGo''">Natasha Belova</a>.','5'
+		if artemLernQW >= 1 and artemVitokQW ! 2:gs'show_table','<a href="exec:minut += 15 & gt ''artemEv'', ''start''">Artem Chebotarev</a>.','5'
+		if katjaMeynoldday ! daystart and meynoldQW >= 2:gs'show_table','<a href="exec:minut += 15 & gt ''katjaEv''">Katja Meynold</a>.','5'
+		if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:
+			gs'show_table','<a href="exec:minut += 15 & gt ''dimaGoHome2''">Dimka Nosov</a>','5'
+		elseif DimaRudeQW > 0 and dimarudeday ! daystart and DimaRudeBlock = 0:
+			gs'show_table','<a href="exec:minut += 15 & gt ''dimaRudeEv''">Dimka Nosov</a>','5'
+		end
+		if IgorLoverQW > 0 and igorkruglovday ! daystart and IdorBlock = 0:gs'show_table','<a href="exec:minut += 15 & gt ''IgorEv''">Igor Kruglov</a>.','5'
+		if st_count > 0 :'Near school yard, you see <TABLE BORDER=1><<$show_table>></TR></TABLE>'
+	end
 	if albinaCarday ! daystart:
 		!!if DanceWhore > 0 or AlbinaLast > 0 or AlbinaBlokDance > 0:'<a href="exec:minut += 15 & gt ''albinaEv''">Albina Barlovskaya</a> is sitting behind the wheel of her brand new BMW X5, waiting near the school.'
 		if AlbFrend >= 1 and albrideday ! daystart:'<a href="exec:minut += 15 & gt ''albinaRide''">Albina Barlovskaya</a> is waiting behind the wheel of a large black SUV, parked near the school.'
 	end
-
-	if katjaMeynoldday ! daystart and meynoldQW >= 2:'<a href="exec:minut += 15 & gt ''katjaEv''">Katja Meynold</a> is walking across the school courtyard, getting ready to go home.'
-	if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:
-		'<a href="exec:minut += 15 & gt ''dimaGoHome2''">Dimka Nosov</a> is deep in thought, as he leans against a lamp post.'
-	elseif DimaRudeQW > 0 and dimarudeday ! daystart and DimaRudeBlock = 0:
-		'<a href="exec:minut += 15 & gt ''dimaRudeEv''">Dimka Nosov</a> is deep in thought, as he leans against a lamp post.'
-	end
-	if IgorLoverQW > 0 and igorkruglovday ! daystart and IdorBlock = 0:'<a href="exec:minut += 15 & gt ''IgorEv''">Igor Kruglov</a> is talking to some of his friends on the courtyard.'
-	if fedorKozlovQW >= 10:'<a href="exec:minut += 15 & gt ''FedorEv''">Fedor Kozlov</a> is standing by himself, far away from the school entrance. When he sees you, he happily waves you over to him.'
 end
 
 if strelaDay ! daystart and strelaQW = 1 and hour = 16:

+ 101 - 98
locations/gschool2

@@ -524,124 +524,127 @@ $d_class_leason = {
 		$teacher[1] = 'Ilya Yenotin'
 		$teacher[2] = 'Ilya Yenotin'
 	end
-
-	act'Listen attentively to <<$teacher[1]>>':
-		cla
-		Suspeh += 1
-		if $teacher = 'Anatoly E.': grupNPC[26] += 1
-
-		if RAND(1,2) = 1:
-			$school_class_txtrand = 'You listen attentively to <<$teacher[1]>> for the duration of the class. Today''s lesson was interesting and informative, and you feel smarter for it.'
-		else
-			$school_class_txtrand = 'You listen attentively to <<$teacher[1]>> for the duration of the class. You particularly enjoy the debate section.'
-		end
-
-		act'Ask a question about the lesson':
+	if Enable_skipnoevclass > 0 and ($teacher = 'Ilya Yenotin' or RAND(1,100) > Enable_skipnoevclass):
+		dynamic $din_bigperemena & !skip class ev if 1.not Anatoly E. or 2. rand < set chance by illume
+	else
+		act'Listen attentively to <<$teacher[1]>>':
 			cla
+			Suspeh += 1
 			if $teacher = 'Anatoly E.': grupNPC[26] += 1
 
-			if RAND(1,4) = 1:
-				'You ask a question about the lesson, hoping to learn even more on the subject. Unfortunately, the constant chatter of your classmates drowns out the teacher''s answer, and you don''t catch much of it. Maybe if you didn''t sit so far towards the back of the class, it would have been easier to hear.'
-				dynamic $d_class_leason[1]
+			if RAND(1,2) = 1:
+				$school_class_txtrand = 'You listen attentively to <<$teacher[1]>> for the duration of the class. Today''s lesson was interesting and informative, and you feel smarter for it.'
 			else
-				Suspeh += 1
-				'<<$teacher>> nods approvingly, always happy to see his students engaged in his class. He happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s topics now.'
+				$school_class_txtrand = 'You listen attentively to <<$teacher[1]>> for the duration of the class. You particularly enjoy the debate section.'
 			end
-			act'Wait for the end of the lesson':dynamic $din_bigperemena
-		end
 
-		if $teacher = 'Anatoly E.' and vnesh > 15 and grupNPC[26] >= 40:
-			if grupNPC[26] >= 40 and grupNPC[26] < 60:
-				ivrand = 1
-			elseif grupNPC[26] >= 60 and grupNPC[26] < 80:
-				ivrand = RAND (1,3)
-			elseif grupNPC[26] >= 80:
-				ivrand = RAND (1,4)
-			end
-			if ivrand = 1:
-				grupNPC[26] += 1
-				if RAND(1,3) = 1:
-					$school_class_txtrand = 'Today, there''s a test about the homework you hopefully did. Anatoly E. calls you forward a lot, having you write your answers down on the board. When he asks you for the fourth time today, you begin to suspect he keeps asking you just because of how cute you look in your school uniform, and blush a little as you pick up the crayon once more.'
-				elseif RAND(1,2) = 1:
-					$school_class_txtrand = 'Today, school turns out to be quite interesting. Instead of just teaching, <<$teacher>> spends the hours engaging the students in a discussion about all sorts of topics. Whenever you say anything, he compliments the eloquent way you engage in discussion and uses you as an example for the rest of the class.'
+			act'Ask a question about the lesson':
+				cla
+				if $teacher = 'Anatoly E.': grupNPC[26] += 1
+
+				if RAND(1,4) = 1:
+					'You ask a question about the lesson, hoping to learn even more on the subject. Unfortunately, the constant chatter of your classmates drowns out the teacher''s answer, and you don''t catch much of it. Maybe if you didn''t sit so far towards the back of the class, it would have been easier to hear.'
+					dynamic $d_class_leason[1]
 				else
-					$school_class_txtrand = 'Today, you had to work hard at school. It certainly pays off though, and <<$teacher>> does his best to involve you in the lessons.'
+					Suspeh += 1
+					'<<$teacher>> nods approvingly, always happy to see his students engaged in his class. He happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s topics now.'
 				end
-			elseif ivrand = 2:
-				grupNPC[26] += 1
-				$school_class_txtrand = 'You listen closely to every word <<$teacher[1]>> says, doing your best to learn. You are however somewhat distracted by the way he keeps glancing at you when he thinks you''re not looking. You notice he keeps looking at your legs, which stick out from under your desk.'
-				dynamic $teacher_class_legs
-			elseif ivrand = 3:
-				$school_class_txtrand = '<<$teacher>> notices you appear to be stuck at one of the assignments and sits down next to you. He patiently explains to you what you are doing wrong, and slowly but surely you begin to understand.'
-				dynamic $teacher_help
-			elseif ivrand = 4:
-				grupNPC[26] += 1
-				if RAND(1,2) = 1:
-					$school_class_txtrand = 'You sit at your desk, writing a summary on today''s lesson to help you study later. Suddenly, <<$teacher>> comes up from behind you and puts his hand on your shoulder. He takes his time and patiently corrects your mistakes, leaning in a bit closer than is appropriate from a teacher. You don''t mind though, <<$teacher>> is always nice to you.'
-				else
-					$school_class_txtrand = 'As you are solving some math dilemmas in your text book, you notice <<$teacher>> walking past your table. When you hear a suspicious *click* you quickly look to your side, and see that he has his phone in his hand, and was quietly trying to make a photo of your legs from the side! He notices you looking at his hand, very embarrassed by the fact that you caught him. As he tries to walk away, you call him towards you and whisper in his ear, "Let me know next time, so I can get into a more elegant pose first..." before sending him off with a lewd wink.'
+				act'Wait for the end of the lesson':dynamic $din_bigperemena
+			end
+
+			if $teacher = 'Anatoly E.' and vnesh > 15 and grupNPC[26] >= 40:
+				if grupNPC[26] >= 40 and grupNPC[26] < 60:
+					ivrand = 1
+				elseif grupNPC[26] >= 60 and grupNPC[26] < 80:
+					ivrand = RAND (1,3)
+				elseif grupNPC[26] >= 80:
+					ivrand = RAND (1,4)
+				end
+				if ivrand = 1:
+					grupNPC[26] += 1
+					if RAND(1,3) = 1:
+						$school_class_txtrand = 'Today, there''s a test about the homework you hopefully did. Anatoly E. calls you forward a lot, having you write your answers down on the board. When he asks you for the fourth time today, you begin to suspect he keeps asking you just because of how cute you look in your school uniform, and blush a little as you pick up the crayon once more.'
+					elseif RAND(1,2) = 1:
+						$school_class_txtrand = 'Today, school turns out to be quite interesting. Instead of just teaching, <<$teacher>> spends the hours engaging the students in a discussion about all sorts of topics. Whenever you say anything, he compliments the eloquent way you engage in discussion and uses you as an example for the rest of the class.'
+					else
+						$school_class_txtrand = 'Today, you had to work hard at school. It certainly pays off though, and <<$teacher>> does his best to involve you in the lessons.'
+					end
+				elseif ivrand = 2:
+					grupNPC[26] += 1
+					$school_class_txtrand = 'You listen closely to every word <<$teacher[1]>> says, doing your best to learn. You are however somewhat distracted by the way he keeps glancing at you when he thinks you''re not looking. You notice he keeps looking at your legs, which stick out from under your desk.'
+					dynamic $teacher_class_legs
+				elseif ivrand = 3:
+					$school_class_txtrand = '<<$teacher>> notices you appear to be stuck at one of the assignments and sits down next to you. He patiently explains to you what you are doing wrong, and slowly but surely you begin to understand.'
+					dynamic $teacher_help
+				elseif ivrand = 4:
+					grupNPC[26] += 1
+					if RAND(1,2) = 1:
+						$school_class_txtrand = 'You sit at your desk, writing a summary on today''s lesson to help you study later. Suddenly, <<$teacher>> comes up from behind you and puts his hand on your shoulder. He takes his time and patiently corrects your mistakes, leaning in a bit closer than is appropriate from a teacher. You don''t mind though, <<$teacher>> is always nice to you.'
+					else
+						$school_class_txtrand = 'As you are solving some math dilemmas in your text book, you notice <<$teacher>> walking past your table. When you hear a suspicious *click* you quickly look to your side, and see that he has his phone in his hand, and was quietly trying to make a photo of your legs from the side! He notices you looking at his hand, very embarrassed by the fact that you caught him. As he tries to walk away, you call him towards you and whisper in his ear, "Let me know next time, so I can get into a more elegant pose first..." before sending him off with a lewd wink.'
+					end
 				end
 			end
+			'<<$school_class_txtrand>>'
+			act'Wait for the end of the lesson':dynamic $din_bigperemena
 		end
-		'<<$school_class_txtrand>>'
-		act'Wait for the end of the lesson':dynamic $din_bigperemena
-	end
-	act'Daydream':
-		cla
-		Suspeh -= 1
-		if RAND(1,2) = 1:
-			'Today''s lessons don''t particularly interest you, and you find yourself drifting off constantly. After a while you notice <<$teacher>> has stopped teaching and is looking at you intently, asking you to pay attention. Apparently this is already the third time he asked; you missed the first two completely when you were stuck in your own thoughts. The whole class is looking at you now.'
-			if $teacher = 'Anatoly E.' and vnesh > 15 and grupNPC[26] >= 40:
-				cla
-				if sub < 30:
-					act'Don''t pay attention':
-						cla
-						if dom > 70:
-							'<<$teacher>> tries to sell you on the importance of today, "<<$name>>, please pay attention, this is very important. Today''s topic is going to be on the exam for sure."'
-							'"Of course, sir. Please continue your super fascinating lesson. Just keep it a bit up-beat please... if you talk any slower, I might fall asleep!" you answer boldly.'
-							'The whole class bursts into loud laughter, and <<$teacher>> has a rough time getting everyone to quiet down.'
-							'"<<$surname>>, get out of class! I should call your parents, and let the principal know you''re being impossible! Out, now!"'
-							act'Don''t leave the classroom':
-								'"What good would that do? Are you trying to get me to start smoking to pass the time? I''m not interrupting your classes, just leave me alone. I''m having some... girl problems. Would you like me to talk about those?" you answer brashly, not having any intentions of getting up.'
-								'Your teacher doesn''t know what to say, and after a while just decides to continue his classes. You obviously don''t learn anything today.'
+		act'Daydream':
+			cla
+			Suspeh -= 1
+			if RAND(1,2) = 1:
+				'Today''s lessons don''t particularly interest you, and you find yourself drifting off constantly. After a while you notice <<$teacher>> has stopped teaching and is looking at you intently, asking you to pay attention. Apparently this is already the third time he asked; you missed the first two completely when you were stuck in your own thoughts. The whole class is looking at you now.'
+				if $teacher = 'Anatoly E.' and vnesh > 15 and grupNPC[26] >= 40:
+					cla
+					if sub < 30:
+						act'Don''t pay attention':
+							cla
+							if dom > 70:
+								'<<$teacher>> tries to sell you on the importance of today, "<<$name>>, please pay attention, this is very important. Today''s topic is going to be on the exam for sure."'
+								'"Of course, sir. Please continue your super fascinating lesson. Just keep it a bit up-beat please... if you talk any slower, I might fall asleep!" you answer boldly.'
+								'The whole class bursts into loud laughter, and <<$teacher>> has a rough time getting everyone to quiet down.'
+								'"<<$surname>>, get out of class! I should call your parents, and let the principal know you''re being impossible! Out, now!"'
+								act'Don''t leave the classroom':
+									'"What good would that do? Are you trying to get me to start smoking to pass the time? I''m not interrupting your classes, just leave me alone. I''m having some... girl problems. Would you like me to talk about those?" you answer brashly, not having any intentions of getting up.'
+									'Your teacher doesn''t know what to say, and after a while just decides to continue his classes. You obviously don''t learn anything today.'
+									act'Wait for the end of the lesson':dynamic $din_bigperemena
+								end
+								act'Leave the classroom':school_event_hour = day & dynamic $din_bigperemena
+								exit
+							else
+								'The eyes of <<$teacher>> grow narrower, and even though you roll your eyes at him, you sit through the rest of the lesson in silence, at least pretending to pay attention sometimes. You don''t learn anything today.'
 								act'Wait for the end of the lesson':dynamic $din_bigperemena
 							end
-							act'Leave the classroom':school_event_hour = day & dynamic $din_bigperemena
-							exit
-						else
-							'The eyes of <<$teacher>> grow narrower, and even though you roll your eyes at him, you sit through the rest of the lesson in silence, at least pretending to pay attention sometimes. You don''t learn anything today.'
-							act'Wait for the end of the lesson':dynamic $din_bigperemena
 						end
 					end
+					act'Try to focus on the lesson':
+						act'Wait for the end of the lesson':dynamic $din_bigperemena
+					end
+					exit
 				end
-				act'Try to focus on the lesson':
-					act'Wait for the end of the lesson':dynamic $din_bigperemena
-				end
-				exit
-			end
 
-			act'Wait for the end of the lesson':dynamic $din_bigperemena
-		else
-			act'Wait for the end of the lesson':dynamic $din_bigperemena
-		end
-	end
-	act'Play with your phone':
-		cla
-		Suspeh -= 1
-		if RAND(1,3) = 1:
-			$school_class_txtrand = 'This lesson is so boring, you have to do something to keep yourself entertained. You take out your phone and begin to play a mobile game, hoping the lesson will be over soon.'
-		elseif RAND(1,2) = 1:
-			$school_class_txtrand = '<<$teacher>> notices you''re not listening at all, and asks you to put your phone away. You decide not to make things worse, and put your phone back in your pocket. The lesson feels like it takes forever to end, and you''re glad when it''s finally over.'
-		else
-			$school_class_txtrand = 'This lesson is so boring, you have to do something to keep yourself entertained. You take out your phone and begin to play a mobile game, hoping the lesson will be over soon.'
+				act'Wait for the end of the lesson':dynamic $din_bigperemena
+			else
+				act'Wait for the end of the lesson':dynamic $din_bigperemena
+			end
 		end
-		if $teacher = 'Anatoly E.' and vnesh > 15 and grupNPC[26] >= 40:
+		act'Play with your phone':
 			cla
-			dynamic $d_class_phone
-		else
-			'<<$school_class_txtrand>>'
+			Suspeh -= 1
+			if RAND(1,3) = 1:
+				$school_class_txtrand = 'This lesson is so boring, you have to do something to keep yourself entertained. You take out your phone and begin to play a mobile game, hoping the lesson will be over soon.'
+			elseif RAND(1,2) = 1:
+				$school_class_txtrand = '<<$teacher>> notices you''re not listening at all, and asks you to put your phone away. You decide not to make things worse, and put your phone back in your pocket. The lesson feels like it takes forever to end, and you''re glad when it''s finally over.'
+			else
+				$school_class_txtrand = 'This lesson is so boring, you have to do something to keep yourself entertained. You take out your phone and begin to play a mobile game, hoping the lesson will be over soon.'
+			end
+			if $teacher = 'Anatoly E.' and vnesh > 15 and grupNPC[26] >= 40:
+				cla
+				dynamic $d_class_phone
+			else
+				'<<$school_class_txtrand>>'
+			end
+			act'Wait for the end of the lesson':dynamic $din_bigperemena
 		end
-		act'Wait for the end of the lesson':dynamic $din_bigperemena
 	end
 }
 

+ 11 - 4
locations/house

@@ -36,10 +36,17 @@ if nik > 30 and niksvid = 2 and hour > 12 and hour < 19 and dayrazb < daystart:g
 
 	if tanwork = 1:
 		act 'Resign':
-			tanuvol = 1
-			tanwork = 0
-			work = 0
-			gt 'down'
+			cla
+			'<font color=red>Are you Sure? You can not live here anymore.</font>'
+			act '<font color=red>Yes, quit this job</font>':
+				tanuvol = 1
+				tanwork = 0
+				work = 0
+				gt 'down'
+			end
+			act 'No, I will carry on working here':
+				gt 'house'
+			end
 		end
 	end
 

+ 2 - 0
locations/indik

@@ -5,6 +5,8 @@ else
 	i = 3
 end
 
+if Enable_statfsize > 0 and Enable_statfsize < i:i = Enable_statfsize
+
 a = ARGS[1]
 a1 = ARGS[2]
 

+ 8 - 1
locations/korrPar

@@ -47,7 +47,14 @@ end
 
 act '<font color = maroon><b>Leave the apartment and go outside</b></font>':
 	if $clothingworntype ! 'nude':
-		gt'gorodok'
+		if hour < 4 and motherWorry = 0 and age < 18:
+			'<font color=red>Are you sure? Your mother will worry if you go out at this time.</font>'
+			cla
+			act '<font color=red>Yes, go outside</font>':gt'gorodok'
+			act 'No, stay inside':gt $curloc
+		else
+			gt'gorodok'
+		end
 	else
 		msg'<b><font color = red>You need to get dressed.</font></b>'
 		gt $curloc

+ 174 - 10
locations/onobjsel

@@ -1,4 +1,5 @@
 # onobjsel
+
 $din_show_tits = {
 	view
 	view 'images/body/t<<tits>>.jpg'
@@ -431,11 +432,11 @@ $din_exhibiHideNewCloth = {
 $din_cheat_statusbars = {
 	if cheatStatusBars = 0:
 		cheatStatusBars = 1
-		dynamic $din_cheat_menu_permanent
+		dynamic $din_cheat_menu_view
 		exit
 	elseif cheatStatusBars = 1:
 		cheatStatusBars = 0
-		dynamic $din_cheat_menu_permanent
+		dynamic $din_cheat_menu_view
 	end
 }
 
@@ -603,7 +604,6 @@ $din_cheat_menu_permanent = {
 
 	pl'<center><a href="exec:dynamic $objcheat_menu"><b>Cheat menu</b></a></center>'
 	pl''
-	pl'<a href="exec:dynamic $din_cheat_statusbars">Switch to smaller status bars</a>: <<$cheatStatusBars>>'
 	pl'<a href="exec:dynamic $din_cheat_work">Disable the requirement of labor</a>: <<$cheatWork>>'
 	pl'<a href="exec:dynamic $din_cheat_hapri">Always combed</a>: <<$cheatHapri>>'
 	pl'<a href="exec:dynamic $din_cheat_klisma">Always do an enema</a>: <<$cheatKlisma>>'
@@ -626,7 +626,82 @@ $din_cheat_menu_permanent = {
 	pl''
 	pl'<a href="exec:dynamic $din_cheat_Slutshot">Slut shot: Turn off pregnancy and periods</a>: <<$cheatSlut>>'
 	pl'<a href="exec:gs ''cum_arrcheat''">OOX Debug</a>'
+	pl''
+	if Enable_autotampon = 1:
+		pl' <a href="exec:Enable_autotampon = 0 & dynamic $din_cheat_menu_permanent">Automatic cheat on Tampon: ON</a>'
+	else
+		pl' <a href="exec:Enable_autotampon = 1 & dynamic $din_cheat_menu_permanent">Automatic cheat on Tampon: OFF</a>'
+	end
+	pl''
+	!{
+	if Enable_nodream > 0:
+		pl'No dream chance: <a href="exec:Enable_nodream=input(''Enter no dream chance (%)'') & dynamic $din_cheat_menu_permanent"><<din_cheat_nodream>>%</a>, <a href="exec:din_cheat_nodream=0 & dynamic $din_cheat_menu_permanent">ON</a>'
+	else
+		pl'No dream chance: <a href="exec:Enable_nodream=input(''Enter no dream chance (%)'') & dynamic $din_cheat_menu_permanent">OFF</a>'
+	end & !1.2.3 new function, not import yet
+	}
+	if Enable_skipnoevclass > 0:
+		pl'Only allow Class event with (Anatoly E.), with chance : <a href="exec:Enable_skipnoevclass=input(''Enter event chance (%)'') & dynamic $din_cheat_menu_permanent"><<Enable_skipnoevclass>>%</a>, <a href="exec:Enable_skipnoevclass=0 & dynamic $din_cheat_menu_permanent">ON</a>'
+	else
+		pl'Only allow Class event with (Anatoly E.): <a href="exec:Enable_skipnoevclass=input(''Enter event chance (%)'') & dynamic $din_cheat_menu_permanent">OFF</a>'
+	end
+	nl
+	pl'<B>WARNING</B>:some events need cum/sweat/non-Virgin to trigger. These cheat may cause bug'
+	!{
+	if Enable_clearcum = 1:
+		pl' <a href="exec:Enable_clearcum = 0 & dynamic $din_cheat_menu_permanent">Clean cum Instantly: ON</a>'
+	else
+		pl' <a href="exec:Enable_clearcum = 1 & dynamic $din_cheat_menu_permanent">Clean cum Instantly: OFF</a>'
+	end
+	if Enable_fbreath = 1:
+		pl' <a href="exec:Enable_fbreath = 0 & dynamic $din_cheat_menu_permanent">Always breath fresh: ON</a>'
+	else
+		pl' <a href="exec:Enable_fbreath = 1 & dynamic $din_cheat_menu_permanent">Always breath fresh: OFF</a>'
+	end
+	!remove them, add later after OOx system done
+	}
+	if Enable_clearwrite = 1:
+		pl' <a href="exec:Enable_clearwrite = 0 & dynamic $din_cheat_menu_permanent">Clean body write Instantly: ON</a>'
+	else
+		pl' <a href="exec:Enable_clearwrite = 1 & dynamic $din_cheat_menu_permanent">Clean body write Instantly: OFF</a>'
+	end
+	if Enable_lockhorny > 0:
+		pl'lock Horny: <a href="exec:Enable_lockhorny=1+input(''Input Horny to lock'') & dynamic $din_cheat_menu_permanent"><<Enable_lockhorny-1>></a>, <a href="exec:Enable_lockhorny=0 & dynamic $din_cheat_menu_permanent">ON</a>'
+	else
+		pl'lock Horny: <a href="exec:Enable_lockhorny=1+input(''Input Horny to lock'') & dynamic $din_cheat_menu_permanent">OFF</a>'
+	end
+	if Enable_Hymenrestore = 1:
+		pl' <a href="exec:Enable_Hymenrestore = 0 & dynamic $din_cheat_menu_permanent">Restore Hymen Instantly: ON</a>'
+	else
+		pl' <a href="exec:Enable_Hymenrestore = 1 & dynamic $din_cheat_menu_permanent">Restore Hymen Instantly: OFF</a>'
+	end
+	if Enable_tightrestore = 1:
+		pl' <a href="exec:Enable_tightrestore = 0 & dynamic $din_cheat_menu_permanent">Tighten Instantly: ON</a>'
+	else
+		pl' <a href="exec:Enable_tightrestore = 1 & dynamic $din_cheat_menu_permanent">Tighten Instantly: OFF</a>'
+	end
+}
+ 
+$din_cheat_avatar_hair_set = {
+	$av_hair = input("Input your custom hair:")
+	if $av_hair='':exit
+	avatar_hair = 1
+	dynamic $din_cheat_menu_look
+}
+
+$din_cheat_rename = {
+	$name = input("What is your first name? (Leave blank for default)")
 
+	if $name = '':$name = 'Svetlana'
+
+	$surname = input("What is your last name? (Leave blank for default)")
+
+	if $surname = '':$surname = 'Lebedev'
+
+	!!!0.2.6 addition
+	$nickname = input("What is your nickname? (Note: If you chose a custom name, you have to enter something here!)")
+
+	if $nickname = '':$nickname = 'Sveta'
 }
 
 $din_cheat_menu_look = {
@@ -634,6 +709,19 @@ $din_cheat_menu_look = {
 	clr
 	pl'<center><a href="exec:dynamic $objcheat_menu"><b>Cheat menu</b></a></center>'
 	pl''
+	pl'<<$name>> <<$surname>> (<<$nickname>>). <a href="exec:dynamic $din_cheat_rename">Rename</a>'
+	if player_avatar = 1:
+		pl' <a href="exec:player_avatar = 0 & dynamic $din_cheat_menu_look">Custom Avatar: ON</a>'
+	else
+		pl' <a href="exec:player_avatar = 1 & dynamic $din_cheat_menu_look">Custom Avatar: OFF</a>'
+	end	
+	if avatar_hair = 1:
+		pl'<a href="exec:avatar_hair = 0 & dynamic $din_cheat_menu_look">Custom Hair: ON</a>'
+		pl'<<$av_hair>>'
+	else
+		pl'<a href="exec:dynamic $din_cheat_avatar_hair_set">Custom Hair: OFF</a>'
+	end
+	pl''
 	pl'<a href="exec:dynamic $din_cheat_menu_param">Show design parameters of body</a>'
 	pl''
 	pl'<a href=>Now you <<age>> years</a>'
@@ -949,6 +1037,13 @@ $din_cheat_menu_documents = {
 	if prava = 1:pl'You already have Driving Licence'
 }
 
+$din_cheat_input_time = {
+	inputtmp = input("Enter time with 4-digit (input 0102 for 1:02)")
+	if inputtmp/100 >= 0 and inputtmp/100 <= 23:hour = inputtmp/100
+	if inputtmp-inputtmp/100*100 >= 0 and inputtmp-inputtmp/100*100 <= 59:minut = inputtmp-inputtmp/100*100
+	dynamic $din_cheat_menu_time
+}
+
 $din_cheat_menu_time = {
 	gs'stat'
 	clr
@@ -961,6 +1056,7 @@ $din_cheat_menu_time = {
 	pl'<a href="exec:dynamic $din_cheat_menu_month">Select Month</a>'
 	pl'<a href="exec:year += 1 & dynamic $din_cheat_menu_time">+1 Year</a>'
 	pl'<a href="exec:year -= 1 & dynamic $din_cheat_menu_time">-1 Year</a>'
+	pl' <a href="exec:dynamic $din_cheat_input_time">Direct input time</a>'	
 	if hour < 10:
     if minut > 9:pl'Right now <b>0<<hour>> : <<minut>></b>'
     if minut < 10:pl'Right now <b>0<<hour>> : 0<<minut>></b>'
@@ -1093,6 +1189,60 @@ $din_cheat_dynamic = {
    dynamic $dynamicCommand
 }
 
+$din_cheat_menu_view = {
+	gs'stat'
+	clr
+	pl'<center> <a href="exec:dynamic $objcheat_menu"><b>Cheat Menu</b></a></center>'
+	nl
+	if Enable_faceturn = 1:
+		pl' <a href="exec:Enable_faceturn = 0 & dynamic $din_cheat_menu_view">Always show face: ON</a>'
+	else
+		pl' <a href="exec:Enable_faceturn = 1 & dynamic $din_cheat_menu_view">Always show face: OFF</a>'
+	end
+	nl
+	if ETOmenu = 1:
+		pl' <a href="exec:ETOmenu = 0 & dynamic $din_cheat_menu_view">Display: Text</a>'
+	else
+		pl' <a href="exec:ETOmenu = 1 & dynamic $din_cheat_menu_view">Display: Bar</a>'
+	end
+	if Enable_showattr = 1:
+		pl' <a href="exec:Enable_showattr = 0 & dynamic $din_cheat_menu_view">More attribute: ON</a>'
+	else
+		pl' <a href="exec:Enable_showattr = 1 & dynamic $din_cheat_menu_view">More attribute: OFF</a>'
+	end
+	if Enable_showskill = 1:
+		pl' <a href="exec:Enable_showskill = 0 & dynamic $din_cheat_menu_view">Show skill: ON</a>'
+	else
+		pl' <a href="exec:Enable_showskill = 1 & dynamic $din_cheat_menu_view">Show skill: OFF</a>'
+	end
+	if Enable_showrelation = 1:
+		pl' <a href="exec:Enable_showrelation = 0 & dynamic $din_cheat_menu_view">Show relations: ON</a>'
+	else
+		pl' <a href="exec:Enable_showrelation = 1 & dynamic $din_cheat_menu_view">Show relations: OFF</a>'
+	end
+	nl
+	if marudatestinterface = 1:
+		pl' <a href="exec:marudatestinterface = 0 & dynamic $din_cheat_menu_view">Map Location describe: OFF</a>'
+	else
+		pl' <a href="exec:marudatestinterface = 1 & dynamic $din_cheat_menu_view">Map Location describe: ON</a>'
+	end
+	if Enable_tablemap = 1:
+		pl' <a href="exec:Enable_tablemap = 0 & dynamic $din_cheat_menu_view">List friends in table: ON</a>'
+	else
+		pl' <a href="exec:Enable_tablemap = 1 & dynamic $din_cheat_menu_view">List friends in table: OFF</a>'
+	end
+	nl
+	if Enable_statfsize<0:Enable_statfsize=0
+	if Enable_statfsize > 0:
+		pl'Set Fontsize for Status: <a href="exec:Enable_statfsize=input(''Enter Fontsize'') & dynamic $din_cheat_menu_view"><<Enable_statfsize>></a>, <a href="exec:Enable_statfsize=0 & dynamic $din_cheat_menu_view">ON</a>'
+	else
+		pl'Set Fontsize for Status: <a href="exec:Enable_statfsize=input(''Enter fontsize'') & dynamic $din_cheat_menu_view">OFF</a>'
+	end
+	if cheatStatusBars = 0:$cheatStatusBars = 'OFF'
+	if cheatStatusBars = 1:$cheatStatusBars = '<b>ON</b>'
+	pl'<a href="exec:dynamic $din_cheat_statusbars">Switch to smaller status bars</a>: <<$cheatStatusBars>>'
+}
+
 $objcheat_menu = {
 	gs'stat'
 	clr
@@ -1104,17 +1254,28 @@ $objcheat_menu = {
 	pl'<a href="exec:dynamic $din_cheat_menu_reputation"><b>Relationships and Reputation</b></a>'
 	pl'<a href="exec:dynamic $din_cheat_menu_documents"><b>Documents</b></a>'
 	pl'<a href="exec:dynamic $din_cheat_menu_time"><b>Manipulating time</b></a>'
+	pl'<a href="exec:dynamic $din_cheat_menu_view"><b>Status Display</b></a>'
 	if StoryLine = 0:pl'<a href="exec:dynamic $din_cheat_menu_magic"><b>Magic</b></a>'
 	pl''
 	pl'<a href="exec:health = vital*10 + stren*5+1000 & willpower = intel*5 + will*5+1000 & manna = (intel*magik) + magik*100 + vital*10 + rikudo & vgape = 0 & agape = 0 & nippain = 0 & dynamic $objcheat_menu">Full restoration of health, manna, Reason.</a>'
 	pl'<a href="exec:dynamic $din_cheat_money">Change money</a>'
 	pl'<a href="exec:money = 0 & dynamic $din_cheat">Zero money</a>'
 	nl
+	if Enable_nogameover = 1:
+		pl' <a href="exec:Enable_nogameover = 0 & dynamic $objcheat_menu">Prevent Non-Drama GAMEOVER: ON</a>'
+	else
+		pl' <a href="exec:Enable_nogameover = 1 & dynamic $objcheat_menu">Prevent Non-Drama GAMEOVER: OFF</a>'
+	end
+	nl
+	if sound = 1:
+		pl' <a href="exec:sound = 0 & dynamic $objcheat_menu">Music: OFF</a>'
+	else
+		pl' <a href="exec:sound = 1 & dynamic $objcheat_menu">Music: ON</a>'
+	end
+	pl' <a href="exec:music_on = 0 & music_off = 1">Stop current Music</a>'
+	nl
 	pl '<a href="exec:dynamic $din_cheat_dynamic">Dynamic Input Command</a>'
 	nl
-	if cheatStatusBars = 0:$cheatStatusBars = 'OFF'
-	if cheatStatusBars = 1:$cheatStatusBars = '<b>ON</b>'
-	pl
    	pl'<a href="exec:gt''gorodok''">Teleport to Pavlovsky</a>'
    	pl'<a href="exec:gt''street''">Teleport to City</a>'
    	pl'<a href="exec:gt''gadukino''">Teleport to Gadukino</a>'
@@ -1488,13 +1649,16 @@ $objbloknot = {
 }
 
 $objavariya = {
-	'<center><b>YOU JUST had to use emergency shutdown of Bagan BLANK SCREEN</b></center>'
+	'<center><b>YOU JUST had to use emergency exit, this is only for use when you get a BLANK SCREEN.</b></center>'
+	*nl
+	'<center><b>DO NOT use this option without a good reason, doing so can cause instability and could damage your save game.</b></center>'
 	*nl
-	'<center><b>DO NOT use this option without a good reason, Can cause failure that destroyed your saved</b></center>'
+	'<center><b>If this was the result of a bug in the game, then please report the issue and when / how it was trigger with as much info as you can on the tfgamesite.com forum.</b></center>'
 	*nl
 
-	if StoryLine = 1:gt'gorodok'
-	gt'street'
+	cla
+	if StoryLine = 1:act 'Go to Pavlovsk':gt'gorodok'
+	act 'Go to the street':gt'street'
 }
 
 $objnewmenu = {

+ 20 - 37
locations/park

@@ -1,8 +1,11 @@
 # park
 if $ARGS[0] = 'start':
-	cla
-	*clr
 	CLOSE ALL
+
+	$metka = $ARGS[0]
+	$loc = $CURLOC
+	$metkaM = $ARGS[0]
+	$locM = $CURLOC
 	if sound = 0:
 		if month >=11 and month <= 12 or month >=1 and month <=3:
 			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/zima.mp3',30
@@ -26,22 +29,21 @@ if $ARGS[0] = 'start':
 
 	$sexloc = $CURLOC
 	
-	if WalkInsidePark = 0:
-		WalkInsidePark = 1
-	end
-	minut += 30
-	clr
+	if WalkInsidePark = 0:WalkInsidePark = 1
+	cls
 	gs 'stat'
 	gs 'time'
 	'<center><b><font color="maroon">Park</font></b></center>'
 	'<center><img src="images/etogame/park.jpg"></center>'
-	'The central park is huge, sandy paths go into all directions and ever so often you''ll find a bench to sit on. In the summer you''ll see a lot people playing ball, relax or have a picnic in the more open areas, while in the winter you''ll meet families with their children sledding down the humps.'
-	'Despite it''s almost paradise-like appearence, the park can be very dangerous once the sun goes down.'
+	'The central park is huge, sandy paths spread out in every direction and every so often you''ll find a bench to sit on. In the summer you''ll see a lot people playing ball, relaxing or have a picnic in the more open areas, while in the winter you''ll meet families with their children sledding down the grass banks.'
+	'Despite it''s almost paradise-like appearance, the park can be very dangerous once the sun goes down.'
 	''
-	'There is a sign that points into general direction of the <a href="exec:minut += 47 & gt ''down''">City Center</a>. You estimate the walk to the city center would take about 40 to 50 minutes.'
-	'The second sign points into the direction of the <a href="exec:minut += 20 & gt ''street''">Residential Area</a>. If you have to guess, the walk to the residential are should take about 20 minutes.'
-	'The third sign says <a href="exec:minut += 60 & gt ''Nord''">Northern District</a> on it and points north, you suppose. You know the Northern District is rather far away from here, you estimate taht a walk would take almost one hour'
+	'There is a sign that points into general direction of the city center. You estimate the walk to the city center would take 45 minutes.'
+	'The second sign points into the direction of the residential area. If you have to guess, the walk to the residential are should take 20 minutes.'
+	'The third sign says northern district on it. You know the Northern District is rather far away from here, you estimate that the walk would take an hour.'
 	''
+	'You could spend an hour <a href="exec:minut += 60 & gt ''parkdin''">walking in the park</a>.'
+	if hour >= 10 and hour <= 22:'The small café in the park is open, you could <a href="exec:minut += 30 & gt ''ParkKafe'', ''food''">sit there and have some food</a> (30 minutes).'
 
 	if SNarkPriton = 0:'Near one of the shops roll <a href="exec:dynamic $torchki">junkies</a>.'
 
@@ -63,29 +65,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	act 'Leave the park':
-		cla
-		minut += 30
-		gt 'street'
-	end
-
-	if hour >= 10 and hour <= 22:
-		act 'Sit in a Café':
-			cla
-			*clr
-			minut += 30
-			gt 'ParkKafe', 'food'
-		end
-	end
-
-	act 'Walk in the park (1:00)':
-		cla
-		minut += 60
-		gt 'parkdin'
-	end
-
-	
-	act 'Sit on the bench':
+	act 'Sit on a bench':
 		cla
 		*clr
 		'<center><img src="images/lmps/сидит.jpg"></center>'
@@ -189,6 +169,9 @@ if $ARGS[0] = 'start':
 
 	act 'Go to the highway near the park':gt 'park', 'whore'
 	act 'Go to the fair':gt 'park', 'luna'
+	act 'Go to the Residential Area':minut += 20 & gt 'street'
+	act 'Go to the City center':minut += 45 & gt 'down'
+	act 'Go to the Northern region':minut += 60 & gt 'Nord'
 end
 
 if $ARGS[0] = 'luna':
@@ -667,9 +650,9 @@ if $ARGS[0] = 'rape1':
 			*clr
 			bj += 1
 			spafinloc = 12
-gs 'cum_manage'
+			gs 'cum_manage'
 			spafinloc = 11
-gs 'cum_manage'
+			gs 'cum_manage'
 			SUB += 5
 			'<center><img src="images/img/spaln/cum.jpg"></center>'
 			'"Give me a blowjob and you''ll get your reward for not resisting, woman.", he tells you. You nod obidiently and move on your knees and begin to give him head. It doesn''t take long for him to groan out in pleasure, "You better swallow it all, slut!" Shortly after that you can taste his hot cum inside your mouth and you swallow every drip of it, somehow enjoying the taste. Then he stand up, buttons up his pants and takes your money. While you were still liking your fingers clean from any drips of cum, he smiles and says to you, "Have a nice day slut."'

+ 10 - 1
locations/pod_ezd

@@ -1109,7 +1109,16 @@ if $ARGS[0] = 'etaj_1':
 		
 	     'Residents of the home: <a href="exec: dynamic $housemates">read</a>'
 		'Hanging Ads: <a href="exec:GT ''pod_ezd'',''pod_objava''">read</a>'
-	act '<font color = maroon><b>To go out</b></font>': gt'gorodok'     
+	act '<font color = maroon><b>To go out</b></font>':
+		if hour < 4 and motherWorry = 0 and age < 18:
+			'<font color=red>Are you sure? Your mother will worry if you go out at this time.</font>'
+			cla
+			act '<font color=red>Yes, go outside</font>':gt'gorodok'
+			act 'No, stay inside':gt $curloc
+		else
+			gt'gorodok'
+		end	
+	end    
 	if ArtemBeInHome > 0 and artemblok = 0: 
 		act 'Apartment number2 Artem Chebotarev': CLOSE ALL & gt'artemhome'
 	end

+ 18 - 0
locations/show_table

@@ -0,0 +1,18 @@
+# show_table
+!{show table v2, by illume
+	this function will push $args[0] into $show_table with $args[1] column, min=1, and  count by st_count
+
+	st_count=0 & $show_table=''
+		if kat > 0:gs'show_table','Kate <<kat>>','2'
+		if vika > 0:gs'show_table','Vika <<vika>>','2'
+		......
+	if st_count > 0 :pl 'Relations:<BR><TABLE BORDER=1><<$show_table>></TR></TABLE>'
+}
+if $ARGS[1] <1 : $ARGS[1] =1
+if st_count-st_count/$ARGS[1]*$ARGS[1]=0:$show_table += "<TR>"
+$show_table += "<TD><<$ARGS[0]>></TD>"
+if st_count-st_count/$ARGS[1]*$ARGS[1]+1=$ARGS[1]:$show_table += "</TR>"
+st_count+=1
+
+--- show_table ---------------------------------
+

+ 125 - 3
locations/spalnya

@@ -11,9 +11,71 @@ tanhouse1 = 1
 gs 'stat'
 '<center><b>Bedroom</b></center>'
 '<center><img src="images/img/centr/spaln.jpg"></center>'
-'There is  a <a href="exec:gt ''bed'', ''start''">double bed</a> and an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>.'
-'Also, a plain <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">wardrobe</a> standing against the wall, bestide which stands a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> on it.'
-if komp = 1:'You can use your <a href="exec:gt ''Komp'', ''start''">Computer</a> here.'
+
+'The room is a very good size, there is  a <a href="exec:gt ''bed'', ''start''">double bed</a> and an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>.'
+'Also, an expensive <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">wardrobe</a> standing against a wall, bestide which stands a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> on it.'
+if komp = 1:
+	$komp = ' with your <a href="exec:gt ''Komp'', ''start''">laptop</a> on it'
+else
+	$komp = ''
+end
+'A luxury <a href="exec:gt ''divan'', ''start''">a leather sofa</a> against a wall. Mounted on the wall opposite the sofa is a huge plasma <a href="exec:gt ''TV'', ''start''">TV</a>. Under the window is a new <a href="exec:gt ''stol'', ''start''">desk</a><<$komp>>.'
++if obruch > 0:'<br>A hula hoop stands in corner of the room. '
++if skak > 0:'A jump rope is on a shelf. '
++if bookYog > 0:'A yoga mat is rolled up in a corner. '
+
+if mishka > 0:'On a shelf is <<mishka>> teddy bear'
+
+sports = 0
+$sportStringPrefix = ''
+
+if obruch > 0 and obruchday ! daystart:
+	$sitrobr = $sportStringPrefix + ' <a href="exec:dynamic $sitrobrd">twist hoop</a>'
+	sports = 1
+	$sportStringPrefix = ', '
+else
+	$sitrobr = ''
+end
+
+if bookYog > 0 and bookYogday ! daystart:
+	$sitryog = $sportStringPrefix + ' <a href="exec:dynamic $sitryogd">meditation</a>'
+	sports = 1
+	$sportStringPrefix = ', '
+else
+	$sitryog = ''
+end
+
+if skak > 0 and skakday ! daystart:
+	$sitrskak = $sportStringPrefix + ' <a href="exec:dynamic $sitrskakd">jumping rope</a>'
+	sports = 1
+	$sportStringPrefix = ', '
+else
+	$sitrskak = ''
+end
+
+if pressday ! daystart:
+	$sitrpress = $sportStringPrefix + ' <a href="exec:dynamic $sitrpressd">abdominal exercises</a>'
+	sports = 1
+	$sportStringPrefix = ', '
+else
+	$sitrpress = ''
+end
+
+if pushday ! daystart:
+	$sitrpush = ' <a href="exec:dynamic $sitrpushd">push-ups</a>'
+	sports = 1
+	$sportStringPrefix = ', '
+else
+	$sitrpush = ''
+end
+
+
+if sports = 1:
+	$sportsitr = '<<$sitrpush>><<$sitrpress>><<$sitrskak>><<$sitrobr>><<$sitr_tread>><<$sitryog>>'
+	'The room has enough space for a variety of sporting activities:<<$sportsitr>>.'
+end
+
+if suhbelo2 > 0:'<br>Lying on the table are <<suhbelo2>> pieces of dried laundry, that need <a href="exec:dynamic $gladbelo">to be ironed</a>.'
 
 act 'Goto the corridor':
 	if $clothingworntype ! 'nude':
@@ -49,7 +111,67 @@ if student > 0 and kursovik < 100:
 		act 'Finish':gt 'spalnya'
 	end
 end
+if magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt'tobiQW','start'
+
+if sick >= 1:
+	act 'Get some bed rest (illness)':
+		cla
+		*clr
+		minut += 240
+		sick -= 1
+		if sick < 0:sick = 0
+		gs'stat'
 
+		'<center><img src="images/inBed/sick+rand(11,17)+.jpg"></center>'
+
+		'You lie in bed, coughing, sneezing and blowing your nose'
+ 
+		act 'Get up': gt 'bedr'
+	end
+end
+
+if horny >= 50:
+	act 'Masturbate':
+		gt'selfplay'
+	end
+end
+
+if pornMagazine > 0:'Under your mattress you hide a porn magazine.' & dynamic $d_read_porn
+
+if tanga = 0 and clrbelo > 0:
+	act 'Wear underwear':
+		cla
+		tanga = 1
+		gt'spalnya'
+	end
+else
+	act 'Remove underwear':
+		cla
+		tanga = 0
+		gt'spalnya'
+	end
+end
+
+if dur > 0:'You have hidden <<dur>> doses pale lady'
+
+if dur > 0 and narkday ! daystart:
+	act 'Take some coke (0:05)':
+		cla
+		*clr
+		minut += 5
+		narkday = daystart
+		health = vital * 10 + stren * 5
+		willpower = intel * 5 + will * 5
+		manna = (intel * magik) + magik * 100 + vital * 10 + rikudo
+		horny = 100
+		nark += 10
+		dur -= 1
+		'<center><img src="images/etogame/dur.jpg"></center>'
+		'You take a small dose of coke and not long after you just start to feel great.'
+
+		act 'Leave':gt $curloc
+	end
+end
 
 --- spalnya ---------------------------------
 

+ 177 - 36
locations/stat

@@ -390,10 +390,20 @@ if SUB >= DOM and DOM > 0:SUB = SUB - DOM & DOM = 0
 if DOM >= SUB and SUB > 0:DOM = DOM - SUB & SUB = 0
 
 if horny < 0:horny = 0
-if health > vital * 10 + stren * 5:health = vital * 10 + stren * 5
-if willpower > intel * 5 + will * 5:willpower = intel * 5 + will * 5
-if manna > (intel * magik) + magik * 100 + vital * 10 + rikudo:manna = intel * magik + magik * 100 + vital * 10 + rikudo
+healthmax = (vital*10 + stren*5)
+willpowermax = (intel*5 + will*5)
 mannamax = (intel * magik) + magik * 100 + vital * 10 + rikudo
+if healthmax < 1:healthmax = 1
+if willpowermax < 1:willpowermax = 1
+if mannamax < 1:mannamax = 1
+!pre-calc max value for later display
+if fairycurse >= daystart: horny = 90
+if Enable_lockhorny > 0:horny = Enable_lockhorny - 1
+if horny < 0:horny = 0
+if health > healthmax:health = healthmax
+if willpower > willpowermax:willpower = willpowermax
+if manna > mannamax:manna = mannamax
+
 !!musle = strenbuf + vitalbuf
 
 !!!!!!!!!!!
@@ -835,7 +845,7 @@ end
 
 if sdaday = day and sdamonth = month and housr = 0:
 	housr = 1
-	'<b><font color="red">The term of your residental apartment lease expired.</font></b>'
+	'<b><font color="red">Your tenants have moved out and your apartment is now vacant.</font></b>' & msg 'Your tenants have moved out and your apartment is now vacant.'
 end
 
 if month = 1 or month = 3 or month = 5 or month = 7 or month = 8 or month = 10 or month = 12:
@@ -1080,9 +1090,14 @@ if energy < 0:
 		vital -= 1
 		energy += 2
 	elseif fat = 0 and stren + vital <= 0:
-		over = 3
-		gt 'gameover'
-		exit
+		if Enable_nogameover = 0 :
+			over = 3
+			gt'gameover'
+			exit
+		else
+			pl '<font color=red><B>You starved to death, but Cheat Mode keeps you Alive.</B></font>'
+			fat = 1
+		end
 	elseif fat > 0:
 		fat -= 1
 		energy += 2
@@ -1103,15 +1118,31 @@ if manna <= 0:
 end
 
 if health < 0:
-	over = 1
-	gt 'gameover'
-	exit
+	if Enable_nogameover = 0 :
+		over = 1
+		gt'gameover'
+		exit & !nogameover by illume
+	else
+		pl '<font color=red><B>You died from injuries, but Cheat Mode keeps you Alive.</B></font>'
+		health = 0
+	end
 end
 
-if willpower < 0 and StoryLine = 0:
-	over = 2
-	gt 'gameover'
-	exit
+if willpower < 0 and mana = 1:
+	if manna < 1:
+		if Enable_nogameover = 0 :
+			if StoryLine = 0:
+				over = 2
+			else
+				over = 10
+			end
+			gt'gameover'
+			exit & !nogameover by illume
+		else
+			pl '<font color=red><B>You are insane, but Cheat Mode keeps you Alive.</B></font>'
+		end
+	end
+	willpower = 0
 end
 
 if saloonce = 0 and opPRE = 0:
@@ -1137,37 +1168,37 @@ end
 
 gs 'body'
 !!!!!!!!!!!!!
-if health >= vital * 10 + stren * 5:
+if health >= healthmax:
 	$health = '<font color="green">You are very healthy.</font>'
-elseif health >= (vital * 10 + stren * 5) * 75 / 100:
+elseif health >= healthmax * 75 / 100:
 	$health = '<font color="blue">You are healthy.</font>'
-elseif health >= (vital * 10 + stren * 5) * 50 / 100:
-	$health = '<font color="brown">you are not healthy.</font>'
-elseif health >= (vital * 10 + stren * 5) * 25 / 100:
+elseif health >= healthmax * 50 / 100:
+	$health = '<font color="brown">You are not healthy.</font>'
+elseif health >= healthmax * 25 / 100:
 	$health = '<font color="red">You are sick.</font>'
 else
 	$health = '<font color="red">You are on the verge of death.'
 end
 
-if willpower >= intel * 5 + will * 5:
+if willpower >= willpowermax:
 	$willpower = '<font color="green">Your mind is clear.</font>'
-elseif willpower >= (intel * 5 + will * 5) * 75 / 100:
-	$willpower = '<font color="blue">You are mostly in thought.</font>'
-elseif willpower >= (intel * 5 + will * 5) * 50 / 100:
+elseif willpower >= willpowermax * 75 / 100:
+	$willpower = '<font color="blue">You are mostly clear of mind.</font>'
+elseif willpower >= willpowermax * 50 / 100:
 	$willpower = '<font color="brown">You are depressed.</font>'
-elseif willpower >= (intel * 5 + will * 5) * 25 / 100:
+elseif willpower >= willpowermax * 25 / 100:
 	$willpower = '<font color="red">You have depression.</font>'
 else
 	$willpower = '<font color="red">You are on the verge of madness.</font>'
 end
 
-if manna >= intel * magik + magik * 100 + vital * 10 + rikudo:
+if manna >= mannamax:
 	$manna = '<font color="green">You are in a good mood.</font>'
-elseif manna >= (intel * magik + magik * 100 + vital * 10 + rikudo) * 75 / 100:
+elseif manna >= mannamax * 75 / 100:
 	$manna = '<font color="blue">You have a normal mood.</font>'
-elseif manna >= (intel * magik + magik * 100 + vital * 10 + rikudo) * 50 / 100:
+elseif manna >= mannamax * 50 / 100:
 	$manna = '<font color="brown">You are in a bad mood.</font>'
-elseif manna >= (intel * magik + magik * 100 + vital * 10 + rikudo) * 25 / 100:
+elseif manna >= mannamax * 25 / 100:
 	$manna = '<font color="red">You are in a terrible mood.</font>'
 else
 	$manna = '<font color="red">Your mood is stuck in the gutter.</font>'
@@ -1214,15 +1245,15 @@ $holyday = ''
 kanikuli = 0
 
 if (month = 10 and day >= 27) or (month = 11 and day <= 4):
-	$holyday = '<b>Autumn holidays.</b>'
+	$holyday = '<b>Autumn holidays</b>'
 	kanikuli = 1
 	if month = 11 and day = 4:$holyday += ' <b>Back to school tomorrow.</b>'
 elseif (month = 12 and day >= 29) or (month = 1 and day <= 13):
-	$holyday = '<b>Winter Break.</b>'
+	$holyday = '<b>Winter Break</b>'
 	kanikuli = 2
 	if month = 1 and day = 13:$holyday += ' <b>Back to school tomorrow.</b>'
 elseif (month = 3 and day >= 25):
-	$holyday = '<b>Spring Break.</b>'
+	$holyday = '<b>Spring Break</b>'
 	kanikuli = 3
 	if month = 3 and day = 25:$holyday += ' <b>Back to school tomorrow.</b>'
 elseif (month = 5 and day >= 25) or month = 6 or month = 7 or month = 8:
@@ -1230,7 +1261,7 @@ elseif (month = 5 and day >= 25) or month = 6 or month = 7 or month = 8:
 		$holyday = '<b>Your graduation is today. Be there by 8h.</b>'
 		kanikuli = 6
 	else
-		$holyday = '<b>Summer holidays.</b>'
+		$holyday = '<b>Summer holidays</b>'
 		kanikuli = 4
 	end
 	if month = 8 and day = 31:$holyday += ' <b>Back to school tomorrow.</b>'
@@ -1239,6 +1270,16 @@ elseif month = 1 and day = 1:
 	kanikuli = 5
 end
 
+if kanikuli ! 6 and kanikuli > 0 and kanicont = 0:
+!holiday countdown by illume. countdown in [cikl], summer vacation pre-set in [startalt]
+    if kanikuli = 1:kanicont = 9
+    if kanikuli = 2:kanicont = 16
+	if kanikuli = 3:kanicont = 7
+	if kanikuli = 4:kanicont = 99
+end
+
+if kanikuli > 0 and kanikuli <5:$holyday += ', <<kanicont>> days left.</b>'
+
 if hour >= 8 and hour < 16 and week < 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0 and schoolProgulDay ! daystart:
 	!!absence from school
 	schoolprogul += 1
@@ -1251,10 +1292,14 @@ if workFabrika = 1 and week => 1 and week <= 5 and hour > 8 and age => 16 and ag
 	FabrikaProgulDay = day
 end
 
+if insleep ! 0:exit &!no need to display status in sleep. skip them to improve performance by illume
+
 !!!!!!!!!!!!!!!!!!!!!
 !!!Beginning Description!!!
 !!!!!!!!!!!!!!!!!!!!!
 
+if Enable_statfsize>0:pl'<font size=<<Enable_statfsize>>>'
+
 if hour < 10:
 	if minut > 9 :
 		pl '<b> 0<<hour>>:<<minut>></b> <<$week>> <<day>> <<$mons>> <<year>>'
@@ -1275,8 +1320,6 @@ if karta > 0:pl '<b><<karta>></b> rubles in your bank account.'
 if stolmoney > 0:pl '<b><<stolmoney>></b> rubles in your table drawer.'
 pl
 
-if fairycurse >= daystart: horny = 90
-
 if ETOmenu = 1:
 	pl '<b><<$health>></b>'
 	pl '<b><<$willpower>></b>'
@@ -1287,11 +1330,9 @@ else
 	gs 'indik', '2', horny, horny
 	pl '<<$ind>> Arousal'
 
-	healthmax = (vital * 10 + stren * 5)
 	gs 'indik', '1', health * 100 / healthmax, health
 	pl '<<$ind>> Health'
 
-	willpowermax = intel * 5 + will * 5
 	gs 'indik', '1', willpower * 100 / willpowermax, willpower
 	pl '<<$ind>> Willpower'
 
@@ -1313,6 +1354,89 @@ else
 end
 pl
 
+if Enable_showattr = 1:	
+	gs 'indik', '1',stren , stren
+	pl '<<$ind>> Power'
+	gs'indik','1',speed,speed
+	pl '<<$ind>> Speed'		
+	gs'indik','1',agil,agil
+	pl '<<$ind>> Agility'	
+	gs'indik','1',vital,vital
+	pl '<<$ind>> Endurance'	
+	gs'indik','1',intel,intel
+	pl '<<$ind>> Intelligence'	
+	gs'indik','1',will,will
+	pl '<<$ind>> Willpower'		
+	gs'indik','1',react,react
+	pl '<<$ind>> Reaction'
+	gs'indik','1',vnesh,vnesh
+	pl '<<$ind>> Attractiveness'
+	if SUB > 0:
+			gs'indik','1',SUB,SUB
+		pl '<<$ind>> Subordination'
+	end
+	if DOM > 0:
+			gs'indik','1',DOM,DOM
+		pl '<<$ind>> Dominance'
+	end	
+	if SchoolAtestat = 0 and StoryLine > 0:	
+			gs'indik','1',Suspeh,Suspeh
+		pl '<<$ind>> School Grades'	
+	end
+	if exhibi > 0:
+		gs'indik','1',exhibi*25,exhibi & !max at [dina], exhibi>=4
+		pl '<<$ind>> exhibitionism'
+	end	
+end
+
+if Enable_showskill = 1:
+	st_count=0
+	$show_table=''
+	if workPTU > 1:gs'show_table','<<teachlevel>> Teacher credibility','2'
+	if magik > 0:gs'show_table','<<magik>> Magic','2'
+	if Jab > 0:gs'show_table','<<Jab>> Jab','2'
+	if Punch > 0:gs'show_table','<<Punch>> Power Strikes','2'
+	if Kik > 0:gs'show_table','<<Kik>> Kicks','2'
+	if KikDef > 0:gs'show_table','<<KikDef>> Protection','2'
+	if beg > 0:gs'show_table','<<beg>> Running','2'
+	if volleyboll > 0:gs'show_table','<<volleyboll>> Volleyball','2'
+	if oficiant > 0:gs'show_table','<<oficiant>> Waitress','2'
+	if vokal > 0:gs'show_table','<<vokal>> Vocal','2'
+	if dance > 0:gs'show_table','<<dance>> Dancing','2'
+	if dancePRO > 0:gs'show_table','<<dancePRO>> Regular dancing','2'
+	if stripdance > 0:gs'show_table','<<stripdance>> Striptease','2'
+	if poledance > 0:gs'show_table','<<poledance>> Poledancing','2'
+	if shoot > 0:gs'show_table','<<shoot>> Shooting','2'
+	if poSkill > 0:gs'show_table','<<poSkill>> tailor','2'
+	if chess > 0:gs'show_table','<<chess>> Chess','2'
+	if mutagenP > 0: gs'show_table','<<mutagenP>> Mutagen strength ','2'
+	if mutagenV > 0: gs'show_table','<<mutagenV>> Mutagen endurance','2'
+	if mutagenA > 0: gs'show_table','<<mutagenA>> Mutagen Agility','2'
+	if st_count > 0 :pl 'Skills: <TABLE BORDER=1><<$show_table>></TR></TABLE>'
+end
+if Enable_showrelation = 1:
+	st_count=0
+	$show_table=''
+	if StoryLine > 0:	
+		if mother > 0:gs'show_table','<<mother>> Mother','2'
+		if father > 0:gs'show_table','<<father>> Father','2'
+		if brother > 0:gs'show_table','<<brother>> Brother','2'
+	end
+	if tanya > 0:gs'show_table','<<tanya>> Tanya','2'
+	if kat > 0:gs'show_table','<<kat>> Kate','2'
+	if vika > 0:gs'show_table','<<vika>> Vika','2'
+	if Irina > 0:gs'show_table','<<Irina>> Irina','2'
+	if Tamara > 0:gs'show_table','<<Tamara>> Tamara','2'
+	if alla > 0:gs'show_table','<<alla>> Alla','2'
+	if masha > 0:gs'show_table','<<masha>> Masha','2'
+	if Givi > 0:gs'show_table','<<Givi>> Givi Karapetovich','2'
+	if Ashot > 0:gs'show_table','<<Ashot>> Ashot','2'
+	if Dmitry > 0:gs'show_table','<<Dmitry>> Dima','2'
+	if afra > 0:gs'show_table','<<afra>> Blacks','2'
+	if trenerepa > 0:gs'show_table','<<trenerepa>> Mikhail Nikolaevich','2'
+	if st_count > 0 :pl 'Relations: <BR><TABLE BORDER=1> <<$show_table>></TR></TABLE>'
+end
+
 if  weatherDay = daystart: pl '<<$weather>>' & pl
 
 if opPRE = 0: pl '<<$mop>> and your hair is <<$hapri>>.' & pl
@@ -1477,6 +1601,20 @@ if hour >= 8 and hour < 9 and week < 5 and workSec >= 1:pl '<b><font color="red"
 if PersSecWork = 1 and week < 6 and hour < 10 and hour >= 5:pl '<b><font color="red">It''s time to work your shift as a secretary</font></b>'
 if workFabrika = 1 and week => 1 and week <= 5 and hour = 8 and age >= 18 or workFabrika = 1 and week => 1 and week <= 5 and hour = 16 and age < 18:pl'<b><font color = red>TheAM To go to work in the factory as a seamstress Pavlovsky</font></b>'
 
+if Enable_Hymenrestore = 1: vagina = 0
+if Enable_tightrestore = 1: anus = 0 & if vagina > 0:vagina = 1
+if Enable_clearwrite > 0: body_write = 0 & face_write = 0
+!{
+if Enable_clearcum > 0:
+	killvar 'sparrvol[0]'
+end
+if Enable_fbreath > 0:
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	fbreath=1
+end
+}
+
 $cumeater = {
 	spdirtyb = 1
 	fbreath = 0
@@ -2199,5 +2337,8 @@ if remdrop = 0:
 end
 }
 
+if Enable_statfsize>0:pl'</font>' & !disable this, all texts comes from pl will have the same font size, like[time]
+if Enable_faceturn = 1:	view FUNC('$face_image')
+
 --- stat ---------------------------------
 

+ 51 - 378
locations/street

@@ -18,9 +18,12 @@ end
 
 !music_on = 0
 gs 'dinam'
-'<center><b>Residential Area</b></center>'
+'<center><b>Residential Area<a href="exec:dynamic $objnewmenu">.</a></b></center>'
 '<center><img src="images/etogame/street.jpg"></center>'
 
+!all random events move to [street_events], and display them before show location. by illume
+gs'street_event','street' & if streetrand=-1:exit
+
 if marudatestinterface = 1:
 
 !!! Transportation
@@ -166,123 +169,6 @@ if gopdeath = 1 and vsehsdaladay ! daystart:
 	exit
 end
 
-if shantpopala > 0:
-	cla
-	*clr
-	hour += 8
-	spafinloc = 14
-gs 'cum_manage'
-	gs 'cum_manage'
-	spafinloc = 4
-gs 'cum_manage'
-	spafinloc = 12
-gs 'cum_manage'
-	spafinloc = 11
-gs 'cum_manage'
-	spafinloc = 7
-gs 'cum_manage'
-	spafinloc = 3
-gs 'cum_manage'
-	fingal += 1
-	guy += 2
-	rape += 1
-	sex += 1
-	bj += 1
-	anal += 1
-	shantpopala -= 1
-	'<center><img src="images/img/centr/rape.jpg"></center>'
-	'On the street close to you, a black jeep suddenly screechs to a halt. You turn your head to see what''s happening and see two large men jump of it and start to run towards you in. Before you can react and run away, they grab you and drag you into the car.'
-	'"You''re doing this for a living? Taking pictures of naked people in the park?", one of them shouts, holding one of the pictures to your face that you took awhile back and sent someone over the internet, hoping they would pay the ransom.'
-	'"No...what? What the hell is going on? I don''t know what you''re talking about!", you try to explain.'
-	'"Don''t lie to use you stupid bitch.", as he says that, he hits you on your head and you pass out.'
-	'You wake up somewhere out of town, you''re tied up and naked. You look down on yourself and notice traces of cum on your body, it also seems like that cum is flowing from your ass and your pussy.'
-	'You notice that the blokes, who captured you are sitting next to you and seem to be having a break, some of them are smoking.'
-	'"Oh, she is finally awake, then the next fuck-cycle will be far more fun.", one of the men said, as he notices you moving. Some of them are starting to get a evil grin on their faces.'
-	'They get up and came back at you, barely a minute later you wished your were still knocked out, as these jackasses had their ways with. You tried to resist, but the tape hindered you from moving. Not long after, everything faded to black and you lost you consciousness again.'
-	'You feel groggy as you wake up, it feels like someone is grabbing you by the hair. He shouts at you. "Let this be a lesson for you, bitch.", then kicks you in the stomach and leaves. As you collapse on the ground holding your stomach in pain, you take a glimpse at the street and see the assholes driving away in their black jeep. The mainroad is about 200m away, you crawl most of the way there, but soon you can walk again and eventually you find your way back to one of the mainstreets.'
-
-	act 'Leave':gt $curloc
-	exit
-end
-
-if workDolgDay <= 0 and workDolg > 0:
-	cls
-	gs 'stat'
-	gs 'time'
-	workDisk = 0
-	'<center><img src="images/sauna/bug.jpg"></center>'
-	'Near the entrance to your home you see two large guys, you notice that both are carrying guns. They notice you and walk up to you. "It''s time for you to pay back your debts."'
-
-	if money >= workDolg:
-		money -= workDolg
-		workDolg = 0
-		'You give the money to the guys, they count it.'
-
-		act 'Leave':gt $curloc
-
-		exit
-	else
-		if money + stolmoney + karta >= workDolg:
-			money += stolmoney + karta
-			stolmoney = 0
-			karta = 0
-			money -= workDolg
-			workDolg = 0
-			'"I have enough at home. Follow me.", you say, going up to your apartment. You quickly rush inside, take the money out of the drawer and go back to pay them. They count it, look at each other nod, then leave.'
-
-			act 'Leave':gt 'korr'
-
-			exit
-		else
-			money += stolmoney + karta
-			stolmoney = 0
-			karta = 0
-			workDolg -= money
-			money = 0
-			workDolg += 10000
-			'You tell them that you don''t have enough money. They smack you, push you into your apartment and search everything. They find your stash and plunder it.'
-			'The brutes take everything that you have. Then explain your situation. In short, you have a dubt of <<workDolg>>. Your debt has grown by 10k, and since you can not pay off, they will help you. The brutes drag you into the car and throw you into the back seat. You are driven somewhere.'
-
-			act 'Out of the car':
-				cls
-				minut += 30
-				gs 'stat'
-				'You are at the sauna. The brutes drag you into a room and start to explain. "You''re going to live here and work until you have cleared your debt. All clear? Try to contact the authorities or escape, we''ll put a bullet in your head and bury you in the woods, understand?"'
-				'Your frightened and nod, realizing that they are not joking.'
-
-				act 'Look around':gt 'saunaroom'
-			end
-		end
-	end
-
-	exit
-end
-
-if workDiskAtkPlayer = 1:
-	workDisk = 1
-	workDiskAtkPlayer = 0
-	'<center><img src="images/sauna/car.jpg"></center>'
-	'You are grabed and thrown into the back seat of the car. Right and left of you sit two angry Indian men. In the front seat - the porn studio manager. "Where is the envelope?" he demands.'
-
-	if konvert = 0:
-		workDolg = 200000
-		workDolgDay = 7
-		'"Stolen."'
-		'"WHAT! But how could this happen! Do you realise, what you have done?! I''ll give you until next Friday. In my office, you bring me 200,000 rubles. If not - Pain itself."'
-	else
-		konvert = 0
-		money += 5000
-		'You give the envelope. He warns you that such delays in the future may be harmful to your business relationships.'
-	end
-
-	act 'Leave':gt $curloc
-
-	exit
-end
-
-if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet2''">Before your entrance sits an Audi and standing beside it waits your indifferent driver Glory</a>.'
-if vladimirday = daystart and vladimirQW = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet3''">Before your entrance sits an Audi and standing beside it waits your indifferent driver Glory</a>.'
-
 housrA = 0
 
 if car > 0 and cardrive = 1:
@@ -326,63 +212,60 @@ end
 
 gs 'taxi'
 
-
-if tanga = 0 and ski = 1 and hour > 6 and hour <= 20 or tanga = 0 and glamur = 1 and hour > 6 and hour <= 20:
-	nurand = rand(0, 100)
-
-	if nurand >= 90:
-		manna -= 5
-		SUB += 1
-		horny += SUB
-		'You hear a deliberately loud whisper from grandmothers on the bench, "That whore! Walks in a short skirt and no panties, everyone can see her ass!"'
-		'You blush in shame from the old ladies caustic remarks.'
-	end
-end
-
-if magik >= 1 and mainQW = 0 and StoryLine = 0:
-	cla
-	*clr
-	mainQW = 1
-	'<center><img src="images/qwest/main.jpg"></center>'
-	'At the entrance you see Karin and Juugo. Karin adjusts glasses and looks around, Juugo seems to have his head in the clouds and a strange look on his face as his tattoos are not visible.'
-	'Karin closely looks around you, "I felt a burst of energy. Were you attacked by a magician?"'
-
-	act 'No':gt 'mainQW'
-
-	exit
-end
 if marudatestinterface = 0:
-	if katkey = 1:'<a href="exec:gt ''katspalnya'', ''start''">Katies</a> apartment'
-	if IrinaQW >= 1:'<a href="exec:gt ''IrinaRoom'', ''start''">Irenes</a> apartment is not far away from yours.'
-	if hour >= 16 and hour < 22 and dimaQW > 0:'<a href="exec:gt ''dima'', ''start''">Dimas</a> apartment'
-	if klofQW >= 2:'<a href="exec:gt ''klofdomhouse'', ''start''">Joras</a> apartment'
-	if hour >= 5 and hour <= 23:'The <a href="exec:gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
-	if hour >= 8 and hour <= 20:'Not far from your house is a <a href="exec:gt ''shop'', ''start''">Supermarket</a>'
-	if hour >= 8 and hour <= 20:'<a href="exec:gt ''poli'', ''start''">The clinic</a> isn''t far from your apartement either'
-	if hour >= 6 and hour <= 9 and military = 1 and week = 6:'There is a <a href="exec:minut += 60 & gt ''Military'', ''start''">military bus</a> waiting on the other side of the street.'
-	if hour >= 8 and hour <= 14 and week ! 1:'At the local, but noisy, <a href="exec:gt ''rinok'', ''start''">marketplace</a> you can go for a small shopping trip'
-	if hour >= 11 and hour < 12 and week > 1 and week < 5 and workKafe = 1:'The side door at the <a href="exec:gt ''kafe'', ''work''">cafe</a> open, so work staff can get in begin their shift.'
-	if hour >= 12 and hour <= 22 and week ! 1:'In a side alley, next to the <a href="exec:gt ''kafe'', ''start''">cafe</a>, you can hear the swearing and laughing of some <a href="exec:gt ''gopnew'', ''start''">Gopniks</a>.'
-	if hour > 22 or hour <= 3:'In one of the parking lots you can hear the swearing and laughing of some <a href="exec:gt ''gopnew'', ''start''">Gopniks</a>.'
-	if clener >= 1 and hour >= 7 and hour <= 22:'There''s a small office building where a <a href="exec:gt ''clener'', ''start''">cleaning lady</a> is needed.'
+	if Enable_tablemap = 0:
+		if katkey = 1:'<a href="exec:gt ''katspalnya'', ''start''">Katies</a> apartment'
+		if IrinaQW >= 1:'<a href="exec:gt ''IrinaRoom'', ''start''">Irenes</a> apartment is not far away from yours.'
+		if hour >= 16 and hour < 22 and dimaQW > 0:'<a href="exec:gt ''dima'', ''start''">Dimas</a> apartment'
+		if klofQW >= 2:'<a href="exec:gt ''klofdomhouse'', ''start''">Joras</a> apartment'
+		if hour >= 5 and hour <= 23:'The <a href="exec:gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
+		if hour >= 8 and hour <= 20:'Not far from your house is a <a href="exec:gt ''shop'', ''start''">Supermarket</a>'
+		if hour >= 8 and hour <= 20:'<a href="exec:gt ''poli'', ''start''">The clinic</a> isn''t far from your apartement either'
+		if hour >= 6 and hour <= 9 and military = 1 and week = 6:'There is a <a href="exec:minut += 60 & gt ''Military'', ''start''">military bus</a> waiting on the other side of the street.'
+		if hour >= 8 and hour <= 14 and week ! 1:'At the local, but noisy, <a href="exec:gt ''rinok'', ''start''">marketplace</a> you can go for a small shopping trip'
+		if hour >= 11 and hour < 12 and week > 1 and week < 5 and workKafe = 1:'The side door at the <a href="exec:gt ''kafe'', ''work''">cafe</a> open, so work staff can get in begin their shift.'
+		if hour >= 12 and hour <= 22 and week ! 1:'In a side alley, next to the <a href="exec:gt ''kafe'', ''start''">cafe</a>, you can hear the swearing and laughing of some <a href="exec:gt ''gopnew'', ''start''">Gopniks</a>.'
+		if hour > 22 or hour <= 3:'In one of the parking lots you can hear the swearing and laughing of some <a href="exec:gt ''gopnew'', ''start''">Gopniks</a>.'
+		if clener >= 1 and hour >= 7 and hour <= 22:'There''s a small office building where a <a href="exec:gt ''clener'', ''start''">cleaning lady</a> is needed.'
+	else
+		st_count=0 & $show_table=''
+		if katkey = 1:gs'show_table','<a href="exec:gt ''katspalnya'', ''start''">Katies</a> apartment','3'
+		if IrinaQW >= 1:gs'show_table','<a href="exec:gt ''IrinaRoom'', ''start''">Irenes</a> apartment is not far away from yours.','3'
+		if hour >= 16 and hour < 22 and dimaQW > 0:gs'show_table','<a href="exec:gt ''dima'', ''start''">Dimas</a> apartment','3'
+		if klofQW >= 2:gs'show_table','<a href="exec:gt ''klofdomhouse'', ''start''">Joras</a> apartment','3'
+		if hour >= 10 and hour < 22 and lesbiQW = 1:
+			gs'show_table','<a href="exec:gt ''lesbidomhouse''">Natalia Petrovnas</a> apartment.'
+		elseif lesbiday ! day and subdom = 2:
+			gs'show_table','<a href="exec:GT ''lesbidomhouse1''">Your slaves</a> apartment.','3'
+		elseif lesbiday ! day and hour >= 8 and lesbiQW > 6 and BDSMClub = 0 and rand(1,5) = 1:
+			gs'show_table','<a href="exec:GT ''BDSM_Club'',''Hos''">Mistress''</a> apartment.','3'
+		elseif lesbiday ! day and hour >= 8 and hour < 22 and lesbiQW >= 2 and lesbiQW < 9:
+			gs'show_table','<a href="exec:GT ''lesbidomhouse''">Mistress''</a> apartment.','3'
+		elseif lesbiday ! day and hour >= 8 and hour < 22 and lesbiQW >= 9:
+			gs'show_table','<a href="exec:GT ''lesbidomhouse''">Mistress''</a> apartment.','3'
+		end
+		if st_count > 0 :'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
+	end
 end	
 	
 	'The towns <a href="exec:minut += 20 & gt ''park'', ''start''">central park</a> is about a 20-minute walk away.'
 	'The cities only <a href="exec:minut += 40 & gt ''lake'', ''start''">lake</a> can be reached from here and is just a 40-minute walk away.'
 	'24 Hour <a href="exec:$loc = ''street'' & gt ''pharmacy'', ''start''">Pharmacy</a>.'
-	
-	if hour >= 10 and hour < 22 and lesbiQW = 1:
-		'<a href="exec:gt ''lesbidomhouse''">Natalia Petrovnas</a> apartment.'
-	elseif lesbiday ! day and subdom = 2:
-		'<a href="exec:GT ''lesbidomhouse1''">Your slaves</a> apartment.'
-	elseif lesbiday ! day and hour >= 8 and lesbiQW > 6 and BDSMClub = 0 and rand(1,5) = 1:
-		'<a href="exec:GT ''BDSM_Club'',''Hos''">Mistress''</a> apartment.'
-	elseif lesbiday ! day and hour >= 8 and hour < 22 and lesbiQW >= 2 and lesbiQW < 9:
-		'<a href="exec:GT ''lesbidomhouse''">Mistress''</a> apartment.'
-	elseif lesbiday ! day and hour >= 8 and hour < 22 and lesbiQW >= 9:
-		'<a href="exec:GT ''lesbidomhouse''">Mistress''</a> apartment.'
+
+	if Enable_tablemap = 0:
+		if hour >= 10 and hour < 22 and lesbiQW = 1:
+			'<a href="exec:gt ''lesbidomhouse''">Natalia Petrovnas</a> apartment.'
+		elseif lesbiday ! day and subdom = 2:
+			'<a href="exec:GT ''lesbidomhouse1''">Your slaves</a> apartment.'
+		elseif lesbiday ! day and hour >= 8 and lesbiQW > 6 and BDSMClub = 0 and rand(1,5) = 1:
+			'<a href="exec:GT ''BDSM_Club'',''Hos''">Mistress''</a> apartment.'
+		elseif lesbiday ! day and hour >= 8 and hour < 22 and lesbiQW >= 2 and lesbiQW < 9:
+			'<a href="exec:GT ''lesbidomhouse''">Mistress''</a> apartment.'
+		elseif lesbiday ! day and hour >= 8 and hour < 22 and lesbiQW >= 9:
+			'<a href="exec:GT ''lesbidomhouse''">Mistress''</a> apartment.'
+		end
 	end
-	
+
 	'In the courtyard of the house you live in, you can find the <a href="exec:gt ''trashplace''">Wastebaskets</a>'
 	
 	if SNarkPriton > 0:'<a href="exec:minut += 5 & gt ''narkopriton''">The Drug House</a> is clearly recognizeable by the syringes and the trash that lies in front of it.'
@@ -391,216 +274,6 @@ end
 
 !!! End of marudatestinterface = 0
 
-if hour = meethour:
-	if svidanieA = 1:'<b><a href="exec:gt ''meet'', ''start''"><<$boyA>></a> waits next to the entrance to your apartment block.</b>'
-	if svidanieB = 1:'<b><a href="exec:gt ''svidan'', ''start''"><<$boyA>></a> waits next to the entrance to your apartment block.</b>'
-	if svidanieC = 1:'<b><a href="exec:gt ''svidan'', ''start''"><<$boyA>></a> waits next to the entrance to your apartment block.</b>'
-end
-
-streetrand = rand(0, 100)
-
-if streetrand >= 90 and hour <= 3:
-	cla
-	*clr
-	'<center><img src="images/etogame/street.jpg"></center>'
-	'Out of the blue you are grapped by a man. He drags you into the closest bush, saying "Honey, you better not scream for help."'
-
-	act 'Useless to resist':
-		gs 'dinsexFX'
-		cla
-		*clr
-		$nameV = 'Rapist'
-		$boy = 'the rapist'
-		dick = rand (8, 20)
-		silavag = 0
-		pose = 3
-		
-		guy += 1
-		'<center><img src="images/picV/dogging.jpg"></center>'
-
-		if prezik > 0 and preziktype ! 2:
-			protect = 2
-			prezik -= 1
-			'You give him a condom. "At least wear protection asshole. I don''t want a bastards child.", you tell him. He nods in silence, then puts it on.'
-		end
-		dynamic $vagstart2
-
-		'"Get ready, bitch." He says pushing you onto your knees. He moves behind you and takes you doggy-style. You can feel his hard cock entering your vagina.'
-
-		dynamic $vagend
-
-		act 'Leave':gt 'street'
-	end
-
-	act 'Fight':
-		cla
-		$nameV = 'Rapist'
-		!!stats
-		strenV = 100
-		speedV = 50
-		agilV = 40
-		reactV = 40
-		vitalV = 50
-		intelV = 10
-		willV = 10
-		!!skills
-		magikV = 100
-		boxingV = 50
-		shootV = 100
-		!!parameters
-		healthV = vitalV * 10 + strenV * 5
-		mannaV = intelV * 10 + magikV * 10
-		willpowerV = willV * 10
-		BonusAtakV = 0
-		BonusDefV = 0
-		!!Programme of Action
-		program = 0
-		RapistFight = 1
-
-		if spellavtoklon = 1:klon = 3
-		if spellbefshild = 1:defence = 500
-
-		gt 'fight', 'start'
-	end
-
-	exit
-end
-
-streetrand = rand(0, 100)
-if streetrand >= 100 and money >= 1000 and daystart >= 10 and hour <= 3:
-	cla
-	*clr
-	'<center><img src="images/etogame/street.jpg"></center>'
-	'Suddenly you are attacked by a robber'
-
-	act 'Don''t fight, just give him your money':
-		cla
-		clr
-		money = 0
-		gs 'stat'
-		'He took all the money you had on you'
-
-		act 'Leave':gt 'street'
-	end
-
-	act 'Fight':
-		cla
-		'The robber throws heavy insults at you.'
-
-		act 'Fight':
-			$nameV = 'Rapist'
-			!!stats
-			strenV = 100
-			speedV = 50
-			agilV = 40
-			reactV = 40
-			vitalV = 50
-			intelV = 10
-			willV = 10
-			!!skills
-			magikV = 100
-			boxingV = 50
-			shootV = 100
-			!!parameters
-			healthV = vitalV * 10 + strenV * 5
-			mannaV = intelV * 10 + magikV * 10
-			willpowerV = willV * 10
-			BonusAtakV = 0
-			BonusDefV = 0
-			!!Programme of Action
-			program = 0
-			RapistFight = 1
-
-			if spellavtoklon = 1:klon = 3
-			if spellbefshild = 1:defence = 500
-
-			gt 'fight', 'start'
-		end
-	end
-
-	exit
-end
-
-streetrand = rand(0, 100)
-
-if streetrand >= 100 and money >= 1000 and daystart >= 10 and hour <= 3:
-	cla
-	*clr
-	'<center><img src="images/etogame/street.jpg"></center>'
-	'You have been robbed. A thief grapped your purse and ran away.'
-
-	act 'Leave it, I can''t catch him':
-		cla
-		clr
-		money = 0
-		gs 'stat'
-
-		act 'That jackass':gt 'street'
-	end
-
-	act 'Catch this asswipe and then fuck him up':
-		if speed < 55 or agil < 55 or vital < 55:
-			cla
-			money = 0
-			clr
-			gs 'stat'
-
-			act 'He was faster than you and you lost sight of him':gt 'street'
-
-		else
-			$nameV = 'Rapist'
-			!!stats
-			strenV = 100
-			speedV = 50
-			agilV = 40
-			reactV = 40
-			vitalV = 50
-			intelV = 10
-			willV = 10
-			!!skills
-			magikV = 100
-			boxingV = 50
-			shootV = 100
-			!!parameters
-			healthV = vitalV * 10 + strenV * 5
-			mannaV = intelV * 10 + magikV * 10
-			willpowerV = willV * 10
-			BonusAtakV = 0
-			BonusDefV = 0
-			!!Programme of Action
-			program = 0
-			RapistFight = 1
-
-			if spellavtoklon = 1:klon = 3
-			if spellbefshild = 1:defence = 500
-
-			gt 'fight', 'start'
-		end
-	end
-
-	exit
-elseif streetrand >= 10 and bfa < 1:
-	vnerand = rand(0, 300)
-
-	if vnerand <= vnesh:
-		gs 'boy'
-		'To you came <<$boybody>> <<$boybod>> <<$boyface>>. he <<$boyClo>>'
-		'The guy introduces himself as <<$boy>> and asked for your telephone number.'
-
-		act 'Tell him your number':
-			cla
-			gs 'boyfrend', 'start'
-			stopboy = 0
-			'<<$boyA>> takes your number and leaves.'
-
-			act 'complete the walk':gt 'street'
-		end
-	end
-end
-
-dynamic $din_street_cum
-
-if rand (0,2) ! 0:dynamic $mobile_check
 
 --- street ---------------------------------
 

+ 427 - 0
locations/street_event

@@ -0,0 +1,427 @@
+# street_event
+!{$arg[0]='down','street','Nord' for trigger position.  if call this with gs, $curloc work the same.
+1. location indepent events, list: rape, rob, hijack, ask phonenumber, no pantie&skirt, $street_cum, $mobile_check
+ all events were only in [street], except shantpopala duplicate in [street][down].
+ original event chance in [street]:
+		streetev_rape=10
+		streetev_rob=1
+		streetev_hijack=1
+		streetev_bf=90
+		streetev_pantie=10
+		shantpopala: 100% if shantpopala>0
+2. home-related events: check if player live here (workDolgDay, vladimirday, magik >= 1 and mainQW = 0, hour = meethour).
+[street]: housr=1 for korr
+[down]:tanwork = 1 for house, student > 0 for dorm
+[Nord]:none for now. use (train station) as position, if no home in city.
+Known issue: boyfriend/vladimir may wait you in both place, if you rent house in [street] and study in university/work in Tanya
+
+set streetrand=-1 for exit --> in outer location,   gs'street_event','home' & if streetrand=-1:exit
+}
+
+streetev_home = 0
+
+if $ARGS[0] = 'street':
+	$streetev_title = '<center><b>Residential Area</b><br><img src="images/etogame/street.jpg"></center>'
+	streetev_rape = 5
+	streetev_rob = 3
+	streetev_hijack = 2
+	streetev_bf = 50
+	streetev_pantie = 10
+	if housr = 1:
+		streetev_home = 1
+		$streetev_home = 'Your apartment'
+	end
+elseif $ARGS[0] = 'down':
+	$streetev_title = '<center><b>City center</b><br><img src="images/etogame/down.jpg"></center>'
+	streetev_rape = 0
+	streetev_rob = 1
+	streetev_hijack = 6
+	streetev_bf = 90
+	streetev_pantie = 20
+	if tanwork = 1 or student > 0:
+		streetev_home = 1
+		$streetev_home = 'Your home'
+	end
+elseif $ARGS[0] = 'Nord':
+	$streetev_title = '<center><b>Northern region</b><br><img src="images/etogame/nord.jpg"></center>'
+	streetev_rape = 8
+	streetev_rob = 5
+	streetev_hijack = 1
+	streetev_bf = 30
+	streetev_pantie = 5
+	if housr = 0 and tanwork = 0 and student = 0:
+		streetev_home = 1
+		$streetev_home = 'Train station'
+	end
+else
+	$streetev_title = '<center><b>in dark</b>'
+	streetev_rape = 10
+	streetev_rob = 1
+	streetev_hijack = 1
+	streetev_bf = 90
+	streetev_pantie = 10
+end
+streetrand = rand(0, 100)
+
+if streetrand < streetev_rape and hour <= 3:
+	cla
+	*clr
+	'<<$streetev_title>>'
+	'Out of the blue you are grapped by a man. He drags you into the closest bush, saying "Honey, you better not scream for help."'
+
+	act 'Useless to resist':
+		gs 'dinsexFX'
+		cla
+		*clr
+		$nameV = 'Rapist'
+		$boy = 'the rapist'
+		dick = rand (8, 20)
+		silavag = 0
+		pose = 3
+		
+		guy += 1
+		'<center><img src="images/picV/dogging.jpg"></center>'
+
+		if prezik > 0:
+			protect = 2
+			prezik -= 1
+			'You give him a condom. "At least wear protection asshole. I don''t want a bastards child.", you tell him. He nods in silence, then puts it on.'
+		end
+		dynamic $vagstart2
+
+		'"Get ready, bitch." He says pushing you onto your knees. He moves behind you and takes you doggy-style. You can feel his hard cock entering your vagina.'
+
+		dynamic $vagend
+
+		act 'Leave':gt $curloc
+	end
+
+	act 'Fight':
+		cla
+		$nameV = 'Rapist'
+		!!stats
+		strenV = 100
+		speedV = 50
+		agilV = 40
+		reactV = 40
+		vitalV = 50
+		intelV = 10
+		willV = 10
+		!!skills
+		magikV = 100
+		boxingV = 50
+		shootV = 100
+		!!parameters
+		healthV = vitalV * 10 + strenV * 5
+		mannaV = intelV * 10 + magikV * 10
+		willpowerV = willV * 10
+		BonusAtakV = 0
+		BonusDefV = 0
+		!!Programme of Action
+		program = 0
+		RapistFight = 1
+
+		if spellavtoklon = 1:klon = 3
+		if spellbefshild = 1:defence = 500
+
+		gt 'fight', 'start'
+	end
+
+	streetrand=-1 & exit
+end
+
+streetrand = rand(0, 100)
+if streetrand < streetev_rob and money >= 1000 and daystart >= 10 and hour <= 3:
+	cla
+	*clr
+	'<<$streetev_title>>'
+	'Suddenly you are attacked by a robber'
+
+	act 'Don''t fight, just give him your money':
+		cla
+		clr
+		money = 0
+		gs 'stat'
+		'He took all the money you had on you'
+
+		act 'Leave':gt $curloc
+	end
+
+	act 'Fight':
+		cla
+		'The robber throws heavy insults at you.'
+
+		act 'Fight':
+			$nameV = 'Robber'
+			!!stats
+			strenV = 100
+			speedV = 50
+			agilV = 40
+			reactV = 40
+			vitalV = 50
+			intelV = 10
+			willV = 10
+			!!skills
+			magikV = 100
+			boxingV = 50
+			shootV = 100
+			!!parameters
+			healthV = vitalV * 10 + strenV * 5
+			mannaV = intelV * 10 + magikV * 10
+			willpowerV = willV * 10
+			BonusAtakV = 0
+			BonusDefV = 0
+			!!Programme of Action
+			program = 0
+			RapistFight = 1
+
+			if spellavtoklon = 1:klon = 3
+			if spellbefshild = 1:defence = 500
+
+			gt 'fight', 'start'
+		end
+	end
+
+	streetrand = -1 & exit
+end
+
+streetrand = rand(0, 100)
+
+if streetrand < streetev_hijack and money >= 1000 and daystart >= 10 and hour <= 3:
+	cla
+	*clr
+	'<<$streetev_title>>'
+	'You have been robbed. A thief grapped your purse and ran away.'
+
+	act 'Leave it, I can''t catch him':
+		cla
+		clr
+		money = 0
+		gs 'stat'
+
+		act 'That jackass':gt $curloc
+	end
+
+	act 'Catch this asswipe and then fuck him up':
+		if speed < 55 or agil < 55 or vital < 55:
+			cla
+			money = 0
+			clr
+			gs 'stat'
+
+			act 'He was faster than you and you lost sight of him':gt $curloc
+
+		else
+			$nameV = 'Rapist'
+			!!stats
+			strenV = 100
+			speedV = 50
+			agilV = 40
+			reactV = 40
+			vitalV = 50
+			intelV = 10
+			willV = 10
+			!!skills
+			magikV = 100
+			boxingV = 50
+			shootV = 100
+			!!parameters
+			healthV = vitalV * 10 + strenV * 5
+			mannaV = intelV * 10 + magikV * 10
+			willpowerV = willV * 10
+			BonusAtakV = 0
+			BonusDefV = 0
+			!!Programme of Action
+			program = 0
+			RapistFight = 1
+
+			if spellavtoklon = 1:klon = 3
+			if spellbefshild = 1:defence = 500
+
+			gt 'fight', 'start'
+		end
+	end
+
+	streetrand=-1 & exit
+end
+
+streetrand = rand(0, 100)
+
+if streetrand < streetev_bf and bfa < 1:
+	vnerand = rand(0, 300)
+
+	if vnerand <= vnesh:
+		gs 'boy'
+		'To you came <<$boybody>> <<$boybod>> <<$boyface>>. he <<$boyClo>>'
+		'The guy introduces himself as <<$boy>> and asked for your telephone number.'
+
+		act 'Tell him your number':
+			cla
+			gs 'boyfrend', 'start'
+			stopboy = 0
+			'<<$boyA>> takes your number and leaves.'
+
+			act 'complete the walk':gt $curloc
+		end
+	end
+end
+
+if shantpopala > 0:
+	cla
+	*clr
+	hour += 8
+	spafinloc = 14
+	gs 'cum_manage'
+	spafinloc = 4
+	gs 'cum_manage'
+	spafinloc = 12
+	gs 'cum_manage'
+	spafinloc = 11
+	gs 'cum_manage'
+	spafinloc = 7
+	gs 'cum_manage'
+	spafinloc = 3
+	gs 'cum_manage'
+	fingal += 1
+	guy += 2
+	rape += 1
+	sex += 1
+	bj += 1
+	anal += 1
+	shantpopala -= 1
+	'<center><img src="images/img/centr/rape.jpg"></center>'
+	'On the street close to you, a black jeep suddenly hit the brakes. You turn your head to see what''s happening and see two large men jump of it and start to run towards you in. Before you can react and run away, they grap you and drag you into the car.'
+	'"You''re doing this for a living? Taking pictures of naked people in the park?", one of the shouts, holding one of the pictures to your face you''ve made awhile back and sent someone over a social network, hoping they would pay the ransom.'
+	'"No...what? What the hell is going on? I don''t know what you''re talking about!", you try to explain.'
+	'"Don''t lie to use you stupid bitch.", as he said that, he hits you on your head and you pass out.'
+	'You wake up somewhere out of town, you''re tied up and naked. You look down on yourself and notice traces of cum on your body, it also seems like that cum is flowing from your ass and your pussy.'
+	'You notice that the blokes, who captured you sit next to you and seem to have a break, some of them are smoking.'
+	'"Oh, she is finally awake, then the next fuck-cycle will be far more fun.", one of the men said, as he noticed you moving. Some of them are starting to get a evil grin on their face.'
+	'They got up and came back at you, barely a minute later you wished your were still knocked out, as these jackasses had their ways with. You tried to resist, but the tape hindered you from moving. Not long after, everything faded to black and you lost you consciousness again.'
+	'You feel groggy as you wake up, but it feels like someone is grapping you by the hair and shouts at you. "Let this be a lesson for you, bitch.", he shouts, then kicks you into the stomach and leaves. As you collapse on the ground holding your stomach in pain, you take a glimpse at the street and see the assholes driving away in their black jeep. The mainroad is about 200m away, you crawl most of the way there, but soon you can walk again and eventually you find your way back to one of the mainstreets.'
+
+	act 'Leave':gt $curloc
+
+	streetrand=-1 & exit
+end
+
+if tanga = 0 and ski = 1 and hour > 6 and hour <= 20 or tanga = 0 and glamur = 1 and hour > 6 and hour <= 20:
+	nurand = rand(0, 100)
+
+	if nurand >= streetev_pantie:
+		manna -= 5
+		SUB += 1
+		horny += SUB
+		'You hear a deliberately loud whisper from grandmothers on the bench, "That whore! Walks in a short skirt and no panties, everyone can see her ass!"'
+		'You blush in shame from the old ladies caustic remarks.'
+	end
+end
+
+dynamic $din_street_cum
+
+if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
+
+!start home-related events check
+if streetev_home=1:
+	if workDolgDay <= 0 and workDolg > 0:
+		cls
+		gs 'stat'
+		gs 'time'
+		workDisk = 0
+		'<center><img src="images/sauna/bug.jpg"></center>'
+		'Near the entrance to your home you see two large guys, you notice that both are carrying guns. They notice you and walk up to you. "It''s time for you to pay back your debts."'
+
+		if money >= workDolg:
+			money -= workDolg
+			workDolg = 0
+			'You give the money to the guys, they count it.'
+
+			act 'Leave':gt $curloc
+
+			streetrand=-1 & exit
+		else
+			if money + stolmoney + karta >= workDolg:
+				money += stolmoney + karta
+				stolmoney = 0
+				karta = 0
+				money -= workDolg
+				workDolg = 0
+				'"I have enough at home. Follow me.", you say, going up to your apartment. You quickly rush inside, take the money out of the drawer and go back to pay them. They count it, look at each other nod, then leave.'
+
+				act 'Leave':gt $curloc
+
+				streetrand=-1 & exit
+			else
+				money += stolmoney + karta
+				stolmoney = 0
+				karta = 0
+				workDolg -= money
+				money = 0
+				workDolg += 10000
+				'You tell them that you don''t have enough money. They smack you, push you into your apartment and search everything. They find your stash and plunder it.'
+				'The brutes take everything that you have. Then explain your situation. In short, you have a dubt of <<workDolg>>. Your debt has grown by 10k, and since you can not pay off, they will help you. The brutes drag you into the car and throw you into the back seat. You are driven somewhere.'
+
+				act 'Out of the car':
+					cls
+					minut += 30
+					gs 'stat'
+					'You are at the sauna. The brutes drag you into a room and start to explain. "You''re going to live here and work until you have cleared your debt. All clear? Try to contact the authorities or escape, we''ll put a bullet in your head and bury you in the woods, understand?"'
+					'Your frightened and nod, realizing that they are not joking.'
+
+					act 'Look around':gt 'saunaroom'
+				end
+			end
+		end
+
+		streetrand=-1 & exit
+	end
+
+	if workDiskAtkPlayer = 1:
+		workDisk = 1
+		workDiskAtkPlayer = 0
+		'<center><img src="images/sauna/car.jpg"></center>'
+		'You are grabed and thrown into the back seat of the car. Right and left of you sit two angry Indian men. In the front seat - the porn studio manager. "Where is the envelope?" he demands.'
+
+		if konvert = 0:
+			workDolg = 200000
+			workDolgDay = 7
+			'"Stolen."'
+			'"WHAT! But how could this happen! Do you realise, what you have done?! I''ll give you until next Friday. In my office, you bring me 200,000 rubles. If not - Pain itself."'
+		else
+			konvert = 0
+			money += 5000
+			'You give the envelope. He warns you that such delays in the future may be harmful to your business relationships.'
+		end
+
+		act 'Leave':gt $curloc
+
+		streetrand=-1 & exit
+	end
+
+	if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet2''">Before your entrance sits an Audi and standing beside it waits your indifferent driver Glory</a>.'
+	if vladimirday = daystart and vladimirQW = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet3''">Before your entrance sits an Audi and standing beside it waits your indifferent driver Glory</a>.'
+
+	if magik >= 1 and mainQW = 0 and StoryLine = 0:
+		cla
+		*clr
+		mainQW = 1
+		'<center><img src="images/qwest/main.jpg"></center>'
+		'At the entrance you see Karin and Juugo. Karin adjusts glasses and looks around, Juugo seems to have his head in the clouds and a strange look on his face as his tattoos are not visible.'
+		'Karin closely looks around you, "I felt a burst of energy. Were you attacked by a magician?"'
+
+		act 'No':gt 'mainQW'
+
+		streetrand=-1 & exit
+	end
+
+	if hour = meethour:
+		if svidanieA = 1:'<b><a href="exec:gt ''meet'', ''start''"><<$boyA>></a> waits next to the entrance to <<$streetev_home>>.</b>'
+		if svidanieB = 1:'<b><a href="exec:gt ''svidan'', ''start''"><<$boyA>></a> waits next to the entrance to <<$streetev_home>>.</b>'
+		if svidanieC = 1:'<b><a href="exec:gt ''svidan'', ''start''"><<$boyA>></a> waits next to the entrance to <<$streetev_home>>.</b>'
+	end
+end
+
+!end home-related events
+
+--- street_event ---------------------------------
+