Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master'

locations/LariskaStart.qsrc

@@ -125,7 +125,7 @@ if $ARGS[0] = 'start':
 				act 'Leave':gt'pav_commcenter'
 			end
 		end
-		if razradKik >= 2 and pcs_stren >= 55:
+		if kickbox['sash'] >= 2 and pcs_stren >= 55:
 			act 'Attack them':
 				cls
 				minut += 5

locations/MartinTalk.qsrc

@@ -333,7 +333,7 @@ if $ARGS[0] = '':
 			end
 		end
 		
-		if razradKik > 0:
+		if kickbox['sash'] > 0:
 			act 'Kickboxing':
 				cla
 				$MartinHobby = 'kickboxing training'

locations/city_lake.qsrc

@@ -42,7 +42,11 @@ if $ARGS[0] = 'start':
 
 	if car > 0 and cardrive = 4:
 		cardrive = 4
-		'At the lake stands <a href="exec:GS ''carF'', ''start''">your <<$car>></a>.'
+		if $clothingworntype ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis':
+			'At the lake stands <a href="exec:GS ''carF'', ''start''">your <<$car>></a>.'
+		else
+			'At the lake stands your <<$car>>, you should get properly dressed if you want to drive away.'
+		end
 	end
 
 	if func('changingroom','count_swim_item') > 0:

locations/enderKik.qsrc

@@ -58,8 +58,8 @@ if profi = 1:
 
 
 
-elseif amateur = 1:
-	amateur = 0
+elseif kickbox['amateur'] = 1:
+	kickbox['amateur'] = 0
 
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kickboxing_speaker.jpg"></center>'
 	'The referee calls you over. It''s time for the announcement...'
@@ -71,12 +71,55 @@ elseif amateur = 1:
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kickboxing_win.jpg"></center>'
 			'The referee raises your arm. Congratulations! You''ve won!'
 
-			KikWinAm += 1
-			amateur = 0
-			amatReit += 1
-			money += 500 + kikmoney
+			if kickbox['opponent'] = 0: 
+				gs 'fame', 'city', 'kickboxing', rand(4,6)
+				if pav_kickboxing <= city_kickboxing: 
+					gs 'fame', 'pav', 'kickboxing', rand(0,city_kickboxing)/10
+				else 
+					gs 'fame', 'pav', 'kickboxing', rand(4,6)
+				end
+			elseif kickbox['opponent'] = 1: 
+				gs 'fame', 'city', 'kickboxing', rand(5,9)
+				if pav_kickboxing <= city_kickboxing: 
+					gs 'fame', 'pav', 'kickboxing', rand(0,city_kickboxing)/10
+				else 
+					gs 'fame', 'pav', 'kickboxing', rand(5,9)
+				end
+			elseif kickbox['opponent'] = 2:
+				gs 'fame', 'city', 'kickboxing', rand(6,9)
+				if pav_kickboxing <= city_kickboxing:
+					gs 'fame', 'pav', 'kickboxing', rand(0,city_kickboxing)/10
+				else
+					gs 'fame', 'pav', 'kickboxing', rand(6,9)
+				end
+			elseif kickbox['opponent'] = 3: 
+				gs 'fame', 'city', 'kickboxing', rand(6,10)
+				if pav_kickboxing <= city_kickboxing:
+					gs 'fame', 'pav', 'kickboxing', rand(0,city_kickboxing)/10
+				else
+					gs 'fame', 'pav', 'kickboxing', rand(6,10)
+				end
+			elseif kickbox['opponent'] = 4: 
+				gs 'fame', 'city', 'kickboxing', rand(7,10)
+				if pav_kickboxing <= city_kickboxing:
+					gs 'fame', 'pav', 'kickboxing', rand(0,city_kickboxing)/10
+				else
+					gs 'fame', 'pav', 'kickboxing', rand(7,10)
+				end
+			else 
+				gs 'fame', 'city', 'kickboxing', rand(7,13)
+				if pav_kickboxing <= city_kickboxing:
+					gs 'fame', 'pav', 'kickboxing', rand(0,city_kickboxing)/4
+				else
+					gs 'fame', 'pav', 'kickboxing', rand(7,10)
+				end
+			end	
+			kickbox['amateurWin'] += 1
+			kickbox['amateur'] = 0
+			kickbox['advancement'] += 1
+			money += 500 + kickbox['money']
 			rikudo += 5
