Просмотр исходного кода

Merge remote-tracking branch 'KevinSmarts/KevinSmarts/v1.2.2' into v1.2.2

EdgaarCorn 8 лет назад
Родитель
Сommit
3e47fa9e6e

+ 1 - 1
locations/Gadhouse

@@ -106,7 +106,7 @@ if monthbabkapay ! month:
 	'Grandma gives you two thousand.'
 end
 
-if rand (0,2) ! 0:dynamic $mobile_check
+if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
 --- Gadhouse ---------------------------------
 

+ 1 - 1
locations/Nord

@@ -194,7 +194,7 @@ end
 
 dynamic $din_street_cum
 
-if rand (0,2) ! 0:dynamic $mobile_check
+if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
 --- Nord ---------------------------------
 

+ 1 - 1
locations/down

@@ -269,7 +269,7 @@ end
 
 dynamic $din_street_cum
 
-if rand (0,2) ! 0:dynamic $mobile_check
+if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
 --- down ---------------------------------
 

+ 10 - 10
locations/ender

@@ -222,23 +222,23 @@ if $ARGS[0] = 'win':
 		exit
 	elseif RapistFight = 1:
 		RapistFight = 0
-		if rikudo > 10:rikudo = rikudo + 100
-		DOM = DOM + 1
-		Win = Win + 1
-		if rapistOnce = 0:rapistOnce = 1 & money = money + RAND(500,2000)
+		if rikudo > 10:rikudo += 100
+		DOM += 1
+		Win += 1
+		money += RAND(500,2000)
 
-		'You beat a rapist and took his wallet.'
+		'You beat the rapist and take his wallet.'
 
 		act 'Logout':gt'park','start'
 		exit
 	elseif gangrapeFight = 1:
 		gangrapeFight = 0
-		if rikudo > 10:rikudo = rikudo + 100
-		DOM = DOM + 1
-		Win = Win + 1
-		if gangrapeOnce = 0:gangrapeOnce = 1 & money = money + RAND(500,2000)
+		if rikudo > 10:rikudo += 100
+		DOM += 1
+		Win += 1
+		money += RAND(500,2000)
 
-		'Drunken mug stuck in a broken snout spit-covered floor in the entryway, you got his money from his pocket saying this for moral damages. Boys looking at you warily parted.'
+		'His face is battered and you broke his nose, his spit and blood cover the floor he can barely hold his hand up to surrender, you empty the cash from his pockets and tell him it is to cover you expenses. The boys part in fear and mumble apologies.'
 
 		act 'Logout':gt'street'
 	elseif ZverevaFight = 1:

+ 1 - 1
locations/gorodok

@@ -386,7 +386,7 @@ if magik >= 1 and mainQW = 0 and altQS = 1:
 	exit
 end
 
-if rand (0,2) ! 0:dynamic $mobile_check
+if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
 --- gorodok ---------------------------------
 

+ 1 - 1
locations/house

@@ -115,7 +115,7 @@ elseif $ARGS[0] = 'razb':
 	end
 end
 
-if rand (0,2) ! 0:dynamic $mobile_check
+if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
 --- house ---------------------------------
 

+ 1 - 1
locations/korr

@@ -84,7 +84,7 @@ elseif parkday ! daystart and parkblackmail = 2:
 	'Damn, your photos with sperm on your face and two dicks in your mouth are plastered around porch.'
 end
 
-if rand (0,2) ! 0:dynamic $mobile_check
+if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
 if hour >= 9 and hour <= 20 and santehnikDolg > 0 and money >= santehnikDolg:
 	'<b><font color="red">, the doorbell rings</font></b>'

+ 1 - 1
locations/korr2x

@@ -66,7 +66,7 @@ elseif parkday ! day and parkblackmail = 2:
 	'Hell, your pictures with a face smeared in sperm and two huyami mouth plastered around porch.'
 end
 
-if rand (0,2) ! 0:dynamic $mobile_check
+if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
 if hour >= 9 and hour <= 20 and santehnikDolg > 0 and money >= santehnikDolg:
 	'<b><font color = red>The doorbell rings</font></b>'

+ 1 - 1
locations/korrPar

@@ -277,7 +277,7 @@ end
 !'<<$pod_client>>'
 !==========================================!
 
-if rand (0,2) ! 0:dynamic $mobile_check
+if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
 --- korrPar ---------------------------------
 

+ 1 - 1
locations/liam

