Преглед изворни кода

[fixed] changed hour += into minut +=

julzor пре 4 година
родитељ
комит
57861fda06

+ 1 - 1
locations/Nord.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = '':
 
 	if car > 0 and cardrive = 3 or (cardrive >= 6 and cardrive <= 9):'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
 
-	'The towns <a href="exec:hour += 1 & gt ''park'', ''start''">central park</a> is an hours walk from here.'
+	'The towns <a href="exec:minut += 60 & gt ''park'', ''start''">central park</a> is an hours walk from here.'
 
 	if hour > 7 and hour < 23:
 		'You can see the <a href="exec:$locM = ''Nord'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'

+ 2 - 1
locations/Palatka.qsrc

@@ -23,7 +23,8 @@ if $ARGS[0] = 'start':
 	act 'Leave':palMir = 0 & gt 'Military', 'start'
 
 	act 'Sleep':
-		hour += 8
+		minut += 480
+		gs 'stat'
 		pcs_sleep = 100
 		gt 'palatka', 'start'
 	end

+ 13 - 18
locations/club.qsrc

@@ -1213,9 +1213,8 @@ if $ARGS[0] = 'work':
 	if clubr = 0:
 		'"OK <<$pcs_nickname>>, I want you to go around the city center and find some customers, bring them to the door and give the bouncer a nod so he knows they are yours. See you in an hour."'
 		act 'Look for customers':
-			cla
-			*clr
-			hour += 1
+			*clr & cla
+			minut += 60
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/down.jpg"></center>'
 			'You spend an hour searching for customers in the city center.'
 			act 'Return to Erik':
@@ -1243,31 +1242,28 @@ if $ARGS[0] = 'work':
 		'"OK <<$pcs_nickname>>, I want you to go around the club getting people to try and hopefully switch to these spirits. You can''t go wrong here, just smile and give out free drinks."'
 		'"No need to hold back with it, the suppliers are paying and if you''re curious and want to try it, don''t its horrible. I''ll see you back here in an hour."'
 		act 'Get to work':
-			cla
-			*clr
-			hour += 1
+			*clr & cla
+			minut += 60
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club6.jpg"></center>'
 			'You spend an hour giving away unpleasant shots.'
 			act 'Return to Erik':
-				cla
-				*clr
+				*clr & cla 
 				money += 200
+				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'
 				'You hand Erik the empty bottles, he gives you 200 <b>₽</b>.'
-				if hour < 1 or hour >= 18:
-					act 'Get another job from Erik':gt 'club', 'work'
-				end
+				if hour < 1 or hour >= 18: act 'Get another job from Erik':gt 'club', 'work'
 
-			act 'Go to dancefloor':gt 'club', 'inside'
+				act 'Go to dancefloor':gt 'club', 'inside'
 			end
 		end
 	elseif clubr = 2:
 		'"OK <<$pcs_nickname>>, we''re short a dancer, get in that cage there and dance. If you put on a good show you get a bonus."'
 		act 'Get in the cage':
 			if pcs_inhib < 60:inhib_exp += rand(1,2)
-			cla
-			*clr
-			hour += 1
+			*clr & cla
+			minut += 60
 			danc_exp += rand (1,3)
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club12.jpg"></center>'
 			if pcs_danc > rand (30, 100):
@@ -1279,9 +1275,8 @@ if $ARGS[0] = 'work':
 				'You try hard, but you are mostly ignored by the customers.'
 				'Erik thanks you for helping when he was short and pays you 200 <b>₽</b>, but doesn''t even mention your dancing.'
 			end
-			if hour < 1 or hour >= 18:
-				act 'Get another job from Erik':gt 'club', 'work'
-			end
+			gs 'stat'
+			if hour < 1 or hour >= 18: act 'Get another job from Erik':gt 'club', 'work'
 
 			act 'Go to dancefloor':gt 'club', 'inside'
 		end

+ 1 - 1
locations/dorm.qsrc

@@ -376,7 +376,7 @@ if $ARGS[0] = 'afragangfuck':
 	$location_type = 'event'
 	reccoldorm = 0
 	afraflag = 0
-	hour += 2
+	minut += 120
 	'You knock on door and are greeted by a huge black guy. He grabs you by the arm and drags you into the room, in where you see five Africans. They surround you and immediately begin grabbing your breasts and ass.'
 	'They speak a lot in their native language but there are some words you''re able to pick up, cumdump, whore, white trash, bimbo slut.'
 	afrand = rand(1, afra)

+ 5 - 7
locations/down.qsrc

