[fixed] move code out of cikl procedure and fixed some stuff related to booty calls

locations/bank.qsrc

@@ -358,5 +358,273 @@ if $ARGS[0] = 'loan_officer':
 	end
 end
 
+if $ARGS[0] = 'cikl':
+	!!------------------------------------------------------------------------------------------------------------
+	!!	Banking
+	!!------------------------------------------------------------------------------------------------------------
+
+	!!MJ: Add some (daily) interest to the bank account.
+	!!Not very realistic but won''t make anyone too rich.
+
+	if bankAccount = 1:
+		kartatotal = karta
+		:kartaloop
+		if kartatotal > 20000000:
+			kartacount += 1
+			largekarta[kartacount] = 20000000
+			kartatotal -= 20000000
+			jump 'kartaloop'
+		else
+			largekarta[0] = kartatotal
+		end
+		if karta >= 2000000:
+			!! yearly interest of 2.3% recalculated into daily interest = 0.006% daily
+			intrate = 60
+		elseif karta >= 0:
+			!! yearly interest of 1.15% recalculated into daily interest = 0.003% daily
+			intrate = 30
+		else
+			!! yearly overdraft interest of 20% recalculated into daily interest = 0.055% daily
+			intrate = 550
+		end
+		:intloop
+		if kartacount > 0:
+			smallmoneypos += (largekarta[kartacount] * intrate)
+			if smallmoneypos >= 1000000 or smallmoneypos <= -1000000: karta += smallmoneypos / 1000000 & smallmoneypos = smallmoneypos mod 1000000
+			largekarta[kartacount] = 0
+			kartacount -= 1
+			jump 'intloop'
+		else
+			smallmoneypos += (largekarta[0] * intrate)
+			largekarta[0] = 0
+			if kartacount ! 0: kartacount = 0
+		end
+
+		if smallmoneypos >= 1000000 or smallmoneypos <= -1000000:
+			karta += smallmoneypos / 1000000
+			smallmoneypos = smallmoneypos mod 1000000
+		end
+
+		if atmDeposit > 0 and atmDepositDate <= daystart:
+			karta += atmDeposit
+			atmDeposit = 0
+		end
+	end
+
+	!!------------------------------------------------------------------------------------------------------------
+	!!	Payments
+	!!------------------------------------------------------------------------------------------------------------
+
+	if day = 25:
+		!! meynold payment
+		if	mey_vika['mey_vika_qw'] >= 35 and mey_tamara['help_count'] < 10 and mey_tamara['qw_end'] = 0:
+			karta += 10000
+			'<b><font color=green>For your efforts aunt Tamara gave you 10,000 rubles</font></b>'
+			mey_tamara['help_count'] = 0
+		elseif mey_vika['mey_vika_qw'] >= 35 and mey_tamara['help_count'] >= 10 and mey_tamara['qw_end'] = 0:
+			karta += 15000
+			'<b><font color=green>For your efforts aunt Tamara gave you 15,000 rubles</font></b>'
+			mey_tamara['help_count'] = 0
+		end
+
+		if BurgerQW['Secretary'] = 1 and BurgerQW['SecretaryTimesWorked'] > 0 and paydaybistrosec = 0:
+			Pay = BurgerQW['SecretaryTimesWorked'] * 1250
+			BurgerQW['SecretaryTimesWorked'] = 0
+			karta += Pay
+			paydaybistrosec = 1
+			'<b><font color="green">Your salary of <<pay>> <b>₽</b> has been paid into your bank account for your job as a secretary.</font></b>'
+		end
+
+		if workKafe['job'] = 1 and paydayKafe = 0:
+			paydayKafe = 1
+			pay = smenaKafe * 600
+			karta += pay
+			smenaKafe = 0
+			'<b><font color="green">Your salary of <<pay>> <b>₽</b> has been paid into your bank account for your job as a waitress in a cafe.</font></b>'
+		end
+
+		if workhosp = 1 and nopaypoly = 0:
+			pay = smena * 1000
+			karta += pay
+			smena = 0
+			nopaypoly = 1
+			'<b><font color="green">Your salary of <<pay>> <b>₽</b> has been paid into your bank account for your work in the clinic.</font></b>'
+		end
+
+		if worksalon = 1 and nopaysalon = 0:
+			pay = smenaSalon * 1560
+			karta += pay
+			smenaSalon = 0
+			nopaysalon = 1
+			'<b><font color="green">Your salary of <<pay>> <b>₽</b> has been paid into your bank account for your work in a beauty salon.</font></b>'
+		end
+
+		if tanwork = 1 and nopaytanwork = 0:
+			nopaytanwork = 1
+			karta += 10000
+			'<b><font color="green">Your salary of 10,000 <b>₽</b> has been paid into your bank account for your work as a house maid.</font></b>'
+		end
+
+		if workSec = 1 and paydaySec = 0:
+			paydaySec = 1
+			pay = sekDay * 1500
+
+			karta += pay
+			sekDay = 0
+			'<b><font color="green">Your salary of <<pay>> <b>₽</b> has been paid into your bank account for your job as a secretary.</font></b>'
+		end
+
+		if workFabrika = 1:
+			pay = smenaFabrika * 600
+			smenaFabrika = 0
+			karta += pay
+			'<b><font color="green">Your salary of <<pay>> <b>₽</b> has been paid into your bank account for your job at the garment factory.</font></b>'
+		end
+
+		if husband > 0 and paydayHusb = 0:
+			paydayHusb = 1
+
+			if husbFin = 0:huspay = 20000
+			if husbFin = 1:huspay = 30000
+			if husbFin = 2:huspay = 40000
+
+			karta += huspay
+			'<b><font color="green">Your husband has paid <<huspay>> <b>₽</b> into your bank account.</font></b>'
+		end
+
+		if func('uniutil', 'scholarship' , 'is_active') and scholarshipday = 0:
+			scholarshipday = 1
+			karta += func('uniutil', 'scholarship', 'get')
+			'<b><font color="green">You have received '+func('uniutil', 'scholarship', 'get')+' <b>₽</b> from your scholarship.</font></b>'
+		end
+
+		! Utilities for all apartments.
+		if (home_owned[1] = 1 or home_owned[1] = 2 or home_owned[4] > 0 or home_owned[5] = 2) and electroday = 0:
+			gs 'housing', 'util'
+			if bankAccount = 1 and karta >= elektro:
+				'<b><font color="green"><<elektro>> <b>₽</b> for utilities, has been automatically deducted from your bank account.</font></b>'
+				electroday = 1
+				if elektro >= 2000:
+					elektro = 2000 + rand(0, 100)
+					karta -= elektro * hcount_util
+				end
+			elseif bankAccount = 1 and karta + bankDebtLimit >= elektro:
+				'<b><font color="green"><<elektro>> <b>₽</b> for utilities, has been automatically deducted from your bank account and overdraw facility. Please contact your bank.</font></b>'
+				electroday = 1
+				if elektro >= 2000:
+					elektro = 2000 + rand(0, 100)
+					karta -= elektro * hcount_util
+				end
+			elseif bankAccount = 0 and money >= elektro:
+				'<b><font color="red">You currently do not have a bank account setup for automatic utilities payments. <<elektro>> <b>₽</b> has been deducted from your cash holdings.</font></b>'
+				electroday = 1
+				if elektro >= 2000:
+					elektro = 2000 + rand(0, 100)
+					money -= elektro * hcount_util
+				end
+			else
+				'<b><font color="red">Your card was declined during automatic debit of <<elektro>> <b>₽</b>, for automatic utilities payment.</font></b>'
+			end
+		end
+
+		! Cable for all apartments
+		if kabel > 0 and kabelday = 0:
+			gs 'housing', 'cable'
+			if bankAccount = 1 and karta >= (300 * hcount_cable):
+				'<b><font color="green">300 <b>₽</b> has been deducted from your bank account, for you cable TV subscription.</font></b>'
+				kabelday = 1
+				karta -= 300 * hcount_cable
+			elseif bankAccount = 1 and karta + bankDebtLimit >= (300 * hcount_cable):
+				'<b><font color="green">300 <b>₽</b> has been deducted from your bank account and overdraw facility, for you cable TV subscription.</font></b>'
+				kabelday = 1
+				karta -= 300 * hcount_cable
+			elseif bankAccount = 0 and money >= (300 * hcount_cable):
+				'<b><font color="red">You currently do not have a bank account setup for automatic payment of your cable TV subscription. 300 <b>₽</b> has been deducted from your cash holdings.</font></b>'
+				kabelday = 1
+				money -= 300 * hcount_cable
+			else
+				'<b><font color="red">Your card was declined during automatic debit of 300 <b>₽</b> for cable TV subscription.</font></b>'
+			end
+		end
+	end
+
+	if day ! 25:
+		if paydayHusb = 1:paydayHusb = 0
+		if workKafe['job'] = 1 and paydayKafe = 1:paydayKafe = 0
+		if workSec = 1 and paydaySec = 1:paydaySec = 0
+		if (home_owned[1] = 1 or home_owned[4] > 0) and haday = 1:haday = 0
+		if (home_owned[1] > 0 or home_owned[4] > 0 or home_owned[5] = 2) and electroday = 1:electroday = 0
+		if (home_owned[1] > 0 or home_owned[4] > 0 or home_owned[5] = 3) and kabel > 0 and kabelday = 1:kabelday = 0
+		if scholarshipday = 1:scholarshipday = 0
+		if nopaytanwork = 1:nopaytanwork = 0
+		if nopaypoly = 1:nopaypoly = 0
+		if nopaysalon = 1:nopaysalon = 0
+		if paydaybistrosec = 1:paydaybistrosec = 0
+	end
+
+	if sdaday = day and sdamonth = month and home_owned[1] = 3:
+		home_owned[1] = 2
+		'<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
+
+	!!----------------------------------------
+	!! Rent
+	!!----------------------------------------
+
+	if home_owned[1] = 1 or home_owned[4] > 0:
+		gs 'housing', 'rent'
+		! Rent for the city apartment
+		if home_owned[1] = 1:
+			if ArendHouseSL <= 2:
+				!From bank
+				if bankAccount = 1 and karta >= home_rent[1]:
+					'<b><font color="green">Your rent payment of <<home_rent[1]>> <b>₽</b> for your city apartment, has automatically been deducted from your bank account.</font></b>'
+					karta -= home_rent[1]
+					ArendHouseSL += ArendHouseSL_due
+				elseif bankAccount = 1 and karta + bankDebtLimit >= home_rent[1]:
+					'<b><font color="green">Your rent payment of <<home_rent[1]>> <b>₽</b> for your city apartment, has automatically been deducted from your bank account and overdraw facility. Please contact your bank regarding your overdraw repayment.</font></b>'
+					karta -= home_rent[1]
+					ArendHouseSL += ArendHouseSL_due
+				elseif bankAccount = 0:
+					'<b><font color="red">You currently do not have a bank account setup for automatic rent deduction of <<home_rent[1]>> <b>₽</b> for your city apartment. To avoid eviction, please make manual payment as soon as possible.</font></b>'
+				else
+					nl
+					'<b><b><font color="red">Your card was declined during automatic rent deduction of <<home_rent[1]>> <b>₽</b> for your city apartment. To avoid eviction, please rectify as soon as possible.</font></b>'
+				end
+			end
+		end
+
+		! Rent for the Pushkin apartment
+		if home_owned[4] > 0:
+			if ArendHouseSL4 <= 2:
+				!From bank
+				if bankAccount = 1 and karta >= home_rent[4]:
+					'<b><font color="green">Your rent payment of <<home_rent[4]>> <b>₽</b> for your Pushkin apartment, has automatically been deducted from your bank account.</font></b>'
+					karta -= home_rent[4]
+					ArendHouseSL4 += ArendHouseSL_due
+				elseif bankAccount = 1 and karta + bankDebtLimit >= home_rent[4]:
+					'<b><font color="green">Your rent payment of <<home_rent[4]>> <b>₽</b> for your Pushkin apartment, has automatically been deducted from your bank account and overdraw facility. Please contact your bank regarding your overdraw repayment.</font></b>'
+					karta -= home_rent[4]
+					ArendHouseSL4 += ArendHouseSL_due
+				elseif bankAccount = 0:
+					'<b><font color="red">You currently do not have a bank account setup for automatic rent deduction of <<home_rent[4]>> <b>₽</b> for your Pushkin apartment. To avoid eviction, please make manual payment as soon as possible.</font></b>'
+				else
+					nl
+					'<b><b><font color="red">Your card was declined during automatic rent deduction of <<home_rent[4]>> <b>₽</b> for your Pushkin apartment. To avoid eviction, please rectify as soon as possible.</font></b>'
+				end
+			end
+		end
+	end
+
+	if home_owned[1] = 1 and ArendHouseSL <= 0: ArendHouseSL = 0 & home_owned[1] = 0
+	if home_owned[4] > 0 and ArendHouseSL4 <= 0: ArendHouseSL4 = 0 & home_owned[4] = 0
+
+	if home_owned[1] = 1: ArendHouseSL -= 1
+	if home_owned[4] > 0: ArendHouseSL4 -= 1
+
+	!!------------------------------------------------------------------------------------------------------------
+
+end
 --- bank ---------------------------------
 