-			'You are awarded a cash prize of <<500 + kikmoney>> <b>₽</b>.'
+			'You are awarded a cash prize of <<500 + kickbox[''money'']>> <b>₽</b>.'
 			gs 'razrKik'
 		end
 
@@ -86,13 +129,58 @@ elseif amateur = 1:
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kickboxing_win_ko.jpg"></center>'
 			'The referee raises your arm. Congratulations! You''ve won by knockout!'
 
-			KikWinAm += 1
-			KikWinAmKO += 1
-			amatReit += 1
-			amateur = 0
-			money += 500 + kikmoney
+			gs 'fame', 'city', 'kickboxing', rand(4,6)
+				if pav_kickboxing > city_kickboxing: gs 'fame', 'pav', 'kickboxing', rand(4,6)
+			if kickbox['opponent'] = 0: 
+				gs 'fame', 'city', 'kickboxing', rand(4,6)
+				if pav_kickboxing <= city_kickboxing: 
+					gs 'fame', 'pav', 'kickboxing', rand(0,city_kickboxing)/10
+				else 
+					gs 'fame', 'pav', 'kickboxing', rand(4,6)
+				end
+			elseif kickbox['opponent'] = 1: 
+				gs 'fame', 'city', 'kickboxing', rand(5,9)
+				if pav_kickboxing <= city_kickboxing: 
+					gs 'fame', 'pav', 'kickboxing', rand(0,city_kickboxing)/10
+				else 
+					gs 'fame', 'pav', 'kickboxing', rand(5,9)
+				end
+			elseif kickbox['opponent'] = 2:
+				gs 'fame', 'city', 'kickboxing', rand(6,9)
+				if pav_kickboxing <= city_kickboxing:
+					gs 'fame', 'pav', 'kickboxing', rand(0,city_kickboxing)/10
+				else
+					gs 'fame', 'pav', 'kickboxing', rand(6,9)
+				end
+			elseif kickbox['opponent'] = 3: 
+				gs 'fame', 'city', 'kickboxing', rand(6,10)
+				if pav_kickboxing <= city_kickboxing:
+					gs 'fame', 'pav', 'kickboxing', rand(0,city_kickboxing)/10
+				else
+					gs 'fame', 'pav', 'kickboxing', rand(6,10)
+				end
+			elseif kickbox['opponent'] = 4: 
+				gs 'fame', 'city', 'kickboxing', rand(7,10)
+				if pav_kickboxing <= city_kickboxing:
+					gs 'fame', 'pav', 'kickboxing', rand(0,city_kickboxing)/10
+				else
+					gs 'fame', 'pav', 'kickboxing', rand(7,10)
+				end
+			else 
+				gs 'fame', 'city', 'kickboxing', rand(7,13)
+				if pav_kickboxing <= city_kickboxing:
+					gs 'fame', 'pav', 'kickboxing', rand(0,city_kickboxing)/4
+				else
+					gs 'fame', 'pav', 'kickboxing', rand(7,10)
+				end
+			end
+			kickbox['amateurWin'] += 1
+			kickbox['amateurWinKO'] += 1
+			kickbox['advancement'] += 1
+			kickbox['amateur'] = 0
+			money += 500 + kikbox['money']
 			rikudo += 10
-			'You are awarded a cash prize of <<500 + kikmoney>> <b>₽</b>.'
+			'You are awarded a cash prize of <<500 + kickbox[''money'']>> <b>₽</b>.'
 			gs 'razrKik'
 		end
 
