:new: improve date (month) handling algorithm.

:recycle: add support to atm deposit.
Merge branch 'master' of http://git.tfgamessite.com/mjsmagalhes/girllife-ecv

MakeQSP.bat

@@ -12,26 +12,60 @@ set QSPGUI=..\QSP\qspgui.exe
 set QGEN=..\QSP\QGen5\QGen.exe
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
-
 :menu
 cls
 echo.
+echo :: QSP Compiler and Launcher
+echo.
 
-if defined NOT_FOUND ( echo ERROR: Option '%action%' wasn't recognized. Is it lowercase\? ) ELSE ( echo. )
-set NOT_FOUND=
+if defined QGEN (
+	if not exist "%QGEN%" ( 
+		echo QGEN     : [ERROR] - %QGEN%  not found. Using DEFAULT application.
+		set QGEN=
+	) else ( echo QGEN     : [OK] - "%QGEN%")
+) else echo QGEN     : [NOT DEFINED] - Using DEFAULT application.
+
+if defined QSPGUI (
+	if not exist "%QSPGUI%" ( 
+		echo QSP EXEC : [ERROR] - %QSPGUI% not found.
+		set QSPGUI=
+	) else ( echo QSP EXEC : [OK] - "%QSPGUI%")
+) else ( echo QSP EXEC : [NOT DEFINED] - Using Windows DEFAULT.)
+
+if defined QSPFILE (
+	if not exist "%QSPFILE%" ( 
+		echo QSP FILE : [WARNING] - %QSPFILE% not found.
+	) else ( echo QSP FILE : [OK] - "%QSPFILE%")
+) else ( echo QSP FILE : [NOT DEFINED] - ERROR: CAN'T CONTINUE.)
+
+if defined CP_TO (
+	if not exist "%CP_TO%" (
+		echo COPY     : [ERROR] - Destination "%CP_TO%" not found. Copy DISABLED.
+		set CP_TO=
+	) else ( echo COPY     : [OK] - "%CP_TO%")
+) else (  echo COPY     : [DISABLED] )
 
 echo.
-echo -- QSP Compiler and Launcher --
+
+if defined NOT_FOUND (
+	echo ERROR: Option '%action%' wasn't recognized. Is it lowercase? 
+	set NOT_FOUND=
+)
+
 echo.
-echo (B)uild  (R)un  (F)ull  (Q)Gen  (E)xit
+echo ACTIONS: (B)uild  (R)un  (F)ull  (Q)Gen  (E)xit
 echo.
 set /p action=Choose an action:
 
-if %action% == b goto build
-if %action% == r goto run
-if %action% == f goto build
-if %action% == q goto qgen
+if defined QSPFILE (
+	if %action% == b goto build
+	if %action% == r goto run
+	if %action% == f goto build
+	if %action% == q goto qgen
+)
+
 if %action% == e goto exit
+
 set NOT_FOUND=1
 goto menu
 
@@ -45,24 +79,23 @@ txt2gam.exe glife.txt %QSPFILE% > nul
 @ECHO OFF
 
 echo.
-if defined CP_TO (echo Copying %QSPFILE% to "%CP_TO%" ... & copy %QSPFILE% %CP_TO% )
+if defined CP_TO ( echo Copying %QSPFILE% to "%CP_TO%" ... & copy %QSPFILE% %CP_TO% > nul )
 
 echo.
 echo Done.
-if %action% == f goto run 
 pause
-goto menu
+if %action% == f ( goto run ) else ( goto menu )
 
 :qgen
 echo.
 echo Running ...
-if defined CP_TO (start %QGEN% %CP_TO%\%QSPFILE% ) else (start %QGEN% %QSPFILE% )
+if defined CP_TO ( start %QGEN% %CP_TO%\%QSPFILE% ) else ( start %QGEN% %QSPFILE% )
 goto exit
 
 :run
 echo.
 echo Running ...
 
-if defined CP_TO (start %QSPGUI% %CP_TO%\%QSPFILE% ) else (start %QSPGUI% %QSPFILE% )
+if defined CP_TO ( start %QSPGUI% %CP_TO%\%QSPFILE% ) else ( start %QSPGUI% %QSPFILE% )
 
 :exit

locations/Komp

@@ -511,7 +511,7 @@ if $ARGS[0] = 'rabota':
 			if hour < 20 and hour > 7:act 'Search more':gt 'Komp', 'rabota'
 
 			act 'Finish':gt 'Komp', 'brows'
-		elseif komprabota > 4 and komprabota < 8 and StoryLine > 0 and Suspeh >= 90 and camwhore = 0:
+		elseif komprabota > 4 and komprabota < 8 and Intel >= 50 and camwhore = 0:
 			'You stumble across on the ad, which says that a website requires webcam models.'
 			act 'Interest':
 				cls
@@ -533,6 +533,7 @@ if $ARGS[0] = 'rabota':
 					gs 'stat'
 					'<center><img src="images/camwhore/camwhore2.jpg"></center>'
 					'You go to the website, and register yourself on it as a model. Ten minutes later, the questionnaire has already been approved and you can now earn money as a webcam girl.'
+					'It will be necessary for you to have a webcam and if you don''t have one, they are easy to find in local supermarkets.' 
 					act 'Finish':gt 'Komp','brows'
 				end
 				act 'Return':gt 'Komp','brows'

locations/clothing_QV

@@ -12,9 +12,9 @@ if $ARGS[0] = 'list':
 	:loopcheap
 		gs 'clothing_attributes', 'cheap', i
 		if CloStyle ! 5:
-			if cheap[i] = 1 and cheapH[i] > 0 and cheapB[i] > (bedra - 8) and cheapB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''cheap'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/1cheap/Cheap<<i>>.jpg" 	height="250" /></div></a>'
+			if cheap[i] = 1 and cheapS[i] = 0 and cheapH[i] > 0 and cheapB[i] > (bedra - 8) and cheapB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''cheap'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/1cheap/Cheap<<i>>.jpg" 	height="250" /></div></a>'
 		else
-			if cheap[i] = 1 and cheapH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''cheap'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/1cheap/Cheap<<i>>.jpg" 	height="250" /></div></a>'
+			if cheap[i] = 1 and cheapS[i] = 0 and cheapH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''cheap'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/1cheap/Cheap<<i>>.jpg" 	height="250" /></div></a>'
 		end
 		i += 1
 	if i <= 85:jump 'loopcheap'
@@ -23,9 +23,9 @@ if $ARGS[0] = 'list':
 	:loopaverage
 		gs 'clothing_attributes', 'cheap', i
 		if CloStyle ! 5:
-			if average[i] = 1 and averageH[i] > 0 and averageB[i] > (bedra - 8) and averageB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''average'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/2average/Average<<i>>.jpg" 	height="250" /></div></a>'
+			if average[i] = 1 and averageS[i] = 0 and averageH[i] > 0 and averageB[i] > (bedra - 8) and averageB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''average'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/2average/Average<<i>>.jpg" 	height="250" /></div></a>'
 		else
-			if average[i] = 1 and averageH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''average'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/2average/Average<<i>>.jpg" 	height="250" /></div></a>'
+			if average[i] = 1 and averageS[i] = 0 and averageH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''average'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/2average/Average<<i>>.jpg" 	height="250" /></div></a>'
 		end
 		i += 1
 	if i <= 125:jump 'loopaverage'
@@ -34,53 +34,53 @@ if $ARGS[0] = 'list':
 	:loopexpensive
 		gs 'clothing_attributes', 'cheap', i
 		if CloStyle ! 5:
-			if expensive[i] = 1 and expensiveH[i] > 0 and expensiveB[i] > (bedra - 8) and expensiveB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''expensive'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/3expensive/Expensive<<i>>.jpg" 	height="250" /></div></a>'
+			if expensive[i] = 1 and expensiveS[i] = 0 and expensiveH[i] > 0 and expensiveB[i] > (bedra - 8) and expensiveB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''expensive'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/3expensive/Expensive<<i>>.jpg" 	height="250" /></div></a>'
 		else
-			if expensive[i] = 1 and expensiveH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''expensive'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/3expensive/Expensive<<i>>.jpg" 	height="250" /></div></a>'
+			if expensive[i] = 1 and expensiveS[i] = 0 and expensiveH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''expensive'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/3expensive/Expensive<<i>>.jpg" 	height="250" /></div></a>'
 		end
 		i += 1
 	if i <= 147:jump 'loopexpensive'
 
 	i = 1
 	:loopformal
-		if formal[i] = 1 and formalH[i] > 0 and formalB[i] > (bedra - 8) and formalB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''formal'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/4formal/Formal<<i>>.jpg" 	height="250" /></div></a>'
+		if formal[i] = 1 and formalS[i] = 0 and formalH[i] > 0 and formalB[i] > (bedra - 8) and formalB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''formal'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/4formal/Formal<<i>>.jpg" 	height="250" /></div></a>'
 		i += 1
 	if i <= 14:jump 'loopformal'
 
 	i = 1
 	:loopoffice
-		if office[i] = 1 and officeH[i] > 0 and officeB[i] > (bedra - 8) and officeB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''office'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/5office/Office<<i>>.jpg" 	height="250" /></div></a>'
+		if office[i] = 1 and officeS[i] = 0 and officeH[i] > 0 and officeB[i] > (bedra - 8) and officeB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''office'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/5office/Office<<i>>.jpg" 	height="250" /></div></a>'
 		i += 1
 	if i <= 30:jump 'loopoffice'
 
 	i = 1
 	:loopschool
-		if school[i] = 1 and schoolH[i] > 0 and schoolB[i] > (bedra - 8) and schoolB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''school'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/6school/School<<i>>.jpg" 	height="250" /></div></a>'
+		if school[i] = 1 and schoolS[i] = 0 and schoolH[i] > 0 and schoolB[i] > (bedra - 8) and schoolB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''school'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/6school/School<<i>>.jpg" 	height="250" /></div></a>'
 		i += 1
 		if i = 6: i = 7
 	if i <= 14:jump 'loopschool'
 
 	i = 1
 	:loopexercise
-		if exercise[i] = 1 and exerciseH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''exercise'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/7exercise/Exercise<<i>>.jpg" 	height="250" /></div></a>'
+		if exercise[i] = 1 and exerciseS[i] = 0 and exerciseH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''exercise'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/7exercise/Exercise<<i>>.jpg" 	height="250" /></div></a>'
 		i += 1
 	if i <= 26:jump 'loopexercise'
 
 	i = 1
 	:loopnaughty
-		if naughty[i] = 1 and naughtyH[i] > 0 and naughtyB[i] > (bedra - 8) and naughtyB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''naughty'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/8naughty/Naughty<<i>>.jpg" 	height="250" /></div></a>'
+		if naughty[i] = 1 and naughtyS[i] = 0 and naughtyH[i] > 0 and naughtyB[i] > (bedra - 8) and naughtyB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''naughty'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/8naughty/Naughty<<i>>.jpg" 	height="250" /></div></a>'
 		i += 1
 	if i <= 67:jump 'loopnaughty'
 
 	i = 1
 	:loopexhibit
-		if exhibit[i] = 1 and exhibitH[i] > 0 and exhibitB[i] > (bedra - 8) and exhibitB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''exhibit'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/9exhibit/Exhibit<<i>>.jpg" 	height="250" /></div></a>'
+		if exhibit[i] = 1 and exhibitS[i] = 0 and exhibitH[i] > 0 and exhibitB[i] > (bedra - 8) and exhibitB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''exhibit'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/9exhibit/Exhibit<<i>>.jpg" 	height="250" /></div></a>'
 		i += 1
 	if i <= 30:jump 'loopexhibit'
 
 	i = 1
 	:loopuniform
-		if uniform[i] = 1 and uniformH[i] > 0 and uniformB[i] > (bedra - 8) and uniformB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''uniform'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/10uniform/Uniform<<i>>.jpg" 	height="250" /></div></a>'
+		if uniform[i] = 1 and uniformS[i] = 0 and uniformH[i] > 0 and uniformB[i] > (bedra - 8) and uniformB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''uniform'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/10uniform/Uniform<<i>>.jpg" 	height="250" /></div></a>'
 		i += 1
 	if i <= 24:jump 'loopuniform'
 end

locations/din_bad

@@ -398,7 +398,7 @@ $Phone_calendar = {
 	pl'<center><img src="images/pic/icon/icon_statusbar.png"><br></center>'
 	pl'<center><font size=6>Calendar</font></center>'
 	pl'<center><img src="images/pic/icon/icon_calendar.png"><br></center>'
-	pl'<center><B>Today: </B><font size=5><<$week>>, <i><font size=6><<day>></font></i> <<$mons>> <i><font size=6><<year>></font></i> year.</font></center>'
+	pl'<center><B>Today: </B><font size=5><<$week>>, <i><font size=6><<day>></font></i> <<$month>> <i><font size=6><<year>></font></i> year.</font></center>'
 	pl'<center><a href="exec:dynamic $Phone_menu"><img src="images/pic/icon/back.png"></a></center>'
 }
 

locations/gdksport

@@ -876,11 +876,11 @@ if $ARGS[0] = 'shower':
 	gs 'stat'
 	'<center><img src="images/pics/dush.jpg"></center>'
 
-	if IvanShowerYes = 1 and rand(0,3) = 1:
+	if IvanShowerYes = 1 and rand(0,3) = 1 and ShowerIvan < 3:
 		if ShowerIvan = 1: ShowerIvan = 2
 		'You entered the women''s shower and turning the water on you began to lather your body with a washcloth. Suddenly, you hear the door creak as it opened and you remember that you agreed not to lock it for Ivan. You looked around and see Ivan Prokhorov stand there looking at you. "Hello <<$nickname>>. The men''s shower is full, so I thought I would join you instead." Ivan smiled after these words.'
 		act 'Further':gt 'gdksport', 'ShowerWithIvan'
-	elseif kotovVSprohorov = 1:
+	elseif kotovVSprohorov = 1 and ShowerIvan < 3:
 		kotovVSprohorov = 2
 		'You enter the women''s shower and turning the water on begin to lather your body with a washcloth. Suddenly, you hear the door creak as it opened and you remember that you forgot to lock it. You looked around and saw Ivan Prokhorov standing in the doorway looking at you. "Hi <<$name>>. Can I join you? The men''s shower is full." Ivan smiled after these words.'
 		act 'Throw Ivan out':
@@ -899,7 +899,6 @@ if $ARGS[0] = 'shower':
 			'Completely surprised and confused by Ivan''s sudden appearance, you are struck speachless. Ivan regarded your inaction and silence as consent. He came into the shower room and closed the door behind him.'
 
 			act 'Escape from the shower':
-				IvanShowerQW = 1 
 				cls
 				IvanShowerQW = 1
 				gs 'stat'
@@ -967,26 +966,45 @@ if $ARGS[0] = 'ShowerWithIvan':
 					'Penetrating further and further into your mouth, then into your throat, you take his member to the root without any problems and without causing you discomfort, and bringing Ivan "heavenly delight", if his groans and moans were any indication. Feeling that your classmate would flood your throat with his seed at any moment, you pulled your mouth off of his cock and turned and bent over, presenting your ass to Ivan. You also wanted some satisfaction.'
 				end
 
-				act 'stand doggy-style':
-					cls
-					IvanShowerQW = 10
-					minut += 5
-					horny += 20
-					$boy = 'Ivan'
-					dick = 17
-					lubonus = 2
-					gs 'stat'
-					'<center><img src="images/qwest/alter/Ev/shover2.jpg"></center>'
-					'You bent over and felt Ivan''s hand stroking your ass and anus.'
-					dynamic $analsex
-					cumspclnt = 1
-					gs 'cum_cleanup'
-					if VoltrenerVoyeur = 3:gt 'VoltrenerSexShower', '3'
-					if VoltrenerVoyeur = 4:gt 'VoltrenerSexShower', '4'
-					if VoltrenerVoyeur = 5:gt 'VoltrenerSexShower', '5'				
-					'Ivan pulls his member out of your ass and you feel the warm splatter of sperm on your back and ass cheeks.'
-
-					act 'Get out of the shower':gt 'gdksport', 'start'
+				if agape > 0:
+					act 'Continue':
+						cls
+						minut += 5
+						horny += 10
+						$boy = 'Ivan'
+						dick = 17
+						if throat < dick:throat += 1
+						spafinloc = 12
+						gs 'cum_manage'
+						gs 'stat'
+						'<center><img src="images/qwest/alter/Ev/cocksuckerswallow.jpg"></center>'
+						'Ivan wants your ass, but when he removes his cock and moves to turn you around, you tell him your butt is too sore.'
+						'He is clearly not pleased, but you take his cock back into your mouth and work the shaft while you swirl your tongue against the head.'
+						'Ivan can only hold back briefly against such an onslaught and you draw back so he can watch himself cum in your mouth.'
+						act 'Get out of the shower':gt 'gdksport', 'start'
+					end
+				else
+					act 'Turn around and bend over':
+						cls
+						IvanShowerQW = 10
+						minut += 5
+						horny += 20
+						$boy = 'Ivan'
+						dick = 17
+						lubonus = 2
+						gs 'stat'
+						'<center><img src="images/qwest/alter/Ev/shover2.jpg"></center>'
+						'As you bend over, you feel Ivan''s hand stroking your ass and his finger starts to massage your anus.'
+						dynamic $analsex
+						cumspclnt = 1
+						gs 'cum_cleanup'
+						if VoltrenerVoyeur = 3:gt 'VoltrenerSexShower', '3'
+						if VoltrenerVoyeur = 4:gt 'VoltrenerSexShower', '4'
+						if VoltrenerVoyeur = 5:gt 'VoltrenerSexShower', '5'				
+						'Ivan pulls his member out of your ass and you feel the warm splatter of sperm on your back and ass cheeks.'
+
+						act 'Get out of the shower':gt 'gdksport', 'start'
+					end
 				end
 			end
 		end

locations/loadg

@@ -41,5 +41,36 @@ if menoage = 0:
 	end
 end
 
+monthsEnd[0] = 31
+monthsEnd[1] = 31
+monthsEnd[2] = 28
+monthsEnd[3] = 31
+monthsEnd[4] = 30
+monthsEnd[5] = 31
+monthsEnd[6] = 30
+monthsEnd[7] = 31
+monthsEnd[8] = 31
+monthsEnd[9] = 30
+monthsEnd[10] = 31
+monthsEnd[11] = 30
+monthsEnd[12] = 31
+monthsEnd[13] = 31
+
+!MJ: Months names.
+$monthName[1] = 'January'
+$monthName[2] = 'February'
+$monthName[3] = 'March'
+$monthName[4] = 'April'
+$monthName[5] = 'May'
+$monthName[6] = 'June'
+$monthName[7] = 'July'
+$monthName[8] = 'August'
+$monthName[9] = 'September'
+$monthName[10] = 'October'
+$monthName[11] = 'November'
+$monthName[12] = 'December'
+
+$month = $monthName[month]
+
 --- loadg ---------------------------------
 

locations/pavResidential

@@ -159,7 +159,7 @@ act 'Wait':
 	act 'Check the time':gt $curloc
 end
 
-if StoryLine = 1 and hour >= 8 and hour < 23 and cumface > 0 and rand(0, 3) = 0 and sosedday ! daystart:
+if StoryLine = 1 and hour >= 8 and hour < 23 and spafinloc = 6 or spafinloc = 7 or spafinloc = 11 or spafinloc = 16 and rand(0, 3) = 0 and sosedday ! daystart:
 	cls
 	sosedday = daystart
 	gs 'stat'

locations/pod_ezd

@@ -390,7 +390,7 @@ minut +=5
 gs'stat'
 '<center><img src="images/qwest/alter/misha.jpg" ></center>'
 'Your neighbor''s name is Mikhail, though everyone calls him uncle Misha. He lives in the other apartment on the same floor as yours. Your mother always forbade you to talk to him, warning you that he used to be a local crime lord, and that you shouldn''t get involved with him. However, he has always been polite and kind to you.'
-	if GorSlut >= 3:
+	if GorSlut >= 3 or dyadyamishaevent >= 1:
 		misha_smoke_rnd = RAND(1,3)
 		if misha_smoke_rnd = 1:
 			manna +=5

locations/shop

@@ -219,9 +219,9 @@ if $shoplocation = 'grocery':
 	FUNC ('$stock_item', 1, 'Regular food', 50, 'eda', $CURLOC) + _
 	FUNC ('$stock_item', 1, 'Diet food', 250, 'edaD', $CURLOC) + _
 	FUNC ('$stock_item', 10, 'Tea biscuits', 300, 'pranik', $CURLOC) + _
-	iif(bag > 0, FUNC ('$single_stock_item', 1, 'Bottle of water', 50, 'bottle', $CURLOC), '') + _
-	iif(bag > 0, FUNC ('$single_stock_item', 1, 'Sandwich', 100, 'buterbrod', $CURLOC), '') + _
-	iif(bag > 0, FUNC ('$single_stock_item', 1, 'Bottle of wine', 500, 'wine', $CURLOC), '') + _
+	iif(bag > 0, FUNC ('$single_stock_item', 1, 'Bottle of water', 50, 'bottle', $CURLOC), '<tr><td>Bottle of water</td><td colspan=2>You need a handbag</td><td>for 50 rubles</td></tr>') + _
+	iif(bag > 0, FUNC ('$single_stock_item', 1, 'Sandwich', 100, 'buterbrod', $CURLOC), '<tr><td>Sandwich</td><td colspan=2>You need a handbag</td><td>for 100 rubles</td></tr>') + _
+	iif(bag > 0, FUNC ('$single_stock_item', 1, 'Bottle of wine', 500, 'wine', $CURLOC), '<tr><td>Bottle of wine</td><td colspan=2>You need a handbag</td><td>for 500 rubles</td></tr>') + _
 	'</table></center>'
 
 	clr
@@ -262,10 +262,10 @@ if $shoplocation= 'cosmetics':
 	FUNC ('$stock_item', 10, 'Hair scrunchies', 80, 'hscrunch', $CURLOC) + _
 	FUNC ('$stock_item', 12, 'Hair pins', 100, 'hpingrip', $CURLOC)
 	
-	*pl iif(bag > 0, FUNC ('$stock_item', 10, 'Wipes', 100, 'salfetka', $CURLOC), '') + _
-	iif(bag > 0, FUNC ('$stock_item', 10, 'Portable makeup', 1000, 'kosmetitka', $CURLOC), '') + _
-	iif(bag > 0, FUNC ('$stock_item', 20, 'Mouthwash', 400, 'mouthwash', $CURLOC), '') + _
-	iif(bag > 0, FUNC ('$single_stock_item', 1, 'Comb', 150, 'greben', $CURLOC), '') + _
+	*pl iif(bag > 0, FUNC ('$stock_item', 10, 'Wipes', 100, 'salfetka', $CURLOC), '<tr><td>Wipes</td><td colspan=2>You need a handbag</td><td>for 100 rubles</td></tr>') + _
+	iif(bag > 0, FUNC ('$stock_item', 10, 'Portable makeup', 1000, 'kosmetitka', $CURLOC), '<tr><td>Portable makeup</td><td colspan=2>You need a handbag</td><td>for 1000 rubles</td></tr>') + _
+	iif(bag > 0, FUNC ('$stock_item', 20, 'Mouthwash', 400, 'mouthwash', $CURLOC), '<tr><td>Mouthwash</td><td colspan=2>You need a handbag</td><td>for 400 rubles</td></tr>') + _
+	iif(bag > 0, FUNC ('$single_stock_item', 1, 'Comb', 150, 'greben', $CURLOC), '<tr><td>Comb</td><td colspan=2>You need a handbag</td><td>for 150 rubles</td></tr>') + _
 	FUNC ('$single_stock_item', 1, 'Handbag', 5000, 'bag', $CURLOC) + _
 	'</table></center>'
 
@@ -653,15 +653,15 @@ if $shoplocation = 'tech':
 	*p iif($ARGS[0] = 'start' or $ARGS[0] = '' or $ARGS[0] = 'move', '<br/>', '<center><<$ARGS[0]>></center>')
 
 	*pl '<center><table align="center">' + _
-	FUNC ('$single_stock_item', 1, 'Scondhand Small CRT TV', 5000, 'TV', $CURLOC) + _
-	FUNC ('$single_stock_item', 2, 'Large Plasma TV', 35000, 'TV', $CURLOC) + _
-	FUNC ('$single_stock_item', 1, 'Computer', 25000, 'komp', $CURLOC) + _
-	iif(komp > 0, FUNC ('$single_stock_item', 1, 'Computer game Dead Sunset', 500, 'GameCD2', $CURLOC), '') + _
-	FUNC ('$single_stock_item', 1, 'Dishwasher', 50000, 'posudomashina', $CURLOC) + _
-	FUNC ('$single_stock_item', 1, 'Washing machine', 50000, 'stiralka', $CURLOC) + _
+	iif(housr > 0, FUNC ('$single_stock_item', 1, 'Scondhand Small CRT TV', 5000, 'TV', $CURLOC), '<tr><td>Scondhand Small CRT TV</td><td colspan=2>costs 5000 rubles</td><td>You need your own home</td></tr>') + _
+	iif(housr > 0, FUNC ('$single_stock_item', 2, 'Large Plasma TV', 35000, 'TV', $CURLOC), '<tr><td>Large Plasma TV</td><td colspan=2>costs 35000 rubles</td><td>You need your own home</td></tr>') + _
+	FUNC ('$single_stock_item', 1, 'Computer', 25000, 'komp', $CURLOC)
+	*p iif(komp > 0, FUNC ('$single_stock_item', 1, 'Computer game Dead Sunset', 500, 'GameCD2', $CURLOC), '') + _
+	iif(housr > 0, FUNC ('$single_stock_item', 1, 'Dishwasher', 50000, 'posudomashina', $CURLOC), '<tr><td>Dishwasher</td><td colspan=2>costs 50000 rubles</td><td>You need your own home</td></tr>') + _
+	iif(housr > 0, FUNC ('$single_stock_item', 1, 'Washing machine', 50000, 'stiralka', $CURLOC), '<tr><td>Washing machine</td><td colspan=2>costs 50000 rubles</td><td>You need your own home</td></tr>') + _
 	FUNC ('$single_stock_item', 1, 'Camera', 10000, 'zenit', $CURLOC) + _
-	FUNC ('$single_stock_item', 1, 'Mini camera disguised as a cigarette pack', 40000, 'minifoto', $CURLOC) + _
-	iif(vasya_shulgin>=30 and webcamera = 0, FUNC ('$single_stock_item', 1, 'Webcam', 10000, 'webcamera', $CURLOC), '') + _
+	FUNC ('$single_stock_item', 1, 'Mini camera disguised as a cigarette pack', 40000, 'minifoto', $CURLOC)
+	*p iif((vasya_shulgin>=30 and webcamera = 0) or (camwhore = 1 and webcamera = 0), FUNC ('$single_stock_item', 1, 'Webcam', 10000, 'webcamera', $CURLOC), '') + _
 	'</table></center>'
 
 	clr

locations/start

@@ -179,6 +179,38 @@ vshrinkdays = 6
 ashrink = 1
 ashrinkdays = 3
 
+!MJ: The day the month ends. Including possible rollover months 0 and 13.
+monthEnd[0] = 31
+monthEnd[1] = 31
+monthEnd[2] = 28
+monthEnd[3] = 31
+monthEnd[4] = 30
+monthEnd[5] = 31
+monthEnd[6] = 30
+monthEnd[7] = 31
+monthEnd[8] = 31
+monthEnd[9] = 30
+monthEnd[10] = 31
+monthEnd[11] = 30
+monthEnd[12] = 31
+monthEnd[13] = 31
+
+!MJ: Months names.
+$monthName[1] = 'January'
+$monthName[2] = 'February'
+$monthName[3] = 'March'
+$monthName[4] = 'April'
+$monthName[5] = 'May'
+$monthName[6] = 'June'
+$monthName[7] = 'July'
+$monthName[8] = 'August'
+$monthName[9] = 'September'
+$monthName[10] = 'October'
+$monthName[11] = 'November'
+$monthName[12] = 'December'
+
+$month = $monthName[month]
+
 act '<center><b>Start</b></center>':
 	cla
 	gt 'begin','real_character'
@@ -194,7 +226,6 @@ end
 
 ! WD: Set variable to store Image needed HTML code
 set $ImageNeededPlacholder = '<center><img src="images/community/Image_needed.png"></center>'
---- start ---------------------------------
 
--------------------------------
+--- start ---------------------------------
 

locations/stat

@@ -734,6 +734,11 @@ if hour >= 24:
 			karta += temp
 			smallmoney -= temp*200000
 		end
+		
+		if atmDeposit > 0 and atmDepositDate <= daystart:
+			karta += atmDeposit
+			atmDeposit = 0
+		end
 	end
 	
 	if hour >= 24:jump 'loop'
@@ -830,28 +835,23 @@ end
 
 if sdaday = day and sdamonth = month and housr = 0:
 	housr = 1
-	'<b><font color="red">Your tenants have moved out and your apartment is now vacant.</font></b>' & msg 'Your tenants have moved out and your apartment is now vacant.'
+	'<b><font color="red">Your tenants have moved out and your apartment is now vacant.</font></b>'
+	!msg 'Your tenants have moved out and your apartment is now vacant.'
 end
 
-if month = 1 or month = 3 or month = 5 or month = 7 or month = 8 or month = 10 or month = 12:
-	!!31
-	if day > 31:day -= 31 & month += 1
-elseif month = 2:
-	!!28
-	if day > 28:day -= 28 & month += 1
-elseif month = 0:
-	month = 1
-
-	if day > 31:day -= 31 & month += 1
-elseif month = 13:
-	month = 1
-
-	if day > 31:day -= 31 & month += 1
-else
-	!!30
-	if day > 30:day -= 30 & month += 1
+if day > monthEnd[month]:
+	day -= monthEnd[month]
+	month += 1
+	
+	if month > 12: month = 1
+	
+	!MJ: Dont think that one is needed. But it was in the original loop.
+	if month < 1: month = 1
+	
+	$month = $monthName[month]
 end
 
+!MJ: Dont think that one is needed. But it was here already.
 if day = 0:day = 1
 
 if week > 7:
@@ -872,22 +872,12 @@ if week = 5:$week = 'Friday'
 if week = 6:$week = 'Saturday'
 if week = 7:$week = 'Sunday'
 
-if month = 0:month = 1
-if month = 13:month = 1 & year += 1
-If month = 1:$month = 'January' & $mons = 'January'
-If month = 2:$month = 'February' & $mons = 'February'
-If month = 3:$month = 'March' & $mons = 'March'
-If month = 4:$month = 'April' & $mons = 'April'
-If month = 5:$month = 'May' & $mons = 'May'
-If month = 6:$month = 'June' & $mons = 'June'
-If month = 7:$month = 'July' & $mons = 'July'
-If month = 8:$month = 'August' & $mons = 'August'
-If month = 9:$month = 'September' & $mons = 'September'
-If month = 10:$month = 'October' & $mons = 'October'
-If month = 11:$month = 'November' & $mons = 'November'
-If month = 12:$month = 'December' & $mons = 'December'
-if minut < 10:$nilmin = '0'
-if minut >= 10:$nilmin = ''
+if minut < 10: 
+	$nilmin = '0' 
+else 
+	$nilmin = '' 
+end
+
 if kid > 0:
 	i = arrsize('yearkid')
 	:LoopKidAgeCounter
@@ -1318,15 +1308,15 @@ if Enable_statfsize>0:pl'<font size=<<Enable_statfsize>>>'
 
 if hour < 10:
 	if minut > 9 :
-		pl '<b> 0<<hour>>:<<minut>></b> <<$week>> <<day>> <<$mons>> <<year>>'
+		pl '<b> 0<<hour>>:<<minut>></b> <<$week>> <<day>> <<$month>> <<year>>'
 	else
-		pl '<b> 0<<hour>>:0<<minut>></b> <<$week>> <<day>> <<$mons>> <<year>>'
+		pl '<b> 0<<hour>>:0<<minut>></b> <<$week>> <<day>> <<$month>> <<year>>'
 	end
 else
 	if minut > 9 :
-		pl '<b> <<hour>>:<<minut>></b> <<$week>> <<day>> <<$mons>> <<year>>'
+		pl '<b> <<hour>>:<<minut>></b> <<$week>> <<day>> <<$month>> <<year>>'
 	else
-		pl '<b> <<hour>>:0<<minut>></b> <<$week>> <<day>> <<$mons>> <<year>>'
+		pl '<b> <<hour>>:0<<minut>></b> <<$week>> <<day>> <<$month>> <<year>>'
 	end
 end
 pl