Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/bedrPar.qsrc

@@ -95,6 +95,7 @@ if popugai2 = 1:
 
 	*nl
 end
+'<table><tr><td>'
 if budilnikOn = 0:
 	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & gt ''<<$loc>>''">off</a>.'
 else
@@ -119,7 +120,7 @@ if komp = 1:'Your <a href="exec:gorodokKomp = 1 & gt ''Komp'',''start''">laptop<
 gorodokKomp = 0
 
 gad = 0
-gs 'subkid'
+
 if npc_QW['A33'] > 10:npc_QW['A33'] = 10
 
 gs'dinsister'
@@ -224,6 +225,10 @@ elseif kid >= 1 and breastpump = 1 and bp_unbox = 1 and pcs_inbition > 30:
 end
 gs 'lact_bp', 'massage'
 
+'</td><td width = "100"></td><td>'
+gs 'subkid'
+'</td></tr></table>'
+
 act 'Relax on your bed': gt 'bed', 'start'
 
 if $ARGS[0] = 'intro':

locations/dina.qsrc

@@ -4,43 +4,43 @@ $brodila = {
 	sexpartkno = 0
 	if home_owned[1] > 0:
 		gt'korr','start'
-	elseif home_owned[4] = 1:    
+	elseif home_owned[4] = 1:
 		gt'korr2x','start'
 	else
 		gt'street', 'start'
-    end
+	end
 }
 
 $brodilr = {
 	if StoryLine = 1 and home_owned[2] = 1:
 		gt 'pavResidential'
-    elseif home_owned[4] = 1:
-        gt'liames'
-    else
-        gt'street','start'
+	elseif home_owned[4] = 1:
+		gt'liames'
+	else
+		gt'street','start'
 	end
 }
 
 $brodilk = {
-    if home_owned[1] > 0:
-        gt'kuhr','start'
-    elseif home_owned[4] = 1:
-        gt'kuhr2x','start'
-    else
+	if home_owned[1] > 0:
+		gt'kuhr','start'
+	elseif home_owned[4] = 1:
+		gt'kuhr2x','start'
+	else
 		gt'street', 'start'
-    end
+	end
 }
 
 $brodils = {
-    if home_owned[1] > 0:
-        gt'sitr','start'
-    elseif home_owned[4] = 1:
-        gt'sitr2x','start'
+	if home_owned[1] > 0:
+		gt'sitr','start'
+	elseif home_owned[4] = 1:
+		gt'sitr2x','start'
 	elseif StoryLine = 1 and home_owned[2] = 1:
 		gt 'sitrPar'
 	else
 		gt'street', 'start'
-    end
+	end
 }
 
 !!This sets the default descriptors and folder names for each default image set
@@ -111,12 +111,12 @@ $rexpot = {
 	gs 'boyStat', 'A166'
 }
 
-$hypnoDaychange = {	
+$hypnoDaychange = {
 	!!if for some reason hypnoTime is too high
 	if hypnoTime > 15:hypnoTime = 15
 	timeTresh = 76 - 4*hypnoType
 	!!Withdrawal effect begings if too strong influence and no visitation
-	if daystart-hypnoDay > 7: 
+	if daystart-hypnoDay > 7:
 		if hypnoAddict = 1:
 			hypnoWithdrawal = 1
 		elseif hypnoAddict = 2:
@@ -136,7 +136,7 @@ $hypnoDaychange = {
 				if hypnoTime < 7:hypnoAddict = 0 & hypnoWithdrawal = 0
 			end
 		else
-			if rand(0,4) = 0: 
+			if rand(0,4) = 0:
 				hypnoStrength = 19
 				hypnoTime -= 1
 				if hypnoTime < 10:hypnoAddict = 1 & hypnoBlock = 0 & hypnoWithdrawal = 1
@@ -156,7 +156,7 @@ $hypnoAddiction = {
 	else
 		missCum += 1
 	end
-	
+
 	if missCum > timeTresh:
 		if hypnoAddict = 1:
 			pcs_mood -= 5
@@ -166,7 +166,7 @@ $hypnoAddiction = {
 			pcs_horny += 20
 		end
 	end
-	
+
 	if hypnoWithdrawal > 0:
 		if hypnoWithdrawal = 1:
 			if missCum >= timeTresh:
@@ -190,7 +190,7 @@ $prezik = {
 			noprotect = 0
 		end
 		prezik -= 1
-	elseif prezik < 0: 
+	elseif prezik < 0:
 		prezik = 0
 	end
 }

locations/gaptek.qsrc

@@ -27,15 +27,9 @@ if $ARGS[0] = 'start' or $message ! '':
 
 	'<center><B><font color="maroon">Pharmacy</font></B></center>'
 	if gaptek_aunt_hours = 1:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_aunt_1.jpg"></center>'
 	else
-		if hour >= 8 and hour < 14 and week < 3:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_2.jpg"></center>'
-		elseif hour >= 8 and hour < 14 and week >= 3 and week < 5:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_3.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_4.jpg"></center>'
-		end
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_'+rand(1,4)+'.jpg"></center>'
 	end
 	*nl
 	
@@ -143,7 +137,7 @@ if $ARGS[0] = 'garden':
 	*clr & cla
 	gs 'stat'
 	'<center><B><font color="maroon">Pharmacy</font></B></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_aunt_1.jpg"></center>'
 	*nl
 
 	if npc_QW['A29'] = 2 and gaogorod < 40:

locations/pharmacy.qsrc

@@ -34,15 +34,7 @@ if $ARGS[0] = 'shop' or $ARGS[0] = '':
 	menu_off = 0
 	gs 'stat'
 	*pl '<center><b><font color="maroon">Pharmacy</font></b></center>'
-	!*pl '<center><img <<$set_imgh>> src="images/unused/pharmacy.jpg"></center>'
-	!there are 3 pic from russian 1.2.5, Let make it 3 shift
-	if hour>22 or hour < 7:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_2.jpg"></center>'
-	elseif hour<17:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_3.jpg"></center>'
-	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_4.jpg"></center>'
-	end
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_'+rand(1,3)+'.jpg"></center>'
 	*nl
 	if $message ! '':
 		$message

locations/sitrPar.qsrc

@@ -18,7 +18,9 @@ gs 'themes', 'indoors'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/sitrpar.jpg"></center>'
 ''
 'The living room has a <a href="exec:gt ''TV'',''pav''">TV</a>, which is near the window. In front of the TV is a <a href="exec:gt ''family'',''sofa''">sofa bed</a>, on which your brother sleeps at night. A large tapestry covers one wall, while the other wall has several shelves on it, stocked with books and other things.'
+*nl
 gs 'family'
+*nl
 gs 'subkid'
 
 if month = 12 and day >= 20:'A Christmas tree stands next to the TV, decorated with tinsel garlands and other ornaments.'