@@ -101,8 +189,8 @@ elseif amateur = 1:
 			*clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kickboxing_loss.jpg"></center>'
 			'The referee raises your opponent''s arm. You''ve lost.'
-			KikLossAm += 1
-			if amatReit > 0:amatReit -= 1
+			kickbox['amateurLoss'] += 1
+			if kickbox['advancement'] > 0:kickbox['advancement'] -= 1
 		end
 
 		if $ARGS[0] = 'lossKO':
@@ -110,16 +198,16 @@ elseif amateur = 1:
 			*clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kickboxing_loss_ko.jpg"></center>'
 			'All of a sudden, the room starts getting darker and darker...'
-			KikLossAm += 1
-			KikLossAmKO += 1
-			if amatReit > 0:amatReit -= 1
+			kickbox['amateurLoss'] += 1
+			kickbox['amateurLossKO'] += 1
+			if kickbox['advancement'] > 0:kickbox['advancement'] -= 1
 		end
 
 		if $ARGS[0] = 'draw':
 			cla
 			*clr
 			'The referee raises both of your arms. It''s a draw!'
-			KikDrawAm += 1
+			kickbox['amateurDraw'] += 1
 		end
 
 		! WD: Argument is 'dressing room'

locations/fit.qsrc

@@ -732,9 +732,9 @@ if $ARGS[0] = 'kickboxing':
 			round = 1
 			minround = 0
 
-			razrand = rand(0, 1)
+			kickbox['opponent'] = kickbox['sash'] + rand(0, 1)
 
-			if razradKik + razrand = 0:
+			if kickbox['opponent'] = 0:
 				gs 'npcgeneratec', 0, 'Useless rival', rand(19,45)
 				gs 'boyStat', $npclastgenerated
 				strenV = rand(10, 20)
@@ -752,8 +752,8 @@ if $ARGS[0] = 'kickboxing':
 				!!parameters
 				healthV = vitalV * 10 + strenV * 5
 				formula = 3
-				amateur = 1
-			elseif razradKik + razrand = 1:
+				kickbox['amateur'] = 1
+			elseif kickbox['opponent'] = 1:
 				gs 'npcgeneratec', 0, '3rd class rival', rand(19,45)
 				gs 'boyStat', $npclastgenerated
 				strenV = rand(15, 25)
@@ -771,8 +771,8 @@ if $ARGS[0] = 'kickboxing':
 				!!parameters
 				healthV = vitalV * 10 + strenV * 5
 				formula = 3
-				amateur = 1
-			elseif razradKik + razrand = 2:
+				kickbox['amateur'] = 1
+			elseif kickbox['opponent'] = 2:
 				gs 'npcgeneratec', 0, '2rd class rival', rand(19,45)
 				gs 'boyStat', $npclastgenerated
 				strenV = rand(20, 30)
@@ -790,8 +790,8 @@ if $ARGS[0] = 'kickboxing':
 				!!parameters
 				healthV = vitalV * 10 + strenV * 5
 				formula = 3
-				amateur = 1
-			elseif razradKik + razrand = 3:
+				kickbox['amateur'] = 1
+			elseif kickbox['opponent'] = 3:
 				gs 'npcgeneratec', 0, '1st class rival', rand(19,45)
 				gs 'boyStat', $npclastgenerated
 				strenV = rand(30, 40)
@@ -809,8 +809,8 @@ if $ARGS[0] = 'kickboxing':
 				!!parameters
 				healthV = vitalV * 10 + strenV * 5
 				formula = 3
-				amateur = 1
-			elseif razradKik + razrand = 4:
+				kickbox['amateur'] = 1
+			elseif kickbox['opponent'] = 4:
 				gs 'npcgeneratec', 0, 'Excellent rival', rand(19,45)
 				gs 'boyStat', $npclastgenerated
 				strenV = rand(40, 60)