@@ -99,7 +99,7 @@ act 'Walk 1 h':
 end
 if hour >= 4 and hour <= 23:'Station <a href="exec:GT ''metro'',''start''">Metro</a> located at 5 walking distance.'
 
-if rand (0,2) ! 0:dynamic $mobile_check
+if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
 --- liam ---------------------------------
 

+ 1 - 1
locations/onobjsel

@@ -1588,7 +1588,7 @@ end
 if $selobj = '<img src="images/pic/icon/Pers.png">':menu '$menu_character'
 if $selobj = '<img src="images/pic/icon/look.png">':menu '$menu_lookon'
 if $selobj = '<img src="images/pic/icon/Proch.png">':menu '$menu_other'
-if $selobj = '<img src="images/pic/icon/Phone.png">':dynamic $Phone_menu
+if $selobj = '<img src="images/pic/icon/Phone.png">':gs 'din_bad' & dynamic $Phone_menu
 if $selobj = '<img src="images/pic/icon/Purse.png">':dynamic $d_bag
 !The new menu: end
 

+ 2 - 2
locations/placer_man

@@ -2,8 +2,8 @@
 if mass_ver_zn > 0:
 	!!calculation of the probability of dating
 	ver_zn = 0
-	!dick check to ensure you have some sexual experience
-	if rand(0, 30) < vnesh and rand(0, 1) = 0 and dick > 0:
+	!guy check to ensure you have some sexual experience
+	if rand(0, 30) < vnesh and rand(0, 1) = 0 and guy > 0:
 		ver_zn = 1
 		if kol_man = 1:
 			$kol_man_text = 'guy' & $kol_man_text_a = 'man' & $kol_man_prefiks_he = 'he'

+ 0 - 148
locations/serge_razgovor_tv