locations/booty_call.qsrc

@@ -1,11 +1,11 @@
 # booty_call
 if $ARGS[0] = 'scheduler':
+	!! clear SMS
+	!! clear schedule
+	killvar 'booty_call_time'
 	i = 0
 	:booty_call_time_sched_loop
 	if i < ARRSIZE('$FuckBuddy'):
-		!! clear SMS
-		!! clear schedule
-		killvar 'booty_call_time'
 		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]]) and (rand(1,npc_rel[$FuckBuddy[i]]) > 0):
 			booty_call_time[$FuckBuddy[i]] = 900 + rand(0,210)
 		else
@@ -20,7 +20,7 @@ if $ARGS[0] = 'SMS raiser':
 	i = 0
 	:booty_call_sms_raiser_loop
 	if i < ARRSIZE('$FuckBuddy'):
-		if booty_call_time[$FuckBuddy[i]] < hour*24+minut:
+		if booty_call_time[$FuckBuddy[i]] < hour*60+minut:
 			gs 'booty_call_sms', 'start',$FuckBuddy[i]
 			gs 'booty_call_sms', 'Add SMS', $FuckBuddy[i]
 			booty_call_time[$FuckBuddy[i]] = 2000

locations/cikl.qsrc

@@ -88,6 +88,10 @@ if (film > 0 or pornstack = 1) and pfilmNO = 0 and pfilmSTOP = 0:
 	gs 'pornschedule', 'schedule'
 end
 