@@ -828,8 +828,8 @@ if $ARGS[0] = 'kickboxing':
 				!!parameters
 				healthV = vitalV * 10 + strenV * 5
 				formula = 3
-				amateur = 1
-			elseif razradKik + razrand >= 5:
+				kickbox['amateur'] = 1
+			elseif kickbox['opponent'] >= 5:
 				gs 'npcgeneratec', 0, 'Best rival in the gym', rand(19,45)
 				gs 'boyStat', $npclastgenerated
 				strenV = rand(60, 100)
@@ -847,7 +847,7 @@ if $ARGS[0] = 'kickboxing':
 				!!parameters
 				healthV = vitalV * 10 + strenV * 5
 				formula = 3
-				amateur = 1
+				kickbox['amateur'] = 1
 			end
 
 			gt 'kikbox', 'start'

locations/foto_events2.qsrc

@@ -155,12 +155,12 @@ if $ARGS[0] = 'kickboxing_documentary':
                 cla & *clr
                 gs 'stat'
                 '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/KD2.jpg"></center>'
-                if city_kickboxing >=150 and razradKik >= 5:
+                if city_kickboxing >=150 and kickbox['sash'] >= 5:
                     '"You are <<$pcs_lastname>> Isn''t it?"'
                     'The journalist shakes your hand with a big smile on his face. Interviewing you, must be a great thing, as practically without stopping, you are showered with questions, from the sport-related to the personal, passing for the absolute trivial.'
                     '"Your feeling about that victory? Your favorite color? A man in your life?"'
                     'The interview goes and goes like this during a long time, until your allocated time end, and then reluctantly the journalist leaves you to talk to another kickboxer.'            
-                elseif city_kickboxing >=60 and razradKik >= 2:
+                elseif city_kickboxing >=60 and kickbox['sash'] >= 2:
                     'Between shots, a journalist comes and asks you questions. Most of them, are fairly generic. Personal data, your opinions about the league, confirmation on their information. In general, it doesn''t seem too deep but it is evident that the journalist has his hands more than full, catching up with all the women in the gymnasium.'
                 else
                     'You wait between shots, but the journalist seems to find somebody else more interesting and forgets to talk with you.'
@@ -169,11 +169,11 @@ if $ARGS[0] = 'kickboxing_documentary':
                     cla & *clr   
                     gs 'stat'
                     '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/KD3.jpg"></center>'
-                    if city_kickboxing >=150 and razradKik >= 5:						                               
+                    if city_kickboxing >=150 and kickbox['sash'] >= 5:						                               
                         'Two hours later, the model session/interviews end. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.'
                         'Sometime later, the article is sent to your phone...' 
                         'And is a little awkward... The realization, that you are getting famous, as one of the best, if not the BEST, female kickboxer in all St. Petersburg. Practically, the article turns around you. With even fans asking all kinds of personal questions. Damn! You are Hot, Mean and Famous!'                            
-                    elseif city_kickboxing >=60 and razradKik >= 2:
+                    elseif city_kickboxing >=60 and kickbox['sash'] >= 2:
                         'Two hours later, the model session/interviews end. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.' 
                         'Sometime later, the article is sent to your phone...' 
                         'Being true, is a little dry, mentioning your name, general information and that you are an up-and-coming kickboxer.'
@@ -236,7 +236,7 @@ if $ARGS[0] = 'track_&_field_documentary':
                     'The journalist shakes your hand with a big smile on his face. Interviewing you must be a great thing, as practically without stoping, you are showered with questions, from the sport-related to the personal, passing for the absolute trivial.'
                     '"Your feeling about that victory? Your favorite color? A man in your life?"'
                     'The interview goes on and on like this for a long time, until you''re allocated time ends, and then reluctantly the journalist leaves you to talk to another runner.'            