@@ -1,148 +0,0 @@
-# serge_razgovor_tv
-$serge_tv = {
-	if hour >=1 and hour < 7:
-		cls
-		gs'stat'
-		'Too late that the time to watch TV'
-		act 'Escape': gt 'shulgabed'
-	elseif hour >= 7 and hour <= 23:
-		cls
-		minut +=30
-		gs'stat'
-serge_tv_rnd = RAND(0,3)
-		if serge_tv_rnd = 0:$serge_tv_rnd = 'The TV goes'
-		if serge_tv_rnd = 1:$serge_tv_rnd = 'On the TV show'
-		if serge_tv_rnd = 2:$serge_tv_rnd = 'Reveal'
-		if serge_tv_rnd = 3:$serge_tv_rnd = 'Goes'
-serge_tv_rand = RAND(0,11)
-		if serge_tv_rand = 0:$serge_tv_rand = '<center><img src="images/zsoft/pod_ezd/shulgahome/tv/tvdance.gif" width="748" height="540"></center><<$serge_tv_rnd>> Teenage music video, where the girls shake their charms.'
-		if serge_tv_rand = 1:$serge_tv_rand = '<center><img src="images/zsoft/pod_ezd/shulgahome/tv/tvgeo1.gif" width="750" height="540"></center><<$serge_tv_rnd>> a documentary about animals.'
-		if serge_tv_rand = 2:$serge_tv_rand = '<center><img src="images/zsoft/pod_ezd/shulgahome/tv/tvgeo2.gif" width="746" height="540"></center><<$serge_tv_rnd>> a documentary about the world.'
-		if serge_tv_rand = 3:$serge_tv_rand = '<center><img src="images/zsoft/pod_ezd/shulgahome/tv/tvgeo3.gif" width="746" height="540"></center><<$serge_tv_rnd>> a documentary about nature.'
-		if serge_tv_rand = 4:$serge_tv_rand = '<center><img src="images/zsoft/pod_ezd/shulgahome/tv/tvgeo4.gif" width="748" height="540"></center><<$serge_tv_rnd>> a documentary film about the ocean.'
-		if serge_tv_rand = 5:$serge_tv_rand = '<center><img src="images/zsoft/pod_ezd/shulgahome/tv/tvkino1.gif" width="750" height="540"></center><<$serge_tv_rnd>> the much-loved Soviet comedy.'
-		if serge_tv_rand = 6:$serge_tv_rand = '<center><img src="images/zsoft/pod_ezd/shulgahome/tv/tvkino2.gif" width="746" height="540"></center><<$serge_tv_rnd>> Import blockbuster.'
-		if serge_tv_rand = 7:$serge_tv_rand = '<center><img src="images/zsoft/pod_ezd/shulgahome/tv/tvkino3.gif" width="772" height="540"></center><<$serge_tv_rnd>> Old Western.'
-		if serge_tv_rand = 8:$serge_tv_rand = '<center><img src="images/zsoft/pod_ezd/shulgahome/tv/tvmult1.gif" width="748" height="540"></center><<$serge_tv_rnd>> relatively new import cartoon.'
-		if serge_tv_rand = 9:$serge_tv_rand = '<center><img src="images/zsoft/pod_ezd/shulgahome/tv/tvmult2.gif" width="746" height="540"></center><<$serge_tv_rnd>> old cartoon.'
-		if serge_tv_rand = 10:$serge_tv_rand = '<center><img src="images/zsoft/pod_ezd/shulgahome/tv/tvsport1.gif" width="748" height="540"></center><<$serge_tv_rnd>> fight without rules.'
-		if serge_tv_rand = 11:$serge_tv_rand = '<center><img src="images/zsoft/pod_ezd/shulgahome/tv/tvsport2.gif" width="746" height="540"></center><<$serge_tv_rnd>> football.'
-rndtv=rand(1,100)
-		if rndtv > 10:'<<$serge_tv_rand>>' 
-		if rndtv <= 10:'<center><img src="images/zsoft/pod_ezd/shulgahome/tv/tvrekl'+rand(1,4)+'.gif" width="748" height="540"></center> There is advertising.'
-		act 'Escape': gt 'shulgabed'
-		act 'Change the channel': dynamic $serge_tv
-		if serge_shulgin > 50:
-			act 'Switch to porn channel': 
-				cls
-				horny += 10
-				minut += 10
-				gs'stat'
-				'<center><img src="images/zsoft/pod_ezd/shulgahome/tv/tvporn'+rand(1,4)+'.gif" width="748" height="540"></center>' 
-				'You switched to porn channel. Sergei little surprised but said nothing.'
-				if horny > 30: 
-					'Have you noticed how Sergei got dick in his pants and he covered his arms awkwardly groin.'
-				end	
-				act 'Escape': gt 'shulgabed'	
-				if serge_shulgin > 70 and horny > 30 and mesec <= 0: 
-					act 'Molest': dynamic $sleep_prstsex
-				end
-			end
-		end
-	end
-}
-
-gs'Serge_Shulgin'
-clr
-cls
-cla
-minut += 1
-gs'stat'
-
-if sergebazar_day ! daystart: sergebazar_count = 10
-'<center><img src="images/zsoft/pod_ezd/shulgahome/serge2.jpg"></center>'
-'Shulgin Sergey Borisovich - 1967 the year of birth, gray hair and a small beer belly, but in your view still looks hearty. With her mother long ago divorced Basil.'
-dynamic $serge_shulgin_rep
-
-act 'Move away': gt 'shulgabed'			
-act 'Talk':
-	cls
-	minut += 15
-	sergebazar_day = daystart
-	sergebazar_count -= 1
-	if sergebazar_count > 0: serge_shulgin +=1
-	gs'stat'
-serge_textb = RAND(0,8)
-	if serge_textb = 0:$serge_textb = 'You asked about the mother of Basil, Sergei was surprised this issue and began to tell: -"Everything is very simple, I met Vaska nurse at a banquet after the celebrated graduation, Well then all get drunk, in short it happened, she flew. Quickly we got married, Bob was born a year later. 
-	A year later, he tired of this life, and when she was offered a job abroad, She left without thinking. Since then, the more we did not communicate and I honestly do not even interested in."'
- 	if serge_textb = 1:$serge_textb = 'Minutes 15 you chat on various topics'
- 	if serge_textb = 2:$serge_textb = 'You asked about work, Sergei began to talk: -"I worked in a factory for the production of bricks, work the first shift with 9:00 to 15:00, 5 days per week.
-	The work is not dusty, wages are not great, but life enough. The duty is to monitor the quality of the equipment and personnel."'
- 	if serge_textb = 3:$serge_textb = 'You asked about his relationship with his son, Sergei waved his hand and said,: -"Normal relations with us, that`s just the idiot with everything got out of hand, the last years does not want to do anything, learning sucks, He is hanging around constantly hell knows where.
-	I tried different methods to reason, but nothing helps, I do not know what to do with it"'
-	if serge_textb = 4:$serge_textb = 'Sergei tells you a funny story: 
-	A friend told.
-	He fell ill as a-the daughter in kindergarten. I had to ask for leave from work, to take to the hospital, on the way he drove his wife. Near the work of his wife is not something that park - no room to swing a cat. I stood on "emergency gang" second row (!) under the sign "Stopping". And then happily drove him to the traffic cops (What a day!).
-	- Good afternoon, Sergeant Petrov. Breach?!...
-	- Ltd., you-what I expect! - one went all-the Bank.
-	- In terms of?...
-	- Yes, that`s what-freak reserve (It shows the old scratch on the bumper) and disappeared. I 02 I called, two hours stuck here, I have been waiting for all.
-	- Aaa, Nooo, at not us...
-	- It is not for you??? You group analysis?
-	- Not-not-not, it`s not us. Wait for your crew!
-	- Well you-it also can make! Th, I`m glad they`ll be three o`clock or something?
-	- Not-not-not-not, wait!!! - jump into the police car and quickly dump.'
-	if serge_textb = 5:$serge_textb = 'Sergei tells the anecdote: I am going to a man drown. He is standing on the bridge with curbs on the neck. To him running and screaming woman:
-	- Man, stand! Wait!
-	- Well, Th you need?
-	Woman, stretching package:
-	- Here`s, Take kittens...'
-	if serge_textb = 6:$serge_textb = 'Sergei tells the anecdote: 
-	- There is a homeless man on the dumps Akademgorodok. Sees - naked woman lies. 
-	He approaches her and asks,: "The second law of thermodynamics?" 
-	She answers: "The entropy of an isolated system can not decrease". 
-	Homeless goes further and thinks: "Normal woman! And that was thrown?"'
-	if serge_textb = 7:$serge_textb = 'You listen carefully to what my uncle says Serge sometimes assents.'
-	if serge_textb = 8:$serge_textb = 'Chatted, are you leaving.'
-serge_textb2 = RAND(0,7)
-	if serge_textb2 = 0:$serge_textb2 = 'Sergei tells you a vulgar anecdote: 
-	- Masha, I call you all night. And you all the time was not available!
-	- In general-then last night I had a very available...'		
-	if serge_textb2 = 1:$serge_textb2 = 'Sergei tells you a vulgar anecdote: 
-	- I do not want to upset you, but your daughter yesterday obviously went through alcohol!
-	- Can not be! She did not take in her mouth!
-	- I`m afraid, I again have upset you...'
-	if serge_textb2 = 2:$serge_textb2 = 'There are two blondes, one says:
-	- I found out, what cunnilingus!
-	- Wow! Tell!
-	- It`s like a blowjob, just the opposite...
-	- What do you mean?! Blow necessary?'
-	if serge_textb2 = 3:$serge_textb2 = 'The resort met the man with the lady. On the first day he stroked her hand, and the second - elbow. Woman angry:
-	- Do you think, I came here three months?'
-	if serge_textb2 = 4:$serge_textb2 = 'Businessman could not hack his way into the numbers in the invoice which-there. Causes secretary:
-	- Olenka, Now, tell, If I give you 1000 dollars less VAT. What in this case is removed?!
-	It, hesitated:
-	- All, except for earrings.'
-	if serge_textb2 = 5:$serge_textb2 = 'The coupe CB travel man and woman. Muzhchinka for the subcategory offers:
-	- Let`s get acquainted riddles. Here`s, eg, my profession begins with the letter "AND", and ends with the letter "P".
-	- Engineer, something? - leering woman says, - And my profession begins with the letter "B", and ends on "B"...
-	Break... The man slowly turns red...
-	- Librarian, - smiling, says the woman, - otherwise, what you think - my hobby.'
-	if serge_textb2 = 6:$serge_textb2 = 'You`re lying relaxed and laughing, when he tells you another vulgar anecdote.'
-	if serge_textb2 = 7:$serge_textb2 = 'Chatted, are you leaving.'
-
-	'<center><img src="images/zsoft/pod_ezd/shulgahome/serge1.jpg"></center>'
-	'Sergei lying on the bed and watch TV.' 
-	dynamic $serg_bazar_rep
-	if sergebazar_count <= 0:'Sergei said,: - "<<$name>>, I`m sorry but not now, important match started, let me see, do not distract."'
-	if serge_shulgin < 30 and sergebazar_count > 0:'<<$serge_textb>>'
-	if serge_shulgin > 50 and sergebazar_count > 0:'<<$serge_textb2>>'
-	act 'Further': gt 'serge_razgovor_tv'
-end
-
-if serge_shulgin > 30: 
-	act 'Next lie down and watch TV': dynamic $serge_tv
-end
-
---- serge_razgovor_tv ---------------------------------
-

