Răsfoiți Sursa

Clothing update, prostitution fix and menu fix

Prostitution not allowing start, menu adding autosave from oldmenu to
new one on main game start and some tweaks to clothing.
KevinSmarts 9 ani în urmă
părinte
comite
670f27392a
4 a modificat fișierele cu 183 adăugiri și 186 ștergeri
  1. 136 138
      locations/Prostitute
  2. 35 35
      locations/_attributes_naughty
  3. 7 8
      locations/clothing
  4. 5 5
      locations/mainQW

+ 136 - 138
locations/Prostitute

@@ -4,9 +4,7 @@ if $ARGS[0] = 'start':
 	$loc = $CURLOC
 	$metkaSex = $ARGS[0]
 	$locSex = $CURLOC
-	cla
-	clr
-	*clr
+	cls
 	minut += 5
 	gs 'stat'
 	gs 'time'
@@ -14,9 +12,7 @@ if $ARGS[0] = 'start':
 	'<center><img src="images/etogame/park2.jpg"></center>'
 
 	if hour >= 16 and hour <= 23:
-		if whoreQW = 2:
-			'Prostitutes look at you with curiosity.'
-		elseif whoreQW = 1:
+		if whoreQW = 1:
 			'Prostitutes look at you with interest.'
 
 			act 'Talk':
@@ -75,160 +71,162 @@ if $ARGS[0] = 'start':
 					act 'Move away':gt 'prostitute', 'start'
 				end
 			end
-		end
+		elseif whoreQW = 2:
+			'Prostitutes look at you with curiosity.'
 
-		if whoreQW > 1 and ($clothingworntype = 'naughty' and CloQuality = 2) and son > 0:
-			act 'Stand on the panel (0:15)':
-				cla
-				minut += 10
+			if $clothingworntype = 'naughty' and PCloQuality = 2 and son > 0:
+				act 'Stand and wait for customers (0:15)':
+					cla
+					minut += 10
 
-				if rand(0, (vnesh + hour) * 2) < 20:
-					'No you are not interested.'
+					if rand(0, (vnesh + hour) * 2) < 20:
+						'No you are not interested.'
 
-					act 'Leave':gt 'prostitute', 'start'
-				else
-					proseventrand = rand(1, 20)
+						act 'Leave':gt 'prostitute', 'start'
+					else
+						proseventrand = rand(1, 20)
 
-					if proseventrand = 1:
-						'To you black jeep pulled up, opened the window and leaned out healthy brazen face. "Hey slut, it´s time to pay tribute. Shtukar Come here and get out on work."'
+						if proseventrand = 1:
+							'To you black jeep pulled up, opened the window and leaned out healthy brazen face. "Hey slut, it´s time to pay tribute. Shtukar Come here and get out on work."'
 
-						if money >= 1000:
-							act 'Giving money':
-								cla
-								money -= 1000
-								'You gave the money big man in the jeep. He put them in his pocket and left.'
+							if money >= 1000:
+								act 'Giving money':
+									cla
+									money -= 1000
+									'You gave the money big man in the jeep. He put them in his pocket and left.'
 
-								act 'Move away':gt 'prostitute', 'start'
+									act 'Move away':gt 'prostitute', 'start'
+								end
+							elseif money < 1000:
+								act 'I have not earned much':
+									cla
+									money = 0
+									'You big man began to explain that you have not earned it grabbed you by the arm and threw him into a jeep, there you have it brushed pocket and said that he will teach you how to work.'
+
+									act 'Work':
+										$nameV = 'bandit'
+										$boy = 'Bandit'
+										dick = rand(18, 21)
+										gt 'blowPR', 'start'
+									end
+								end
 							end
-						elseif money < 1000:
-							act 'I have not earned much':
+
+							act 'Fuck you!':
 								cla
-								money = 0
-								'You big man began to explain that you have not earned it grabbed you by the arm and threw him into a jeep, there you have it brushed pocket and said that he will teach you how to work.'
-
-								act 'Work':
-									$nameV = 'bandit'
-									$boy = 'Bandit'
-									dick = rand(18, 21)
-									gt 'blowPR', 'start'
-								end
+								minut += 15
+								$nameV = 'Bandit'
+								!!stats
+								strenV = 200
+								speedV = 30
+								agilV = 20
+								reactV = 20
+								vitalV = 150
+								intelV = 10
+								willV = 10
+								!!skills
+								magikV = 10
+								boxingV = 10
+								shootV = 10
+								!!parameters
+								healthV = vitalV * 10 + strenV * 5
+								mannaV = intelV * 10 + magikV * 10
+								willpowerV = willV * 10
+								BonusAtakV = 0
+								BonusDefV = 0
+								!!Programme of Action
+								program = 0
+								prostitutFight = 2
+
+								if spellavtoklon = 1:klon = 3
+								if spellbefshild = 1:defence = 500
+
+								gt 'fight', 'start'
 							end