+!! set the time when the SMS will be send
+gs 'booty_call', 'scheduler'
+
+
 !!------------------------------------------------------------------------------------------------------------
 !!	Job Stuff
 !!------------------------------------------------------------------------------------------------------------
@@ -706,271 +710,8 @@ if temprel < aarraynumber:
 	jump 'toptemprel'
 end
 killvar 'temprel'
-!!------------------------------------------------------------------------------------------------------------
-!!	Banking
-!!------------------------------------------------------------------------------------------------------------
-
-!!MJ: Add some (daily) interest to the bank account.
-!!Not very realistic but won''t make anyone too rich.
-
-if bankAccount = 1:
-	kartatotal = karta
-	:kartaloop
-	if kartatotal > 20000000:
-		kartacount += 1
-		largekarta[kartacount] = 20000000
-		kartatotal -= 20000000
-		jump 'kartaloop'
-	else
-		largekarta[0] = kartatotal
-	end
-	if karta >= 2000000:
-		!! yearly interest of 2.3% recalculated into daily interest = 0.006% daily
-		intrate = 60
-	elseif karta >= 0:
-		!! yearly interest of 1.15% recalculated into daily interest = 0.003% daily
-		intrate = 30
-	else
-		!! yearly overdraft interest of 20% recalculated into daily interest = 0.055% daily
-		intrate = 550
-	end
-	:intloop
-	if kartacount > 0:
-		smallmoneypos += (largekarta[kartacount] * intrate)
-		if smallmoneypos >= 1000000 or smallmoneypos <= -1000000: karta += smallmoneypos / 1000000 & smallmoneypos = smallmoneypos mod 1000000
-		largekarta[kartacount] = 0
-		kartacount -= 1
-		jump 'intloop'
-	else
-		smallmoneypos += (largekarta[0] * intrate)
-		largekarta[0] = 0
-		if kartacount ! 0: kartacount = 0
-	end
-
-	if smallmoneypos >= 1000000 or smallmoneypos <= -1000000:
-		karta += smallmoneypos / 1000000
-		smallmoneypos = smallmoneypos mod 1000000
-	end
-
-	if atmDeposit > 0 and atmDepositDate <= daystart:
-		karta += atmDeposit
-		atmDeposit = 0
-	end
-end
-
-!!------------------------------------------------------------------------------------------------------------
-!!	Payments
-!!------------------------------------------------------------------------------------------------------------
-
-if day = 25:
-	!! meynold payment
-	if	mey_vika['mey_vika_qw'] >= 35 and mey_tamara['help_count'] < 10 and mey_tamara['qw_end'] = 0:
-		karta += 10000
-		'<b><font color=green>For your efforts aunt Tamara gave you 10,000 rubles</font></b>'
-		mey_tamara['help_count'] = 0
-	elseif mey_vika['mey_vika_qw'] >= 35 and mey_tamara['help_count'] >= 10 and mey_tamara['qw_end'] = 0:
-		karta += 15000
-		'<b><font color=green>For your efforts aunt Tamara gave you 15,000 rubles</font></b>'
-		mey_tamara['help_count'] = 0
-	end
-
-	if BurgerQW['Secretary'] = 1 and BurgerQW['SecretaryTimesWorked'] > 0 and paydaybistrosec = 0:
-		Pay = BurgerQW['SecretaryTimesWorked'] * 1250
-		BurgerQW['SecretaryTimesWorked'] = 0
-		karta += Pay
-		paydaybistrosec = 1
-		'<b><font color="green">Your salary of <<pay>> <b>₽</b> has been paid into your bank account for your job as a secretary.</font></b>'
-	end
-
-	if workKafe['job'] = 1 and paydayKafe = 0:
-		paydayKafe = 1
-		pay = smenaKafe * 600
-		karta += pay
-		smenaKafe = 0
-		'<b><font color="green">Your salary of <<pay>> <b>₽</b> has been paid into your bank account for your job as a waitress in a cafe.</font></b>'
-	end
-
-	if workhosp = 1 and nopaypoly = 0:
-		pay = smena * 1000
-		karta += pay
-		smena = 0
-		nopaypoly = 1
-		'<b><font color="green">Your salary of <<pay>> <b>₽</b> has been paid into your bank account for your work in the clinic.</font></b>'
-	end
-
-	if worksalon = 1 and nopaysalon = 0:
-		pay = smenaSalon * 1560
-		karta += pay
-		smenaSalon = 0
-		nopaysalon = 1
-		'<b><font color="green">Your salary of <<pay>> <b>₽</b> has been paid into your bank account for your work in a beauty salon.</font></b>'
-	end
-
-	if tanwork = 1 and nopaytanwork = 0:
-		nopaytanwork = 1
-		karta += 10000
-		'<b><font color="green">Your salary of 10,000 <b>₽</b> has been paid into your bank account for your work as a house maid.</font></b>'
-	end
-
-	if workSec = 1 and paydaySec = 0:
-		paydaySec = 1
-		pay = sekDay * 1500
-
-		karta += pay
-		sekDay = 0
-		'<b><font color="green">Your salary of <<pay>> <b>₽</b> has been paid into your bank account for your job as a secretary.</font></b>'
-	end
-
-	if workFabrika = 1:
-		pay = smenaFabrika * 600
-		smenaFabrika = 0
-		karta += pay
-		'<b><font color="green">Your salary of <<pay>> <b>₽</b> has been paid into your bank account for your job at the garment factory.</font></b>'
-	end
-
-	if husband > 0 and paydayHusb = 0:
-		paydayHusb = 1
-
-		if husbFin = 0:huspay = 20000
-		if husbFin = 1:huspay = 30000
-		if husbFin = 2:huspay = 40000
-
-		karta += huspay
-		'<b><font color="green">Your husband has paid <<huspay>> <b>₽</b> into your bank account.</font></b>'
-	end
-
-	if func('uniutil', 'scholarship' , 'is_active') and scholarshipday = 0:
-		scholarshipday = 1
-		karta += func('uniutil', 'scholarship', 'get')
-		'<b><font color="green">You have received '+func('uniutil', 'scholarship', 'get')+' <b>₽</b> from your scholarship.</font></b>'
-	end
 
