[fixed] issues raised by temp on the repo, mostly logic errors

locations/beverage.qsrc

@@ -345,13 +345,13 @@ end
 if $ARGS[0] = 'bev_bbr': food_loc = 0 & gt 'brothel','bar:order:password'
 
 if $ARGS[0] = 'afteralcohol':
-	if pcs_hydra < 100:
-		$mtxt = ' while your drink, you wish you were better hydrated before you started.'
-	elseif pcs_hydra <= 80:
+	if pcs_hydra < 20:
+		$mtxt = ' while you drink, you wish you were better hydrated before you started.'
+	elseif pcs_hydra <= 40:
 		$mtxt = ' you should remind yourself to drink some water later, so you don''t get dehydrated.'
 	elseif pcs_hydra <= 60:
 		$mtxt = ' you aren''t sure how many more you can fit in before you need to pee.'
-	elseif pcs_hydra <= 40:
+	elseif pcs_hydra <= 80:
 		$mtxt = ' you definitely need to drink some water now, or you''ll end up with a hangover.'
 	else
 		$mtxt = ' you enjoyed that drink immensely. Let''s have some more!'

locations/kuhr2x.qsrc

@@ -84,12 +84,13 @@ dynamic $fatdel
 dynamic $driwater
 
 if husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
-	act 'Cooking for her husband 1 h (2 Food Unit)':
+	act 'Cook meal for your husband and yourself (1hr, 2 potions of food)':
 		cla
 		*clr
 		husband += 5
-		eda = eda - 2
-		minut = minut + 60
+		eda -= 2
+		dynamic $edahotd
+		minut += 60
 
 
 		huseatday = daystart

locations/lover_love.qsrc

@@ -55,7 +55,7 @@ elseif loverlove[lover_number] = 2:
 			loverlove[lover_number] = 3
 			'You get into a taxi with your soon to be husband and go to the store to choose a dress. You choose an expensive and luxurious dress. <<$loverdesc[lover_number]>> pays for the purchase.'
 			'After a long day you feel tired and ask <<$loverdesc[lover_number]>> to drive you home, warning him that the next time you''ll meet you will get married.'
-			gt 'din_npc', 'go_home'
+			act 'Go home': gt 'din_npc', 'go_home'
 		end
 	end
 

locations/natbelapt.qsrc

@@ -105,9 +105,8 @@ if $ARGS[0] = 'home':
 	if (NatashaLoc = 6 or NatashaLoc = 7) and NatbelQW['MotherHome'] = 1: NatbelQW['MotherDoor'] = 1
 
 	! Natasha''s mother''s state. If it''s 0 you get a random state.
-	if NatbelQW['MotherState'] = 0:
-		NatbelQW['MotherState'] = rand(1,6)
-	elseif NatbelQW['MotherState'] = 1:
+	if NatbelQW['MotherState'] = 0: NatbelQW['MotherState'] = rand(1,6)
+	if NatbelQW['MotherState'] = 1:
 		$NatbelQW['MotherStateMsg'] = 'tired'
 	elseif NatbelQW['MotherState'] = 2:
 		$NatbelQW['MotherStateMsg'] = 'happy'

locations/npcstatic2.qsrc

@@ -137,7 +137,7 @@ $npc_nickname['A<<npctemp>>'] = 'Mira'
 $npc_usedname['A<<npctemp>>'] = 'Mira'
 $npc_lastname['A<<npctemp>>'] = 'Maximova'
 $npc_notes['A<<npctemp>>'] = 'Girl from Gadukino. Daughter of Afanasiy'
-npc_dob['A<<npctemp>>'] = 20000805
+npc_dob['A<<npctemp>>'] = 19990805
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 npc_bust['A<<npctemp>>'] = 9
@@ -150,7 +150,7 @@ $npc_firstname['A<<npctemp>>'] = 'Kolyamba'
 $npc_nickname['A<<npctemp>>'] = 'Kolyamba'
 $npc_usedname['A<<npctemp>>'] = 'Kolyamba'
 $npc_lastname['A<<npctemp>>'] = 'Rostislav'
-npc_dob['A<<npctemp>>'] = 20000065
+npc_dob['A<<npctemp>>'] = 20000605
 $npc_notes['A<<npctemp>>'] = 'Boy from Gadukino'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -165,7 +165,7 @@ $npc_nickname['A<<npctemp>>'] = 'Vasyan'
 $npc_usedname['A<<npctemp>>'] = 'Vasyan'
 $npc_lastname['A<<npctemp>>'] = 'Makarovich'
 $npc_notes['A<<npctemp>>'] = 'Boy from Gadukino'
-npc_dob['A<<npctemp>>'] = 20000096
+npc_dob['A<<npctemp>>'] = 20000906
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'thicker than average'
@@ -209,7 +209,7 @@ $npc_nickname['A<<npctemp>>'] = 'Vitaliy'
 $npc_usedname['A<<npctemp>>'] = 'Vitaliy'
 $npc_lastname['A<<npctemp>>'] = 'Maximov'
 $npc_notes['A<<npctemp>>'] = 'Mira''s Brother'