-						end
+						elseif proseventrand = 2:
+							'To you approached a prostitute. "I hear you, slut, if you do not want problems, you have to pay Stella. Pyatihatnik Come here and get out on work."'
 
-						act 'Fuck you!':
-							cla
-							minut += 15
-							$nameV = 'Bandit'
-							!!stats
-							strenV = 200
-							speedV = 30
-							agilV = 20
-							reactV = 20
-							vitalV = 150
-							intelV = 10
-							willV = 10
-							!!skills
-							magikV = 10
-							boxingV = 10
-							shootV = 10
-							!!parameters
-							healthV = vitalV * 10 + strenV * 5
-							mannaV = intelV * 10 + magikV * 10
-							willpowerV = willV * 10
-							BonusAtakV = 0
-							BonusDefV = 0
-							!!Programme of Action
-							program = 0
-							prostitutFight = 2
-
-							if spellavtoklon = 1:klon = 3
-							if spellbefshild = 1:defence = 500
-
-							gt 'fight', 'start'
-						end
-					elseif proseventrand = 2:
-						'To you approached a prostitute. "I hear you, slut, if you do not want problems, you have to pay Stella. Pyatihatnik Come here and get out on work."'
+							if money >= 500:
+								act 'Giving money':
+									cla
+									money -= 500
+									'You gave the money to the prostitute, she turned and walked away.'
 
-						if money >= 500:
-							act 'Giving money':
-								cla
-								money -= 500
-								'You gave the money to the prostitute, she turned and walked away.'
+									act 'Move away':gt 'prostitute', 'start'
+								end
+							elseif money < 500:
+								act 'I have not earned much':
+									cla
+									money = 0
+									'You started zhalovatsya that do not earn much money. You searched prostitute taking everything of value and left.'
 
-								act 'Move away':gt 'prostitute', 'start'
+									act 'Move away':gt 'prostitute', 'start'
+								end
 							end
-						elseif money < 500:
-							act 'I have not earned much':
-								cla
-								money = 0
-								'You started zhalovatsya that do not earn much money. You searched prostitute taking everything of value and left.'
 
-								act 'Move away':gt 'prostitute', 'start'
+							act 'Fuck you!':
+								cla
+								minut += 15
+								$nameV = 'Prostitute'
+								!!stats
+								strenV = 50
+								speedV = 50
+								agilV = 40
+								reactV = 30
+								vitalV = 60
+								intelV = 10
+								willV = 10
+								!!skills
+								magikV = 10
+								boxingV = 10
+								shootV = 10
+								!!parameters
+								healthV = vitalV * 10 + strenV * 5
+								mannaV = intelV * 10 + magikV * 10
+								willpowerV = willV * 10
+								BonusAtakV = 0
+								BonusDefV = 0
+								!!Programme of Action
+								program = 0
+								prostitutFight = 3
+
+								if spellavtoklon = 1:klon = 3
+								if spellbefshild = 1:defence = 500
+
+								gt 'fight', 'start'
 							end
-						end
-
-						act 'Fuck you!':
-							cla
-							minut += 15
-							$nameV = 'Prostitute'
-							!!stats
-							strenV = 50
-							speedV = 50
-							agilV = 40
-							reactV = 30
-							vitalV = 60
-							intelV = 10
-							willV = 10
-							!!skills
-							magikV = 10
-							boxingV = 10
-							shootV = 10
-							!!parameters
-							healthV = vitalV * 10 + strenV * 5
-							mannaV = intelV * 10 + magikV * 10
-							willpowerV = willV * 10
-							BonusAtakV = 0
-							BonusDefV = 0
-							!!Programme of Action
-							program = 0
-							prostitutFight = 3
-
-							if spellavtoklon = 1:klon = 3
-							if spellbefshild = 1:defence = 500
-
-							gt 'fight', 'start'
-						end
-					else
-						'To you a car drove up.'
-						prosti = 0
-						if proseventrand <= 8:
-							'The client wants to blow and asks how much it will cost.'
-						elseif proseventrand <= 14:
-							'Client wants sex and asks how much it will cost.'
 						else
-							'Client wants anal and asks how much it will cost.'
-						end
+							'To you a car drove up.'
+							prosti = 0
+							if proseventrand <= 8:
+								'The client wants to blow and asks how much it will cost.'
+							elseif proseventrand <= 14:
+								'Client wants sex and asks how much it will cost.'
+							else
+								'Client wants anal and asks how much it will cost.'
+							end
 
-						act 'Leave':gt 'prostitute', 'start'
+							act 'Leave':gt 'prostitute', 'start'
 