-	! Utilities for all apartments.
-	if (home_owned[1] = 1 or home_owned[1] = 2 or home_owned[4] > 0 or home_owned[5] = 2) and electroday = 0:
-		gs 'housing', 'util'
-		if bankAccount = 1 and karta >= elektro:
-			'<b><font color="green"><<elektro>> <b>₽</b> for utilities, has been automatically deducted from your bank account.</font></b>'
-			electroday = 1
-			if elektro >= 2000:
-				elektro = 2000 + rand(0, 100)
-				karta -= elektro * hcount_util
-			end
-		elseif bankAccount = 1 and karta + bankDebtLimit >= elektro:
-			'<b><font color="green"><<elektro>> <b>₽</b> for utilities, has been automatically deducted from your bank account and overdraw facility. Please contact your bank.</font></b>'
-			electroday = 1
-			if elektro >= 2000:
-				elektro = 2000 + rand(0, 100)
-				karta -= elektro * hcount_util
-			end
-		elseif bankAccount = 0 and money >= elektro:
-			'<b><font color="red">You currently do not have a bank account setup for automatic utilities payments. <<elektro>> <b>₽</b> has been deducted from your cash holdings.</font></b>'
-			electroday = 1
-			if elektro >= 2000:
-				elektro = 2000 + rand(0, 100)
-				money -= elektro * hcount_util
-			end
-		else
-			'<b><font color="red">Your card was declined during automatic debit of <<elektro>> <b>₽</b>, for automatic utilities payment.</font></b>'
-		end
-	end
-
-	! Cable for all apartments
-	if kabel > 0 and kabelday = 0:
-		gs 'housing', 'cable'
-		if bankAccount = 1 and karta >= (300 * hcount_cable):
-			'<b><font color="green">300 <b>₽</b> has been deducted from your bank account, for you cable TV subscription.</font></b>'
-			kabelday = 1
-			karta -= 300 * hcount_cable
-		elseif bankAccount = 1 and karta + bankDebtLimit >= (300 * hcount_cable):
-			'<b><font color="green">300 <b>₽</b> has been deducted from your bank account and overdraw facility, for you cable TV subscription.</font></b>'
-			kabelday = 1
-			karta -= 300 * hcount_cable
-		elseif bankAccount = 0 and money >= (300 * hcount_cable):
-			'<b><font color="red">You currently do not have a bank account setup for automatic payment of your cable TV subscription. 300 <b>₽</b> has been deducted from your cash holdings.</font></b>'
-			kabelday = 1
-			money -= 300 * hcount_cable
-		else
-			'<b><font color="red">Your card was declined during automatic debit of 300 <b>₽</b> for cable TV subscription.</font></b>'
-		end
-	end
-end
-
-if day ! 25:
-	if paydayHusb = 1:paydayHusb = 0
-	if workKafe['job'] = 1 and paydayKafe = 1:paydayKafe = 0
-	if workSec = 1 and paydaySec = 1:paydaySec = 0
-	if (home_owned[1] = 1 or home_owned[4] > 0) and haday = 1:haday = 0
-	if (home_owned[1] > 0 or home_owned[4] > 0 or home_owned[5] = 2) and electroday = 1:electroday = 0
-	if (home_owned[1] > 0 or home_owned[4] > 0 or home_owned[5] = 3) and kabel > 0 and kabelday = 1:kabelday = 0
-	if scholarshipday = 1:scholarshipday = 0
-	if nopaytanwork = 1:nopaytanwork = 0
-	if nopaypoly = 1:nopaypoly = 0
-	if nopaysalon = 1:nopaysalon = 0
-	if paydaybistrosec = 1:paydaybistrosec = 0
-end
-
-if sdaday = day and sdamonth = month and home_owned[1] = 3:
-	home_owned[1] = 2
-	'<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
-
-!!----------------------------------------
-!! Rent
-!!----------------------------------------
-
-if home_owned[1] = 1 or home_owned[4] > 0:
-	gs 'housing', 'rent'
-	! Rent for the city apartment
-	if home_owned[1] = 1:
-		if ArendHouseSL <= 2:
-			!From bank
-			if bankAccount = 1 and karta >= home_rent[1]:
-				'<b><font color="green">Your rent payment of <<home_rent[1]>> <b>₽</b> for your city apartment, has automatically been deducted from your bank account.</font></b>'
-				karta -= home_rent[1]
-				ArendHouseSL += ArendHouseSL_due
-			elseif bankAccount = 1 and karta + bankDebtLimit >= home_rent[1]:
-				'<b><font color="green">Your rent payment of <<home_rent[1]>> <b>₽</b> for your city apartment, has automatically been deducted from your bank account and overdraw facility. Please contact your bank regarding your overdraw repayment.</font></b>'
-				karta -= home_rent[1]
-				ArendHouseSL += ArendHouseSL_due
-			elseif bankAccount = 0:
-				'<b><font color="red">You currently do not have a bank account setup for automatic rent deduction of <<home_rent[1]>> <b>₽</b> for your city apartment. To avoid eviction, please make manual payment as soon as possible.</font></b>'
-			else
-				nl
-				'<b><b><font color="red">Your card was declined during automatic rent deduction of <<home_rent[1]>> <b>₽</b> for your city apartment. To avoid eviction, please rectify as soon as possible.</font></b>'
-			end
-		end
-	end
-
-	! Rent for the Pushkin apartment
-	if home_owned[4] > 0:
-		if ArendHouseSL4 <= 2:
-			!From bank
-			if bankAccount = 1 and karta >= home_rent[4]:
-				'<b><font color="green">Your rent payment of <<home_rent[4]>> <b>₽</b> for your Pushkin apartment, has automatically been deducted from your bank account.</font></b>'
-				karta -= home_rent[4]
-				ArendHouseSL4 += ArendHouseSL_due
-			elseif bankAccount = 1 and karta + bankDebtLimit >= home_rent[4]:
-				'<b><font color="green">Your rent payment of <<home_rent[4]>> <b>₽</b> for your Pushkin apartment, has automatically been deducted from your bank account and overdraw facility. Please contact your bank regarding your overdraw repayment.</font></b>'
-				karta -= home_rent[4]
-				ArendHouseSL4 += ArendHouseSL_due
-			elseif bankAccount = 0:
-				'<b><font color="red">You currently do not have a bank account setup for automatic rent deduction of <<home_rent[4]>> <b>₽</b> for your Pushkin apartment. To avoid eviction, please make manual payment as soon as possible.</font></b>'
-			else
-				nl
-				'<b><b><font color="red">Your card was declined during automatic rent deduction of <<home_rent[4]>> <b>₽</b> for your Pushkin apartment. To avoid eviction, please rectify as soon as possible.</font></b>'
-			end
-		end
-	end
-end
-
-if home_owned[1] = 1 and ArendHouseSL <= 0: ArendHouseSL = 0 & home_owned[1] = 0
-if home_owned[4] > 0 and ArendHouseSL4 <= 0: ArendHouseSL4 = 0 & home_owned[4] = 0
-
-if home_owned[1] = 1: ArendHouseSL -= 1
-if home_owned[4] > 0: ArendHouseSL4 -= 1
-
-!!------------------------------------------------------------------------------------------------------------
+gs 'bank', 'cikl'
 
 killvar 'holyday'
 killvar 'kanikuli'