-                elseif city_running >=30 and razradKik >= 1:
+                elseif city_running >=30 and razradbeg >= 1:
                     'Between shots, a journalist comes and asks you questions. Most of them, are fairly generic. Personal data, your opinions about the Championship, confirmation on their information. In general, it doesn''t seem too deep but it is evident that the journalist has his hands more than full, catching up with all the women in the field.'
                 else
                     'You wait between shots, but the journalist seems to find somebody else more interesting and forgets to talk with you.'
@@ -250,7 +250,7 @@ if $ARGS[0] = 'track_&_field_documentary':
                         'Two hours later, the model session/interviews ends. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.'
                         'Sometime later, the article is sent to your phone...' 
                         'And is a little awkward... The realization, that you are getting famous, as one of the best, if not THE best runner in The Women''s 400 Meter Dash category in all of St. Petersburg. Practically, the article turns around you. With even fans asking all kinds of personal questions. Damn! You are Hot, Fast and Famous!'                            
-                    elseif city_running >=30 and razradKik >= 1:
+                    elseif city_running >=30 and razradbeg >= 1:
                         'Two hours later, the model session/interviews ends. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.' 
                         'Sometime later, the article is sent to your phone...' 
                         'Being true, is a little dry, mentioning your name, general information and that you are an up-and-coming runner in The Women''s 400 Meter Dash category.'

locations/foto_models2.qsrc

@@ -787,7 +787,7 @@ if $ARGS[0] = 'jeff_model':
 	act'Continue':
 		if jeff_model = 1:
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/busy1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/busy.jpg"></center>'
 			'"Whooo! Yipee!"'
 			'You find her in the middle of a photoshoot and she''s jumping up and down on the bed kicking her legs and striking poses mid air.'
 			'The photographer seems really excited saying, "Yes! I love that Jeff! Do you think you can do that again but get your leg higher so we can get a better look at your pussy?"'

locations/obj_din.qsrc

@@ -526,20 +526,16 @@ if $ARGS[0] = 'stats':
 	end
 
 	if Win > 0 or Loss > 0: 'Wins in fights <<Win>>, losses in fights <<Loss>>' & *nl
-	if razradKik > 0: '<<$razradKik>>'
 
-	if KikWinAm > 0 or KikLossAm > 0 or KikDrawAm > 0:
-		'Amateur Kickboxing Record:<br>Wins: <<KikWinAm>> (<<KikWinAmKO>> by KO) - Losses: <<KikLossAm>> (<<KikLossAmKO>> by KO) - Draws: <<KikDrawAm>>'
-		*nl
+	if kickbox['sash'] > 0:
+		if kickbox['sash'] = 1: 'You have earned green sash(rank 4) in kickboxing'
+		if kickbox['sash'] = 2: 'You have earned purple sash(rank 5) in kickboxing'
+		if kickbox['sash'] = 3: 'You have earned blue sash(rank 6) in kickboxing'
+		if kickbox['sash'] = 4: 'You have earned brown sash(rank 7) in kickboxing'
+		if kickbox['sash'] = 5: 'You have earned black sash, 1st dan in kickboxing'
 	end
-
-	if razradKik > 0:
-		if razradKik = 1:$razradKik = 'You have earned green sash(rank 4) in kickboxing'
-		if razradKik = 2:$razradKik = 'You have earned purple sash(rank 5) in kickboxing'
-		if razradKik = 3:$razradKik = 'You have earned blue sash(rank 6) in kickboxing'
-		if razradKik = 4:$razradKik = 'You have earned brown sash(rank 7) in kickboxing'
-		if razradKik = 5:$razradKik = 'You have earned black sash, 1st dan in kickboxing'
-
+	if kickbox['amateurWin'] > 0 or kickbox['amateurLoss'] > 0 or kickbox['amateurDraw'] > 0:
+		'Amateur Kickboxing Record:<br>Wins: <<kickbox[''amateurWin'']>> (<<kickbox[''amateurWinKO'']>> by KO) - Losses: <<kickbox[''amateurLoss'']>> (<<kickbox[''amateurLossKO'']>> by KO) - Draws: <<kickbox[''amateurDraw'']>>'
 		*nl
 	end
 

