1
0
Просмотр исходного кода

Variables cleanup - uninitialized, unused, misspelt
Unused Code

Changed test days past logic to used 'daystart' instead of 'day'

Wonder Dog 9 лет назад
Родитель
Сommit
962b2d894d
100 измененных файлов с 418 добавлено и 370 удалено
  1. BIN
      glife.txt
  2. 1 1
      locations/BDSM_Club
  3. 4 3
      locations/BDsex
  4. 2 2
      locations/BurgerTip
  5. 2 1
      locations/EvBoyBuh
  6. 2 0
      locations/FSstart
  7. 1 1
      locations/FedorEv
  8. 5 2
      locations/Gadbana
  9. 0 1
      locations/Gadsarai
  10. 2 0
      locations/IgorEv
  11. 1 1
      locations/IvanEv
  12. 2 0
      locations/KGDstart
  13. 5 0
      locations/KatjaHomeDin
  14. 5 5
      locations/Katlake
  15. 1 1
      locations/LCwork
  16. 4 4
      locations/Mall
  17. 1 1
      locations/MiroslavaHome
  18. 2 2
      locations/Nudelake
  19. 1 1
      locations/Prostitute
  20. 6 6
      locations/QwestDisdock
  21. 1 1
      locations/RimmaSexQW
  22. 3 1
      locations/Terminal
  23. 1 1
      locations/Timofei
  24. 1 1
      locations/TimofeiMetro
  25. 3 5
      locations/_menu_automatica
  26. 3 4
      locations/_menu_mobila
  27. 1 1
      locations/albinaEv
  28. 2 0
      locations/alterStart
  29. 5 5
      locations/annafrends
  30. 2 2
      locations/artemhome
  31. 4 4
      locations/arturRinok
  32. 1 1
      locations/arturSex
  33. 1 1
      locations/arturkiosk
  34. 1 1
      locations/balkon
  35. 3 3
      locations/balkon2
  36. 1 1
      locations/bank
  37. 1 1
      locations/bass
  38. 3 3
      locations/bed
  39. 1 1
      locations/bed1
  40. 6 6
      locations/bedr
  41. 2 2
      locations/bedrPar
  42. 3 3
      locations/bedrPar2
  43. 2 2
      locations/bobka
  44. 3 3
      locations/boyfrend
  45. 1 1
      locations/brosh
  46. 1 1
      locations/brosok
  47. 42 30
      locations/brother
  48. 4 4
      locations/buklinik
  49. 5 5
      locations/buklinik_event
  50. 6 6
      locations/burger
  51. 6 6
      locations/burgerBoss
  52. 3 3
      locations/butik
  53. 6 6
      locations/clener
  54. 5 5
      locations/club
  55. 5 4
      locations/counter
  56. 1 1
      locations/dachain
  57. 2 2
      locations/dachaogr0
  58. 1 1
      locations/dimaGoHome
  59. 3 3
      locations/dimaGoHome2
  60. 4 4
      locations/dimaHome
  61. 1 1
      locations/dimaRudeEv
  62. 5 5
      locations/dinBoroda
  63. 8 8
      locations/dina
  64. 2 2
      locations/dinfather
  65. 12 1
      locations/divan
  66. 20 20
      locations/dk
  67. 2 2
      locations/dom_gor
  68. 1 1
      locations/down
  69. 5 5
      locations/etoexhib
  70. 2 2
      locations/family
  71. 8 10
      locations/father
  72. 7 5
      locations/fit
  73. 1 1
      locations/fitgirl
  74. 12 11
      locations/gaptek
  75. 6 5
      locations/gdksport
  76. 1 1
      locations/gevent
  77. 1 1
      locations/gkafe
  78. 12 10
      locations/gopnew
  79. 2 2
      locations/gorodok
  80. 2 2
      locations/gpoli
  81. 7 7
      locations/gschool
  82. 1 1
      locations/gtelefon
  83. 16 16
      locations/housezal
  84. 2 2
      locations/hozspal
  85. 6 5
      locations/husbSex
  86. 1 0
      locations/init_music
  87. 2 1
      locations/kafe
  88. 2 2
      locations/kafesvid
  89. 1 1
      locations/kamera
  90. 1 1
      locations/katjaEv
  91. 8 8
      locations/kitchen
  92. 7 7
      locations/klofdomhouse
  93. 5 5
      locations/klofdomhouse1
  94. 23 22
      locations/korr
  95. 1 1
      locations/korrPar
  96. 6 6
      locations/kuhr
  97. 4 4
      locations/kuhrPar
  98. 13 13
      locations/lab
  99. 3 3
      locations/lake
  100. 3 3
      locations/lakecafe

+ 1 - 1
locations/BDSM_Club

@@ -7,7 +7,7 @@ $loc = $CURLOC
 if $ARGS[0] = 'Hos':
 	cls
 	minut += 10
-	lesbiday = day
+	lesbiday = daystart
 	BDSMClub = 1
 	alko += 2
 	gs 'stat'

+ 4 - 3
locations/BDsex

@@ -731,10 +731,11 @@ if $ARGS[0] = 'an':
 
 	if anus + lubonus + 2 < dick:
 		if mop > 1:mop = 0
-
 		'You utter a muffled cry and bite down a pillow when his <<dick>> centimeter cock begins to fuck your ass full force.'
-	elseif anus + lubonus + 2 >= dick:'You start to moan rhythmically in time with thrusts of the dick buried in your ass.'
-
+	elseif anus + lubonus + 2 >= dick:
+		'You start to moan rhythmically in time with thrusts of the dick buried in your ass.'
+	end
+	
 	anal += 1
 end
 

+ 2 - 2
locations/BurgerTip