@@ -1252,153 +993,7 @@ elseif mentats_dose > 1:
 end
 
 
-
-!! vovan, from 1.2.5
-hunters_check = 0
-mushroom_pickers = 0
-mira_go_river = 0
-forestpicnic = 0
-if Mira_no > 0: Mira_no -= 1
-if Mira_no < 0: Mira_no = 0
-
-!! new grandparent chore stuff, for 0.8.0
-if gadstay = 1 and lost_girl = 0:
-	if daystart > (grandmaQW['last_day_helped'] + 3) and daystart > (grandpaQW['last_day_helped'] + 3):
-		if (daystart - grandmaQW['last_day_helped']) <= (daystart - grandpaQW['last_day_helped']):
-			'You haven''t helped your grandparents with any chores in <<daystart - grandmaQW[''last_day_helped'']>> days. You should help out more regularly to stay on your grandparents'' good side.'
-		else
-			'You haven''t helped your grandparents with any chores in <<daystart - grandpaQW[''last_day_helped'']>> days. You should help out more regularly to stay on your grandparents'' good side.'
-		end
-		grandmaQW['help_amount'] -= 1
-	end
-end
-
-!! disappointing grandma
-if grandmaQW['chore_clean_floor'] = 1 or grandmaQW['chore_clean_floor'] = 2:
-	grandmaQW['chore_clean_floor'] = 0
-	grandmaQW['disappointment'] = 1
-elseif grandmaQW['chore_wash_clothes'] = 1 or grandmaQW['chore_wash_clothes'] = 2:
-	grandmaQW['chore_wash_clothes'] = 0
-	grandmaQW['disappointment'] = 1
-elseif grandmaQW['chore_milk_cow'] = 1 or grandmaQW['chore_milk_cow'] = 2:
-	grandmaQW['chore_milk_cow'] = 0
-	grandmaQW['disappointment'] = 1
-elseif grandmaQW['chore_groceries'] = 1 or grandmaQW['chore_groceries'] = 2:
-	grandmaQW['chore_groceries'] = 0
-	grandmaQW['disappointment'] = 1
-elseif grandmaQW['chore_can_mushrooms'] = 1 or grandmaQW['chore_can_mushrooms'] = 2:
-	grandmaQW['chore_can_mushrooms'] = 0
-	grandmaQW['disappointment'] = 1
-elseif grandmaQW['chore_can_berries'] = 1 or grandmaQW['chore_can_berries'] = 2:
-	grandmaQW['chore_can_berries'] = 0
-	grandmaQW['disappointment'] = 1
-elseif grandmaQW['chore_can_veggies'] = 1 or grandmaQW['chore_can_veggies'] = 2:
-	grandmaQW['chore_can_veggies'] = 0
-	grandmaQW['disappointment'] = 1
-elseif grandmaQW['chore_feed_chickens'] = 1 or grandmaQW['chore_feed_chickens'] = 2:
-	grandmaQW['chore_feed_chickens'] = 0
-	grandmaQW['disappointment'] = 1
-elseif grandmaQW['chore_work_in_garden'] = 1 or grandmaQW['chore_work_in_garden'] = 2:
-	grandmaQW['chore_work_in_garden'] = 0
-	grandmaQW['disappointment'] = 1
-elseif grandmaQW['chore_water_garden'] = 1 or grandmaQW['chore_water_garden'] = 2:
-	grandmaQW['chore_water_garden'] = 0
-	grandmaQW['disappointment'] = 1
-elseif grandmaQW['chore_collect_strawberries'] = 1 or grandmaQW['chore_collect_strawberries'] = 2:
-	grandmaQW['chore_collect_strawberries'] = 0
-	grandmaQW['disappointment'] = 1
-elseif grandmaQW['chore_collect_fruit'] = 1 or grandmaQW['chore_collect_fruit'] = 2:
-	grandmaQW['chore_collect_fruit'] = 0
-	grandmaQW['disappointment'] = 1
-elseif grandmaQW['chore_harvest_garden'] = 1 or grandmaQW['chore_harvest_garden'] = 2:
-	grandmaQW['chore_harvest_garden'] = 0
-	grandmaQW['disappointment'] = 1
-elseif grandmaQW['chore_gather_mushrooms'] = 1 or grandmaQW['chore_gather_mushrooms'] = 2:
-	grandmaQW['disappointment'] = 2
-elseif grandmaQW['chore_gather_mushrooms'] = 1 or grandmaQW['chore_gather_mushrooms'] = 2 and grandmaQW['disappointment'] = 2:
-	grandmaQW['chore_gather_mushrooms'] = 0
-	grandmaQW['chore_mushroom_quantity'] = 0
-	grandmaQW['disappointment'] = 1
-elseif grandmaQW['chore_gather_berries'] = 1 or grandmaQW['chore_gather_berries'] = 2:
-	grandmaQW['disappointment'] = 2
-elseif grandmaQW['chore_gather_berries'] = 1 or grandmaQW['chore_gather_berries'] = 2 and grandmaQW['disappointment'] = 2:
-	grandmaQW['chore_gather_berries'] = 0
-	grandmaQW['chore_berry_quantity'] = 0
-	grandmaQW['disappointment'] = 1
-elseif grandmaQW['chore_gather_both'] = 1 or grandmaQW['chore_gather_both'] = 2:
-	grandmaQW['disappointment'] = 2
-elseif grandmaQW['chore_gather_both'] = 1 or grandmaQW['chore_gather_both'] = 2 and grandmaQW['disappointment'] = 2:
-	grandmaQW['chore_gather_both'] = 0
-	grandmaQW['chore_mushroom_quantity'] = 0
-	grandmaQW['chore_berry_quantity'] = 0
-	grandmaQW['disappointment'] = 1
-end
-
-!! disappointing grandpa
-if grandpaQW['chore_fetch_firewood'] = 1 or grandpaQW['chore_fetch_firewood'] = 2:
-	grandpaQW['chore_fetch_firewood'] = 0
-	grandpaQW['disappointment'] = 1
-elseif grandpaQW['chore_feed_horse'] = 1 or grandpaQW['chore_feed_horse'] = 2:
-	grandpaQW['chore_feed_horse'] = 0
-	grandpaQW['disappointment'] = 1
-elseif grandpaQW['chore_feed_cow'] = 1 or grandpaQW['chore_feed_cow'] = 2:
-	grandpaQW['chore_feed_cow'] = 0
-	grandpaQW['disappointment'] = 1
-elseif grandpaQW['chore_clean_yard'] = 1 or grandpaQW['chore_clean_yard'] = 2:
-	grandpaQW['chore_clean_yard'] = 0
-	grandpaQW['disappointment'] = 1
-elseif grandpaQW['chore_feed_boar'] = 1 or grandpaQW['chore_feed_boar'] = 2:
-	grandpaQW['chore_feed_boar'] = 0
-	grandpaQW['disappointment'] = 1
-elseif grandpaQW['chore_bathe_horse'] = 1 or grandpaQW['chore_bathe_horse'] = 2:
-	grandpaQW['chore_bathe_horse'] = 0
-	grandpaQW['chore_bathe_horse_prog'] = 0
-	grandpaQW['disappointment'] = 1
-elseif grandpaQW['chore_brush_horse'] = 1 or grandpaQW['chore_brush_horse'] = 2:
-	grandpaQW['chore_brush_horse'] = 0
-	grandpaQW['disappointment'] = 1
-elseif grandpaQW['chore_lead_horse_to_field'] = 1 or grandpaQW['chore_lead_horse_to_field'] = 2:
-	grandpaQW['chore_lead_horse_to_field'] = 0
-	grandpaQW['disappointment'] = 1
-elseif grandpaQW['chore_herd_cattle'] = 1 or grandpaQW['chore_herd_cattle'] = 2:
-	grandpaQW['chore_herd_cattle'] = 0
-	grandpaQW['disappointment'] = 1
-elseif grandpaQW['chore_lead_cow_to_field'] = 1 or grandpaQW['chore_lead_cow_to_field'] = 2:
-	grandpaQW['chore_lead_cow_to_field'] = 0
-	grandpaQW['disappointment'] = 1
-elseif grandpaQW['chore_gather_mushrooms'] = 1 or grandpaQW['chore_gather_mushrooms'] = 2:
-	grandpaQW['disappointment'] = 2
-elseif grandpaQW['chore_gather_mushrooms'] = 1 or grandpaQW['chore_gather_mushrooms'] = 2 and grandpaQW['disappointment'] = 2:
-	grandpaQW['chore_gather_mushrooms'] = 0
-	grandpaQW['chore_mushroom_quantity'] = 0
-	grandpaQW['disappointment'] = 1
-elseif grandpaQW['chore_gather_berries'] = 1 or grandpaQW['chore_gather_berries'] = 2:
-	grandpaQW['disappointment'] = 2
-elseif grandpaQW['chore_gather_berries'] = 1 or grandpaQW['chore_gather_berries'] = 2 and grandpaQW['disappointment'] = 2:
-	grandpaQW['chore_gather_berries'] = 0
-	grandpaQW['chore_berry_quantity'] = 0
-	grandpaQW['disappointment'] = 1
-elseif grandpaQW['chore_gather_both'] = 1 or grandpaQW['chore_gather_both'] = 2:
-	grandpaQW['disappointment'] = 2
-elseif grandpaQW['chore_gather_both'] = 1 or grandpaQW['chore_gather_both'] = 2 and grandpaQW['disappointment'] = 2:
-	grandpaQW['chore_gather_both'] = 0
-	grandpaQW['chore_mushroom_quantity'] = 0
-	grandpaQW['chore_berry_quantity'] = 0
-	grandpaQW['disappointment'] = 1
-elseif grandpaQW['chore_bale_hay'] = 1 or grandpaQW['chore_bale_hay'] = 2:
-	grandpaQW['chore_bale_hay'] = 0
-	grandpaQW['disappointment'] = 1
-end
-
-!! grandparents use root cellar
-if boletus_stored > 0: boletus_stored -= rand(0,1)
-if bilberry_stored > 0: bilberry_stored -= rand(0,1)
-if boletus_stored < 0: boletus_stored = 0
-if bilberry_stored < 0: bilberry_stored = 0
-!! end of new grandparent chore stuff, for 0.8.0
-
-if catout ! 0: catout = 0
-if feedcat ! 0: feedcat = 0
+gs 'gaddvor','cikl'
 
 loc_count = ARRSIZE('$CloLosLoc')
 i = loc_count - 1