locations/razrKik.qsrc

@@ -1,37 +1,37 @@
 # razrKik
-if razradKik = 0:
-	if amatReit >= 5:
-		razradKik = 1
-		amatReit = 0
-		kikmoney = 200
+if kickbox['sash'] = 0:
+	if kickbox['advancement'] >= 5:
+		kickbox['sash'] = 1
+		kickbox['advancement'] = 0
+		kickbox['money'] = 200
 		'Having covered red, yellow and orange in your basic training, you have now been awarded green sash(rank 4).'
 	end
-elseif razradKik = 1:
-	if amatReit >= 10:
-		razradKik = 2
-		amatReit = 0
-		kikmoney = 500
+elseif kickbox['sash'] = 1:
+	if kickbox['advancement'] >= 10:
+		kickbox['sash'] = 2
+		kickbox['advancement'] = 0
+		kickbox['money'] = 500
 		'You have been awarded purple sash(rank 5).'
 	end
-elseif razradKik = 2:
-	if amatReit >= 15:
-		razradKik = 3
-		amatReit = 0
-		kikmoney = 1500
+elseif kickbox['sash'] = 2:
+	if kickbox['advancement'] >= 15:
+		kickbox['sash'] = 3
+		kickbox['advancement'] = 0
+		kickbox['money'] = 1500
 		'You have been awarded blue sash(rank 6).'
 	end
-elseif razradKik = 3:
-	if amatReit >= 20:
-		razradKik = 4
-		amatReit = 0
-		kikmoney = 3500
+elseif kickbox['sash'] = 3:
+	if kickbox['advancement'] >= 20:
+		kickbox['sash'] = 4
+		kickbox['advancement'] = 0
+		kickbox['money'] = 3500
 		'You have been awarded brown sash(rank 7).'
 	end
-elseif razradKik = 4:
-	if amatReit >= 25:
-		razradKik = 5
-		amatReit = 0
-		kikmoney = 7500
+elseif kickbox['sash'] = 4:
+	if kickbox['advancement'] >= 25:
+		kickbox['sash'] = 5
+		kickbox['advancement'] = 0
+		kickbox['money'] = 7500
 		'You have been awarded black sash, 1st dan.'
 	end
 end

locations/saveg.qsrc

@@ -2,6 +2,6 @@
 version_major = 0
 version_minor = 8
 version_revision = 2
-version_patch = 3
+version_patch = 4
 --- saveg ---------------------------------
 

locations/saveupdater.qsrc

@@ -933,6 +933,24 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	if AlbinaQW['AlbFatherQW']  > 1:AlbinaQW['AlbFatherQW']  = 1
 	
 	!!---------------------------------------------------------------
+
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080204:
+
+	!! Migrates kikboxing variables into an array, removes unneeded variables.
+	if razradKik > 0: kickbox['sash'] = razradKik & killvar 'razradKik'
+	if amatReit > 0: kickbox['advancement'] = amatReit & killvar 'amatReit'
+	if kikmoney > 0: kickbox['money'] = kikmoney & killvar 'kikmoney'
+	if KikWinAm > 0: kickbox['amateurWin'] = KikWinAm & killvar 'KikWinAm'
+	if KikWinAmKO > 0: kickbox['amateurWinKO'] = KikWinAmKO & killvar 'KikWinAmKO'
+	if KikLossAm > 0: kickbox['amateurLoss'] = KikLossAm & killvar 'KikLossAm'
+	if KikLossAmKO > 0: kickbox['amateurLossKO'] = KikLossAmKO & killvar 'KikLossAmKO'
+	if KikDrawAm > 0: kickbox['amateurDraw'] = KikDrawAm & killvar 'KikDrawAm'
+	if amateur > 0: kickbox['amateur'] = amateur & killvar 'amateur'
+	killvar 'razrand'
+	end
+
+	!!---------------------------------------------------------------
+
 end