-npc_dob['A<<npctemp>>'] = 20000643
+npc_dob['A<<npctemp>>'] = 20000623
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'thick'

locations/rolanbath.qsrc

@@ -240,14 +240,14 @@ if $ARGS[0] = 'start':
 		*nl
 		if sh_rolan_bazar < 4:
 			'You''re not used to having Rolan wandering around, especially with a broken door.'
-		elseif sh_rolan_bazar >= 5:
+		elseif sh_rolan_bazar <= 15:
 			pcs_horny += rand(0,2)
 			'You''re still not used to having Rolan wandering around, especially with a broken door.'
 			'Starting to soap yourself you unwittingly turn your attention to your breasts...'
-		elseif sh_rolan_bazar >= 15:
+		elseif sh_rolan_bazar <= 25:
 			pcs_horny += rand(0,4)
 			'You have become a little bit accustomed to washing yourself in Rolan''s bath and casually you pinch your nipple as if this situation arouses you.'
-		elseif sh_rolan_bazar >= 25:
+		else
 			pcs_horny += rand(2,6)
 			'You lean back and relax for a while. Then you begin to lather your body, gently gliding your soft hands over your smooth curves, and wash yourself thoroughly.'
 		end
@@ -506,12 +506,6 @@ if $ARGS[0] = 'bazar':
 			act 'Ask to take a shower': gt 'rolanbath', 'pervshower'
 		end
 		if sh_rolan_bazar >= 25 and npc_rel['A133'] >= 50 and rolan_bazar_count >= 1 and pcs_vag >=1:
-			*clr & cla
-			gs 'stat'
-			'<br><<$rolan_imgb_vanna>><br>'
-			'<br><<$rolan_textb_vanna>><br>'
-			act 'Chat some more': gt 'rolanbath', 'bazar'
-			act 'Ask to take a shower': gt 'rolanbath', 'pervshower'
 			act 'Suggest bathing together': gt 'rolanbath', 'bonershower'
 		end
 	end

locations/sexm.qsrc

@@ -73,7 +73,7 @@ if $ARGS[0] = 'start':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		gt 'din_npc', 'go_home'
+		act 'Close the door': gt 'din_npc', 'go_home'
 	end
 
 	act 'Say goodnight':
@@ -132,7 +132,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		gt 'din_npc', 'go_home'
+		act 'Close the door': gt 'din_npc', 'go_home'
 	end
 
 	if husband = 0:

locations/stallion.qsrc

@@ -65,7 +65,7 @@ if $ARGS[0] = 'rape':
 		'You feel his cock stab you in the vagina. It''s not very well lubricated, and it rubs painfully against your sensitive flesh as it penetrates you.'
 	elseif pcs_horny < 70:
 		'You feel his cock stab you in the vagina. It slides into your lubricated entryway, penetrating you.'
-	elseif pcs_horny >= 70:
+	else
 		'You feel his hard cock enter your wet vagina, easily entering you.'
 	end
 	if pcs_vag = 0: 'It brings tears to your eyes as he painfully rips your hymen, taking your virginity.'
@@ -75,17 +75,17 @@ if $ARGS[0] = 'rape':
 	stallionQ = 5
 	if MagikDostup = 0 and broodcurse = 0:
 		broodcurse = 1
-		if pcs_magik > 0:
+		if pcs_magik = 0:
+			'You feel a tingling in your body. You are pretty sure it is something Stallion has done to you.'
+		elseif pcs_magik < 3:
 			'"Is that magic I feel in you, <<$pcs_nickname>>? It''s not going to protect you. I have some magic of my own."'
 			'You feel a tingling in your body as he does something to you.'
-		elseif pcs_magik > 3:
+		elseif pcs_magik < 7:
 			'"Don''t think I don''t feel the magic in you, <<$pcs_nickname>>. It''s not going to protect you. I have some magic of my own."'
 			'You feel a tingling in your body as he works some fertility magic upon you.'
-		elseif pcs_magik > 7:
+		else
 			'"Your magic is strong, <<$pcs_nickname>>, but it is not going to protect you. Mine is much stronger."'
 			'You feel a tingling in your body. He places a powerful enchantment on you, increasing your fertility and binding your life force to the fruit of your womb. You realize with horror that he has practically guaranteed all sexual encounters will result in pregnancy in the future. Furthermore, your life is now tied to your womb. An abortion will result in your death.'
-		else
-			'You feel a tingling in your body. You are pretty sure it is something Stallion has done to you.'
 		end
 		act 'What have you done to me?':
 			'"I have given you a gift, sweet <<$pcs_nickname>>. I have turned you into a broodmare." He replied as he continued to repeatedly thrust into you.'