@@ -130,7 +130,7 @@ $burger_work_din = {
 
 			if bosstiprand = 0:
 				TerminalPapper = 1
-				DayTerminalPapper = day
+				DayTerminalPapper = daystart
 				'Came out of the office Anatoly Borisovich and walked up to you. "<<$name>>, take these documents to the North area, in a storage terminal, then you can be free today."'
 
 				act 'Leave':gt 'down'
@@ -148,7 +148,7 @@ $burger_work_din = {
 
 			elseif bosstiprand = 2:
 				BankPapper = 1
-				dayBankPapper = day
+				dayBankPapper = daystart
 				'Came out of the office Anatoly Borisovich and walked up to you. "<<$name>>, run to the bank with these documents. How otneseshsya documents can be free today."'
 
 				act 'Leave':gt 'down'

+ 2 - 1
locations/EvBoyBuh

@@ -236,7 +236,8 @@ if GorSlut = 0:
 						$nameBoyfrend[numboyFrend] = $bname
 						$nameBoyfrendFull[numboyFrend] = $bnamefull
 						dickBoyFrend[numboyFrend] = dick
-						silavagBoyFrend[numboyFrend] = siladick
+						! WD: Uninitialised ~ 'siladick' use 'silavag'
+						silavagBoyFrend[numboyFrend] = silavag
 						otnBoyFrend[numboyFrend] = 50
 						minut += 30
 						bmFrend[Tboynum] = 1

+ 2 - 0
locations/FSstart

@@ -1,4 +1,6 @@
 # FSstart
+! WD: Missing code ~ Fight opponent does not get any variables set.
+
 minut += 1
 nosave = 1
 gs 'stat'

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
locations/FedorEv


+ 5 - 2
locations/Gadbana

@@ -22,7 +22,7 @@ if week = 6:
 		canpar = 1
 		'In the bath can be steamed'
 
-		if banaday!day:
+		if banaday ! daystart:
 			act 'Steamed in the sauna (2:00)':
 				cls
 				minut += 120
@@ -31,11 +31,14 @@ if week = 6:
 				mop = 1
 				sweat = -3
 
+				! WD: Missing Var ~ 'banaday'
+				banaday = daystart
+
 				if frost > 0:frost = 0
 
 				skinvan += 5
 
-				if skinvan >= 20:skinvan = 0 & skin += 1
+				if skinvan >= 20:skinvan -= 20 & skin += 1
 
 				gs 'stat'
 

+ 0 - 1
locations/Gadsarai

@@ -267,7 +267,6 @@ if findvel=1 and hour >= 7 and hour < 20:
 		sweat+=2
 		findvelrand= RAND (0,100)
 		! WD: Fix old nude variable
-		! if nude = 1:
 		if $clothingworntype = 'nude':
 			horny += 20
 			willpower+=10

+ 2 - 0
locations/IgorEv

@@ -12,6 +12,8 @@ if fedorKozlovQW >= 10 and $loc = 'gdkin':
 	exit
 end
 
+! WD: Uninitialised ~ 'igorkruglovday'
+igorkruglovday = daystart
 'Igor eagerly tell you, "Well what? Come to my house?".'
 
 if IgorLove > 0:

+ 1 - 1
locations/IvanEv

@@ -1,5 +1,5 @@
 # IvanEv
-ivansportday = day
+ivansportday = daystart
 gs 'stat'
 '<center><b><font color="maroon"><<$npcName[3]>> <<$npcSurName[3]>></font></b></center>'
 ! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc3.jpg"></center>'

+ 2 - 0
locations/KGDstart

@@ -1,4 +1,6 @@
 # KGDstart
+! WD: Miossing Code ~ Enemy Strings for fighting are never set
+
 '<center><b>Disopl</b></center>'
 ''
 

+ 5 - 0
locations/KatjaHomeDin

@@ -93,6 +93,7 @@ $d_katjaSextalk = {
 				act 'further':minut += 15 & gt 'KatjaHomeTalk'
 			end
 		end
+
 	elseif kattalkrand = 2:
 		if KatjaKnowAnal > 0:
 			'- <<$name>>, tell, how you took in the ass.'
@@ -105,6 +106,8 @@ $d_katjaSextalk = {
 				cls
 				KatjaLust += 5
 				KatjaHorny += 10
+				! WD: Uninitialised ~ 'KatjaKnowAnal'
+				KatjaKnowAnal = 1
 				gs 'stat'
 				'<center><img src="images/qwest/alter/npc/14.jpg"></center>'
 				'You told Katja as you gave in the ass and that it felt. Katja blushed and bit her lip.'
@@ -124,6 +127,8 @@ $d_katjaSextalk = {
 				cls
 				KatjaLust += 5
 				KatjaHorny += 10
+				! WD: Uninitialised ~ 'KatjaKnowMastr'
+				KatjaKnowMastr = 1
 				gs 'stat'
 				'<center><img src="images/qwest/alter/npc/14.jpg"></center>'
 				'You told Katja how you masturbate in the bathroom. Katja blushed and bit her lip.'

+ 5 - 5
locations/Katlake

@@ -18,7 +18,7 @@ if $ARGS[0] = 'znakomstvo':
 	gs 'stat'
 
 	if vnesh < 14:
-		katday = day
+		katday = daystart
 		'"Hello" you say, a bit shyly.'
 		'The girl looked around you scornful look and said nothing'
 		'"Talk will not work" flashed in your head'
@@ -27,7 +27,7 @@ if $ARGS[0] = 'znakomstvo':
 	else
 		cla
 		clr
-		katday = day
+		katday = daystart
 		telkat += 1
 		kat = 1
 		minut += 30
@@ -57,7 +57,7 @@ if $ARGS[0] = 'kat':
 	act 'Chat':
 		cla
 		clr
-		katday = day
+		katday = daystart
 		kat += 1
 		minut += 30
 		'You talked for half an hour.'
@@ -70,7 +70,7 @@ if $ARGS[0] = 'voleybol':
 	cla
 	clr
 	*clr
-	katday = day
+	katday = daystart
 	kat += 3
 	minut += 30
 	agil += 1
@@ -85,7 +85,7 @@ end
 
 if $ARGS[0] = 'walk':
 	cla
-	katday = day
+	katday = daystart
 	kat += 2
 	minut += 30
 	gs 'stat'

+ 1 - 1
locations/LCwork

@@ -191,7 +191,7 @@ if $ARGS[0] = 'Kitchen':
 	minut += 90
 	LCwork2 += 1
 	money += 175
-	LCwork2day = day
+	LCwork2day = daystart
 	'<center><img src="images/LakeCafe/KitchenWorkCafe.jpg"></center>'
 	'You wash the dishes, floors, chop vegetables, cook food for half an hour, for what you give your deserved 175 rubles.'
 

+ 4 - 4
locations/Mall

@@ -8,15 +8,15 @@ gs 'stat'
 '<center><img src="images/etogame/rinok.jpg"></center>'
 'Bustling market, you can buy in the market place to buy clothes or for 30,000 rubles and receive income from the outlet, but for the purchase and delivery of course need to have a car. You can trade yourself or hire a saleswoman.'
 
-! WD: Vars never Initialised ~ '$marka', 'benzin'
+! WD: Uninitialised ~ '$marka', 'benzin' use 'benz'
 if car = 0:
 	money -= 20
 	'You get on the shuttle bus and pay the fare of 20 rubles.'
-elseif car > 0 and benzin > 0:
-	benzin -= 1
+elseif car > 0 and benz > 0:
+	benz -= 1
 	gs 'stat'
 	'You reached into your <<$marka>>.'
-elseif car > 0 and benzin <= 0:
+elseif car > 0 and benz <= 0:
 	money -= 20
 	gs 'stat'
 	'You ran out of gas and you had to go on the bus, paying the fare of 20 rubles.'

+ 1 - 1
locations/MiroslavaHome

@@ -172,7 +172,7 @@ if hour >= 8 and hour <= 22:
 								horny += 20
 								if frost > 0:frost = 0
 								skinvan += 5
-								if skinvan >= 20:skinvan = 0 & skin = skin + 1
+								if skinvan >= 20:skinvan -= 20 & skin = skin + 1
 								gs 'stat'
 								'<center><img src="images/qwest/gadukino/MiraBan2.jpg"></center>'
 								'Finally the World ends up a wash, and for this cause you are accepted. Soon you join razomlevshego friend and the rest of the time you bathing in the bath, occasionally perceives meaningless comments...'

+ 2 - 2
locations/Nudelake

@@ -11,7 +11,7 @@ end
 
 act 'Go to the main beach':gt 'lake', 'start'
 
-if katday ! day and kat >= 1:
+if katday ! daystart and kat >= 1:
 	'You see at the beach Cat.'
 
 	act 'Approach the Cat':gt 'Katlake', 'kat'
@@ -60,7 +60,7 @@ if $ARGS[0] = 'zagarat':
 	nzagrand = rand(0, 100)
 
 	if nzagrand >= 60 and nzagrand < 70 and kat > 30 and katkey = 0:gt 'Katlake', 'key'
-	if nzagrand >= 70 and nzagrand < 80 and kat = 0 and katday ! day:gt 'Katlake'
+	if nzagrand >= 70 and nzagrand < 80 and kat = 0 and katday ! daystart:gt 'Katlake'
 	if nzagrand >= 80 and nzagrand < 90:gt 'Vnlake1'
 	if nzagrand >= 90:gt 'Vnlake2'
 

+ 1 - 1
locations/Prostitute

@@ -530,7 +530,7 @@ if $ARGS[0] = 'work2':
 								'You felt like like vagina stretched anus clasping member when a customer came in you, he immediately began to have your ass.'
 							end
 
-							if klismaday ! day:
+							if klismaday ! daystart:
 								act 'Escape':
 									cla
 									*clr

+ 6 - 6
locations/QwestDisdock

@@ -9,17 +9,17 @@ end
 !!located in the location park  array luna
 if vladimirQW = 0 and hour >= 9 and hour <= 20 and week > 5:'<a href="exec:gt ''qwloc''">Near the fence strong man stands and looks at you</a>.'
 !!in location korr
-if vladimirday ! day and vladimirQW = 20 and hour = 16:'<a href="exec:gt ''qwloc2''">The phone rings</a>.'
+if vladimirday ! daystart and vladimirQW = 20 and hour = 16:'<a href="exec:gt ''qwloc2''">The phone rings</a>.'
 !!in location telefon array start
-if vladimirday ! day and vladimirQW = 20 and hour = 16:gt 'qwloc2'
+if vladimirday ! daystart and vladimirQW = 20 and hour = 16:gt 'qwloc2'
 !!in location restoran array start
-if vladimirday = day and vladimirQW = 21 and hour = 20:gt 'qwmeet'
+if vladimirday = daystart and vladimirQW = 21 and hour = 20:gt 'qwmeet'
 !!in location korr
-if vladimirday ! day and vladimirQW = 25 and hour = 16 and week = 6:'<a href="exec:gt ''qwloc3''">The phone rings</a>.'
+if vladimirday ! daystart and vladimirQW = 25 and hour = 16 and week = 6:'<a href="exec:gt ''qwloc3''">The phone rings</a>.'
 !!in location telefon array start
-if vladimirday ! day and vladimirQW = 25 and hour = 16 and week = 6:gt 'qwloc3'
+if vladimirday ! daystart and vladimirQW = 25 and hour = 16 and week = 6:gt 'qwloc3'
 !!street
-if vladimirday = day and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet2''">Before your porch worth audit and near stolidly worth waiting for you driver Glory</a>.'
+if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet2''">Before your porch worth audit and near stolidly worth waiting for you driver Glory</a>.'
 
 !!down
 if izoldaQW >= 1:'<a href="exec:gt ''qwIzoldaApp''">Flat Isolde</a>.'

+ 1 - 1
locations/RimmaSexQW

@@ -1,7 +1,7 @@
 # RimmaSexQW
 cls
 minut += 15
-rimmaday = day
+rimmaday = daystart
 gs 'stat'
 'You came to Rimma that you smiled affably. And she said, I''ll end up, can go to you?'
 

+ 3 - 1
locations/Terminal

@@ -18,7 +18,7 @@ act 'Leave':
 	gt 'nord'
 end
 
-if TerminalPapper = 1 and DayTerminalPapper = day:
+if TerminalPapper = 1 and DayTerminalPapper = daystart:
 	act 'Classified documents':
 		cls
 		minut += 15
@@ -40,6 +40,7 @@ if money >= 100:
 		gs 'stat'
 		'You went to the office and spoke with the manager about buying small things.'
 
+		! WD: Uninitialised ~ 'tovarskladlevel' allways true
 		if tovarskladlevel = 0:
 			if tovarL >= 30:
 				'Thinking a bit you realize, you just have nowhere to store the goods and decide to unsubscribe from the purchase.'
@@ -77,6 +78,7 @@ if money >= 100:
 			gs 'stat'
 			'You went to the office and spoke with the manager about buying small things.'
 
+			! WD: Uninitialised ~ 'tovarskladlevel' allways true
 			if tovarskladlevel = 0:
 				if GarTorgItem >= 100:
 					'Thinking a bit you realize, you just have nowhere to store the goods and decide to unsubscribe from the purchase.'

+ 1 - 1
locations/Timofei

@@ -1,6 +1,6 @@
 # Timofei
 minut += 1
-sosedDay = day
+sosedDay = daystart
 gs 'stat'
 '<center><img src="images/qwest/sosed/sosed.jpg"></center>'
 'Timothy shakes ashes in a jar and you nod "Hello."'

+ 1 - 1
locations/TimofeiMetro

@@ -1,6 +1,6 @@
 # TimofeiMetro
 minut += 1
-sosedMetroDay = day
+sosedMetroDay = daystart
 gs 'stat'
 ! Missing Image
 !!'<center><img src="images/qwest/sosed.jpg"></center>'

+ 3 - 5
locations/_menu_automatica

@@ -1,10 +1,8 @@
 # $menu_automatica
-! WD: Location never called
-
-! WD: Missing location
+! WD: Location never called, Missing location ~ 'automatics', Unused ~ '$automatica'
+!{
 gs 'automatics'
-! WD: Vars never Initialised ~ '$automatica'
 dynamic $automatica
-
+}
 --- $menu_automatica ---------------------------------
 

+ 3 - 4
locations/_menu_mobila

@@ -1,8 +1,7 @@
 # $menu_mobila
-! WD: Location never called
-
-! WD: Vars never Initialised ~ $objmobila
+! WD: Location never called, Uninitialised ~ '$objmobila'
+!{
 dynamic $objmobila
-
+}
 --- $menu_mobila ---------------------------------
 

+ 1 - 1
locations/albinaEv

@@ -11,7 +11,7 @@ $din_albina_get_over_car = {
 	end
 }
 
-albinaCarday = day
+albinaCarday = daystart
 gs 'stat'
 '<center><img src="images/qwest/alter/BMW.jpg"></center>'
 'You went out to the car and see Albina sitting in it, nervously looking every which direction. As you approach, she starts the engine.'

+ 2 - 0
locations/alterStart

@@ -89,6 +89,8 @@ father = 50
 mother = 50
 sister = 50
 brother = 50
+! WD: Add Uninitialised ~ 'brotherDick'
+brotherDick = rand(13, 17)
 Suspeh = 75
 $npcName[1] = 'Dimka'
 $npcSurName[1] = 'Nosov'

+ 5 - 5
locations/annafrends

@@ -290,7 +290,7 @@ if reksLike = 1 and toiletRexSex = 0 and sisboypartyQW > 1:
 		gs 'reks'
 		gs 'stat'
 		'<center><img src="images/qwest/alter/Reks/Rex.jpg"></center>'
-		! WD: Vars never Initialised ~ '$rexRep'
+		! WD: Uninitialised ~ '$rexRep'
 		!! dynamic $rexRep
 		'Comes up to you Rex'
 		'- <<$nickname>>, as much as I 2 was given this nickname in the Park waiting for you! As it is not friendly...'
@@ -305,7 +305,7 @@ if reksLike = 1 and toiletRexSex = 0 and sisboypartyQW > 1:
 		gs 'reks'
 		gs 'stat'
 		'<center><img src="images/qwest/alter/Reks/Rex.jpg"></center>'
-		! WD: Vars never Initialised ~ '$rexRep'
+		! WD: Uninitialised ~ '$rexRep'
 		!! dynamic $rexRep
 		'Comes up to you Rex'
 		'- <<$nickname>>, as much as I  2 hours stuck at the door waiting for you! As it is not friendly...'
@@ -320,7 +320,7 @@ if reksLike = 1 and toiletRexSex = 0 and sisboypartyQW > 1:
 		gs 'reks'
 		gs 'stat'
 		'<center><img src="images/qwest/alter/Reks/Rex.jpg"></center>'
-		! WD: Vars never Initialised ~ '$rexRep'
+		! WD: Uninitialised ~ '$rexRep'
 		!! dynamic $rexRep
 		'Comes up to you Rex'
 		'- <<$nickname>>, well, you could even out said, I won`t go... I`m a disaster! Next time better tell that will not be able.'
@@ -333,14 +333,14 @@ if reksLike = 1 and toiletRexSex = 0 and sisboypartyQW > 1:
 		gs 'reks'
 		gs 'stat'
 		'<center><img src="images/qwest/alter/Reks/Rex.jpg"></center>'
-		! WD: Vars never Initialised ~ '$rexRep'
+		! WD: Uninitialised ~ '$rexRep'
 		!! dynamic $rexRep
 		'The Rex with a glass of beer.'
 		act 'Chat':
 			cla
 			rex += 1
 			minut += 5
-			! WD: Vars never Initialised ~ '$rexGdkTalk'
+			! WD: Uninitialised ~ '$rexGdkTalk'
 			!! dynamic $rexGdkTalk
 			gs 'stat'
 		end

+ 2 - 2
locations/artemhome

@@ -131,8 +131,8 @@ elseif artemhomemark = 1:
 	'Artem sits in his room on the bed.'
 
 	artemRand = rand(0,1)
-	if artemRand = 1 and artemtimes >= 45 and artemsex > 0 and artemanal > 0 and artemProgul ! day and (GorSlut < 2 or artemblag = 1):
-		artemProgul = day
+	if artemRand = 1 and artemtimes >= 45 and artemsex > 0 and artemanal > 0 and artemProgul ! daystart and (GorSlut < 2 or artemblag = 1):
+		artemProgul = daystart
 		cla
 		gs 'stat'
 		artemRand = rand(0,1)

+ 4 - 4
locations/arturRinok

@@ -39,19 +39,19 @@ if $ARGS[0] = 'start':
 			end
 		end
 	else
-		if arturday ! day:
+		if arturday ! daystart:
 			gt 'arturQW', 'arturQW_1'
-		elseif arturday = day:
+		elseif arturday = daystart:
 			cls
 			minut += 5
 			gs 'stat'
 
-			if arturblowday ! day:
+			if arturblowday ! daystart:
 				'<center><img src="images/qwest/alter/artur/artur.jpg"></center>'
 				'Arthur smiled kindly and handed you a tangerine. "Wai, work to do, I''m sorry. Unless it''s quick."'
 
 				act 'Go with Arthur':gt 'arturkiosk'
-			elseif arturblowday = day:
+			elseif arturblowday = daystart:
 				'<center><img src="images/qwest/alter/artur/artur.jpg"></center>'
 				'Arthur smiled amiably you. "Wai, work to do, I''m sorry."'
 

+ 1 - 1
locations/arturSex

@@ -3,7 +3,7 @@ horny += 10
 
 if arturSex = 0:arturSex = 1 & guy += 1
 
-arturDay = day
+arturDay = daystart
 gs 'stat'
 gs 'arturdin'
 'Arthur put his arm around you, and his hands began to take off your clothes and caress your body.'

+ 1 - 1
locations/arturkiosk

@@ -18,7 +18,7 @@ act 'Kneel down':
 		cumlip += 1
 		swallow += 1
 		money += 500
-		arturblowday = day
+		arturblowday = daystart
 		gs 'stat'
 		'<center><img src="images/qwest/alter/artur/cocksuckercum.jpg"></center>'
 		'Arthur began to cum in your mouth and you become immediately swallow sperm. After that Arthur grinned, bosses cock in his pants and said "Wai Svetka, You''re a real nipple. Here''s from Uncle Arturchik, Buy sebe konfetok." he handed to you 500 rubles.'

+ 1 - 1
locations/balkon

@@ -28,7 +28,7 @@ if $ARGS[0] = 'start':
 	end
 
 	if $clothingworntype = 'nude':
-		if sosedBalDay ! day:
+		if sosedBalDay ! daystart:
 			if rand(1, 4) = 4:
 				'A neighbor from the opposite building is out on his balcony and looking at your naked body.'
 				act 'Look at the neighbor':gt 'balkon2', 'sosed'

+ 3 - 3
locations/balkon2

@@ -21,7 +21,7 @@ if $ARGS[0] = 'demo1':
 	*clr
 	horny += rand(30, 50)
 	minut += 5
-	sosedBalDay = day
+	sosedBalDay = daystart
 
 	if exhibi = 2:exhibi = 3
 
@@ -42,7 +42,7 @@ if $ARGS[0] = 'palec1':
 	*clr
 	horny += rand(10, 30)
 	minut += 1
-	sosedBalDay = day
+	sosedBalDay = daystart
 	gs 'stat'
 
 	if tanga = 1:'<center><img src="images/community/fuckyou_underwear.jpg"></center>'
@@ -59,7 +59,7 @@ if $ARGS[0] = 'niz':
 	*clr
 	gs 'stat'
 
-	! WD: Vars never Initialised ~ 'alcohol' USE 'alko'
+	! WD: Uninitialised ~ 'alcohol' USE 'alko'
 	if alko < 12:
 		if $clothingworntype = 'nude':
 			'<center><img src="images/community/balcony_naked2.jpg"></center>'

+ 1 - 1
locations/bank

@@ -13,7 +13,7 @@ if $ARGS[0] = 'start':
 
 	if karta > 0:'In the bank <<karta>> rubles'
 
-	if BankPapper = 1 and dayBankPapper = day:
+	if BankPapper = 1 and dayBankPapper = daystart:
 		act 'Give documents':
 			cls
 			minut += 15

+ 1 - 1
locations/bass

@@ -14,7 +14,7 @@ if $ARGS[0] = 'start':
 
 	act 'Leave':minut += 5 & gt 'down'
 
-	if db >= 1 and bikini > 0 and Goraday ! day:act 'Search ZHoru':Goraday = day & gt 'klofdomhouse', 'ev42'
+	if db >= 1 and bikini > 0 and Goraday ! daystart:act 'Search ZHoru':Goraday = daystart & gt 'klofdomhouse', 'ev42'
 
 	if money >= 100 and bikini > 0:
 		act 'Pay to swim in the pool for an hour (100 rubles)':

+ 3 - 3
locations/bed

@@ -7,7 +7,7 @@ if $ARGS[0] = 'start':
 	housevorrand = rand(0, 200)
 	gs 'stat'
 
-	if hour > 22 and houserabrand < 2 and houserab = 1 and houserabday ! day and son < 10 and tanhouse1 = 1:gt 'bed', 'rab'
+	if hour > 22 and houserabrand < 2 and houserab = 1 and houserabday ! daystart and son < 10 and tanhouse1 = 1:gt 'bed', 'rab'
 	if hour > 22 and housevorrand = 0 and housrA = 1 and husband = 0:gt 'bed', 'vor'
 
 	if $clothingworntype = 'nude':
@@ -184,7 +184,7 @@ if $ARGS[0] = 'start':
 	act 'Get out of bed':gt 'bed', 'fin'
 	act 'Try to sleep':gt 'bed2', 'dosip'
 
-	if zoo > 6 and housrA = 1 and dogday ! day and houserabrand < 4:gt 'bed1', 'sog1'
+	if zoo > 6 and housrA = 1 and dogday ! daystart and houserabrand < 4:gt 'bed1', 'sog1'
 end
 
 if $ARGS[0] = 'fin':
@@ -220,7 +220,7 @@ if $ARGS[0] = 'rab':
 	cla
 	*clr
 	minut += 120
-	houserabday = day
+	houserabday = daystart
 	'<center><img src="images/img/th/r0.jpg"></center>'
 	'Once you get into bed as you mistress comes into the room, "What a bitch sleep going?" she said from the doorway.'
 	'"Yes, " you reply.'

+ 1 - 1
locations/bed1

@@ -57,7 +57,7 @@ if $ARGS[0] = 'sogn':
 	*clr
 	horny += 10
 	minut += 10
-	dogday = day
+	dogday = daystart
 	'You undressed and lay down on the bed <<$namesob>> brazenly jumped into bed and began to lick your pussy'
 	'<center><img src="images/zoo/2.jpg"></center>'
 

+ 6 - 6
locations/bedr

@@ -35,16 +35,16 @@ else
 	$nude = 'Get dressed'
 end
 
-if husbandrinkday = day:
+if husbandrinkday = daystart:
 	if husbanstrapon = 1:'Drunken husband sleeps on the bed with butt plug in his ass.'
 	if husbanstrapon = 2:'Drunken husband sleeps on the bed after you have put a dildo up his ass.'
 	if husbanstrapon = 3:'Drunken husband sleeps on the bed after you fucked him with a strapon.'
 end
-if husband > 0 and husbandrink ! 10 and husbandrinkday ! day:
+if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 	if hour > 22 or hour < 7:'<a href="exec:gt ''husb'', ''start''">Husband is sleeping on the bed.</a>'
 end
 
-if husbandrink = 11 and husbanstrapon > 0 and husbandrinkday ! day:
+if husbandrink = 11 and husbanstrapon > 0 and husbandrinkday ! daystart:
 	cla
 	'Your husband approached you and said, "Honey my ass hurts do you know if maybe I fell yesterday"'
 
@@ -118,7 +118,7 @@ if husbandrink = 10 and hour > 20 and hour < 23 and husbanstrapon = 0:
 		act 'Insert butt plug in his ass':
 			cla
 			*clr
-			husbandrinkday = day
+			husbandrinkday = daystart
 			husbandrink = 11
 			husbanstrapon = 1
 			minut += 10
@@ -199,12 +199,12 @@ end
 
 if dur > 0:'You have hidden <<dur>> doses pale lady'
 
-if dur > 0 and narkday ! day:
+if dur > 0 and narkday ! daystart:
 	act 'Sniff pale lady (0:05)':
 		cla
 		*clr
 		minut += 5
-		narkday = day
+		narkday = daystart
 		health = vital * 10 + stren * 5
 		willpower = intel * 5 + will * 5
 		manna = (intel * magik) + magik * 100 + vital * 10 + rikudo

+ 2 - 2
locations/bedrPar

@@ -76,12 +76,12 @@ end
 
 if dur > 0:'You have hidden <<dur>> doses pale lady'
 
-if dur > 0 and narkday ! day:
+if dur > 0 and narkday ! daystart:
 	act 'Nyuhnut pale lady 5 min':
 		cla
 		*clr
 		minut += 5
-		narkday = day
+		narkday = daystart
 		health = vital * 10 + stren * 5
 		willpower = intel * 5 + will * 5
 		manna = (intel * magik) + magik * 100 + vital * 10 + rikudo

+ 3 - 3
locations/bedrPar2

@@ -17,16 +17,16 @@ lcolor = rgb(106, 90, 205)
 'The room in which the parents live. In the center stands a double bed and a large clowall.'
 gs 'family'
 
-if hour > 6 and hour < 21 and prezikday!day:
+if hour > 6 and hour < 21 and prezikday ! daystart:
 	if prezikProver >= 3:
-		prezikday = day - 4
+		prezikday = daystart - 4
 		act 'Take condoms from your parents stash':
 			cls
 			cla
 			gs 'stat'
 			minut+=rand(5,7)
 			prezik+=rand(1,3)
-			prezikday=day
+			prezikday = daystart
 			prezikProver = 0
 			'<center><img src="images/qwest/alter/condoms_steal.jpg"></center>'
 			'You quietly pulled out of the parent caches some condoms. Now you have <<prezik>> pcs.'

+ 2 - 2
locations/bobka

@@ -23,7 +23,7 @@ $bobka_inject = {
 
 		if narkoman ! 0:$tempval = ' with trembling hands'
 
-		! WD: Vars never Initialised ~ '$tempname' USE '$boy'
+		! WD: Uninitialised ~ '$tempname' USE '$boy'
 		'You grabbed the syringe and injected yourself<<$tempval>>. While <<$boy>> was looking at you with a smile.'
 
 		if HaveMetBobka = 0:'"By the way I''m Bobka, and you are?" You mumbled "<<$name>>."' & HaveMetBobka = 1
@@ -84,7 +84,7 @@ elseif bobrand = 2:
 		'<center><img src="images/qwest/sosed/anal.jpg"></center>'
 		dynamic $sexstart
 		dynamic $analsex
-		! WD: Vars never Initialised ~ '$tempname' USE '$boy'
+		! WD: Uninitialised ~ '$tempname' USE '$boy'
 		'Finally <<$boy>> stops and you feel like your ass filling with warm sperm.'
 		'He threw you a syringe.'
 		dynamic $bobka_inject

+ 3 - 3
locations/boyfrend

@@ -32,7 +32,7 @@ if $ARGS[0] = 'A':
 	titBoyA = titBoy
 	haerBoyA = haerBoy
 	harakBoyA = harakBoy
-	boydayA = day
+	boydayA = daystart
 	bfA = 1
 	daya = 0
 	boyonceA = 0
@@ -60,7 +60,7 @@ if $ARGS[0] = 'B':
 	titBoyB = titBoy
 	haerBoyB = haerBoy
 	harakBoyB = harakBoy
-	boydayB = day
+	boydayB = daystart
 	bfB = 1
 	dayb = 0
 	boyonceB = 0
@@ -84,7 +84,7 @@ if $ARGS[0] = 'C':
 	titBoyC = titBoy
 	haerBoyC = haerBoy
 	harakBoyC = harakBoy
-	boydayC = day
+	boydayC = daystart
 	bfC = 1
 	dayc = 0
 	boyonceC = 0

+ 1 - 1
locations/brosh

@@ -80,7 +80,7 @@ act 'Going beyond school':
 		gs 'stat'
 
 		'<center><img src="images/qwest/alter/ev/bj.jpg"></center>'
-		'You sat down on his haunches and took Kolka <<brotherDick>>-five inch penis from his pants pulling your face to its members, You dutifully wrapped around his lips and began to suck.'
+		'You sat down on his haunches and took Kolka <<brotherDick>>cm penis from his pants pulling your face to its members, You dutifully wrapped around his lips and began to suck.'
 
 		act 'Suck':
 			cls

+ 1 - 1
locations/brosok

@@ -7,7 +7,7 @@ if boyonceA = 0:
 	$bfsex += '<font color="maroon">'+$boyA+'</font>:He was a '+$boybody+' '+$boybod+' '+$boyface+'. Most of the time he was '+$boyClo+' First time we had sex was on the '+day+'th of '+$month+'. He had a '+dickA+' cm long member'
 
 	if dickA > 20:
-		$bfsex += '[:o].'
+		$bfsex += '[:c].'
 		elseif dickA > 14:
 		$bfsex += '[:)].'
 	else

+ 42 - 30
locations/brother

@@ -11,7 +11,8 @@ if brother >= 40 and brother < 60:'You and your brother normal relations.'
 if brother >= 60 and brother < 80:'You and your brother good relationship.'
 if brother >= 80:'You and your brother a great relationship.'
 
-if cumbelly > 0 and nude = 1:
+! WD: Fix old nude variable
+if cumbelly > 0 and $clothingworntype = 'nude':
 	'- Go wash yourself, you look disgusting covered in all that cum.'
 	if brothersex = 0:
 		brother -= 1
@@ -28,7 +29,8 @@ if  cumface > 0 :
 	end
 end
 
-if cumass > 0 and nude=1 and tanga =0:
+! WD: Fix old nude variable
+if cumass > 0 and $clothingworntype = 'nude' and tanga =0:
 	'- Go wash yourself, all the ass in concho.'
 	if brotherSex = 0:
 		brother -=1
@@ -37,21 +39,22 @@ if cumass > 0 and nude=1 and tanga =0:
 	end
 end
 
-if cumfrot > 0 and nude = 0:
+! WD: Fix old nude variable
+if cumfrot > 0 and $clothingworntype ! 'nude':
 	'- You have all the clothes are dirty. Wash, or mother ask.'
 end
 
-if spanked > 1 and nude=1 and tanga=0:
+if spanked > 1 and $clothingworntype = 'nude' and tanga=0:
 	'What`s with booty? Punished for that-then?'
 end
 
-if nude=1 and lobok>2 and tanga = 0:
+if $clothingworntype = 'nude' and lobok > 2 and tanga = 0:
 	'- You would have shaved, - brother makes you a comment, - or not Demetriou all your thickets'
-elseif nude=1:
+elseif $clothingworntype = 'nude':
 	if brotherSex >= 1:
 		'"<<$nickname>>, you have an amazing body"'
 	else
-		'"Very best look. You what,nudism decided to do?'
+		'Very best look. You what, nudism decided to do?'
 		brother += 1
 	end
 end
@@ -88,8 +91,9 @@ if $loc = 'gschool':
 		'Brother frowns "Get off me pridurochnaya!"'
 		exit
 	end
-	if evgenQW >= 4 and BJBeerQW >= 3:
-		'Brother grins "Hi <<$nickname>>. But why do you want this football, better go with us to watch porn?'
+	! WD: Unused Var 'BJBeerQW' use 'GorSlut'
+	if evgenQW >= 4 and GorSlut >= 3:
+		'Brother grins "Hi <<$nickname>>. But why do you want this football, better go with us to watch porn?"'
 
 		act 'Go watch porn':minut += 5 & gt 'seeporn'
 	elseif evgenQW >= 4:
@@ -144,7 +148,8 @@ if $loc = 'gschool':
 end
 !!end
 
-if $loc = 'sitrPar' and indorf = 0 and nude = 0 and brothersawpirsF=0 and father_go = 1 and brother > 85 and hour >= 18 and hour < 21 and pirsF > 0:
+! WD: Fix old nude variable
+if $loc = 'sitrPar' and indorf = 0 and $clothingworntype ! 'nude' and brothersawpirsF=0 and father_go = 1 and brother > 85 and hour >= 18 and hour < 21 and pirsF > 0:
 	act 'Show pierced nipples':
 		cls
 		gs 'stat'
@@ -166,7 +171,9 @@ if $loc = 'sitrPar' and indorf = 0 and nude = 0 and brothersawpirsF=0 and father
 	end
 end
 
-if $loc = 'sitrPar' and indorf = 0 and nude=1 and pirsF>0 and brothersawpirsF =0:
+$clothingworntype ! 'nude'
+! if $loc = 'sitrPar' and indorf = 0 and nude=1 and pirsF>0 and brothersawpirsF =0:
+if $loc = 'sitrPar' and indorf = 0 and $clothingworntype = 'nude' and pirsF>0 and brothersawpirsF =0:
 	if  brotherSex = 0:
 		if brother>=70:
 			'- Good on you, - brother, wink, indicates your pierced nipples.'
@@ -201,9 +208,9 @@ end
 
 dynamic $brotherSexCount
 
-if $loc = 'sitrPar' and indorf = 0 and brotherSexCount > 0 and brotherDay = day:
+if $loc = 'sitrPar' and indorf = 0 and brotherSexCount > 0 and brotherDay = daystart:
 	brotherRand = rand(0,10)
-	if hour >= 5 and hour < 7 and brotherSex > 0 and brotherMorningSex ! day and brotherRand < 2:
+	if hour >= 5 and hour < 7 and brotherSex > 0 and brotherMorningSex ! daystart and brotherRand < 2:
 		'Going up in the morning to the sleeping brother, you saw the mound under the blanket.'
 		act 'On-quiet morning to solve the problem of his brother':
 			cls
@@ -214,7 +221,7 @@ if $loc = 'sitrPar' and indorf = 0 and brotherSexCount > 0 and brotherDay = day:
 			swallow += 1
 			brotherSex += 1
 			brotherSexCount -= 1
-			brotherMorningSex = day
+			brotherMorningSex = daystart
 			gs 'stat'
 
 			'<center><img src="images/qwest/alexey/bj6.jpg"></center>'
@@ -226,12 +233,13 @@ if $loc = 'sitrPar' and indorf = 0 and brotherSexCount > 0 and brotherDay = day:
 		end
 	end
 
-	if hour >= 21 and hour < 24 and brotherSex > 0 and brotherNightSex ! day:
+	if hour >= 21 and hour < 24 and brotherSex > 0 and brotherNightSex ! daystart:
 		'When you come closer, he suddenly opened his eyes and said,:'
-		if sub > 0 or (evgenQW >= 4 and BjBeerQW>=3):
+		! WD: Unused Var 'BJBeerQW' use 'GorSlut'
+		if sub > 0 or (evgenQW >= 4 and GorSlut >= 3):
 			'"<<$nickname>>, help me sleep." Then he threw a blanket, and you saw him strut.'
 			brotherSexCount -= 1
-			brotherNightSex = day
+			brotherNightSex = daystart
 
 			dynamic $brotherSexStart
 		else
@@ -240,7 +248,7 @@ if $loc = 'sitrPar' and indorf = 0 and brotherSexCount > 0 and brotherDay = day:
 			act 'Help him':
 				'"Yes, I know, what to do" Then he pulled back the blanket and saw him strut.'
 				brotherSexCount -= 1
-				brotherNightSex = day
+				brotherNightSex = daystart
 
 				dynamic $brotherSexStart
 			end
@@ -252,12 +260,13 @@ if $loc = 'sitrPar' and indorf = 0 and brotherSexCount > 0 and brotherDay = day:
 		end
 	end
 
-	if father_go = 1 and hour >= 18 and hour < 21 and brotherSex > 0 and brotherEvSex ! day:
+	if father_go = 1 and hour >= 18 and hour < 21 and brotherSex > 0 and brotherEvSex ! daystart:
 		'When you come closer, He turned to you and said,:'
-		if sub > 0 or (evgenQW >= 4 and BjBeerQW>=3):
+		! WD: Unused Var 'BJBeerQW' use 'GorSlut'
+		if sub > 0 or (evgenQW >= 4 and GorSlut >= 3):
 			'"<<$nickname>>, Come on you-quiet here you will work, to ancestors have not heard." Then he dropped his pants, and you have seen his hard <<brotherDick>> inch dick.'
 			brotherSexCount -= 1
-			brotherEvSex = day
+			brotherEvSex = daystart
 
 			dynamic $brotherSexStart
 		else
@@ -266,7 +275,7 @@ if $loc = 'sitrPar' and indorf = 0 and brotherSexCount > 0 and brotherDay = day:
 			act 'Help him':
 				'"I know, which will help solve this problem, only-quiet and take your pants off." Once your words Kolka smiled and took off his pants, exposing his standing <<brotherDick>> inch dick.'
 				brotherSexCount -= 1
-				brotherEvSex = day
+				brotherEvSex = daystart
 
 				dynamic $brotherSexStart
 			end
@@ -387,7 +396,8 @@ $brotherSexStart = {
 
 $brotherSexEnd = {
 	brotherSex += 1
-	if sub > 0 or (evgenQW >= 4 and BjBeerQW>=3):
+	! WD: Unused Var 'BJBeerQW' use 'GorSlut'
+	if sub > 0 or (evgenQW >= 4 and GorSlut >= 3):
 		if $loc = 'sitrPar' and father_go = 1 and hour >= 18 and hour < 21:
 			minut += 15
 
@@ -427,18 +437,20 @@ $brotherSexEnd = {
 }
 
 $brotherSexCount = {
-	if brotherDay = day - 1 and brotherSexCount > 0:brotherSexCount = 5
+	if brotherDay = daystart - 1 and brotherSexCount > 0:brotherSexCount = 5
 
-	if brotherMorningSex < day or brotherMorningSex > day:brotherMorningSex = day - 1
-	if brotherEvSex < day or brotherEvSex > day:brotherEvSex = day - 1
-	if brotherNightSex < day or brotherNightSex > day:brotherNightSex = day - 1
+	if brotherMorningSex ! daystart:brotherMorningSex = daystart - 1
+	if brotherEvSex  ! daystart:brotherEvSex = daystart - 1
+	if brotherNightSex  ! daystart:brotherNightSex = daystart - 1
 
 	if brotherSexCount < 1:
-		brotherDay = day + 1
+		brotherDay = daystart + 1
 		brotherSexCount = 5
 	else
-		brotherDay = day
+		brotherDay = daystart
 	end
+	
+	!{
 	if month = 1 or month = 3 or month = 5 or month = 7 or month = 8 or month = 10 or month = 12:
 		!31
 		if brotherDay > 31:brotherDay -= 31
@@ -451,7 +463,7 @@ $brotherSexCount = {
 	end
 
 	if brotherDay = 0:brotherDay = 1
-
+	}
 }
 
 --- brother ---------------------------------

+ 4 - 4
locations/buklinik

@@ -279,10 +279,10 @@ if $ARGS[0] = 'olga2':
 	'(Olga - groomed and cute brunette with a kind smile.)'
 
 	if bumtolik > 5:'- Hello, <<$name>>!'
-	if buklinikDay = day:'- Today there is no more work, we can relax.'
-	if bumtolik = 7 and buklinikDay ! day:'- <<$name>>, We need help <a href="exec:gt ''buklinik_event'', ''pos6''">feed the needy</a>.'
-	if bumtolik >= 8 and buklinikDay ! day: '- <<$name>>, here is the address of one <a href="exec:GT ''buklinik_event'',''pos8''">elderly man</a>, go see him help with the housework.'
-	if bumtolik = 9 and buklinikDay ! day: '- <<$name>>, Need help persuade a wino not wander the streets, and come to live with <a href="exec:GT ''buklinik_event'',''pos9''">to_us</a>.'
+	if buklinikDay = daystart:'- Today there is no more work, we can relax.'
+	if bumtolik = 7 and buklinikDay ! daystart:'- <<$name>>, We need help <a href="exec:gt ''buklinik_event'', ''pos6''">feed the needy</a>.'
+	if bumtolik >= 8 and buklinikDay ! daystart: '- <<$name>>, here is the address of one <a href="exec:GT ''buklinik_event'',''pos8''">elderly man</a>, go see him help with the housework.'
+	if bumtolik = 9 and buklinikDay ! daystart: '- <<$name>>, Need help persuade a wino not wander the streets, and come to live with <a href="exec:GT ''buklinik_event'',''pos9''">to_us</a>.'
 	if bumtolik = 5:
 		bumtolik = 6
 		'Olga:- Continue along the corridor beds, showers and a dining room where guests can eat for free. See there is nothing special. Well, that''s all. At the reception we sit two girls - Regina and Karina, you''ve seen them.'

+ 5 - 5
locations/buklinik_event

@@ -3,7 +3,7 @@ if $ARGS[0] = 'pos1':
 	cla
 	*clr
 	minut += 30
-	buklinikDay = day
+	buklinikDay = daystart
 	gs 'stat'
 	'<center><img src="images/etogame/bukli_spal.jpg"></center>'
 	'The room was a male and you have decided that it is necessary to introduce them.'
@@ -34,7 +34,7 @@ if $ARGS[0] = 'pos2':
 
 	'You seated at a small table in the center of the room. On all sides surround you face strangers. Mostly elderly, but as one with a hangover.'
 
-	'Vladimir:- Meet it Vitaly is Paul Afanasyevitch Oleg O., Kostya and lame Albert.'
+	'Vladimir:- Meet it Vitaly is Paul Afanasyevitch Oleg c., Kostya and lame Albert.'
 	'From the crowd:- So you''ll help us, it''s good to help me not hurt. Long time I did not help women.'
 	'- Yeah, and me! So young, smooth skin and smells delicious.'
 
@@ -107,7 +107,7 @@ end
 if $ARGS[0] = 'pos7':
 	cla
 	*clr
-	buklinikDay = day
+	buklinikDay = daystart
 	gs 'stat'
 	'<center><img src="images/etogame/bukli_eat2.jpg"></center>'
 	if bumtolik > 7:
@@ -127,7 +127,7 @@ if $ARGS[0] = 'pos8':
 
 	if bumtolik = 8:bumtolik = 9
 
-	buklinikDay = day
+	buklinikDay = daystart
 	minut += 120
 	manna += 20
 	gs 'stat'
@@ -139,7 +139,7 @@ end
 if $ARGS[0] = 'pos9':
 	cla
 	*clr
-	buklinikDay = day
+	buklinikDay = daystart
 	minut += 120
 	gs 'stat'
 	'<center><img src="images/etogame/bukli_mission.jpg"></center>'

+ 6 - 6
locations/burger

@@ -122,11 +122,11 @@ if $ARGS[0] = 'start':
 				act 'Leave':gt 'burger', 'start'
 			end
 		end
-	elseif posuda >= 1 and posudaday ! day and NoBistroWork = 0 and PersSecWork = 0:
+	elseif posuda >= 1 and posudaday ! daystart and NoBistroWork = 0 and PersSecWork = 0:
 		act 'Wash the dishes for 100 rubles (1:00)':
 			cla
 			*clr
-			posudaday = day
+			posudaday = daystart
 			minut += 60
 			posuda += 1
 			manna -= 15
@@ -349,7 +349,7 @@ if $ARGS[0] = 'start':
 
 							act 'Envelope attributed to Ivan':
 								cls
-								IvanPodstavaDay = day
+								IvanPodstavaDay = daystart
 								IvanPodstavaQW = 1
 								NoBistroWork = 1
 								gs 'stat'
@@ -362,7 +362,7 @@ if $ARGS[0] = 'start':
 						act 'Envelope attributed to Ivan':
 							cls
 							$burgerIvanText = 'You took the envelope and close the safe headed out.'
-							IvanPodstavaDay = day
+							IvanPodstavaDay = daystart
 							IvanPodstavaQW = 1
 							NoBistroWork = 1
 							gs 'stat'
@@ -585,11 +585,11 @@ if $ARGS[0] = 'start':
 
 			act 'Leave':gt 'burger', 'start'
 		end
-	elseif posudaA >= 1 and posudaAday ! day and hour < 10 and NoBistroWork = 0 and PersSecWork = 0:
+	elseif posudaA >= 1 and posudaAday ! daystart and hour < 10 and NoBistroWork = 0 and PersSecWork = 0:
 		act 'Wash the floor for 100 rubles(1:00)':
 			cla
 			*clr
-			posudaAday = day
+			posudaAday = daystart
 			minut += 60
 			posuda += 1
 			manna -= 15

+ 6 - 6
locations/burgerBoss

@@ -62,7 +62,7 @@ if BistroBoss = 10:
 							work = 1
 							PersSecWork = 1
 							gs 'stat'
-							'You agreed to become secretary Anatoly Chubais, he took your career, made a copy of passport and diploma, and began to tell. Come back every weekday at bystroezhku no later than 9 o''clock, carefully observe the dress code. Receive calls, write, print documents, in general nothing supernatural. Will work to 17ti hours, salary every month.'
+							'You agreed to become secretary Anatoly Chubais, he took your career, made a copy of passport and diploma, and began to tell. Come back every weekday at bystroezhku no later than 9 c''clock, carefully observe the dress code. Receive calls, write, print documents, in general nothing supernatural. Will work to 17ti hours, salary every month.'
 
 							act 'Leave':gt 'burger', 'start'
 						end
@@ -130,7 +130,7 @@ elseif BistroBoss = 1:
 				swallow += 1
 				cumlip += 1
 				BistroBoss = 2
-				BistroBossDay = day
+				BistroBossDay = daystart
 				gs 'stat'
 				'<center><img src="images/qwest/sosed/bj2.jpg"></center>'
 				'You knelt down and took the money from the floor. Anatoly Borisovich member and you got tipped off his face on his solid body. Then you gripped it with his lips and began to suck as hard core feeling fills your mouth. Anatoly Borisovich his teeth with pleasure "Suck slut, now swallow, and that would be swallowed up all the drops!" You feel like you hit the sperm in her mouth and began to swallow cum quickly, that would not choke. When finished, Anatoly Borisovich took dick in pants and said, "Now get out."'
@@ -140,13 +140,13 @@ elseif BistroBoss = 1:
 		end
 	end
 
-elseif BistroBoss = 2 and BistroBossDay = day:
+elseif BistroBoss = 2 and BistroBossDay = daystart:
 	'Knocking you walked into the office to Anatoly Borisovich. He looked angrily at you, "I said, get out of here."'
 
 	act 'Leave':gt 'burger', 'start'
 
-elseif BistroBoss = 2 and BistroBossDay ! day:
-	BistroBossDay = day
+elseif BistroBoss = 2 and BistroBossDay ! daystart:
+	BistroBossDay = daystart
 	'Knocking you walked into the office to Anatoly Borisovich. He looked darkly at you and got a bill of 300 rubles, "Get up on your knees and work it off, as you are able, vaflersha."'
 
 	act 'Leave':gt 'burger', 'start'
@@ -158,7 +158,7 @@ elseif BistroBoss = 2 and BistroBossDay ! day:
 		bj += 1
 		swallow += 1
 		cumlip += 1
-		BistroBossDay = day
+		BistroBossDay = daystart
 		gs 'stat'
 		'<center><img src="images/qwest/sosed/bj2.jpg"></center>'
 		'You knelt down and took the money from the floor. Anatoly Borisovich member and you got tipped off his face on his solid body. Then you gripped it with his lips and began to suck as hard core feeling fills your mouth. Anatoly Borisovich his teeth with pleasure "Suck slut, now swallow, and that would be swallowed up all the drops!" You feel like you hit the sperm in her mouth and began to swallow cum quickly, that would not choke. When finished, Anatoly Borisovich took dick in pants and said, "Now get out."'

+ 3 - 3
locations/butik

@@ -29,8 +29,8 @@ if $ARGS[0] = 'start':
 		act 'Stare at the woman.':gt 'event', 'lesbi'
 	end
 
-	if QWdogreiqTimer = 0 and QWdogReiq = 1 and week = 7 and qwdogiventday ! day:
-		qwdogiventday = day
+	if QWdogreiqTimer = 0 and QWdogReiq = 1 and week = 7 and qwdogiventday ! daystart:
+		qwdogiventday = daystart
 		'Going into the boutique you begin to consider picking dresses on hangers.By casually taking one you try it on in passing it on your back ,you hang with mild grim face.One of the dresses unexpectedly attracts your attention , as you began to study it more closely ,you feel a strange feeling as if you were being watched'
 
 		act 'Disregard':gt 'butik', 'start'
@@ -40,7 +40,7 @@ if $ARGS[0] = 'start':
 	end
 
 	if RimmaSex > 0:
-		if rimmaday ! day:
+		if rimmaday ! daystart:
 			'<a href="exec:gt ''RimmaSexQW''">Rima</a> smiled at you. She bits her lip and starts shooting her eyes in your direction.'
 		else
 			'Rima smiled at you and continued to do her business.'

+ 6 - 6
locations/clener

@@ -54,9 +54,9 @@ if $ARGS[0] = 'start':
 			minut += 5
 			gs 'stat'
 
-			if borodachSexDay = day:'You approach the security guard and say hello. You chat with him a bit, then Sasha was going to crawl and you''re away without becoming disturb him.'
+			if borodachSexDay = daystart:'You approach the security guard and say hello. You chat with him a bit, then Sasha was going to crawl and you''re away without becoming disturb him.'
 
-			if borodachSexDay ! day:
+			if borodachSexDay ! daystart:
 				'You approach the security guard and say hello. He winks at you, I stashed the bubble here, as you look at the cult of mass leisure?'
 
 				act 'Come':
@@ -257,11 +257,11 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if clener > 1 and clenday ! day:
+	if clener > 1 and clenday ! daystart:
 		act 'Mop the floor in the office (1:00)':
 			cla
 			*clr
-			clenday = day
+			clenday = daystart
 			minut += 60
 			clener += 1
 			manna -= 15
@@ -323,11 +323,11 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if clenerT >= 1 and clendayT ! day:
+	if clenerT >= 1 and clendayT ! daystart:
 		act 'Clean toilets (1:00)':
 			cla
 			*clr
-			clendayT = day
+			clendayT = daystart
 			minut += 60
 			clenerT += 1
 			manna -= 25

+ 5 - 5
locations/club

@@ -941,27 +941,27 @@ if $ARGS[0] = 'lezbsort2':
 end
 
 if $ARGS[0] = 'vip':
-	if vipcart = 0 and vipday ! day:
+	if vipcart = 0 and vipday ! daystart:
 		'A security guard stops you from going any further. "I''m sorry, I can''t let your through, because you don''t own a VIP-Card. You can buy one for 10.000 rubles, which will be good for 10 visits."'
 
 		if money >= 10000:
 			act 'Buy a VIP-Card (10,000 rubles)':
 				money -= 10000
 				vipcart = 10
-				vipday = day
+				vipday = daystart
 				gt 'vipclub', 'start'
 			end
 		end
-	elseif vipcart > 0 and vipday ! day:
+	elseif vipcart > 0 and vipday ! daystart:
 		act 'Go to the VIP-Area':
 			vipcart -= 1
 			vipday = 1
-			vipday = day
+			vipday = daystart
 			gt 'vipclub', 'start'
 		end
 	end
 
-	if vipday = day:act 'Go back the main area':gt 'vipclub', 'inside'
+	if vipday = daystart:act 'Go back the main area':gt 'vipclub', 'inside'
 
 	act 'Leave him be and go away':gt 'club', 'inside'
 end

+ 5 - 4
locations/counter

@@ -5,10 +5,11 @@ if music_on <> music_on_prev or $music_theme <> $music_theme_prev:
 	$music_theme_prev = $music_theme
 
 	if $music_theme <> '':
-		copyarr 'cur_theme', 'tracklist_<<$music_theme>>'
+	! WD: Numeric arrays 'cur_theme' & 'tracklist_*' don`t exist use string arrays
+		copyarr '$cur_theme', '$tracklist_<<$music_theme>>'
 		track[$music_theme] = track[$music_theme] - 1
 
-		if track[$music_theme] < 0:track[$music_theme] = arrsize('cur_theme')
+		if track[$music_theme] < 0:track[$music_theme] = arrsize('$cur_theme')
 	end
 end
 
@@ -16,14 +17,14 @@ if music_on = 1 and $music_theme <> '':
 	if no isplay ($cur_theme[track[$music_theme]]):
 		track[$music_theme] += 1
 
-		if arrsize('cur_theme') <= track[$music_theme]:track[$music_theme] = 0
+		if arrsize('$cur_theme') <= track[$music_theme]:track[$music_theme] = 0
 	end
 
 	play $cur_theme[track[$music_theme]], volume
 end
 
 ! WD: Code not called
-! WD: Vars never Initialised ~ '$race1[]', '$showcar'
+! WD: Uninitialised~ '$race1[]', '$showcar'
 ! {
 if race_start = 1:
 	bcolor = rgb(255, 255, 255)

+ 1 - 1
locations/dachain

@@ -11,7 +11,7 @@ lcolor = rgb(106, 90, 205)
 
 if hour >= 6 and hour <= 20 and etoexhib = 11:'Kopashatsya working in the garden, hmm ... maybe sometime <a href="exec:gt ''etoexhib'', ''pos10''">motivate</a> for them to work quicker and smarter.'
 if hour >= 6 and hour <= 20 and etoexhib = 12:'Leave in <a href="exec:gt ''etoexhib'', ''pos11''">garden in lingerie and robe.</a>'
-if hour >= 6 and hour <= 20 and etoexhib = 13 and temp ! day:'I wonder how to <a href="exec:gt ''etoexhib'', ''pos12''">garden</a>'
+if hour >= 6 and hour <= 20 and etoexhib = 13 and temp ! daystart:'I wonder how to <a href="exec:gt ''etoexhib'', ''pos12''">garden</a>'
 
 if hour < 23:
 	act 'Lie on the couch':

+ 2 - 2
locations/dachaogr0

@@ -15,7 +15,7 @@ elseif etoexhib = 11:
 	'Working with lazy and smoke breaks dig in the ground, pull weeds.'
 elseif etoexhib >= 12 and etoexhib < 14:
 	'Workers digging the ground. Stumps removed.'
-elseif etoexhib = 14 and temp ! day:
+elseif etoexhib = 14 and temp ! daystart:
 	cls
 	gs 'stat'
 	'<center><b><font color="maroon">Vegetable</font></b></center>'
@@ -24,7 +24,7 @@ elseif etoexhib = 14 and temp ! day:
 	'Satisfied drunken workers rest in the shade. Clearly, for the money they took a drink. And, apparently under doping, finished faster.'
 
 	act 'Pay':gt 'etoexhib', 'pos14'
-elseif etoexhib = 15 and temp ! day:
+elseif etoexhib = 15 and temp ! daystart:
 	cls
 	gs 'stat'
 	'<center><b><font color="maroon">Vegetable</font></b></center>'

+ 1 - 1
locations/dimaGoHome

@@ -1,6 +1,6 @@
 # dimaGoHome
 Mud = totminut + 120
-dimarudeday = day
+dimarudeday = daystart
 gs 'stat'
 '<center><b><font color="maroon"><<$npcName[1]>> <<$npcSurName[1]>></font></b></center>'
 '<center><img src="images/qwest/alter/npc/1.jpg"></center>'

+ 3 - 3
locations/dimaGoHome2

@@ -1,14 +1,14 @@
 # dimaGoHome2
 gs 'stat'
 
-if dimaGohomeday = day:
+if dimaGohomeday = daystart:
 	'You come to a beautiful private home and rang the bell. You opened the door to a pretty blonde of about forty years, apparently the mother of Dimka. She looked at you and smiled "Dimka is not at home."'
 
 	act 'Leave':gt 'gorodok'
-elseif dimaGohomeday ! day:
+elseif dimaGohomeday ! daystart:
 	'You come to a beautiful private home and rang the bell. You opened the door to a pretty blonde of about forty years, apparently the mother of Dimka. She looked at you and smiled "You Dimka?" You nodded and mother of Dimka let you in the house.'
 
-	act 'Go into the room Dimka':dimaGohomeday = day & gt 'dimaHome'
+	act 'Go into the room Dimka':dimaGohomeday = daystart & gt 'dimaHome'
 end
 
 --- dimaGoHome2 ---------------------------------

+ 4 - 4
locations/dimaHome

@@ -13,7 +13,7 @@ if dimaFilm = 0:
 	act 'nyuhnut':
 		cls
 		minut += 15
-		narkday = day
+		narkday = daystart
 		health = vital * 10 + stren * 5
 		willpower = intel * 5 + will * 5
 		manna = (intel * magik) + magik * 100 + vital * 10 + rikudo
@@ -111,13 +111,13 @@ if dimaFilm = 0:
 		end
 	end
 elseif dimaFilm > 0:
-	if narkday ! day:
+	if narkday ! daystart:
 		'Dimka took some white powder from his desk and nyuhnul. After that "smell, cool thing! Excellent relaxing!"'
 
 		act 'nyuhnut':
 			cls
 			minut += 15
-			narkday = day
+			narkday = daystart
 			health = vital * 10 + stren * 5
 			willpower = intel * 5 + will * 5
 			manna = (intel * magik) + magik * 100 + vital * 10 + rikudo
@@ -270,7 +270,7 @@ elseif dimaFilm > 0:
 			end
 		end
 
-	elseif narkday = day:
+	elseif narkday = daystart:
 		if maxdradrug = 0:maxdradrug = 1
 
 		'Dimka aloof you smiling "what, fun_too?"'

+ 1 - 1
locations/dimaRudeEv

@@ -1,5 +1,5 @@
 # dimaRudeEv
-dimarudeday = day
+dimarudeday = daystart
 gs 'stat'
 '<center><b><font color="maroon"><<$npcName[1]>> <<$npcSurName[1]>></font></b></center>'
 ! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc1.jpg"></center>'

+ 5 - 5
locations/dinBoroda

@@ -51,7 +51,7 @@ $borodachSex = {
 			minut += 5
 			horny += 20
 			gs 'stat'
-			borodachSexDay = day
+			borodachSexDay = daystart
 			sex += 1
 			minut += 30
 			pose = 0
@@ -87,7 +87,7 @@ $ohrhjcum = {
 		cls
 		minut += 15
 		horny += dom
-		borodachSexDay = day
+		borodachSexDay = daystart
 		gs 'stat'
 		'<center><img src="images/qwest/ohrannik/hjcum.jpg"></center>'
 		'Sasha groaned and his cock began to ejaculate a jet of sperm in your palm.'
@@ -129,7 +129,7 @@ $ohrbjcum = {
 			minut += 15
 			horny += 5
 			vaf += 1
-			borodachSexDay = day
+			borodachSexDay = daystart
 			gs 'stat'
 			picrand = rand(1, 3)
 			'<center><img src="images/qwest/ohrannik/swallow<<picrand>>.jpg"></center>'
@@ -145,7 +145,7 @@ $ohrbjcum = {
 
 			if vaf > 0:vaf -= 1
 
-			borodachSexDay = day
+			borodachSexDay = daystart
 			gs 'stat'
 			'<center><img src="images/qwest/ohrannik/spit.jpg"></center>'
 			'You have opened your mouth filling with sperm, that you spat into the sink.'
@@ -161,7 +161,7 @@ $ohrsex = {
 		minut += 5
 		horny += 20
 		gs 'stat'
-		borodachSexDay = day
+		borodachSexDay = daystart
 		sex += 1
 		minut += 30
 		pose = 0

+ 8 - 8
locations/dina

@@ -26,7 +26,7 @@ $sitr_tread_d = {
 	cla
 	*clr
 	minut += 15
-	treadmillday = day
+	treadmillday = daystart
 	agil += 2
 	sweat += 1
 	beg += 1
@@ -44,7 +44,7 @@ $sitrobrd = {
 	cla
 	*clr
 	minut += 15
-	obruchday = day
+	obruchday = daystart
 	agil += 1
 	sweat += 1
 	manna -= 1
@@ -59,7 +59,7 @@ $sitryogd = {
 	cla
 	*clr
 	minut += 15
-	bookYogday = day
+	bookYogday = daystart
 	will += 1
 	manna += 5
 
@@ -80,7 +80,7 @@ $sitrskakd = {
 	cla
 	*clr
 	minut += 15
-	skakday = day
+	skakday = daystart
 	speed += 1
 	sweat += 1
 	manna -= 1
@@ -103,7 +103,7 @@ $sitrpressd = {
 	cla
 	*clr
 	minut += 15
-	pressday = day
+	pressday = daystart
 	vital += 1
 	sweat += 1
 	manna -= 1
@@ -126,7 +126,7 @@ $sitrpushd = {
 	cla
 	*clr
 	minut += 15
-	pushday = day
+	pushday = daystart
 	stren += 1
 	sweat += 1
 	manna -= 1
@@ -670,7 +670,7 @@ $butikreiqdi = {
 
 							if RimmaSex = 0:RimmaSex = 1 & girl += 1
 
-							rimmaday = day
+							rimmaday = daystart
 							gs 'stat'
 							'<center><img src="images/zoo/primer.jpg"></center>'
 							'<font color="magenta">Rimma, do you like me? </font> ou asked quietly'
@@ -721,7 +721,7 @@ $butikreiqdi = {
 
 $polactdog = {
 	cls
-	streetdogday = day
+	streetdogday = daystart
 
 	!!if QWdogReiq = 0:QWdogReiq = 1 & QWdogreiqTimer = 7
 

+ 2 - 2
locations/dinfather

@@ -753,7 +753,7 @@ fatherTalk = rand (1,3)
 	if fatherTalk = 3:
 	'You sit down for an impromptu table of the two tires and boards. For an hour, then Uncle Misha and stepfather respect each-friend.'
 	end
-	if gorslut>=3 and dyadyamishaevent = 1 and dmishaday ! day and fatherandmisha!1:
+	if gorslut>=3 and dyadyamishaevent = 1 and dmishaday ! daystart and fatherandmisha!1:
 		cla
 		*clr
 		'<center><img src="images/qwest/alter/father.jpg"></center>'
@@ -773,7 +773,7 @@ fatherTalk = rand (1,3)
 		'Stepfather: - But now we have it, and "punish".'
 			act 'Suffer punishment':gt 'misha','2'
 	end
-	if dyadyamishaevent = 1 and dmishaday ! day and fatherandmisha=1:
+	if dyadyamishaevent = 1 and dmishaday ! daystart and fatherandmisha=1:
 		'Uncle Misha: - Well Vovan, "punish" besom?'
 		'Stepfather: - But now we have it, and "punish".'
 			act 'Suffer punishment':gt 'misha','2'

+ 12 - 1
locations/divan

@@ -1,5 +1,6 @@
 # divan
-if $ARGS[0] = 'start':
+! WD: Reading book code cant use argument
+if $ARGS[0] = 'start' or $ARGS[0] = '':
 	$divmastr = {
 		cls
 
@@ -43,6 +44,9 @@ if $ARGS[0] = 'start':
 		end
 	end
 
+
+	! WD: Uninitialised ~ 'book'
+	!{
 	if book > 0:
 		act 'Read a book (0:30)':
 			cla
@@ -55,6 +59,13 @@ if $ARGS[0] = 'start':
 			act 'Put the book':gt 'divan', 'start'
 		end
 	end
+	}
+	! WD: Use read book code
+	if f_book <= 0 and fantasybook <= 0 and w_book = 0 and womanbook = 0:
+		#loc = 'divan'
+		dynamic '$d_read_book'
+	end
+
 
 	if horny >= 75:
 		act 'Masturbate (0:15)':dynamic $divmastr

+ 20 - 20
locations/dk

@@ -16,12 +16,12 @@ if $ARGS[0] = 'start':
 		act 'Go to the House of Culture':gt 'dk', 'holl'
 	end
 
-	if avtoskul >= 1 and avtoskul < 11 and skulday ! day and week >= 6 and money >= 1000 and age >= 18:
+	if avtoskul >= 1 and avtoskul < 11 and skulday ! daystart and week >= 6 and money >= 1000 and age >= 18:
 		act 'Driver Training class (1,000 rubles) (2:00)':
 			cla
 			*clr
 			money -= 1000
-			skulday = day
+			skulday = daystart
 			avtoskul += 1
 			minut += 120
 			'<center><img src="images/etogame/dk2.jpg"></center>'
@@ -82,12 +82,12 @@ if $ARGS[0] = 'holl':
 	if secrDiplom = 0 and sekrObu > 0:sekrObuA = sekrObu - 1 & 'Trained on the Secretary-General <<sekrObuA>> 30 days of'
 
 	if hour >= 9 and hour <= 17 and week < 6:
-		if vokalday ! day and alexeySex > 0 and alexeyVopros = 2:
+		if vokalday ! daystart and alexeySex > 0 and alexeyVopros = 2:
 			act 'Go to singing lessons':
 				cls
 				alexeyQW += 1
 				vokal += 1
-				vokalday = day
+				vokalday = daystart
 				horny += 30
 				gs 'stat'
 				'You are engaged in an hour with Alexei vocal that every now and then caressed your foot, then touch the ass, then stroked his chest.'
@@ -136,24 +136,24 @@ if $ARGS[0] = 'holl':
 					end
 				end
 			end
-		elseif money >= 500 and vokalday ! day and alexeySex > 0 and alexeyVopros = 1:
+		elseif money >= 500 and vokalday ! daystart and alexeySex > 0 and alexeyVopros = 1:
 			act 'Singing lesson cost 500 rubles':
 				cls
 				money -= 500
 				alexeyQW += 1
 				vokal += 1
-				vokalday = day
+				vokalday = daystart
 				gs 'stat'
 				'You are engaged in an hour with Alexei vocals, which gave no indication that when you otduplil it in all holes.'
 
 				act 'Leave':gt 'dk', 'holl'
 			end
-		elseif money >= 500 and vokalday ! day and alexeySex > 0 and alexeyVopros = 0:
+		elseif money >= 500 and vokalday ! daystart and alexeySex > 0 and alexeyVopros = 0:
 			act 'Singing lesson cost 500 rubles':
 				cls
 				alexeyQW += 1
 				vokal += 1
-				vokalday = day
+				vokalday = daystart
 				gs 'stat'
 				'You are logged in to the office to Alexei. He guiltily looked at you and said. "Sorry, this is a musician first and foremost a creative person, and only then, drunken rednecks."'
 				'You could not help smiling at the memory as you dragged the carcass of his teacher sleeping with his back, where he was snoring peacefully.'
@@ -176,14 +176,14 @@ if $ARGS[0] = 'holl':
 					act 'Leave':gt 'dk', 'holl'
 				end
 			end
-		elseif money >= 500 and vokalday ! day and alexeySex = 0:
+		elseif money >= 500 and vokalday ! daystart and alexeySex = 0:
 			act 'Singing lesson cost 500 rubles (1:00)':
 				cls
 				minut += 60
 				money -= 500
 				alexeyQW += 1
 				vokal += 1
-				vokalday = day
+				vokalday = daystart
 				gs 'stat'
 				!!'<center><img src="images/etogame/dk2.jpg"></center>'
 
@@ -295,11 +295,11 @@ if $ARGS[0] = 'holl':
 			end
 		end
 
-		if sekrObu > 0 and sekrObu < 11 and secrday ! day:
+		if sekrObu > 0 and sekrObu < 11 and secrday ! daystart:
 			act 'Learn from the Secretary (2:00)':
 				cla
 				*clr
-				secrday = day
+				secrday = daystart
 				sekrObu += 1
 				minut += 120
 				'<center><img src="images/etogame/kurs.jpg"></center>'
@@ -309,11 +309,11 @@ if $ARGS[0] = 'holl':
 
 				act 'Leave':gt 'dk', 'holl'
 			end
-		elseif sekrObu >= 11 and secrday ! day:
+		elseif sekrObu >= 11 and secrday ! daystart:
 			act 'Get Secretary diploma':
 				cla
 				*clr
-				secrday = day
+				secrday = daystart
 				sekrObu = 0
 				minut += 15
 				secrDiplom = 1
@@ -324,11 +324,11 @@ if $ARGS[0] = 'holl':
 			end
 		end
 
-		if avtoskul >= 1 and avtoskul < 11 and skulday ! day and age >= 18:
+		if avtoskul >= 1 and avtoskul < 11 and skulday ! daystart and age >= 18:
 			act 'Learn from the right (2:00)':
 				cla
 				*clr
-				skulday = day
+				skulday = daystart
 				avtoskul += 1
 				minut += 120
 				'<center><img src="images/etogame/dk2.jpg"></center>'
@@ -338,7 +338,7 @@ if $ARGS[0] = 'holl':
 
 				act 'Leave':gt 'dk', 'holl'
 			end
-		elseif avtoskul >= 11 and skulday ! day and age >= 18:
+		elseif avtoskul >= 11 and skulday ! daystart and age >= 18:
 			act 'Pass on the right (2:00)':
 				cla
 				*clr
@@ -354,15 +354,15 @@ if $ARGS[0] = 'holl':
 			end
 		end
 
-		if money >= 5000 and masash < 10 and masashshoolday ! day:
+		if money >= 5000 and masash < 10 and masashshoolday ! daystart:
 			act 'Learn massage (5,000 rubles)':
 				cla
-				masashshoolday = day
+				masashshoolday = daystart
 				money -= 5000
 				masash += 1
 				minut += 120
 				gs 'stat'
-				'You two o''clock studied massage'
+				'You two c''clock studied massage'
 
 				if masash = 10:'You are issued a certificate of course completion masseurs.'
 

+ 2 - 2
locations/dom_gor

@@ -24,11 +24,11 @@ lcolor = rgb(106, 90, 205)
 '<center><img src="images/etogame/kom_gor.jpg"></center>'
 'Your room in a hostel. The room is small, there is only the minimum necessary. 2 sleepers, <a href="exec:gt ''gor_mirror'', ''start''">mirror</a>, <a href="exec:gt ''gor_exh'', ''pos1''">hanger</a>, <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">cupboard</a> for things and a small TV.'
 
-if cloth_vid = 2 and teachlevel > 20 and parkrunday ! day and hour < 21 and hour > 6:
+if cloth_vid = 2 and teachlevel > 20 and parkrunday ! daystart and hour < 21 and hour > 6:
 	act 'Jogging on the Square (1:00)':
 		cla
 		*clr
-		parkrunday = day
+		parkrunday = daystart
 		minut += 30
 		manna += 10
 		willpower -= 10

+ 1 - 1
locations/down

@@ -69,7 +69,7 @@ end
 
 gs 'taxi'
 
-if tanya > 0 and tanwork = 0 and hour >= 16 and hour <= 21 and tanday ! day:'<a href="exec:gt ''tanhouse''">Apartment of Thani</a>'
+if tanya > 0 and tanwork = 0 and hour >= 16 and hour <= 21 and tanday ! daystart:'<a href="exec:gt ''tanhouse''">Apartment of Thani</a>'
 if tanwork = 1:'<a href="exec:gt ''house''">Thanis</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'

+ 5 - 5
locations/etoexhib

@@ -307,7 +307,7 @@ if $ARGS[0] = 'pos10':
 	*clr
 	minut += 30
 	horny += 10
-	temp = day
+	temp = daystart
 	etoexhib = 12
 	gs 'stat'
 	'<center><img src="images/etogame/dachabust.jpg"></center>'
@@ -324,7 +324,7 @@ if $ARGS[0] = 'pos11':
 	minut += 15
 	etoexhib = 13
 	horny += 10
-	temp = day
+	temp = daystart
 	gs 'stat'
 	'<center><img src="images/etogame/dachaex.jpg"></center>'
 	'You pretend to hang clothes to dry. You can see that through the mall on the site to swarm your neighbor Kuzmich and stole glances at you. Lightly knotted robe is not able to hide your appetizing forms. But, you do not hide them, and give your neighbor enjoy the beauty.'
@@ -358,7 +358,7 @@ if $ARGS[0] = 'pos12':
 		act 'Disagree':
 			cls
 			etoexhib = 15
-			temp = day
+			temp = daystart
 			gs 'stat'
 			'<center><img src="images/etogame/dachabust3.jpg"></center>'
 			'<font color="magenta">You:- While all do, do not get anything</font>.'
@@ -370,7 +370,7 @@ if $ARGS[0] = 'pos12':
 			cls
 			money -= 1500
 			etoexhib = 14
-			temp = day
+			temp = daystart
 			gs 'stat'
 			'<center><img src="images/etogame/dachabust3.jpg"></center>'
 			'Well, here''s a half. But in order for tomorrow morning is all finished.'
@@ -1707,7 +1707,7 @@ if $ARGS[0] = 'pos51':
 		end
 
 		exit
-	elseif sosedQW > 0 and hour >= 16 and sosedDay ! day:
+	elseif sosedQW > 0 and hour >= 16 and sosedDay ! daystart:
 		sosedrand = rand(0, 100)
 
 		if sosedrand >= 70:'Your neighbor, <a href="exec:Gt ''Timofei''">Timothy</a>, is in the hallway. He''s smoking a cigarette, flicking the ashes into a jar.'

+ 2 - 2
locations/family

@@ -1,6 +1,6 @@
 # family
-if day ! m_day:
-	m_day = day
+if daystart ! m_day:
+	m_day = daystart
 	father_go = rand(0, 1)
 	mother_go = rand(0, 1)
 end

+ 8 - 10
locations/father

@@ -78,16 +78,16 @@ act 'Ask for money':
 	act 'Move away':gt $loc, $metka
 
 	''
-	if fatherPayDay=day:
+	if fatherPayDay = daystart:
 		'Built up a face sweetly, you began to beg money from his stepfather, what he just shook his head wearily: - "No, Sveta. I`ve already given money. Let us call it a day."'
 	else
 		if father<=40 and TouchedByFather=0 or vnesh<=15 and TouchedByFather=0:
 			'You asked for money stepfather, But in response, he only shook his head: - "All my mother`s salary bear, Come here and ask her."'
 		else
 			'You asked for money stepfather, But in response, he only shook his head: - "All my mother`s salary bear, Come here and ask her."'
-			if father>=40 and father<60 and fatherPayDay!day:FatherMolest = RAND (1,4)
-			if father>=60 and father<80 and fatherPayDay!day:FatherMolest = RAND (1,2)
-			if father>=80 and fatherPayDay!day:FatherMolest = 1
+			if father>=40 and father<60 and fatherPayDay ! daystart:FatherMolest = RAND (1,4)
+			if father>=60 and father<80 and fatherPayDay ! daystart:FatherMolest = RAND (1,2)
+			if father>=80 and fatherPayDay ! daystart:FatherMolest = 1
 			if FatherMolest=1:
 				'During a call, you notice, stepfather in a good mood today,, so that, perhaps, you have a chance to persuade him...'
 				act 'Oh please':
@@ -106,7 +106,7 @@ act 'Ask for money':
 
 					if fatherLust=1:
 						money+=rand(200,300)
-						fatherPayDay=day
+						fatherPayDay = daystart
 						gs 'stat'
 						'- Eh... Okay. Just do not tell my mother! - he said in a tired voice, shooting eyes in the kitchen. You portray genuine delight, take the money, She kisses him on the cheek and happily go.'
 					end
@@ -118,7 +118,7 @@ act 'Ask for money':
 						cla
 						minut+=5
 						money+=rand(300,500)
-						fatherPayDay=day
+						fatherPayDay = daystart
 						gs 'stat'
 						'- Are not you forgetting? - serious voice you say, an apparent reference to your recent him "relationship".'
 						'Stepfather clearly embarrassed and surprised your trick. His eloquent "Cough-cough" It leads you into the feeling and you feel uncomfortable from-for their behavior.'
@@ -166,8 +166,8 @@ if motherKnowSpravka = 1 and hadsexwithfather=0:
 	act 'Move away':gt $loc, $metka
 end
 
-if alko > 0 and alkoday ! day:
-	alkoday = day
+if alko > 0 and alkoday ! daystart:
+	alkoday = daystart
 	father -= 1
 	'Stepfather sniffed "<<$name>> from you smell alcohol, what is this mess? You''re too young to drink that!"'
 end
@@ -269,7 +269,6 @@ if mother_go = 1 and hour = 16 and TouchedByFather = 1 and horny >= 50 or hadsex
 end
 
 ! WD: Fix old nude variable
-! if nude = 1:
 if $clothingworntype = 'nude':
 	'Stepfather with a smirk looking at you - "Nifiga! Blyadinka growing. Did you ever be ashamed,I-I`m still the man."'
 	if hadsexwithfather ! 1:
@@ -304,7 +303,6 @@ if hadsexwithfather=1 and fatherwantssex=1 and mother_go = 1 and hour = 16 and f
 	'<center><B><font color=maroon>Stepfather Vladimir Skryabin</font></B></center>'
 	'<center><img src="images/qwest/alter/father.jpg"></center>'
 	! WD: Fix old nude variable
-	! if nude = 1:
 	if $clothingworntype = 'nude': '- Wow, I see you`ve prepared, I undressed for "Daddy"'
 	'Not having to say a word stepfather, you notice, he unbuttons his pants and pulls out a ready to fight a member: "Svetik, Rejoice old."'
 	act '<B>Move away</B>':gt $loc, $metka

+ 7 - 5
locations/fit

@@ -32,12 +32,12 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if abonement > 0 and fitday ! day:
+	if abonement > 0 and fitday ! daystart:
 		act 'Walk in dressing room':
 			cla
 			frost = 0
 			abonement -= 1
-			fitday = day
+			fitday = daystart
 			razdtumbler = 1
 			gt 'fit', 'dressing room'
 		end
@@ -59,8 +59,10 @@ if $ARGS[0] = 'dressing room':
 	'Recruited girls section races, the winners of the competition receive cash prizes.'
 	'Attention, visit the sports section razreshaetsya only with tracksuits.'
 
-	if razdrand = 0 and tanznak = 0 and tanday ! day:
-		tanday = day
+	! WD: Uninitialised ~ 'razdrand'
+	! if razdrand = 0 and tanznak = 0 and tanday ! daystart:
+	if tanznak = 0 and tanday ! daystart:
+		tanday = daystart
 		'In the locker room you notice <a href="exec:gt ''fitgirl''">cute girl</a>.'
 	elseif tanznak = 2:
 		cls
@@ -160,7 +162,7 @@ if $ARGS[0] = 'fitgirl':
 			act 'Molest':
 				cla
 				*clr
-				tanday = day
+				tanday = daystart
 				gs 'stat'
 				'<center><img src="images/img/centr/razd1.jpg"></center>'
 				'You walk up to a girl and vskhvativ one hand on the buttock deploy to face you.'

+ 1 - 1
locations/fitgirl

@@ -4,7 +4,7 @@ $dintaniastart = {
 		act 'Molest':
 			cla
 			*clr
-			tanday = day
+			tanday = daystart
 			gs 'stat'
 
 			'<center><img src="images/img/centr/razd1.jpg"></center>'

+ 12 - 11
locations/gaptek

@@ -69,7 +69,7 @@ if motherQW >= 2:
 					'- Here we have all "for the garden." Choose.'
 				else
 					minut += rand(5, 15)
-					if gaprezikday ! day or gatabletkiday ! day:
+					if gaprezikday ! daystart or gatabletkiday ! daystart:
 						'You wait until the last buyer leaves from the pharmacy, and then speak to my aunt.'
 						'- Aunts, my mom would have it ... for a vegetable garden ...'
 						'- Yes, I have understood, you go here, trash - she grins.'
@@ -112,8 +112,8 @@ if motherQW >= 2:
 			end
 		else
 			minut += rand(5, 15)
-			if gaprezikday ! day or gatabletkiday ! day or galubri = 0 or (galubri = 1 and galubriday ! day):
-				if rand(1, 10) = 10 and oluuosegunday ! day:
+			if gaprezikday ! daystart or gatabletkiday ! daystart or galubri = 0 or (galubri = 1 and galubriday ! daystart):
+				if rand(1, 10) = 10 and oluuosegunday ! daystart:
 					cls
 					'<center><b><font color="maroon">Drugstore</font></b></center>'
 					'<center><img src="images/etogame/aptek.jpg"></center>'
@@ -149,7 +149,7 @@ if motherQW >= 2:
 
 					act 'Agree':
 						cla
-						oluuosegunday = day
+						oluuosegunday = daystart
 						if tetyafirst < 2:
 							tetyafirst = 2
 							'- Well, aunt, figs with you, help you, tea is not a stranger. But going to be!'
@@ -242,6 +242,7 @@ if motherQW >= 2:
 											'- Bad? Yes in the ass is a pain that does not pass!'
 											'- I understand - aunt winced, remembering the experience. - What did you, no lubrication or what?'
 
+											! WD: Uninitialised ~ 'ssdostup'
 											if age < 18 and ssdostup = 0:'- Where do you take it? In the adult store I have not allowed. Besides, I do ofigela on its size and disconnected, and woke up when it was too late.'
 											if age >= 18 or ssdostup = 1:'- Yes, I even did not have time to understand. When I saw razmerchik, so we can say disconnected. And when I came it was too late. In addition, far away to the city to go.'
 
@@ -432,7 +433,7 @@ if motherQW >= 2:
 
 					act 'Do not agree':
 						cla
-						oluuosegunday = day
+						oluuosegunday = daystart
 						if tetyafirst = 0:
 							tetyafirst = 1
 							'- You just moved, aunt! Niece of the litter of a black man trying to do!'
@@ -463,7 +464,7 @@ if motherQW >= 2:
 end
 
 if StoryLine = 1:
-	if money >= 100 and motherQW >= 2 and gaptekfirst = 1 and gaprezikday ! day:
+	if money >= 100 and motherQW >= 2 and gaptekfirst = 1 and gaprezikday ! daystart:
 		act 'Buy <b>condoms</b> (100 rubles) <<iif(prezik > 0, ''[left:<b>'' + prezik + ''</b>]'', '''')>>':
 			cla
 			*clr
@@ -477,7 +478,7 @@ if StoryLine = 1:
 				prezik += portion * 5
 				minut += 5 + (portion / 5)
 				money -= portion * 100
-				gaprezikday = day
+				gaprezikday = daystart
 				'<center><img src="images/etogame/kassa.jpg"></center>'
 				'You bought condoms and paid the money to the cashier.'
 
@@ -513,7 +514,7 @@ if StoryLine = 1:
 	end
 
 	!! you can only buy lube here if your aunt arranged for it and you haven''t bought any today yet
-	if money >= 300 and galubri = 1 and motherQW >= 2 and gaptekfirst = 1 and galubriday ! day:
+	if money >= 300 and galubri = 1 and motherQW >= 2 and gaptekfirst = 1 and galubriday ! daystart:
 		act 'Buy <b>lubricant</b> (300 rubles) <<iif(lubri > 0, ''[left:<b>'' + lubri + ''</b>]'', '''')>>':
 			cla
 			*clr
@@ -526,7 +527,7 @@ if StoryLine = 1:
 				lubri += portion * 5
 				minut += 5 + (portion / 5)
 				money -= portion * 300
-				galubriday = day
+				galubriday = daystart
 				'<center><img src="images/etogame/kassa.jpg"></center>'
 				'You bought some lubricant and paid the money to the cashier.'
 			else
@@ -538,7 +539,7 @@ if StoryLine = 1:
 	end
 
 	if money >= 500:
-		if gatabletkiday ! day:
+		if gatabletkiday ! daystart:
 			act 'Buy <b>birth control pills</b> (500 rubles) <<iif(tabletki > 0, ''[left:<b>'' + tabletki + ''</b>]'', '''')>>':
 				cla
 				*clr
@@ -550,7 +551,7 @@ if StoryLine = 1:
 					tabletki += portion * 28
 					minut += 5 + (portion / 5)
 					money -= portion * 500
-					gatabletkiday = day
+					gatabletkiday = daystart
 					'<center><img src="images/etogame/kassa.jpg"></center>'
 					'You bought some lubricant and paid the money to the cashier.'
 				else

+ 6 - 5
locations/gdksport

@@ -86,10 +86,11 @@ lcolor = rgb(106, 90, 205)
 
 if kotovLoveQW > 0 and hour = 16:
 	'Do you see how the club is included <a href="exec:minut += 3 & gt ''kotovEv''">Vitek Kotov</a> with a large sports bag.'
-elseif grupNPC[3] >= 80 and hour = 17 and ivansportday ! day:
+elseif grupNPC[3] >= 80 and hour = 17 and ivansportday ! daystart:
 	'Do you see how the club included <a href="exec:minut += 3 & gt ''IvanEv''">Ivan Prokhorov</a> with a large sports bag.'
 end
 
+! WD: Uninitialised ~ 'UNSTARTER' allways false
 if grupNPC[5] >= 80 and fedorKozlovQW = 0 and GorSlut = 0 and UNSTARTER = 1:
 	!!event does not have to start over because they do not
 	cls
@@ -670,11 +671,11 @@ if gsAboVolley > 0 and volleysostav = 0 and sport = 1:
 end
 
 if volleysostav > 0 and sport = 1:
-	if week ! 6 and volkomday ! day:
+	if week ! 6 and volkomday ! daystart:
 		act 'To engage with the team':
 			cla
 			*clr
-			volkomday = day
+			volkomday = daystart
 			minut += 120
 			speed += rand(1, 3)
 			agil += rand(1, 3)
@@ -697,7 +698,7 @@ if volleysostav > 0 and sport = 1:
 			act 'Leave':gt 'gdksport'
 			act 'Go to coaching':gt 'Voltrener'
 		end
-	elseif week = 6 and sorevday ! day:
+	elseif week = 6 and sorevday ! daystart:
 		act 'Check out the competition with a team':
 			cla
 			*clr
@@ -705,7 +706,7 @@ if volleysostav > 0 and sport = 1:
 			if poverkomand = 0:poverkomand = 600
 
 			volltime = 0
-			sorevday = day
+			sorevday = daystart
 			minut += 180
 			speed += rand(1, 3)
 			agil += rand(1, 3)

+ 1 - 1
locations/gevent

@@ -65,7 +65,7 @@ end
 if $ARGS[0] = '1-1':
 	cla
 	*clr
-	dmishaday = day
+	dmishaday = daystart
 	dick = 18
 	sex += 1
 	bj += 1

+ 1 - 1
locations/gkafe

@@ -102,7 +102,7 @@ else
 				'Oh, <<$name>>, hello. I learned? See, what yes. Listen, here it is... We are your stepfather as it repaired the car late, and then lay down with me to overthrow ryumashki, and I stayed at the apartment of his luggage with tools. Help him to return? I''ll give a money for ice cream.'
 
 				act 'Agree':gt 'gevent', '1'
-			elseif razvrand > 7 and hour > 16 and hour < 20 and dyadyamishaevent = 1 and dmishaday ! day:
+			elseif razvrand > 7 and hour > 16 and hour < 20 and dyadyamishaevent = 1 and dmishaday ! daystart:
 				''
 				'Suddenly you at the table sits Misha, that strips you look, looking greedy and oily eyes on your chest, and says,:'
 				'Hello, <<$name>>.. can now look within me for tea..? Have fun as last time, Yes, and the donations will not hurt, and?'

+ 12 - 10
locations/gopnew

@@ -86,14 +86,14 @@ if $ARGS[0] = 'start':
 			cla
 			'To you came Gopnik'
 
-			if gopopusday ! day:
+			if gopopusday ! daystart:
 				'Babosy you brought us?.'
 
 				if money >= 2000:
 					act 'Giving money':
 						cla
 						money -= 2000
-						gopopusday = day
+						gopopusday = daystart
 						'You gave money goparyam.'
 
 						act 'Leave.':gt 'street'
@@ -114,7 +114,7 @@ if $ARGS[0] = 'start':
 						act 'In the car':gt 'gopnew', 'degrading'
 					end
 				end
-			elseif gopopusday = day:
+			elseif gopopusday = daystart:
 				if GLust > 0:
 					cla
 					'<<$gopnik>>'
@@ -133,11 +133,11 @@ if $ARGS[0] = 'start':
 			cla
 			'You tried to pretend that did not see Gopnik and went to his house.'
 
-			if gopopusday = day:
+			if gopopusday = daystart:
 				'Gopnik neighing "Looking as rushed. Probably her fresh dick kisnet there, and we distract her."'
 
 				act 'Run into the apartment.':gt 'street'
-			elseif gopopusday ! day:
+			elseif gopopusday ! daystart:
 				'Gopnik immediately overtaken and surrounded you. "You slut struhnya in ears or something hit? Slyshish Not that appeal to you."'
 				'Babosy you brought us?.'
 
@@ -145,7 +145,7 @@ if $ARGS[0] = 'start':
 					act 'Giving money':
 						cla
 						money -= 2000
-						gopopusday = day
+						gopopusday = daystart
 						'You gave money goparyam.'
 
 						act 'Leave.':gt 'street'
@@ -190,6 +190,7 @@ if $ARGS[0] = 'start':
 		exit
 	end
 
+	! WD: Uninitialised ~ 'rosetka'
 	if rosetka > 0:
 		'Hey socket shout you Gopnik. <<$gopnik>>'
 
@@ -421,7 +422,7 @@ if $ARGS[0] = 'pivas':
 		end
 
 		if frotknow = 1:
-			'Gray looked at you and evil grin. "Hold on guys, I''ll tell you one prikolyuhu now. Anyway, I for one huylo pogonyalom Grater such prikolyuhu said he rides on the subway and babsky zhoptsam sticks that would rub on them. So says was got on the subway faultless slut ready suffering always ass podstvait friendship. He sfotkal it on mobile. So this is your <<$name>> is the very slut underground, in a joke right?'
+			'Gray looked at you and evil grin. "Hold on guys, I''ll tell you one prikolyuhu now. Anyway, I for one huylo pogonyalom Grater such prikolyuhu said he rides on the subway and babsky zhoptsam sticks that would rub on them. So says was got on the subway faultless slut ready suffering always ass podstvait friendship. He sfotkal it on mobile. So this is your <<$name>> is the very slut underground, in a joke right?"'
 			'Bob angrily threw a beer bottle to the side. "You bastard beer obschakovoe their fucking lips zafarshmachila. Come on, you have to market."'
 
 			act 'Go through the gate with boys':gt 'gopnew', 'bazar'
@@ -475,7 +476,7 @@ if $ARGS[0] = 'pivas':
 		end
 
 		if frotknow = 1:
-			'Gray looked at you and evil grin. "Hold on guys, I''ll tell you one prikolyuhu now. Anyway, I for one huylo pogonyalom Grater such prikolyuhu said he rides on the subway and babsky zhoptsam sticks that would rub on them. So says was got on the subway faultless slut ready suffering always ass podstvait friendship. He sfotka it on mobile. So this is your <<$name>> is the very slut underground, in a joke right?'
+			'Gray looked at you and evil grin. "Hold on guys, I''ll tell you one prikolyuhu now. Anyway, I for one huylo pogonyalom Grater such prikolyuhu said he rides on the subway and babsky zhoptsam sticks that would rub on them. So says was got on the subway faultless slut ready suffering always ass podstvait friendship. He sfotka it on mobile. So this is your <<$name>> is the very slut underground, in a joke right?"'
 			'Bob angrily threw a beer bottle to the side. "You bastard beer obschakovoe their fucking lips zafarshmachila. Come on, you have to market."'
 
 			act 'Go through the gate with boys':gt 'gopnew', 'bazar'
@@ -516,7 +517,8 @@ if $ARGS[0] = 'bazar':
 	'(Gopar) - You''re a bitch is not particularly right. I Vasya nail. I know the area at all, and you saucy slut specifically roughened. You owe me!'
 	'Bob rudely shook you by the shoulders, "you agree bitch?"'
 
-	if magic > 0:'At this point, you felt someone''s evil and powerful magical force that suppresses your and does not use against Gopnik.'
+	! WD: Uninitialised ~ 'magic' use 'magik'
+	if magik > 0:'At this point, you felt someone''s evil and powerful magical force that suppresses your and does not use against Gopnik.'
 		act 'Agree':
 			cla
 			*clr
@@ -1044,7 +1046,7 @@ if $ARGS[0] = 'degrading':
 	anal += 1
 	sex += 1
 	rape += 1
-	gopopusday = day
+	gopopusday = daystart
 	gs 'stat'
 
 	if VasanTut = 3 and vasansex = 0:vasansex = 1 & guy += 1

+ 2 - 2
locations/gorodok

@@ -114,9 +114,9 @@ act 'Wait':
 	act 'Take a look at the clock':gt $curloc
 end
 
-if StoryLine = 1 and hour >= 8 and hour < 23 and cumface > 0 and rand(0, 3) = 0 and sosedday ! day:
+if StoryLine = 1 and hour >= 8 and hour < 23 and cumface > 0 and rand(0, 3) = 0 and sosedday ! daystart:
 	cls
-	sosedday = day
+	sosedday = daystart
 	gs 'stat'
 
 	if sosedknow = 0:

+ 2 - 2
locations/gpoli

@@ -34,11 +34,11 @@ if hour >= 6 and hour <= 21:
 
 			act 'Leave':gt 'gpoli'
 		end
-	elseif gpoliuborka > 1 and hour >= 8 and hour <= 21 and gpolicleanday ! day:
+	elseif gpoliuborka > 1 and hour >= 8 and hour <= 21 and gpolicleanday ! daystart:
 		act 'To work as a cleaner':
 			cla
 			*clr
-			gpolicleanday = day
+			gpolicleanday = daystart
 			minut += 60
 			manna -= 15
 			money += 100

+ 7 - 7
locations/gschool

@@ -195,7 +195,7 @@ if hour <= 8 and week < 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli =
 	end
 end
 
-if hour >= 16 and GorSlut >= 3 and SchoolGossip > 0 and afterschoolday ! day:
+if hour >= 16 and GorSlut >= 3 and SchoolGossip > 0 and afterschoolday ! daystart:
 	aftgopbjrand = rand(0, 2)
 
 	if aftgopbjrand = 0:
@@ -204,7 +204,7 @@ if hour >= 16 and GorSlut >= 3 and SchoolGossip > 0 and afterschoolday ! day:
 
 		act 'Go after school':
 			cls
-			afterschoolday = day
+			afterschoolday = daystart
 			SchoolGossip += 1
 			minut += 60
 			gs 'stat'
@@ -249,16 +249,16 @@ if JuliaMilLernQW >= 1 and hour = 16 and week < 6 and kanikuli = 0:'In the schoo
 if NatBelLernQW >= 1 and hour = 16 and week < 6 and kanikuli = 0:'In the school yard strolls <a href="exec:minut += 1 & gt ''NatBelGo''">Natasha Belova</a>'
 if artemLernQW >= 1 and hour = 16 and week < 6 and kanikuli = 0 and artemVitokQW ! 2:'In the school yard you already waiting <a href="exec:minut += 15 & gt ''artemEv''">Artem Chebotarev</a>'
 if week = 1 and kanikuli = 0 and arthakQW >= 10 and apmeetday ! daystart and hour >= 16:gt 'artgar'
-if hour = 16 and albinaCarday ! day and week < 6 and kanikuli = 0:
+if hour = 16 and albinaCarday ! daystart and week < 6 and kanikuli = 0:
 	!!if DanceWhore > 0 or AlbinaLast > 0 or AlbinaBlokDance > 0:'You see standing in the school yard and BMW X5 <a href="exec:minut += 15 & gt ''albinaEv''">Albina Barlovskuyu</a> sitting behind the wheel'
 	if AlbFrend >= 1 and albrideday ! daystart:'Near a large black SUV parked near the school stands <a href="exec:minut += 15 & gt ''albinaRide''">Albina Barlovskaya</a>'
 end
 
-if hour = 16 and week < 6 and kanikuli = 0 and katjaMeynoldday ! day and meynoldQW >= 2:'In the school yard stroll <a href="exec:minut += 15 & gt ''katjaEv''">Katja Meynold</a>'
-if DimaRudeQW > 0 and hour = 16 and week < 6 and kanikuli = 0 and dimarudeday ! day and DimaRudeBlock = 0:'In the school yard is worth pondering <a href="exec:minut += 15 & gt ''dimaRudeEv''">Dimka Nosov</a>'
-if IgorLoverQW > 0 and hour = 16 and week < 6 and kanikuli = 0 and igorkruglovday ! day and IdorBlock = 0:'In the school yard strolls <a href="exec:minut += 15 & gt ''IgorEv''">Igor Kruglov</a>'
+if hour = 16 and week < 6 and kanikuli = 0 and katjaMeynoldday ! daystart and meynoldQW >= 2:'In the school yard stroll <a href="exec:minut += 15 & gt ''katjaEv''">Katja Meynold</a>'
+if DimaRudeQW > 0 and hour = 16 and week < 6 and kanikuli = 0 and dimarudeday ! daystart and DimaRudeBlock = 0:'In the school yard is worth pondering <a href="exec:minut += 15 & gt ''dimaRudeEv''">Dimka Nosov</a>'
+if IgorLoverQW > 0 and hour = 16 and week < 6 and kanikuli = 0 and igorkruglovday ! daystart and IdorBlock = 0:'In the school yard strolls <a href="exec:minut += 15 & gt ''IgorEv''">Igor Kruglov</a>'
 if fedorKozlovQW >= 10 and hour = 16 and week < 6 and kanikuli = 0:'Far away from the school entrance stands <a href="exec:minut += 15 & gt ''FedorEv''">Fedor Kozlov</a>, he was glad to see you and come to you.'
-if strelaDay ! day and strelaQW = 1 and hour = 16:
+if strelaDay ! daystart and strelaQW = 1 and hour = 16:
 	cls
 	gs 'stat'
 	'To school drove Mitsubishi Pajero and BMW. Of the cars went out strong, inflated guys in leather jackets and tracksuits. They came to the meeting Kotov, Auburn and Shulga. They talked about something and came here from school Fedor Kozlov with a swollen face, bruised. Kotov you waved a hand "<<$name>>, come here, you''re a witness."'

+ 1 - 1
locations/gtelefon

@@ -1,5 +1,5 @@
 # gtelefon
-boyinday[numnpcboy] = day
+boyinday[numnpcboy] = daystart
 Gcall = 0
 minut += 3
 gs 'stat'

+ 16 - 16
locations/housezal

@@ -96,7 +96,7 @@ if week < 6 and hour > 8 and hour < 20:
 					end
 				end
 			end
-		elseif hour > 17 and hour < 20 and housezalrand < 3 and niksvid = 1 and niksexday ! day:
+		elseif hour > 17 and hour < 20 and housezalrand < 3 and niksvid = 1 and niksexday ! daystart:
 			cla
 			*clr
 			'<center><img src="images/img/centr/nikzal1.jpg"></center>'
@@ -107,7 +107,7 @@ if week < 6 and hour > 8 and hour < 20:
 			act 'Allow':
 				cla
 				*clr
-				niksexday = day
+				niksexday = daystart
 				bj += 1
 				anal += 1
 				guy += 1
@@ -176,10 +176,10 @@ if week < 6 and hour > 8 and hour < 20:
 					end
 				end
 			end
-		elseif hour > 17 and hour < 20 and housezalrand >= 3 and housezalrand <= 5 and niksvid > 1 and niksexday ! day:
+		elseif hour > 17 and hour < 20 and housezalrand >= 3 and housezalrand <= 5 and niksvid > 1 and niksexday ! daystart:
 			cla
 			*clr
-			niksexday = day
+			niksexday = daystart
 			'<center><img src="images/img/th/n2.jpg"></center>'
 			'While you zip over the room with a vacuum cleaner, comes Nicholas sat on the sofa and began to read a newspaper. Soon he looked up from the newspaper and began to watch you as you walk around the room with a vacuum cleaner and bend down periodically, that would vacuum under the furniture, it is not surprising, because every time it will be charmed by your bare buttocks, panties then you are not clothed. Do you like that he looks at you, and you have already started to bend especially where already vacuumed a couple of times and even got up on all fours, pretending to be trying to push the vacuum cleaner away with cupboard under, with your bare ass flaunted in front of him. You squinting nadlyudali he swallows saliva, looking at you with lust.'
 
@@ -201,11 +201,11 @@ if week < 6 and hour > 8 and hour < 20:
 
 		act 'Leave':gt 'house'
 	end
-elseif week = 6 and hour > 5 and hour < 10 and housezalrand < 5 and niksvid > 1 and niksexday ! day:
+elseif week = 6 and hour > 5 and hour < 10 and housezalrand < 5 and niksvid > 1 and niksexday ! daystart:
 	cla
 	*clr
 	minut += 30
-	niksexday = day
+	niksexday = daystart
 	'<center><img src="images/img/th/n0.jpg"></center>'
 	'Entering the room you see Nicholas lying on the sofa, in the clothes. It seems that he is not bad gulnul yesterday, the smell in the room could get drunk and wifey sent him to sleep in the living room.'
 	'"A <<$name>>, pour something" he said, opening his eyes and trying to get up there and then collapsed back vskhvativshis head. "Nah, because you can not drink." he articulated.'
@@ -228,11 +228,11 @@ elseif week = 6 and hour > 5 and hour < 10 and housezalrand < 5 and niksvid > 1
 	end
 
 	act 'Leave':gt 'house'
-elseif hour > 17 and hour < 20 and housezalrand >= 3 and housezalrand <= 5 and niksvid > 1 and niksexday ! day:
+elseif hour > 17 and hour < 20 and housezalrand >= 3 and housezalrand <= 5 and niksvid > 1 and niksexday ! daystart:
 	cla
 	*clr
 	minut += 10
-	niksexday = day
+	niksexday = daystart
 	'<center><img src="images/img/th/n4.jpg"></center>'
 	'Entering the room you see Nicholas, sitting in a chair and talking on the phone. "<<$name>>, get a drink, " he said see you. You brought him a glass of whiskey, he took the glass and motioned for you to linger. You waited until he finished talking on the phone.'
 	'"What a day, sit down sit with me, " he said, slapping his thigh.'
@@ -245,15 +245,15 @@ elseif hour > 17 and hour < 20 and housezalrand >= 3 and housezalrand <= 5 and n
 		nik += 2
 		minut += 30
 		picrand = 79
-		niksexday = day
+		niksexday = daystart
 		'<center><img src="images/img/th/n5.jpg"></center>'
 		'You sit down on his leg and one arm around his neck, Nicholas hugs you by the waist and held her back in his chair. You almost lying on it, and he does not even try to climb between your legs, it just pushes you to come and sit and eyes closed. Realizing that he was just tired and he wants something to someone was there, you relax and lozhite head on his shoulder. So half an hour passes, Nicholas sits in a chair clutching you to yourself, and you listen to how he breathes, so you like to just relax and start to climb to the head of dreams, that if he was yours and you were sitting here in the evenings and rested. You clung to him more tightly embracing both hands, Nicholas felt as if your desire, and opened his eyes looked at you, after a couple of seconds, you kissed, but not as much as before, with animal passion, as if going to devour each other, and easily and gently, almost kosayas each other lips. Soon, his hands sliding over your body, he raised you and putting on a chair began to cover your body with kisses, descending lower and lower until he reached her thighs.'
 
 		act 'Continue':gt 'sex', 'kuni'
 	end
-elseif hour > 17 and hour < 20 and housezalrand < 3 and niksvid > 1 and niksexday ! day:
+elseif hour > 17 and hour < 20 and housezalrand < 3 and niksvid > 1 and niksexday ! daystart:
 	cla
-	niksexday = day
+	niksexday = daystart
 	'Entering the room you see Nicholas, sitting in a chair "<<$name>> wanna watch TV?" he asked.'
 
 	act 'Refuse':gt 'house'
@@ -264,7 +264,7 @@ elseif hour > 17 and hour < 20 and housezalrand < 3 and niksvid > 1 and niksexda
 		minut += 40
 		nik += 1
 		picrand = 80
-		niksexday = day
+		niksexday = daystart
 		'<center><img src="images/img/th/n6.jpg"></center>'
 		'You sit down beside him on the sofa, Nikolai priobnimaet you and lays down with one hand on hip, you are already prepared for the fact that it will start to stick, but then nothing happened, he just sat and watched TV pressed you to her. You get comfortable and resting her head on his shoulder, too, have begun to look at the TV show which is nonsense, but you did not care, and it seems too. So you sat for about half an hour, occasionally exchanging short phrases, you suddenly become so good and comfortable with him, but your idyll interrupted by football and you yourself do not believe Nicholas when asked to change the channel. "Maybe a little bit of a look?" he asked, as if this is your apartment and your TV.'
 
@@ -287,13 +287,13 @@ elseif hour > 17 and hour < 20 and housezalrand < 3 and niksvid > 1 and niksexda
 			end
 		end
 	end
-elseif hour > 17 and hour < 20 and housezalrand < 3 and nikslut = 1 and niksexday ! day:
+elseif hour > 17 and hour < 20 and housezalrand < 3 and nikslut = 1 and niksexday ! daystart:
 	cla
 	*clr
 	SUB += 1
 	guy += 1
 	minut += 20
-	niksexday = day
+	niksexday = daystart
 	money += 2000
 	picrand = 35
 	'<center><img src="images/img/th/s0.jpg"></center>'
@@ -302,13 +302,13 @@ elseif hour > 17 and hour < 20 and housezalrand < 3 and nikslut = 1 and niksexda
 	'"With pleasure, " you reply, kneeling.'
 
 	act 'Start':xgt 'sexdvoe', 'var'
-elseif hour > 17 and hour < 20 and housezalrand > 8 and nikslut = 1 and niksexday ! day:
+elseif hour > 17 and hour < 20 and housezalrand > 8 and nikslut = 1 and niksexday ! daystart:
 	cla
 	*clr
 	SUB += 1
 	guy += 1
 	minut += 20
-	niksexday = day
+	niksexday = daystart
 	money += 2000
 	picrand = 37
 	'<center><img src="images/img/th/s2.jpg"></center>'

+ 2 - 2
locations/hozspal

@@ -16,10 +16,10 @@ if $ARGS[0] = 'start':
 			gs 'stat'
 			housespalrand = rand(0, 4)
 
-			if hour > 17 and hour < 20 and housespalrand = 0 and nikslut = 1 and niksexday ! day:
+			if hour > 17 and hour < 20 and housespalrand = 0 and nikslut = 1 and niksexday ! daystart:
 				cla
 				*clr
-				niksexday = day
+				niksexday = daystart
 				money += 2000
 				SUB += 1
 				guy += 1

+ 6 - 5
locations/husbSex

@@ -192,8 +192,9 @@ if $ARGS[0] = 'variant':
 	act 'Give blowjob':gt 'husbsex', 'minet'
 	act 'Masturbate him':gt 'husbsex', 'hand'
 
-	if kundayH ! day:
-		act 'Cooney':gt 'husbsex', 'kuni'
+	! WD: Uninitialised ~ 'kundayH'
+	if kundayH ! daystart:
+		act 'Cooney': kundayH = daystart & gt 'husbsex', 'kuni'
 	end
 
 	if DOM > 0 and harakHusb = 0 and izvratH = 1 and strapon > 0:
@@ -269,7 +270,7 @@ end
 
 if $ARGS[0] = 'kuni':
 	*clr
-	kunday = day
+	kunday = daystart
 	gs 'brosok'
 	DOM += 1
 	kuni += 1
@@ -389,10 +390,10 @@ if $ARGS[0] = 'anal':
 
 	'Finally <<$husName>> grabbed you tight ass and drove for your aching ass dick up to the finished balls inside you.'
 
-	if klismaday ! day:
+	if klismaday ! daystart:
 		husband -= 1
 		'<<$husName>> took out a member of your ass and see on your dick shit said, "Damn. <<$name>> my ass before sex."'
-	elseif klismaday = day:
+	elseif klismaday = daystart:
 		husband += 5
 		'<<$husName>> took out a member of you and kissed you went to the bathroom.'
 	end

+ 1 - 0
locations/init_music

@@ -15,6 +15,7 @@ $tracklist_fight[0] = 'music/fight.mp3'
 $tracklist_fight[1] = 'music/fight1.mp3'
 $tracklist_orochimaru[0] = 'music/orochimaru.mp3'
 
+! WD: Uninitialised ~ 'club'
 if club = 1:
 	clubrand = rand(0, 5)
 

+ 2 - 1
locations/kafe

@@ -753,7 +753,8 @@ if $ARGS[0] = 'workPred':
 				elseif kaferand >= 90 and opusk > 0 and pirsA = 0:
 					cls
 					pirsA = 1
-					pirsday = day
+					! WD: Unused ~ 'pirsday'
+					! pirsday = day
 					! WD: Correct Image path ~ "images/body/pirs.jpg"
 					'<center><img src="images/body/pirsA.jpg"></center>'
 					'Beckons you to one of the clients, you come to the table and notice that in front of you are the real criminals.'

+ 2 - 2
locations/kafesvid

@@ -264,8 +264,8 @@ if $ARGS[0] = '2':
 							'<center><img src="images/img/kafesvid/20.jpg"></center>'
 							'You jump off the table and natsinaete yarosno suck, trying not to fall term.'
 
-							if klismaday ! day:'Do you realize that there''s not an enema did you lie in member izmazany mixture of sperm and the contents of your ass, you''re choking back retching continue sucking, and <<$telsob>> noticing it looks at you with a grin, "That Vidisha as important in the ass keep clean, for me it''s like brush your teeth. "'
-							if klismaday = day:'You suck dick feeling the taste of semen left on it, and how of your ass is not yet closed and sperm follows spreads to the buttocks and thighs'
+							if klismaday ! daystart:'Do you realize that there''s not an enema did you lie in member izmazany mixture of sperm and the contents of your ass, you''re choking back retching continue sucking, and <<$telsob>> noticing it looks at you with a grin, "That Vidisha as important in the ass keep clean, for me it''s like brush your teeth. "'
+							if klismaday = daystart:'You suck dick feeling the taste of semen left on it, and how of your ass is not yet closed and sperm follows spreads to the buttocks and thighs'
 
 							'When a member of the newly gained strength and was ready to continue, <<$telsob>> once again commanded "And now on top and ass at full speed"'
 

+ 1 - 1
locations/kamera

@@ -45,7 +45,7 @@ act 'Hello':
 					cla
 					gopdeath = 1
 					minut += 180
-					vsehsdaladay = day
+					vsehsdaladay = daystart
 					gs 'stat'
 					'You told all they knew, and even then what just heard from conversations Gopnik. After that you released.'
 

+ 1 - 1
locations/katjaEv

@@ -130,7 +130,7 @@ $din_katja_kiss = {
 	end
 }
 
-katjaMeynoldday = day
+katjaMeynoldday = daystart
 gs 'stat'
 gs 'KatjaHomeDin'
 gs 'katjaEvDin'

+ 8 - 8
locations/kitchen

@@ -46,9 +46,9 @@ if tanwork = 1:
 		minut += 60
 		nikrand = rand(0, 5)
 
-		if week < 6 and hour >= 6 and hour <= 9 and nikrand = 0 and vnesh > 20 and niksexday ! day:
+		if week < 6 and hour >= 6 and hour <= 9 and nikrand = 0 and vnesh > 20 and niksexday ! daystart:
 			cla
-			niksexday = day
+			niksexday = daystart
 			'The kitchen breakfast Tannin stepfather, Nikolai'
 
 			act 'Go about their business.':gt 'kitchen'
@@ -324,12 +324,12 @@ end
 if lekarstvo > 0:
 	'You have <<lekarstvo>> tablets.'
 
-	if sick > 0 and lekarday ! day:
+	if sick > 0 and lekarday ! daystart:
 		act 'Take a pill':
 			cla
 			*clr
 			minut += 5
-			lekarday = day
+			lekarday = daystart
 			lekarstvo -= 1
 			sick -= sick * 20/100
 			lekrand = rand(1, 9)
@@ -343,12 +343,12 @@ end
 
 if vitamin > 0:
 	'You have <<vitamin>> vitaminok.'
-	if vitaminday ! day:
+	if vitaminday ! daystart:
 		act 'Drink Vitamins (0:05)':
 			cla
 			*clr
 			minut += 5
-			vitaminday = day
+			vitaminday = daystart
 			vitamin -= 1
 			frost = 0
 			skinvan += 1
@@ -365,13 +365,13 @@ end
 
 housekitrand = rand(0, 10)
 
-if hour > 17 and hour < 20 and housekitrand > 8 and nikslut = 1 and niksexday ! day:
+if hour > 17 and hour < 20 and housekitrand > 8 and nikslut = 1 and niksexday ! daystart:
 	cla
 	*clr
 	SUB += 1
 	guy += 1
 	minut += 20
-	niksexday = day
+	niksexday = daystart
 	money += 2000
 	picrand = 36
 	'<center><img src="images/img/th/s1.jpg"></center>'

+ 7 - 7
locations/klofdomhouse

@@ -7,11 +7,11 @@ if $ARGS[0] = 'start':
 	act 'Ring the doorbell':
 		cla
 
-		if klofQW = 2 and hour >= 16 and klofday ! day:
-			klofday = day
+		if klofQW = 2 and hour >= 16 and klofday ! daystart:
+			klofday = daystart
 			gt 'klofdomhouse', 'ev1'
-		elseif klofQW > 2 and hour >= 16 and klofday ! day:
-			klofday = day
+		elseif klofQW > 2 and hour >= 16 and klofday ! daystart:
+			klofday = daystart
 			gt 'klofdomhouse', 'start1'
 		else
 			'No one home'
@@ -26,7 +26,7 @@ end
 if $ARGS[0] = 'start1':
 	cla
 	*clr
-	klofday = day
+	klofday = daystart
 	minut += 5
 	kloftimes += 1
 	gs 'stat'
@@ -44,7 +44,7 @@ end
 if $ARGS[0] = 'ev1':
 	cla
 	*clr
-	klofday = day
+	klofday = daystart
 	minut += 5
 	kloftimes += 1
 	gs 'stat'
@@ -397,7 +397,7 @@ end
 if $ARGS[0] = 'ev20':
 	cla
 	*clr
-	klofday = day
+	klofday = daystart
 	minut += 5
 	'<center><img src="images/klof/klof.jpg"></center>'
 	'If you want to talk serious business with our boss'

+ 5 - 5
locations/klofdomhouse1

@@ -7,9 +7,9 @@ if $ARGS[0] = 'start':
 	act 'Ring the doorbell':
 		cla
 
-		if klofQW = 2 and hour >= 16 and klofday ! day:
+		if klofQW = 2 and hour >= 16 and klofday ! daystart:
 			gt 'klofdomhouse', 'ev1'
-		elseif klofQW > 2 and hour >= 16 and klofday ! day:
+		elseif klofQW > 2 and hour >= 16 and klofday ! daystart:
 			gt 'klofdomhouse', 'start1'
 		else
 			'No one home'
@@ -24,7 +24,7 @@ end
 if $ARGS[0] = 'ev1':
 	cla
 	*clr
-	klofday = day
+	klofday = daystart
 	minut += 5
 	'<center><img src="images/klof/klof.jpg"></center>'
 	'You rang the doorbell.'
@@ -133,7 +133,7 @@ end
 if $ARGS[0] = 'start1':
 	cla
 	*clr
-	klofday = day
+	klofday = daystart
 	minut += 5
 	gt 'klofdomhouse', 'ev7'
 end
@@ -382,7 +382,7 @@ end
 if $ARGS[0] = 'ev20':
 	cla
 	*clr
-	klofday = day
+	klofday = daystart
 	minut += 5
 	'<center><img src="images/klof/klof.jpg"></center>'
 

+ 23 - 22
locations/korr

@@ -69,14 +69,14 @@ if sobaka = 1:'Your dog, <a href="exec:gt ''soba'', ''start''"><<$namesob>></a>,
 if krolik = 1:'Resting on the floor your rabbit <a href="exec:gt ''krol'', ''start''"><<$namekrol>></a>.'
 if popugai = 1:'In the cage sits your parrot <a href="exec:gt ''popu'', ''start''"><<$namepopu>></a>.'
 
-if parkday ! day and parkblackmail = 1:
+if parkday ! daystart and parkblackmail = 1:
 	parkblackmail = 2
-	parkday = day
+	parkday = daystart
 	'A heavy envelope has arrived in the mail. When you open it you can see pictures in it. Damn, it''s pictures of you where you are giving blowjobs to two guys in the park.'
 	'Small note says:'
 	'If you do not want to have these pictures posted on your porch and sent to your work, come to this address (address listed is a Studio)'
 	'PS, if you do not come today, these pictures will be hanging in your entryway tomorrow.'
-elseif parkday ! day and parkblackmail = 2:
+elseif parkday ! daystart and parkblackmail = 2:
 	parkblackmail = 0
 	fotoyousuck = 1
 	'Damn, your photos with sperm on your face and two dicks in your mouth are plastered around porch.'
@@ -85,40 +85,40 @@ end
 if bfA < 0:
 	bfA = 0
 	'<b><font color="red">Your boyfriend <<$boyA>> does not call you, he probably dumped you.</font></b>'
-elseif bfA > 1 and boydayA ! day and hour >= 5 and hour < 20 and vnesh >= vneshBoyA:
+elseif bfA > 1 and boydayA ! daystart and hour >= 5 and hour < 20 and vnesh >= vneshBoyA:
 	ring = 1
 	ringA = 1
 	'<b><font color="red">The phone is ringing</font></b>'
-elseif bfA > 1 and boydayA ! day and hour >= 5 and hour < 20 and vnesh < vneshBoyA:
+elseif bfA > 1 and boydayA ! daystart and hour >= 5 and hour < 20 and vnesh < vneshBoyA:
 	bfA = 0
 	'<b><font color="red">Your guy does not call you, apparently he threw you.</font></b>'
 end
 
-if bfB > 1 and boydayB ! day and hour >= 5 and hour < 20 and vnesh >= vneshBoyB:
+if bfB > 1 and boydayB ! daystart and hour >= 5 and hour < 20 and vnesh >= vneshBoyB:
 	ring = 1
 	ringB = 1
 	'<b><font color="red">The phone is ringing</font></b>'
-elseif bfB > 1 and boydayB ! day and hour >= 5 and hour < 20 and vnesh < vneshBoyB:
+elseif bfB > 1 and boydayB ! daystart and hour >= 5 and hour < 20 and vnesh < vneshBoyB:
 	bfB = 0
 	'<b><font color="red">Your boyfriend <<$boyB>> does not call you, he probably dumped you.</font></b>'
 end
 
-if bfC > 1 and boydayC ! day and hour >= 5 and hour < 20 and vnesh >= vneshBoyC:
+if bfC > 1 and boydayC ! daystart and hour >= 5 and hour < 20 and vnesh >= vneshBoyC:
 	ring = 1
 	ringC = 1
 	'<b><font color="red">The phone is ringing</font></b>'
-elseif bfC > 1 and boydayC ! day and hour >= 5 and hour < 20 and vnesh < vneshBoyC:
+elseif bfC > 1 and boydayC ! daystart and hour >= 5 and hour < 20 and vnesh < vneshBoyC:
 	bfC = 0
 	'<b><font color="red">Your boyfriend <<$boyC>> does not call you, he probably dumped you.</font></b>'
 end
 
-if vladimirday ! day and vladimirQW = 20 and hour >= 15 and hour <= 17:'<a href="exec:gt ''qwloc2''"><font color="red"><b>The phone is ringing</b></font></a>.'
-if vladimirday ! day and vladimirQW = 25 and hour >= 15 and hour <= 17 and week = 6:'<a href="exec:gt ''qwloc3''"><font color="red"><b>The phone is ringing</b></font></a>.'
-if vladimirday ! day and vladimirQW = 35 and hour >= 15 and hour <= 17 and week = 6:'<a href="exec:gt ''qwloc4''"><font color="red"><b>The phone is ringing</b></font></a>.'
-if QWdogreiqTimer = 0 and QWdogReiq = 2 and week = 7 and qwdogiventday ! day and hour >= 12:'<a href="exec:gt ''qwlocdog''"><font color="red"><b>The phone is ringing</b></font></a>.'
+if vladimirday ! daystart and vladimirQW = 20 and hour >= 15 and hour <= 17:'<a href="exec:gt ''qwloc2''"><font color="red"><b>The phone is ringing</b></font></a>.'
+if vladimirday ! daystart and vladimirQW = 25 and hour >= 15 and hour <= 17 and week = 6:'<a href="exec:gt ''qwloc3''"><font color="red"><b>The phone is ringing</b></font></a>.'
+if vladimirday ! daystart and vladimirQW = 35 and hour >= 15 and hour <= 17 and week = 6:'<a href="exec:gt ''qwloc4''"><font color="red"><b>The phone is ringing</b></font></a>.'
+if QWdogreiqTimer = 0 and QWdogReiq = 2 and week = 7 and qwdogiventday ! daystart and hour >= 12:'<a href="exec:gt ''qwlocdog''"><font color="red"><b>The phone is ringing</b></font></a>.'
 
 if bfA = 1 or bfB = 1 or bfC = 1:
-	if bfA = 1 and boydayA ! day and hour > 5 and hour < 20 and ringA = 0:
+	if bfA = 1 and boydayA ! daystart and hour > 5 and hour < 20 and ringA = 0:
 		if bfb = 1:bfb = 0
 		if bfc = 1:bfc = 0
 
@@ -132,7 +132,7 @@ if bfA = 1 or bfB = 1 or bfC = 1:
 		end
 	end
 
-	if bfB = 1 and boydayB ! day and hour > 5 and hour < 20 and ringB = 0:
+	if bfB = 1 and boydayB ! daystart and hour > 5 and hour < 20 and ringB = 0:
 		if bfa = 1:bfa = 0
 		if bfc = 1:bfc = 0
 
@@ -146,7 +146,7 @@ if bfA = 1 or bfB = 1 or bfC = 1:
 		end
 	end
 
-	if bfC = 1 and boydayC ! day and hour > 5 and hour < 20 and ringC = 0:
+	if bfC = 1 and boydayC ! daystart and hour > 5 and hour < 20 and ringC = 0:
 		if bfa = 1:bfa = 0
 		if bfb = 1:bfb = 0
 
@@ -246,7 +246,7 @@ if IvanPodstavaQW = 3 and hour >= 9 and hour <= 20:
 	exit
 end
 
-if IvanPodstavaDay ! day and IvanPodstavaQW = 1 and hour >= 8 and hour <= 20:
+if IvanPodstavaDay ! daystart and IvanPodstavaQW = 1 and hour >= 8 and hour <= 20:
 	'<b><font color="red">The doorbell rings</font></b>'
 
 	act 'Come to the door':
@@ -293,13 +293,13 @@ end
 
 if gopstop > 30:gt 'police', '1'
 
-if sick > 0 and doktorday ! day:
+if sick > 0 and doktorday ! daystart:
 	!'
 	act 'Call a doctor':
 		cla
 		*clr
 		minut += 15
-		doktorday = day
+		doktorday = daystart
 		sick -= 5
 
 		if sick < 1:sick = 1
@@ -311,7 +311,7 @@ if sick > 0 and doktorday ! day:
 	end
 	'!
 
-	act 'Call a doctor':doktorday = day & dynamic $polidin
+	act 'Call a doctor':doktorday = daystart & dynamic $polidin
 end
 
 $ninel0 = {
@@ -623,10 +623,11 @@ $polidin = {
 						minut += timerand * 30
 						'You are lying in bed, shivering in the chill and wrapped in a blanket. Time passes excruciatingly slow - you can not tell how much time passed before the doorbell rang.'
 
+						! WD: Uninitialised ~ 'ninel' use 'ninelmet'
 						act 'Answer the door':
-							if ninel > 0 and sick <= 50:
+							if ninelmet > 0 and sick <= 50:
 								gt 'housecall', 'ninel1'
-							elseif ninel = 0 or sick > 50:
+							elseif ninelmet = 0 or sick > 50:
 								doctrnd = rand(0, 1)
 
 								if doctrnd = 0:dynamic $drPP

+ 1 - 1
locations/korrPar

@@ -171,7 +171,7 @@ if hour >= 15 and hour < 20:
 		:markboyfrendcall
 		numnpcboy += 1
 
-		if otnBoyFrend[numnpcboy] >= 20 and boyinday[numnpcboy]!day:
+		if otnBoyFrend[numnpcboy] >= 20 and boyinday[numnpcboy]!daystart:
 			Gcall = 1
 			jump 'markboyfrendcall2'
 		end

+ 6 - 6
locations/kuhr

@@ -548,14 +548,14 @@ act 'Drink water (0:05)':
 	act 'Get up from the table':gt 'kuhr'
 end
 
-if husband > 0 and husbanday > 0 and huseatday ! day and eda >= 2:
+if husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
 	act 'Cook a meal for your husband and yourself, 2 servings (1:00)':
 		cla
 		*clr
 		husband += 5
 		eda -= 2
 		minut += 60
-		huseatday = day
+		huseatday = daystart
 		manna -= 25
 		'<center><img src="images/pics/cook.jpg"></center>'
 		'You prepare a meal for your husband and yourself.'
@@ -567,12 +567,12 @@ end
 if lekarstvo > 0:
 	'You have <b><<lekarstvo>></b> tablets.'
 
-	if sick > 0 and lekarday ! day:
+	if sick > 0 and lekarday ! daystart:
 		act 'Take a pill':
 			cla
 			*clr
 			minut += 5
-			lekarday = day
+			lekarday = daystart
 			lekarstvo -= 1
 			sick -= sick * 20 / 100
 			lekrand = rand(1, 9)
@@ -588,7 +588,7 @@ end
 if vitamin > 0:
 	'You have <b><<vitamin>></b> vitamin drinks.'
 
-	if vitaminday ! day:
+	if vitaminday ! daystart:
 		act 'Take vitamins (0:05)':
 			cla
 			*clr
@@ -596,7 +596,7 @@ if vitamin > 0:
 			if fat > salo:fat = salo
 
 			minut += 5
-			vitaminday = day
+			vitaminday = daystart
 			vitamin -= 1
 			frost = 0
 

+ 4 - 4
locations/kuhrPar

@@ -175,12 +175,12 @@ end
 if lekarstvo > 0:
 	'you <<lekarstvo>> tablets.'
 
-	if sick > 0 and lekarday ! day:
+	if sick > 0 and lekarday ! daystart:
 		act 'Take a pill (0:05)':
 			cla
 			*clr
 			minut += 5
-			lekarday = day
+			lekarday = daystart
 			lekarstvo -= 1
 			sick -= sick * 20 / 100
 			lekrand = rand(1, 9)
@@ -195,7 +195,7 @@ end
 if vitamin > 0:
 	'you <<vitamin>> vitaminok.'
 
-	if vitaminday ! day:
+	if vitaminday ! daystart:
 		act 'Take vitamins (0:05)':
 			cla
 			*clr
@@ -203,7 +203,7 @@ if vitamin > 0:
 			if fat > salo:fat = salo
 
 			minut += 5
-			vitaminday = day
+			vitaminday = daystart
 			vitamin -= 1
 			frost = 0
 

+ 13 - 13
locations/lab

@@ -27,10 +27,10 @@ if $ARGS[0] = 'start':
 		gt 'lab', 'karin'
 	end
 
-	if judosparday ! day:
+	if judosparday ! daystart:
 		act 'Sparring (Juugo, mutant power 600)':
 			cla
-			judosparday = day
+			judosparday = daystart
 			$nameV = 'Juugo'
 			!!stats
 			strenV = 600
@@ -57,10 +57,10 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if karinsparday ! day:
+	if karinsparday ! daystart:
 		act 'Sparring (Karin mag6)':
 			cla
-			karinsparday = day
+			karinsparday = daystart
 			$nameV = 'Karin'
 			!!stats
 			strenV = 60
@@ -103,12 +103,12 @@ if $ARGS[0] = 'jugo':
 
 	act 'Leave':gt 'lab', 'start'
 
-	if jugoday ! day:
+	if jugoday ! daystart:
 		act 'Develop strength (1:00)':
 			cla
 			stren += rand(3, 6)
 			minut += 60
-			jugoday = day
+			jugoday = daystart
 			'You do exercises under the guidance of Juugo.'
 
 			act 'Leave':gt 'lab', 'jugo'
@@ -118,7 +118,7 @@ if $ARGS[0] = 'jugo':
 			cla
 			speed += rand(3, 6)
 			minut += 60
-			jugoday = day
+			jugoday = daystart
 			'You do exercises under the guidance of Juugo.'
 
 			act 'Leave':gt 'lab', 'jugo'
@@ -128,7 +128,7 @@ if $ARGS[0] = 'jugo':
 			cla
 			agil += rand(3, 6)
 			minut += 60
-			jugoday = day
+			jugoday = daystart
 			'You do exercises under the guidance of Juugo.'
 
 			act 'Leave':gt 'lab', 'jugo'
@@ -138,7 +138,7 @@ if $ARGS[0] = 'jugo':
 			cla
 			react += rand(3, 6)
 			minut += 60
-			jugoday = day
+			jugoday = daystart
 			'You do exercises under the guidance of Juugo.'
 
 			act 'Leave':gt 'lab', 'jugo'
@@ -148,7 +148,7 @@ if $ARGS[0] = 'jugo':
 			cla
 			vital += rand(3, 6)
 			minut += 60
-			jugoday = day
+			jugoday = daystart
 			'You do exercises under the guidance of Juugo.'
 
 			act 'Leave':gt 'lab', 'jugo'
@@ -231,12 +231,12 @@ if $ARGS[0] = 'karin':
 			end
 		end
 
-		if karinday ! day:
+		if karinday ! daystart:
 			act 'Develop intelligence (1:00)':
 				cla
 				intel += rand(3, 6)
 				minut += 60
-				karinday = day
+				karinday = daystart
 				'Did you do with Karin developing his intellect.'
 
 				act 'Leave':gt 'lab', 'karin'
@@ -246,7 +246,7 @@ if $ARGS[0] = 'karin':
 				cla
 				will += rand(3, 6)
 				minut += 60
-				karinday = day
+				karinday = daystart
 				'Did you do with Karin developing his intellect.'
 
 				act 'Leave':gt 'lab', 'karin'

+ 3 - 3
locations/lake

@@ -115,7 +115,7 @@ if $ARGS[0] = 'start':
 							cla
 							*clr
 							andrei = 2
-							anreiday = day
+							anreiday = daystart
 							guy += 1
 							anal += 1
 							anus += 1
@@ -157,7 +157,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if anreiday ! day and andrei = 2:
+		if anreiday ! daystart and andrei = 2:
 			'You see on the beach Andrew.'
 
 			act 'Approach to Andrew':gt 'lake', 'andrey1'
@@ -1062,7 +1062,7 @@ if $ARGS[0] = 'andrey1':
 
 	act 'Bathe':
 		cla
-		anreiday = day
+		anreiday = daystart
 		anreirape = 0
 		'<center><img src="images/img/Lake/Andrey1/andrey1.jpg"></center>'
 		'- I see the lady agree - predatory Andrew grinned. - Then let''s go for a swim. He caught you in his arms, laughing your inappropriate attempts to cover him from his chest, dropped your hand and lips gently pinched the right nipple. You sigh, and abdomen began to rise warm wave excitation.'

+ 3 - 3
locations/lakecafe

@@ -87,7 +87,7 @@ if $ARGS[0] = 'main':
 		end
 	end
 
-	if LCwork2 >= 1 and LCwork2day ! day and hour = 18:
+	if LCwork2 >= 1 and LCwork2day ! daystart and hour = 18:
 		act 'Help in the kitchen':gt 'LCwork', 'Kitchen'
 	end
 
@@ -188,7 +188,7 @@ if $ARGS[0] = 'barmensha':
 				'<center><img src="images/LakeCafe/LakeBarmensha.jpg"></center>'
 
 				if LCworkwork = 0:
-					'You ask Zhenyu about the "special" work. It tells you that on Monday, at 22 o''clock, in the cafe visitors who need quality "service." Pay from 500 to 2, 000 rubles.'
+					'You ask Zhenyu about the "special" work. It tells you that on Monday, at 22 c''clock, in the cafe visitors who need quality "service." Pay from 500 to 2, 000 rubles.'
 
 					act '...':
 						LCworkwork = 1
@@ -197,7 +197,7 @@ if $ARGS[0] = 'barmensha':
 						gt 'lakecafe', 'barmensha'
 					end
 				elseif LCworkwork = 1:
-					'You ask about the work of Eugene. It reminds you of conditions:on Mondays, at 22 o''clock, you will need to "serve" certain visitors. Paid for it from 500 to 2000 rubles.'
+					'You ask about the work of Eugene. It reminds you of conditions:on Mondays, at 22 c''clock, you will need to "serve" certain visitors. Paid for it from 500 to 2000 rubles.'
 
 					act '...':
 						minut += 3

Некоторые файлы не были показаны из-за большого количества измененных файлов