Explorar el Código

[fixed] small tweaks for relationship and a couple other minor fixes

sovietmercader hace 5 años
padre
commit
248423bb0f
Se han modificado 2 ficheros con 30 adiciones y 28 borrados
  1. 2 2
      locations/gadroad.qsrc
  2. 28 26
      locations/mitkabuh.qsrc

+ 2 - 2
locations/gadroad.qsrc

@@ -37,10 +37,10 @@ if $ARGS[0] = '':
 	if mitka_first_drink > 0 and mitkaday ! daystart and hour >= 17 and hour < 20 and mitkarand = 1 and (npc_QW['A63'] < 11 or gadriver_gang > 2):
 		'<a href="exec:gt ''mitka''">Mitka</a> is smoking near the road, he smiles at you as you walk by.'
 	! Meet the boys to drink with them at 20 if Sveta has been invited by Mitka already
-	elseif mitka_first_drink > 0 and hour = 20:
+	elseif mitka_first_drink > 0 and hour = 20 and alko < 10 and mitkadrinkday ! daystart:
 		'<a href="exec:gt ''gadroad'',''drinking_invite''">Mitka, Kolyamba, and Vasyan</a> are walking down the road towards the woods, drinking moonshine and talking loudly.'
 	! If Sveta is late to go drink with the boys if she already knows where the trailer is she can still get there
-	elseif mitka_first_drink = 2 and hour > 20 and alko < 10:
+	elseif mitka_first_drink = 2 and hour > 20 and alko < 10 and mitkadrinkday ! daystart:
 		! if Sveta did not bring Mira with her and Mira has met the boys already then there is a 50% chance she will show up too
 		if MiraLoc ! 5 and npc_QW['A60'] >= 1:
 			mirarand = rand(1,10)

+ 28 - 26
locations/mitkabuh.qsrc

@@ -52,7 +52,7 @@ end
 if $ARGS[0] = 'partyalone':
 	$loc = 'mitkabuh'
 	$metka = 'partyalone'
-	$location_type = 'secluded'
+	$location_type = 'indoors'
 	
 	$menu_loc = 'mitkabuh'
 	$menu_arg = 'partyalone'
@@ -64,6 +64,7 @@ if $ARGS[0] = 'partyalone':
 	
 	! prevent drinking events from repeating after sex is done because the passage of time in the sex events allowed alko to decrease again
 	if mitkabuhday = 1 and alko < 10: alko = 10
+	mitkadrinkday = daystart
 	
 	! Sveta is not drunk
 	if alko < 10:
@@ -71,9 +72,9 @@ if $ARGS[0] = 'partyalone':
 			*clr & cla
 			menu_off = 1
 			minut += 30
-			npc_rel['A63'] += 1
-			npc_rel['A62'] += 1
-			npc_rel['A61'] += 1
+			npc_rel['A63'] += rand(0,1)
+			npc_rel['A62'] += rand(0,1)
+			npc_rel['A61'] += rand(0,1)
 			alko += rand(3,5)
 			cumspclnt = 2
 			gs 'cum_cleanup'
@@ -152,7 +153,7 @@ end
 if $ARGS[0] = 'partywithMira':
 	$loc = 'mitkabuh'
 	$metka = 'partywithMira'
-	$location_type = 'secluded'
+	$location_type = 'indoors'
 	
 	$menu_loc = 'mitkabuh'
 	$menu_arg = 'partywithMira'
@@ -211,10 +212,10 @@ if $ARGS[0] = 'partywithMira':
 				act 'Drink the shot yourself':
 					cla
 					minut += 30
-					npc_rel['A63'] += 1
-					npc_rel['A62'] += 1
-					npc_rel['A61'] += 1
-					npc_rel['A60'] += 1
+					npc_rel['A63'] += rand(0,1)
+					npc_rel['A62'] += rand(0,1)
+					npc_rel['A61'] += rand(0,1)
+					npc_rel['A60'] += rand(0,1)
 					alko += rand(3,5)
 					cumspclnt = 2
 					gs 'cum_cleanup'
@@ -266,10 +267,10 @@ if $ARGS[0] = 'partywithMira':
 				act 'Mira drinks the shot instead':
 					cla
 					minut += 30
-					npc_rel['A63'] += 1
-					npc_rel['A62'] += 1
-					npc_rel['A61'] += 1
-					npc_rel['A60'] += 1
+					npc_rel['A63'] += rand(0,1)
+					npc_rel['A62'] += rand(0,1)
+					npc_rel['A61'] += rand(0,1)
+					npc_rel['A60'] += rand(0,1)
 					npc_drunk['A60'] += rand(3,5)
 					gs 'stat'
 					
@@ -292,10 +293,10 @@ if $ARGS[0] = 'partywithMira':
 				*clr & cla
 				menu_off = 1
 				minut += 30
-				npc_rel['A63'] += 1
-				npc_rel['A62'] += 1
-				npc_rel['A61'] += 1
-				npc_rel['A60'] += 1
+				npc_rel['A63'] += rand(0,1)
+				npc_rel['A62'] += rand(0,1)
+				npc_rel['A61'] += rand(0,1)
+				npc_rel['A60'] += rand(0,1)
 				gs 'stat'
 				
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/drinking.jpg"></center>'
@@ -337,9 +338,10 @@ if $ARGS[0] = 'partywithMira':
 				*clr & cla
 				menu_off = 1
 				minut += 30
-				npc_rel['A63'] += 1
-				npc_rel['A62'] += 1
-				npc_rel['A61'] += 1
+				npc_rel['A63'] += rand(0,1)
+				npc_rel['A62'] += rand(0,1)
+				npc_rel['A61'] += rand(0,1)
+				npc_rel['A60'] += rand(0,1)
 				alko += rand(3,5)
 				cumspclnt = 2
 				gs 'cum_cleanup'
@@ -371,10 +373,10 @@ if $ARGS[0] = 'partywithMira':
 			act 'Watch Mira drink with the boys':
 				*clr & cla
 				menu_off = 1
-				npc_rel['A63'] += 1
-				npc_rel['A62'] += 1
-				npc_rel['A61'] += 1
-				npc_rel['A60'] += 1
+				npc_rel['A63'] += rand(0,1)
+				npc_rel['A62'] += rand(0,1)
+				npc_rel['A61'] += rand(0,1)
+				npc_rel['A60'] += rand(0,1)
 				minut += 30
 				npc_drunk['A60'] += rand(3,5)
 				gs 'stat'
@@ -897,9 +899,9 @@ if $ARGS[0] = 'solo_11andup_2boys':
 			if npc_QW['A63'] < 20: npc_QW['A63'] += 1
 			npc_sex[$boy[0]] += 1
 			npc_sex[$boy[1]] += 1
-			gs 'arousal', 'bj', 10, 'sub', 'rough'
+			gs 'arousal', 'bj', 10, 'sub', 'rough', 'deepthroat'
 			if mesec = 0:
-				gs 'arousal', 'vaginal', 10, 'sub', 'rough', 'deepthroat'
+				gs 'arousal', 'vaginal', 10, 'sub', 'rough'
 			else
 				gs 'arousal', 'anal', 10, 'sub', 'rough'
 			end