+ 42 - 41
locations/telefon

@@ -1,5 +1,44 @@
 # telefon
-$objmobilaraz = {
+
+$telotkaz = {
+	cla
+	minut += 10
+	'<<$telsob>>, "Sorry I''m busy, maybe next time."'
+
+	act 'Hangup':gt 'telefon', 'fin'
+}
+
+$telotkazboy = {
+	cla
+	minut += 10
+	'<<$boyA>>, "Sorry, I''m busy right now, maybe next time."'
+
+	act 'Hangup':gt 'telefon', 'fin'
+}
+
+if $ARGS[0] = 'start':
+	cla
+	clr
+	gs 'stat'
+	dynamic $phone_call_receive
+
+	if nastjaqw = 1 and week = 6 and vnesh > 20:
+		gt 'nastja', 'pos4'
+	elseif nastjaqw = 2 and week ! 6 and zenit = 0 and nastjaday ! daystart:
+		gt 'nastja', 'pos13'
+	elseif hour >= 8 and hour <= 20 and nastjaqw = 2 and week = 6 and vnesh > 20 and nastjaday ! daystart:
+		gt 'nastja', 'pos12'
+	elseif nastjaqw = 5 and week = 6 and nastjaday ! daystart:
+		gt 'nastja', 'pos22'
+	elseif nastjaqw = 6 and nastjaday ! daystart:
+		gt 'nastja', 'pos31'
+	else
+		$callerid = 'icon_nastja'
+		dynamic $phone_call_reject
+	end
+end
+
+if $ARGS[0] = 'mobilaraz':
 	cls
 	cla
 	gs'din_bad'
@@ -76,9 +115,9 @@ $objmobilaraz = {
 	end
 
 	act 'Hangup':gt 'telefon', 'fin'
-}
+end
 
-$objmobilarazboy = {
+if $ARGS[0] = 'mobilarazboy':
 	cls
 	cla
 	gs'din_bad'
@@ -144,44 +183,6 @@ $objmobilarazboy = {
 	end
 
 	act 'Hangup':gt 'telefon', 'fin'
-}
-
-$telotkaz = {
-	cla
-	minut += 10
-	'<<$telsob>>, "Sorry I''m busy, maybe next time."'
-
-	act 'Hangup':gt 'telefon', 'fin'
-}
-
-$telotkazboy = {
-	cla
-	minut += 10
-	'<<$boyA>>, "Sorry, I''m busy right now, maybe next time."'
-
-	act 'Hangup':gt 'telefon', 'fin'
-}
-
-if $ARGS[0] = 'start':
-	cla
-	clr
-	gs 'stat'
-	dynamic $phone_call_receive
-
-	if nastjaqw = 1 and week = 6 and vnesh > 20:
-		gt 'nastja', 'pos4'
-	elseif nastjaqw = 2 and week ! 6 and zenit = 0 and nastjaday ! daystart:
-		gt 'nastja', 'pos13'
-	elseif hour >= 8 and hour <= 20 and nastjaqw = 2 and week = 6 and vnesh > 20 and nastjaday ! daystart:
-		gt 'nastja', 'pos12'
-	elseif nastjaqw = 5 and week = 6 and nastjaday ! daystart:
-		gt 'nastja', 'pos22'
-	elseif nastjaqw = 6 and nastjaday ! daystart:
-		gt 'nastja', 'pos31'
-	else
-		$callerid = 'icon_nastja'
-		dynamic $phone_call_reject
-	end
 end
 
 if $ARGS[0] = 'boyA':

+ 1 - 1
locations/ymans

@@ -27,7 +27,7 @@ if ymanrem[3] >= 1:act 'Gymnasium':minut += 1 & gt 'ysport'
 if ymanrem[3] >= 1:act 'Cabinet':minut += 1 & gt 'ykabinet'
 if $clothingworntype ! 'nude':act 'Go outside':minut += 5 & gt 'youplace'
 
-if rand (0,2) ! 0:dynamic $mobile_check
+if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
 --- ymans ---------------------------------