1
0

5 Komitmen c1eae1947e ... bbc2f45d03

Pembuat SHA1 Pesan Tanggal
  KevinSmarts bbc2f45d03 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 tahun lalu
  KevinSmarts 18a100ae9d [fixes] Bug fixes from TFGS for Leonid job offer loop and motel exit at wrong point on the highway 4 tahun lalu
  3xpurt 83b7077697 [fixed] broken reputation table in obj_din, and title in traits. 4 tahun lalu
  KevinSmarts 5de50102f6 [fixes] wrong value stopped fuckable or not firing for non-nerds 4 tahun lalu
  julzor 347233522c [added] cheat to block random robbers, rapist and hijackers in the streets 4 tahun lalu

+ 16 - 0
locations/Cheatmenu_din.qsrc

@@ -418,6 +418,16 @@ $cheatmenu['random_bf_gf'] = {
 	end
 }
 
+$cheatmenu['street_events'] = {
+	if cheat_street_events = 0:
+		cheat_street_events = 1
+		dynamic $cheatmenu['permanent']
+	elseif cheat_street_events = 1:
+		cheat_street_events = 0
+		dynamic $cheatmenu['permanent']
+	end
+}
+
 $cheatmenu['permanent'] = {
 	gs'stat'
 	*clr & cla
@@ -474,6 +484,8 @@ $cheatmenu['permanent'] = {
 	if cheatTime = 1:$cheatTime = 'Enabled'
 	if random_bf_gf_cheat = 0: $random_bf_gf_cheat = 'Enabled'
 	if random_bf_gf_cheat = 1: $random_bf_gf_cheat = 'Disabled'
+	if cheat_street_events = 0: $cheat_street_events = 'Enabled'
+	if cheat_street_events = 1: $cheat_street_events = 'Disabled'
 
 	'<center><h1>Cheat Menu - Recurrent Cheats</h1></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
@@ -494,7 +506,11 @@ $cheatmenu['permanent'] = {
 	else
 		'Allow any clothing for school: <a href="exec:Enable_sforma = 1 & dynamic $cheatmenu[''permanent'']">Currently OFF</a>'
 	end
+	
+	*nl
+	
 	'Random boyfriend/girlfriend events: <a href="exec:dynamic $cheatmenu[''random_bf_gf'']"><<$random_bf_gf_cheat>></a>'
+	'Random rapist/robbers in the streets: <a href="exec:dynamic $cheatmenu[''street_events'']"><<$cheat_street_events>></a>'
 
 	*nl
 

+ 1 - 1
locations/gschool_lessonsev1.qsrc

@@ -979,7 +979,7 @@ if $ARGS[0] = 'computer':
 			else
 				act 'Flip him off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		elseif scooltiperand = 17 and fuckornot = 3:
+		elseif scooltiperand = 18 and fuckornot = 3:
 !!ToDo: Needs an image
 			'While working on your computer assignment you get a message from someone, no name is listed. Just has a school ID, you look around to see who might have sent it but no one seems to be paying attention to you, so you can''t tell. All the message says is "Did you check your rating lately?'
 			act 'Ignore it and focus on your school work.': fuckornot_day = daystart + rand(0,2) & gt 'gschool_lessons', 'short_break'

+ 2 - 2
locations/leonid.qsrc

@@ -350,7 +350,7 @@ if $ARGS[0] = 'cumAnal':
 	gs 'stat'
 	'<center><video autoplay loop src="images/characters/pavlovsk/resident/leonid/sex/cumanal'+rand(1, 2)+'.mp4"></video></center>'
 	'<<$bName>> cums deep in your intestines.'
-	if money < 2000:
+	if money < 2000 and leonidSecretary = 0:
 		act 'Mister <<$bSurname>>, may I ask you something?':gt 'leonid', 'askForJob'
 	end
 	act 'Thank him and leave':gt 'leonid', 'office'
@@ -362,7 +362,7 @@ if $ARGS[0] = 'cumPussy':
 	gs 'cum_call', '', $boy, 1
 	gs 'arousal', 'end'
 	gs 'stat'
-	if money < 2000:
+	if money < 2000 and leonidSecretary = 0:
 		act 'Mister <<$bSurname>>, may I ask you something?':gt 'leonid', 'askForJob'
 	end
 	'<center><video autoplay loop src="images/characters/pavlovsk/resident/leonid/sex/cumpussy'+rand(1, 1)+'.mp4"></video></center>'

+ 1 - 1
locations/motel.qsrc

@@ -12,7 +12,7 @@ gs 'stat'
 '<center><img <<$set_imgh>> src="images/locations/highway/motel/motel.jpg"></center>'
 'Roadside motel where truckers stop for something to eat and sleep.'
 
-act 'Exit the highway':minut += 12 & nroad = 14 & gt 'road'
+act 'Exit the highway':minut += 12 & nroad = 12 & gt 'road'
 
 --- motel ---------------------------------
 

+ 5 - 3
locations/obj_din.qsrc

@@ -1229,12 +1229,14 @@ if $ARGS[0] = 'stats_fetish':
 	'</td></tr></table></center>'
 end
 
+
 if $ARGS[0] = 'reputation':
 	*clr & cla
 	gs 'obj_din','chartabs'
 	!'<center><img src="images/system/icon/reputation.png"><br></center>'
 	'<center><h1>Renown</h1></center>'
-	'<center><table>''<tr><td>'
+	'<center><table width="90%" cellspacing="0" cellpadding="20" valign="top">'
+		'<tr><td width="50%" cellspacing="0" cellpadding="0" valign="top">'
 		'<center>Family Renown</center>'
 		if Enable_family_Reputation = 0:
 			'<center><a href="exec:Enable_family_Reputation = 1 & gs ''obj_din'', ''reputation''">Show details</a></center>'
@@ -1322,7 +1324,7 @@ if $ARGS[0] = 'reputation':
 				'You are not famous enough on social media to be known outside of any local areas.'
 			end
 		end
-		'<center><table><tr><td>'
+		'<center><table width="225" cellspacing="0" cellpadding="20" valign="top"><tr><td>'
 			'<center>Renown in Pavlovsk</center>'
 			if Enable_pav_Reputation = 0:
 				'<center><a href="exec:Enable_pav_Reputation = 1 & gs ''obj_din'', ''reputation''">Show details</a></center>'
@@ -1447,7 +1449,7 @@ if $ARGS[0] = 'reputation':
 				'	Social media = <<village_media>>'
 			end
 		'</tr></td></table></center>'
-		'</td><td>'
+		'</td><td width="50%" cellspacing="0" cellpadding="0" valign="top">'
 		if film > 0:
 			'<b>Pornographic Filmography</b>'
 			gs 'pornhist', 'short'

+ 3 - 5
locations/street_event.qsrc

@@ -227,7 +227,7 @@ if $ARGS[1] = 'main':
 		end
 	end
 
-	if streetrand < streetev_rape and hour <= 3 and streetev_day ! daystart:
+	if streetrand < streetev_rape and hour <= 3 and streetev_day ! daystart and cheat_street_events = 0:
 		*clr & cla
 		menu_off = 1
 		streetev_day = daystart
@@ -389,7 +389,7 @@ if $ARGS[1] = 'main':
 	end
 
 	streetrand = rand(0, 100)
-	if streetrand < streetev_rob and daystart >= 10 and (hour < 6 or hour >= 20) and streetev_day ! daystart and bag = 1 and streetev_rob_day ! daystart:
+	if streetrand < streetev_rob and daystart >= 10 and (hour < 6 or hour >= 20) and streetev_day ! daystart and bag = 1 and streetev_rob_day ! daystart and cheat_street_events = 0:
 		*clr & cla
 		menu_off = 1
 		streetev_day = daystart
@@ -504,15 +504,13 @@ if $ARGS[1] = 'main':
 
 	streetrand = rand(0, 100)
 
-	if streetrand < streetev_hijack and daystart >= 10 and hour >= 6 and hour < 20 and streetev_day ! daystart and bag = 1 and streetev_hijack_day ! daystart:
+	if streetrand < streetev_hijack and daystart >= 10 and hour >= 6 and hour < 20 and streetev_day ! daystart and bag = 1 and streetev_hijack_day ! daystart and cheat_street_events = 0:
 		*clr & cla
 		menu_off = 1
 		gs'stat'
 		streetev_day = daystart
 		'<<$streetev_title>>'
 		'<center><img src="images/locations/shared/street/pursesnatch.jpg"></center>'
-		'As you are walking down the street minding your own business, you are suddenly jerked sideways and nearly pulled off your feet. As you stumble to regain your balance you realize a man has just snatched your purse from you and is running away with it.'
-		
 		if rand(0,300) < (pcs_agil + pcs_stren):
 			'As you are walking down the street minding your own business, you are suddenly jerked sideways and nearly pulled off your feet. You quickly regain your balance and instinctively your fingers hold your purse tighter as you feel something tugging on it. A man is trying to snatch your purse, but he runs away, when you don''t let go of it immediately.'
 			act 'Continue': gt $loc

+ 1 - 1
locations/traits.qsrc

@@ -3,7 +3,7 @@
 if $ARGS[0] = 'menu':
 	*clr & cla
 	gs 'obj_din', 'chartabs'
-	'<center><h2>Traits</h2></center>'
+	'<center><h1>Traits</h1></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td>'
 	'<center><b>Bimbo</b></center>'