Sfoglia il codice sorgente

Replaced the old, random "are you free for a quickie for 200?" events.

Instead of the old event, it will now pick a random event from the WLife ones.
netuttki 1 anno fa
parent
commit
3f9097f9d8

+ 4 - 0
locations/liam.qsrc

@@ -79,5 +79,9 @@ end
 
 act 'Wait':gs 'obj_din', 'wait'
 
+!-- Random prostitution solicitation check ------------------------ 
+gs 'prostitution_integ', 'check_solicitation_event'
+
+
 --- liam ---------------------------------
 

+ 4 - 0
locations/pav_commercial.qsrc

@@ -211,5 +211,9 @@ elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23
 	act 'Go to the jeep': gt 'belgang', 'workofdebt'
 end
 
+!-- Random prostitution solicitation check ------------------------ 
+gs 'prostitution_integ', 'check_solicitation_event'
+
+
 --- pav_commercial ---------------------------------
 

+ 6 - 0
locations/pav_complex.qsrc

@@ -153,6 +153,10 @@ if $ARGS[0] = 'start':
 !!	if mid($start_type,1,2) = 'sg': act 'Go to the old apartment building':minut += 1 & gt 'pavComplexOld', 'etaj_1'
 	act 'Sit on a bench':gt 'pav_aptcourtev', 'bench'
 	gs 'camera', 'check_location'
+
+	!-- Random prostitution solicitation check ------------------------ 
+	gs 'prostitution_integ', 'check_solicitation_event'
+
 end
 
 if $ARGS[0] = 'garages':
@@ -491,6 +495,8 @@ if $ARGS[0] = 'garages':
 		act 'Go back to the courtyard':minut += 2 & gt 'pav_complex', 'start'
 		if mid($start_type,1,2) = 'sg': act 'Go to your stepfather''s garage': minut += 5 & gt 'gargazel'
 	end
+
 end
 
+
 --- pav_complex ---------------------------------

+ 4 - 0
locations/pav_industrial.qsrc

@@ -116,5 +116,9 @@ elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23
 	act 'Go to the jeep': gt 'belgang', 'workofdebt' 	
 end
 
+!-- Random prostitution solicitation check ------------------------ 
+gs 'prostitution_integ', 'check_solicitation_event'
+
+
 --- pav_industrial ---------------------------------
 

+ 4 - 0
locations/pav_market.qsrc

@@ -296,5 +296,9 @@ act 'Walk to Pushkin (0:20)':minut += 20 & nroad = 19 & gt 'liam'
 
 gs 'camera', 'check_location'
 
+!-- Random prostitution solicitation check ------------------------ 
+gs 'prostitution_integ', 'check_solicitation_event'
+
+
 --- pav_market ---------------------------------
 

+ 4 - 0
locations/pav_park.qsrc

@@ -303,6 +303,10 @@ if $ARGS[0] = 'start':
 	end
 
 	gs 'camera', 'check_location'
+	
+	!-- Random prostitution solicitation check ------------------------ 
+	gs 'prostitution_integ', 'check_solicitation_event'
+
 end
 
 if $ARGS[0] = 'alb_father_meeting_1':

+ 21 - 16
locations/pav_residential.qsrc

@@ -71,22 +71,24 @@ elseif rape > rape_count:
 	end
 end
 
-if fame['pav_slut'] >= 250 and rand(1, 10) = 10 and pav_residential_prost_day ! daystart:
-	pav_residential_prost_day = daystart
-	'A man approaches you, and asks if you want to earn some easy money. He''s offers you 200 <b>₽</b> for a quickie in the bushes.'
-
-	gs 'willpower', 'prostitution', 'resist'
-	if will_cost <= pcs_willpwr:
-		act 'Decline (<<will_cost>> Willpower)':
-			gs 'willpower', 'pay', 'resist'
-			gt 'pav_residential'
-		end
-	else
-		act 'Decline (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end
-	act 'Agree': gs 'npcgeneratec', 0, 'Stranger at the Park', rand(18,45) & gs 'boyStat', $npclastgenerated & gt 'gevent', '5'
-	exit
-end
+!! TODO: Commented out and replaced by the wlife mechanics - see end of the file under !-- Prostitution ---- 
+!!if fame['pav_slut'] >= 250 and rand(1, 10) = 10 and pav_residential_prost_day ! daystart:
+!!	pav_residential_prost_day = daystart
+!!	'A man approaches you, and asks if you want to earn some easy money. He''s offers you 200 <b>₽</b> for a quickie in the bushes.'
+!!
+!!
+!!	gs 'willpower', 'prostitution', 'resist'
+!!	if will_cost <= pcs_willpwr:
+!!		act 'Decline (<<will_cost>> Willpower)':
+!!			gs 'willpower', 'pay', 'resist'
+!!			gt 'pav_residential'
+!!		end
+!!	else
+!!		act 'Decline (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+!!	end
+!!	act 'Agree': gs 'npcgeneratec', 0, 'Stranger at the Park', rand(18,45) & gs 'boyStat', $npclastgenerated & gt 'gevent', '5'
+!!	exit
+!!end
 
 if ((month = 9 and day > 16) or month >= 10) and (AlbinaQW['StarletsShutDown'] = 0 or AlbinaQW['Chernov'] = 0): 'You can see election posters on the walls all over town. They say: "Vote for Boris Barlovsky!" Wait a minute... isn''t that Albina''s father?'
 if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and AlbinaQW['Chernov'] = 0 and ((month = 11 and day > 18) or month = 12) and hour >= 14:gt 'albina_election_events', 'start'
@@ -274,6 +276,9 @@ elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23
 	act 'Go to the jeep': gt 'belgang', 'workofdebt' 	
 end
 
+!-- Random prostitution solicitation check ------------------------ 
+gs 'prostitution_integ', 'check_solicitation_event'
+
 
 --- pav_residential ---------------------------------