-						if ProsMoney > 0:
-							act '<<ProsMoney * 100>> rubles':
-								cls
-								gt 'prostitute', 'work1', iif(proseventrand <= 8, 'blow job', iif(proseventrand <= 14, 'sex', 'anal'))
+							if ProsMoney > 0:
+								act '<<ProsMoney * 100>> rubles':
+									cls
+									gt 'prostitute', 'work1', iif(proseventrand <= 8, 'blow job', iif(proseventrand <= 14, 'sex', 'anal'))
+								end
 							end
-						end
 
-						act 'Assign a price':
-							cls
-							gs 'stat'
-							ProsMoney = input("Enter a number below, which will multiplied by 100")
+							act 'Assign a price':
+								cls
+								gs 'stat'
+								ProsMoney = input("Enter a number below, which will multiplied by 100")
 
-							if ProsMoney < 1:
-								'The client looked at you in amazement and muttered "what that fucker." Then started the car and drove away.'
+								if ProsMoney < 1:
+									'The client looked at you in amazement and muttered "what that fucker." Then started the car and drove away.'
 
-								act 'Leave':gt 'prostitute', 'start'
-							else
-								gt 'prostitute', 'work1', iif(proseventrand <= 8, 'blow job', iif(proseventrand <= 14, 'sex', 'anal'))
+									act 'Leave':gt 'prostitute', 'start'
+								else
+									gt 'prostitute', 'work1', iif(proseventrand <= 8, 'blow job', iif(proseventrand <= 14, 'sex', 'anal'))
+								end
 							end
 						end
 					end

+ 35 - 35
locations/_attributes_naughty

@@ -3,29 +3,29 @@
 !Quality range is 2-6. 2 for cheap street hooker outfits, 4 for simple underwear (bra and panties), 5 for more complex lingerie. 6 is for one-of-a-kind unique outfits.
 !All underwear items should have the exhibitionist flag (CloStyle = 4)
 if ARGS[1] = 1:
-	CloQuality = 3
+	CloQuality = 2
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 5
 elseif ARGS[1] = 2:
-	CloQuality = 2
+	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 6
 	CloBimbo = 1
 	CloStyle = 4
 elseif ARGS[1] = 3:
-	CloQuality = 3
+	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 2
 elseif ARGS[1] = 4:
-	CloQuality = 4
+	CloQuality = 2
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 2
 elseif ARGS[1] = 5:
-	CloQuality = 4
+	CloQuality = 2
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 5
@@ -55,7 +55,7 @@ elseif ARGS[1] = 9:
 	CloSkirtShortness = 5
 	CloStyle = 4
 elseif ARGS[1] = 10:
-	CloQuality = 4
+	CloQuality = 2
 	CloThinness = 3
 	CloTopCut = 3
 	CloSkirtShortness = 5
@@ -72,7 +72,7 @@ elseif ARGS[1] = 12:
 	CloSkirtShortness = 4
 	CloStyle = 2
 elseif ARGS[1] = 13:
-	CloQuality = 4
+	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
@@ -90,42 +90,42 @@ elseif ARGS[1] = 15:
 	CloTopCut = 3
 	CloSkirtShortness = 1
 elseif ARGS[1] = 16:
-	CloQuality = 3
+	CloQuality = 2
 	CloThinness = 6
 	CloTopCut = 3
 	CloSkirtShortness = 5
 	CloStyle = 4
 elseif ARGS[1] = 17:
-	CloQuality = 4 
+	CloQuality = 2 
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 elseif ARGS[1] = 18:
-	CloQuality = 5
+	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
 elseif ARGS[1] = 19:
-	CloQuality = 4
+	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 5
-	CloStyle = 4
+	CloBimbo = 1
 elseif ARGS[1] = 20:
-	CloQuality = 3
+	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 5
 	CloStyle = 4
 elseif ARGS[1] = 21:
-	CloQuality = 4
+	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 5
 	CloBimbo = 1
 elseif ARGS[1] = 22:
-	CloQuality = 5
+	CloQuality = 2
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 5
@@ -148,14 +148,14 @@ elseif ARGS[1] = 25:
 	CloPantsShortness = 5
 	CloBimbo = 1
 elseif ARGS[1] = 26:
-	CloQuality = 3
+	CloQuality = 2
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 6
 	CloBimbo = 1
 	CloStyle = 4
 elseif ARGS[1] = 27:
-	CloQuality = 6
+	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 6
@@ -185,13 +185,13 @@ elseif ARGS[1] = 31:
 	CloSkirtShortness = 6
 	CloStyle = 4
 elseif ARGS[1] = 32:
-	CloQuality = 4
+	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 6
 	CloStyle = 4
 elseif ARGS[1] = 33:
-	CloQuality = 4
+	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 6
@@ -220,7 +220,7 @@ elseif ARGS[1] = 37:
 	CloBimbo = 1
 	CloStyle = 4
 elseif ARGS[1] = 38:
-	CloQuality = 3
+	CloQuality = 2
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 6
@@ -232,7 +232,7 @@ elseif ARGS[1] = 39:
 	CloTopCut = 4
 	CloSkirtShortness = 4
 elseif ARGS[1] = 40:
-	CloQuality = 4
+	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 5
@@ -270,22 +270,22 @@ elseif ARGS[1] = 46:
 	CloTopCut = 3
 	CloPantsShortness = 1
 elseif ARGS[1] = 47:
-	CloQuality = 4
+	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 48:
-	CloQuality = 3
+	CloQuality = 2
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 elseif ARGS[1] = 49:
-	CloQuality = 3
+	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 elseif ARGS[1] = 50:
-	CloQuality = 4
+	CloQuality = 2
 	CloThinness = 6
 	CloTopCut = 4
 	CloPantsShortness = 1
@@ -297,12 +297,12 @@ elseif ARGS[1] = 51:
 	CloTopCut = 4
 	CloPantsShortness = 1
 elseif ARGS[1] = 52:
-	CloQuality = 3
+	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
 elseif ARGS[1] = 53:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 5
@@ -320,7 +320,7 @@ elseif ARGS[1] = 55:
 	CloPantsShortness = 6
 	CloOnePiece = 1
 elseif ARGS[1] = 56:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 6
@@ -337,18 +337,18 @@ elseif ARGS[1] = 58:
 	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 59:
-	CloQuality = 4
+	CloQuality = 6
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 60:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 6
 	CloStyle = 4
 elseif ARGS[1] = 61:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 6
@@ -360,13 +360,13 @@ elseif ARGS[1] = 62:
 	CloPantsShortness = 6
 	CloStyle = 4
 elseif ARGS[1] = 63:
-	CloQuality = 4
+	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 6
 	CloStyle = 4
 elseif ARGS[1] = 64:
-	CloQuality = 4
+	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
@@ -377,12 +377,12 @@ elseif ARGS[1] = 65:
 	CloPantsShortness = 1
 	CloStyle = 2
 elseif ARGS[1] = 66:
-	CloQuality = 4
+	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
 elseif ARGS[1] = 67:
-	CloQuality = 4
+	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5

+ 7 - 8
locations/clothing

@@ -344,13 +344,14 @@ if $ARGS[0] = 'strip':
 	CloPantsShortness = 0
 	CloSkirtShortness = 0
 	CloStyle = 0
+	CloBimbo = 0
 	PCloQuality = 0
 	PCloThinness = 0
 	PCloTopCut = 0
 	PCloPants = 0
 	PCloSkirt = 0
 	PCloStyle = 0
-	CloBimbo = 0
+	PCloBimbo = 0
 	glamur = 0
 	sport = 0
 	ski = 0
@@ -373,12 +374,14 @@ if $ARGS[0] = 'wear':
 	$clothingworntype = $ARGS[1]
 	clothingwornnumber = ARGS[2]
 	
-	if $ARGS[2] ! 'coat' and $ARGS[2] ! 'swimwear':
+	if $ARGS[1] ! 'coat' and $ARGS[1] ! 'swimwear':
 		gs 'clothing_descriptions'
 	else
-		FUNC('$clothing_name', $ARGS[2], ARGS[3])
+		FUNC('$clothing_name', $ARGS[1], ARGS[2])
 	end
 
+	gs 'clothing_attributes', $ARGS[1], ARGS[2]
+
 	PCloQuality = CloQuality
 	PCloThinness = CloThinness
 	PCloTopCut = CloTopCut
@@ -393,11 +396,7 @@ if $ARGS[0] = 'wear':
 		if tits >= 6:PCloTopCut += 3
 	end
 
-	!{	sexual = 1
-		sport = 1
-		ski = 1
-		glamur = 1
-		ofclo = 1
+	!{	
 	if $clothingworntype = 'cheap':
 		odevnesh = -3
 	elseif $clothingworntype = 'average':

+ 5 - 5
locations/mainQW

@@ -46,12 +46,12 @@ act 'Investigate':
 					dynamic $objnewmenu
 				else
 					dynamic $objoldmenu
-				end
 
-				if disable_autosave = 1:
-					addobj 'enable autosave'
-				else
-					addobj 'disable autosave'
+					if disable_autosave = 1:
+						addobj 'enable autosave'
+					else
+						addobj 'disable autosave'
+					end
 				end
 
 				'<center><img src="images/qwest/main1.jpg"></center>'