Browse Source

gadukino enhancements and bug fixes

John Doe 2 years ago
parent
commit
0f72dd11ec

+ 3 - 0
locations/gadforest_event.qsrc

@@ -553,6 +553,9 @@ end
 if $ARGS[0] = 'mitka_temporary_event':
 	! never had sex with Mitka or not the village whore
 	if npc_QW['A63'] = 0 or gadriver_gang >= 3:
+    ! Mitka found Sveta nude in the forest 
+    if npc_QW['A60'] > 11 and npc_QW['A63'] = 0 and $clothingworntype = 'nude':npc_QW['A63'] = 1
+
 		! Mira is already fucking Mitka but not the boys slut yet
 		if npc_QW['A60'] >= 2 and npc_QW['A60'] < 11:
 			*clr & cla

+ 2 - 2
locations/gadforestlost.qsrc

@@ -205,7 +205,7 @@ if $ARGS[0] = 'relax':
 
 			act 'Continue':gt 'gadforestlost', 'relax'
 		end
-		if pcs_sleep < 40:
+		if pcs_sleep < 40 or cheatNoSleep ! 0:
 			act 'Nap on the ground (2:00)':
 				*clr & cla
 				menu_off = 1
@@ -244,7 +244,7 @@ if $ARGS[0] = 'relax':
 
             act 'Continue':gt 'gadforestlost', 'relax'
         end
-		if pcs_sleep < 40:
+		if pcs_sleep < 40 or cheatNoSleep ! 0:
 			act 'Nap by the fire (2:00)':
 				*clr & cla
 				menu_off = 1

+ 2 - 1
locations/gadhouse.qsrc

@@ -399,6 +399,8 @@ if $ARGS[0] = 'main':
 		end
 	end
 
+	act 'Relax on your bed': gt 'bed', 'start'
+
 	if grandmaQW['chore_clean_floor'] = 1:
 		act 'Clean the floor for Grandma (1:00)':
 			*clr & cla
@@ -499,7 +501,6 @@ if $ARGS[0] = 'main':
 	end
 
 	if rand(0,2) ! 0: gs 'din_bad' & dynamic $mobile_check
-	act 'Relax on your bed': gt 'bed', 'start'
 end
 
 if $ARGS[0] = 'grandma':

+ 2 - 5
locations/gadriver.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'start':
 
 	temp_gr = rand(0,20)
 
-	if temp_gr = 1 and hour < 5 and month >= 5 and month <= 9 and npc_QW['A60'] >= 20: 'Right next to the path leading to the river, you see <a href="exec: gt ''gadriver'', ''mirapunish'' ">Mira</a> naked, bound with ropes between two trees...'
+	if temp_gr >= 15 and (hour <= 6 or hour >= 22) and month >= 5 and month <= 9 and npc_QW['A60'] >= 20: 'Right next to the path leading to the river, you see <a href="exec: gt ''gadriver'', ''mirapunish'' ">Mira</a> naked, bound with ropes between two trees...'
 
 	if temp_gr = 4 and MiraLoc ! 1 and npc_QW['A63'] >= 13 and hour >= 5:
 		if mitkaguysriver ! daystart:
@@ -198,6 +198,7 @@ if $ARGS[0] = 'gadbitch':
 			'You need to dress in regular clothes first.'
 			act'Return':gt'gadriver', 'gadbitch'
 		elseif $clothingworntype = 'nude':
+			cla
 			'You need to put some clothes on first.'
 			act'Return':gt'gadriver', 'gadbitch'
 		else
@@ -874,7 +875,6 @@ if $ARGS[0] = 'GuysRiver':
 					gs 'stat'
 				else
 					gs 'boyStat', 'A62'
-					pcs_ass += 1
 					spafinloc = 3
 					gs 'cum_manage'
 					gs'stat'
@@ -924,7 +924,6 @@ if $ARGS[0] = 'GuysRiver':
 					gs 'stat'
 				else
 					gs 'boyStat', 'A62'
-					pcs_ass += 1
 					spafinloc = 3
 					gs 'cum_manage'
 					gs'stat'
@@ -941,7 +940,6 @@ if $ARGS[0] = 'GuysRiver':
 		act 'Pleasure Kolyamba':
 			*clr & cla
 			gs 'boyStat', 'A61'
-			pcs_ass += 1
 			spafinloc = 3
 			gs 'cum_manage'
 
@@ -988,7 +986,6 @@ if $ARGS[0] = 'GuysRiver':
 					gs 'stat'
 				else
 					gs 'boyStat', 'A62'
-					pcs_ass += 1
 					spafinloc = 3
 					gs 'cum_manage'
 					gs'stat'

+ 2 - 2
locations/meadow.qsrc

@@ -612,7 +612,7 @@ if $ARGS[0] = 'mira_mitka':
 end
 
 if $ARGS[0] = 'mira_gang':
-	npc_QW['A60'] = 31
+	if npc_QW['A60'] < 31: npc_QW['A60'] = 31
 	menu_off = 1
 	mirasextimes += 1
 
@@ -628,7 +628,7 @@ if $ARGS[0] = 'miraperversion11':
 	minut += 5
 	menu_off = 1
 	pcs_horny += 10
-	npc_QW['A60'] = 12
+	if npc_QW['A60'] < 12: npc_QW['A60'] = 12
 	gs 'stat'
 
 	gs 'miroslava', 'miraclothes'