locations/gaddvor.qsrc

@@ -249,5 +249,155 @@ if $ARGS[0] = 'chickens':
 	end
 end
 
+if $ARGS[0] = 'cikl':
+	!! vovan, from 1.2.5
+	hunters_check = 0
+	mushroom_pickers = 0
+	mira_go_river = 0
+	forestpicnic = 0
+	if Mira_no > 0: Mira_no -= 1
+	if Mira_no < 0: Mira_no = 0
+
+	!! new grandparent chore stuff, for 0.8.0
+	if gadstay = 1 and lost_girl = 0:
+		if daystart > (grandmaQW['last_day_helped'] + 3) and daystart > (grandpaQW['last_day_helped'] + 3):
+			if (daystart - grandmaQW['last_day_helped']) <= (daystart - grandpaQW['last_day_helped']):
+				'You haven''t helped your grandparents with any chores in <<daystart - grandmaQW[''last_day_helped'']>> days. You should help out more regularly to stay on your grandparents'' good side.'
+			else
+				'You haven''t helped your grandparents with any chores in <<daystart - grandpaQW[''last_day_helped'']>> days. You should help out more regularly to stay on your grandparents'' good side.'
+			end
+			grandmaQW['help_amount'] -= 1
+		end
+	end
+
+	!! disappointing grandma
+	if grandmaQW['chore_clean_floor'] = 1 or grandmaQW['chore_clean_floor'] = 2:
+		grandmaQW['chore_clean_floor'] = 0
+		grandmaQW['disappointment'] = 1
+	elseif grandmaQW['chore_wash_clothes'] = 1 or grandmaQW['chore_wash_clothes'] = 2:
+		grandmaQW['chore_wash_clothes'] = 0
+		grandmaQW['disappointment'] = 1
+	elseif grandmaQW['chore_milk_cow'] = 1 or grandmaQW['chore_milk_cow'] = 2:
+		grandmaQW['chore_milk_cow'] = 0
+		grandmaQW['disappointment'] = 1
+	elseif grandmaQW['chore_groceries'] = 1 or grandmaQW['chore_groceries'] = 2:
+		grandmaQW['chore_groceries'] = 0
+		grandmaQW['disappointment'] = 1
+	elseif grandmaQW['chore_can_mushrooms'] = 1 or grandmaQW['chore_can_mushrooms'] = 2:
+		grandmaQW['chore_can_mushrooms'] = 0
+		grandmaQW['disappointment'] = 1
+	elseif grandmaQW['chore_can_berries'] = 1 or grandmaQW['chore_can_berries'] = 2:
+		grandmaQW['chore_can_berries'] = 0
+		grandmaQW['disappointment'] = 1
+	elseif grandmaQW['chore_can_veggies'] = 1 or grandmaQW['chore_can_veggies'] = 2:
+		grandmaQW['chore_can_veggies'] = 0
+		grandmaQW['disappointment'] = 1
+	elseif grandmaQW['chore_feed_chickens'] = 1 or grandmaQW['chore_feed_chickens'] = 2:
+		grandmaQW['chore_feed_chickens'] = 0
+		grandmaQW['disappointment'] = 1
+	elseif grandmaQW['chore_work_in_garden'] = 1 or grandmaQW['chore_work_in_garden'] = 2:
+		grandmaQW['chore_work_in_garden'] = 0
+		grandmaQW['disappointment'] = 1
+	elseif grandmaQW['chore_water_garden'] = 1 or grandmaQW['chore_water_garden'] = 2:
+		grandmaQW['chore_water_garden'] = 0
+		grandmaQW['disappointment'] = 1
+	elseif grandmaQW['chore_collect_strawberries'] = 1 or grandmaQW['chore_collect_strawberries'] = 2:
+		grandmaQW['chore_collect_strawberries'] = 0
+		grandmaQW['disappointment'] = 1
+	elseif grandmaQW['chore_collect_fruit'] = 1 or grandmaQW['chore_collect_fruit'] = 2:
+		grandmaQW['chore_collect_fruit'] = 0
+		grandmaQW['disappointment'] = 1
+	elseif grandmaQW['chore_harvest_garden'] = 1 or grandmaQW['chore_harvest_garden'] = 2:
+		grandmaQW['chore_harvest_garden'] = 0
+		grandmaQW['disappointment'] = 1
+	elseif grandmaQW['chore_gather_mushrooms'] = 1 or grandmaQW['chore_gather_mushrooms'] = 2:
+		grandmaQW['disappointment'] = 2
+	elseif grandmaQW['chore_gather_mushrooms'] = 1 or grandmaQW['chore_gather_mushrooms'] = 2 and grandmaQW['disappointment'] = 2:
+		grandmaQW['chore_gather_mushrooms'] = 0
+		grandmaQW['chore_mushroom_quantity'] = 0
+		grandmaQW['disappointment'] = 1
+	elseif grandmaQW['chore_gather_berries'] = 1 or grandmaQW['chore_gather_berries'] = 2:
+		grandmaQW['disappointment'] = 2
+	elseif grandmaQW['chore_gather_berries'] = 1 or grandmaQW['chore_gather_berries'] = 2 and grandmaQW['disappointment'] = 2:
+		grandmaQW['chore_gather_berries'] = 0
+		grandmaQW['chore_berry_quantity'] = 0
+		grandmaQW['disappointment'] = 1
+	elseif grandmaQW['chore_gather_both'] = 1 or grandmaQW['chore_gather_both'] = 2:
+		grandmaQW['disappointment'] = 2
+	elseif grandmaQW['chore_gather_both'] = 1 or grandmaQW['chore_gather_both'] = 2 and grandmaQW['disappointment'] = 2:
+		grandmaQW['chore_gather_both'] = 0
+		grandmaQW['chore_mushroom_quantity'] = 0
+		grandmaQW['chore_berry_quantity'] = 0
+		grandmaQW['disappointment'] = 1
+	end
+
+	!! disappointing grandpa
+	if grandpaQW['chore_fetch_firewood'] = 1 or grandpaQW['chore_fetch_firewood'] = 2:
+		grandpaQW['chore_fetch_firewood'] = 0
+		grandpaQW['disappointment'] = 1
+	elseif grandpaQW['chore_feed_horse'] = 1 or grandpaQW['chore_feed_horse'] = 2:
+		grandpaQW['chore_feed_horse'] = 0
+		grandpaQW['disappointment'] = 1
+	elseif grandpaQW['chore_feed_cow'] = 1 or grandpaQW['chore_feed_cow'] = 2:
+		grandpaQW['chore_feed_cow'] = 0
+		grandpaQW['disappointment'] = 1
+	elseif grandpaQW['chore_clean_yard'] = 1 or grandpaQW['chore_clean_yard'] = 2:
+		grandpaQW['chore_clean_yard'] = 0
+		grandpaQW['disappointment'] = 1
+	elseif grandpaQW['chore_feed_boar'] = 1 or grandpaQW['chore_feed_boar'] = 2:
+		grandpaQW['chore_feed_boar'] = 0
+		grandpaQW['disappointment'] = 1
+	elseif grandpaQW['chore_bathe_horse'] = 1 or grandpaQW['chore_bathe_horse'] = 2:
+		grandpaQW['chore_bathe_horse'] = 0
+		grandpaQW['chore_bathe_horse_prog'] = 0
+		grandpaQW['disappointment'] = 1
+	elseif grandpaQW['chore_brush_horse'] = 1 or grandpaQW['chore_brush_horse'] = 2:
+		grandpaQW['chore_brush_horse'] = 0
+		grandpaQW['disappointment'] = 1
+	elseif grandpaQW['chore_lead_horse_to_field'] = 1 or grandpaQW['chore_lead_horse_to_field'] = 2:
+		grandpaQW['chore_lead_horse_to_field'] = 0
+		grandpaQW['disappointment'] = 1
+	elseif grandpaQW['chore_herd_cattle'] = 1 or grandpaQW['chore_herd_cattle'] = 2:
+		grandpaQW['chore_herd_cattle'] = 0
+		grandpaQW['disappointment'] = 1
+	elseif grandpaQW['chore_lead_cow_to_field'] = 1 or grandpaQW['chore_lead_cow_to_field'] = 2:
+		grandpaQW['chore_lead_cow_to_field'] = 0
+		grandpaQW['disappointment'] = 1
+	elseif grandpaQW['chore_gather_mushrooms'] = 1 or grandpaQW['chore_gather_mushrooms'] = 2:
+		grandpaQW['disappointment'] = 2
+	elseif grandpaQW['chore_gather_mushrooms'] = 1 or grandpaQW['chore_gather_mushrooms'] = 2 and grandpaQW['disappointment'] = 2:
+		grandpaQW['chore_gather_mushrooms'] = 0
+		grandpaQW['chore_mushroom_quantity'] = 0
+		grandpaQW['disappointment'] = 1
+	elseif grandpaQW['chore_gather_berries'] = 1 or grandpaQW['chore_gather_berries'] = 2:
+		grandpaQW['disappointment'] = 2
+	elseif grandpaQW['chore_gather_berries'] = 1 or grandpaQW['chore_gather_berries'] = 2 and grandpaQW['disappointment'] = 2:
+		grandpaQW['chore_gather_berries'] = 0
+		grandpaQW['chore_berry_quantity'] = 0
+		grandpaQW['disappointment'] = 1
+	elseif grandpaQW['chore_gather_both'] = 1 or grandpaQW['chore_gather_both'] = 2:
+		grandpaQW['disappointment'] = 2
+	elseif grandpaQW['chore_gather_both'] = 1 or grandpaQW['chore_gather_both'] = 2 and grandpaQW['disappointment'] = 2:
+		grandpaQW['chore_gather_both'] = 0
+		grandpaQW['chore_mushroom_quantity'] = 0
+		grandpaQW['chore_berry_quantity'] = 0
+		grandpaQW['disappointment'] = 1
+	elseif grandpaQW['chore_bale_hay'] = 1 or grandpaQW['chore_bale_hay'] = 2:
+		grandpaQW['chore_bale_hay'] = 0
+		grandpaQW['disappointment'] = 1
+	end
+
+	!! grandparents use root cellar
+	if boletus_stored > 0: boletus_stored -= rand(0,1)
+	if bilberry_stored > 0: bilberry_stored -= rand(0,1)
+	if boletus_stored < 0: boletus_stored = 0
+	if bilberry_stored < 0: bilberry_stored = 0
+	!! end of new grandparent chore stuff, for 0.8.0
+
+	if catout ! 0: catout = 0
+	if feedcat ! 0: feedcat = 0
+
+end
+
 --- gaddvor ---------------------------------
 

locations/stat.qsrc

@@ -1264,7 +1264,7 @@ end
 
 !!--------------------------Booty Call SMSs--------------------------------
 
-if (hour >= 15 and hour <= 19) and arrsize('$fuckbuddy') > 0 : gs 'booty_call_start','draw'
+if (hour >= 15 and hour <= 20) and arrsize('$fuckbuddy') > 0 : gs 'booty_call', 'SMS raiser'
 
 --- stat ---------------------------------