@@ -59,10 +59,9 @@ gs'street_event','down', 'extras'
 if nichWork = 2:act '<b>GO HOME</b> (Nicholas'' apartment)':gt 'nichApartment'
 
 if shantpopala > 0:
-	cla
-	*clr
+	*clr & cla
 	menu_off = 0
-	hour += 8
+	minut += 480
 	spafinloc = 14
 	gs 'cum_manage'
 	gs 'cum_manage'
@@ -91,11 +90,10 @@ if shantpopala > 0:
 	'They got up and came back at you, barely a minute later you wished your were still knocked out, as these jackasses had their ways with. You tried to resist, but the tape hindered you from moving. Not long after, everything faded to black and you lost you consciousness again.'
 	'You feel groggy as you wake up, but it feels like someone is grapping you by the hair and shouts at you. "Let this be a lesson for you, bitch.", he shouts, then kicks you into the stomach and leaves. As you collapse on the ground holding your stomach in pain, you take a glimpse at the street and see the assholes driving away in their black jeep. The mainroad is about 200m away, you crawl most of the way there, but soon you can walk again and eventually you find your way back to one of the mainstreets.'
 
-	gs 'arousal', 'bj', 60, 'sub', 'gangbang','humiliation', 'rough'
-	gs 'arousal', 'vaginal', 60, 'sub', 'gangbang', 'humiliation', 'rough'
-	gs 'arousal', 'anal', 60, 'sub', 'gangbang', 'humiliation', 'rough'
+	gs 'arousal', 'bj', -60, 'sub', 'gangbang','humiliation', 'rough'
+	gs 'arousal', 'vaginal', -60, 'sub', 'gangbang', 'humiliation', 'rough'
+	gs 'arousal', 'anal', -60, 'sub', 'gangbang', 'humiliation', 'rough'
 	gs 'arousal', 'end'
-	minut -= 60
 	gs 'stat'
 
 	act 'Leave':gt $curloc

+ 3 - 9
locations/event.qsrc

@@ -3,8 +3,6 @@ if $ARGS[0] = 'klof 2':
 	cla
 	*clr
 	minut += 5
-	cla
-	*clr
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/jora/15 1.jpg"></center>'
 	'"Well baby, come and see us if you want more entertainment, and if you behave, you can earn some cash"'
@@ -479,10 +477,8 @@ if $ARGS[0] = 'dima21':
 end
 
 if $ARGS[0] = 'dima30':
-	cla
-	clr
-	*clr
-	hour += 3
+	*clr & cla
+	minut += 180
 	dimaQW = 2
 	gs 'stat'
 	'I confess, I am a sinner, a writer from me worthless, and all my dark little thoughts went to the recent arrival of women. If there are interesting ideas/scenarios to continue - fling in a personal, zabubenyu'
@@ -491,9 +487,7 @@ if $ARGS[0] = 'dima30':
 end
 
 if $ARGS[0] = 'dima31':
-	cla
-	clr
-	*clr
+	*clr & cla
 	minut += 30
 	dimaQW = 2
 	gs 'stat'

+ 12 - 12
locations/events.qsrc

@@ -215,33 +215,33 @@ if $ARGS[0] = 'snkayf':
 	snkz = RAND(1,6)
 	gs 'underwear', 'remove'
 	if snkz = 1:
-		hour += 2
+		minut += 120
 		gt'gdk'
 	end
 
 	if snkz = 2:
-		hour += 2
+		minut += 120
 		gt 'gskver', 'start'
 	end
 
 	if snkz = 3:
-		hour += 2
+		minut += 120
 		gt'bedrPar'
 	end
 
 	if snkz = 4:
-		hour += 2
+		minut += 120
 		gt'gopskver'
 	end
 
 	if snkz = 5:
-		hour += 2
+		minut += 120
 		gt 'pavtrainhall', 'female'
 	end
 
 	if snkz = 6:
 		gs 'clothing', 'strip'
-		hour += 2
+		minut += 120
 		gt'Glake'
 	end
 end
@@ -328,32 +328,32 @@ if $ARGS[0] = 'snkayf1':
 	snkz = RAND(1,6)
 	gs 'underwear', 'remove'
 	if snkz = 1:
-		hour += 2
+		minut += 120
 		gt'park','start'
 	end
 
 	if snkz = 2:
-		hour += 2
+		minut += 120
 		gt'down'
 	end
 
 	if snkz = 3:
-		hour += 2
+		minut += 120
 		gt'nord'
 	end
 
 	if snkz = 4:
-		hour += 2
+		minut += 120
 		gt'street'
 	end
 
 	if snkz = 5:
-		hour += 2
+		minut += 120
 		gt'dachi'
 	end
 
 	if snkz = 6:
-		hour += 2
+		minut += 120
 		gt'lake','start'
 	end
 end

+ 4 - 5
locations/kamera.qsrc

@@ -1,5 +1,6 @@
 # kamera
 
+!!This should be minut += 2880, but it''s so long that I didn''t want to touch it, maybe it breaks the event (sleep, hunger, ...), there is another hour += 20 in the file (julzor)
 hour += 48
 gs 'stat'
 '<center><b>Prison cell</b></center>'
@@ -47,10 +48,9 @@ act 'Greet her':
 			gs 'stat'
 			
 			act 'Crawl into bed and sleep':
-				cla
-				*clr
+				*clr & cla
 				pcs_vag += 1
-				hour += 4
+				minut += 240
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/police/sex/c6.jpg"></center>'
 				'A few hours later you wake up because your vagina hurts. When you open your eyes you see why: a female prison guard is trying to thrust her baton inside you! She hasn''t gotten it in yet, and is impatiently rubbing the tip of the baton against your pussy lips to try and gain access.'
@@ -150,8 +150,7 @@ act 'Greet her':
 			gs 'stat'
 			
 			act 'Wait':
-				cla
-				*clr
+				*clr & cla
 				gnewQW = 3
 				hour += 20
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/police/c1.jpg"></center>'

+ 4 - 5
locations/street_event.qsrc

@@ -474,7 +474,7 @@ if $ARGS[1] = 'main':
 	if shantpopala > 0:
 		*clr & cla
 		menu_off = 1
-		hour += 8
+		minut += 480
 		spafinloc = 14
 		gs 'cum_manage'
 		spafinloc = 4
@@ -503,10 +503,9 @@ if $ARGS[1] = 'main':
 		'They got up and came back at you, barely a minute later you wished your were still knocked out, as these jackasses had their ways with you. You try to resist, but the tape hindered you from moving. Not long after, everything faded to black and you lost your consciousness again.'
 		'You feel groggy as you wake up, but it feels like someone is grapping you by the hair and shouts at you. "Let this be a lesson for you, bitch.", he shouts, then kicks you into the stomach and leaves. As you collapse on the ground holding your stomach in pain, you take a glimpse at the street and see the assholes speed away in their black jeep. The main road is about 200m away, you crawl most of the way there, but soon you can walk again and eventually you find your way back to one of the mainstreets.'
 
-		gs 'arousal', 'bj', 40, 'group', 'rough', 'sub'
-		gs 'arousal', 'vaginal', 40, 'group', 'rough', 'sub'
-		gs 'arousal', 'anal', 40, 'group', 'rough', 'sub'
-		minut -= 40
+		gs 'arousal', 'bj', -40, 'group', 'rough', 'sub'
+		gs 'arousal', 'vaginal', -40, 'group', 'rough', 'sub'
+		gs 'arousal', 'anal', -40, 'group', 'rough', 'sub'
 		gs 'arousal', 'end'
 		gs 'stat'
 

+ 2 - 2
locations/tatiana_missions.qsrc

@@ -114,7 +114,7 @@ if $ARGS[0] = 'mission1':
 		else
 			'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/central_station_day.jpg"></center>'
 		end
-		hour += 1
+		minut += 60
 		'This time, you don''t walk far - she directs your steps towards the train station and inside where she buys two tickets for you.'
 		'"Where are we going exactly?"'
 		'"Pavlovsk," she replies, handing you your ticket.'
@@ -225,7 +225,7 @@ if $ARGS[0] = 'mission1':
 					act 'Try to follow the conversation':
 						*clr & cla
 						knowsfairy = 1
-						hour += 1
+						minut += 60
 						'You try to follow what they''re saying, you really do, but Tatiana''s questions are about the nature of fairy magic, how their dust works and where they get it from, if and when their glow changes, how fairies choose their homes, how they procreate, and many, many more that you can either see little point to or that you quite literally have trouble understanding.'
 						'About an hour passes like this and you are starting to get tired of standing around doing nothing, but it would seem that Tatiana has also remembered that you''re still there. Or maybe she''s just tired of the fairy giving her vague and confused answers, there''s really no telling which it is.'
 						'Regardless of the ''why'', the redhead finally stops talking and looks at you. "I think those may be enough questions for one day; and certainly enough for our first joint encounter with a magical being, wouldn''t you say?"'