5 Commits def9859dc4 ... 5a024dd190

Autor SHA1 Mensagem Data
  Lusticon 5a024dd190 [fixed] string vs integer 5 meses atrás
  Lusticon d7d34916c9 [changed] moved 'Purge the "Blackmailer" questline' setting to cheat 5 meses atrás
  Lusticon a35cb84e61 [added] variables for migration 5 meses atrás
  Kevin_Smarts 07c5274fb3 Merge remote-tracking branch 'Lusticon/master' 5 meses atrás
  Kevin_Smarts 8a2a27f751 [fixed] Dancer starting sportwear adjusted and some of the old sports defaults set wrong (they shouldn't do anything but corrected them for now) 5 meses atrás

+ 1 - 1
locations/Cheatmenu_din.qsrc

@@ -51,7 +51,6 @@ $cheatmenu['setting'] = {
 	*nl
 	'Renaming porn movies you star in: <a href="exec:			cheatVars[''rename_porn'']			= iif(cheatVars[''rename_porn''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''rename_porn'']			, ''Enabled'', ''Disabled'')>></a>'
 	'Remove "once a week" therapist limit: <a href="exec:		cheatVars[''therapist_schedule'']	= iif(cheatVars[''therapist_schedule''], 0, 1)	& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''therapist_schedule'']	, ''Enabled'', ''Disabled'')>></a>'
-	if blackmailQW['stage'] ! 0:	'Purge the "Blackmailer" questline: <a href="exec:		gs ''blackmailer'', ''purge_all'' & dynamic $cheatmenu[$cheatmenu[''this_menu'']]">Permanently reset the entire questline!</a>'
 	*nl
 
 	'<B>Difficulty Setting</B>'
@@ -253,6 +252,7 @@ $cheatmenu['index'] = {
 	*nl
 	'Hide Console input in objects window: <a href="exec:		cheatVars[''console'']		= iif(cheatVars[''console''], 0, 1)		& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''console'']		, ''Enabled'', ''Disabled'')>></a>'
 	'Time Cheat in Objects window: <a href="exec:				cheatVars[''time'']			= iif(cheatVars[''time''], 0, 1)		& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''time'']			, ''Enabled'', ''Disabled'')>></a>'
+	if blackmailQW['stage'] ! 0: 'Purge the "Blackmailer" questline: <a href="exec: gs ''blackmailer'', ''purge_all'' & dynamic $cheatmenu[$cheatmenu[''this_menu'']]">Permanently reset the entire questline!</a>'
 	*nl
 	'<a href="exec:dynamic $cheatmenu[''vartracker'']"><b>Variable tracker</b></a>'
 	'</tr></table></b></center>'

+ 4 - 4
locations/ballet_npc.qsrc

@@ -27,8 +27,8 @@ gs 'npcstaticdefaults', 'body', 'model'
 !! mod appearance NPC settings, height in cm, weight in kg
 $npc_haircolour['A<<npctemp>>'] = 'Blonde'
 $npc_eyecolour['A<<npctemp>>'] = 'blue'
-$npc_height['A<<npctemp>>'] = 160
-$npc_weight['A<<npctemp>>'] = 50 
+$npc_height['A<<npctemp>>'] = str(160)
+$npc_weight['A<<npctemp>>'] = str(50)
 $npc_img_path['A<<npctemp>>'] = 'images/characters/pushkin/maya'
 
 npctemp = 3502 
@@ -72,8 +72,8 @@ gs 'npcstaticdefaults', 'body', 'model'
 !! mod appearance NPC settings, height in cm, weight in kg
 $npc_haircolour['A<<npctemp>>'] = 'Brunette'
 $npc_eyecolour['A<<npctemp>>'] = 'Blue'
-$npc_height['A<<npctemp>>'] = 145
-$npc_weight['A<<npctemp>>'] = 40 
+$npc_height['A<<npctemp>>'] = str(145)
+$npc_weight['A<<npctemp>>'] = str(40)
 $npc_img_path['A<<npctemp>>'] = 'images/characters/pushkin/gasha'
 
 !! Calina

+ 32 - 32
locations/beverage.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'bev_kva':
 	frost = 1
 	minut += 10
 	fat += 2
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 5
 	pcs_mood += 15
 	if pcs_hydra >= 100:
@@ -37,7 +37,7 @@ if $ARGS[0] = 'bev_jui':
 	if alko > 0: alko -= 1
 	minut += 10
 	fat += 3
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 8
 	pcs_mood += 10
 	if pcs_hydra >= 100:
@@ -66,7 +66,7 @@ if $ARGS[0] = 'bev_mil':
 	frost = 1
 	minut += 10
 	fat += 6
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 5
 	pcs_mood += 20
 	pcs_energy += 5
@@ -96,7 +96,7 @@ if $ARGS[0] = 'bev_wat':
 	frost = 1
 	if alko > 0: alko -= 1
 	minut += 1
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 10
 	if pcs_hydra >= 100:
 		pcs_hydra += 25
@@ -123,7 +123,7 @@ if $ARGS[0] = 'bev_cof':
 	frost = 0
 	if alko > 0: alko -= 1
 	minut += 10
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 5
 	pcs_mood += 20
 	if pcs_hydra >= 100:
@@ -153,7 +153,7 @@ if $ARGS[0] = 'bev_tea':
 	frost = 0
 	if alko > 0: alko -= 1
 	minut += 10
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 20
 	if pcs_hydra >= 100:
@@ -183,7 +183,7 @@ if $ARGS[0] = 'bev_energy_drink':
 	frost = 1
 	if alko > 0: alko -= 1
 	minut += 5
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 20
 	pcs_energy += 10
@@ -213,7 +213,7 @@ if $ARGS[0] = 'bev_vod':
 	if pcs_health > 20:
 		*clr & cla
 		minut += 15
-		money -= val($_drink['<<args[1]>>,price'])
+		money -= _drink['<<args[1]>>,price']
 		gs 'drugs', 'alcohol', 'vodka'
 		gs 'beverage', 'afteralcohol'
 		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/barordervodka.jpg"></center>'
@@ -238,7 +238,7 @@ if $ARGS[0] = 'bev_bla':
 		*clr & cla
 		minut += 15
 		pcs_mood += 10
-		money -= val($_drink['<<args[1]>>,price'])
+		money -= _drink['<<args[1]>>,price']
 		gs 'drugs', 'alcohol', 'vodka'
 		gs 'beverage', 'afteralcohol'
 		'<center><img <<$set_imgh>> src="images/shared/drinks/blackrussian.jpg"></center>'
@@ -261,7 +261,7 @@ if $ARGS[0] = 'bev_sco':
 	if pcs_health > 20:
 		*clr & cla
 		minut += 15
-		money -= val($_drink['<<args[1]>>,price'])
+		money -= _drink['<<args[1]>>,price']
 		gs 'drugs', 'alcohol', 'scotch'
 		gs 'beverage', 'afteralcohol'
 		'<center><img <<$set_imgh>> src="images/shared/drinks/scotch.jpg"></center>'
@@ -285,7 +285,7 @@ if $ARGS[0] = 'bev_win':
 	if pcs_health > 20:
 		*clr & cla
 		minut += 15
-		money -= val($_drink['<<args[1]>>,price'])
+		money -= _drink['<<args[1]>>,price']
 		gs 'drugs', 'alcohol', 'wine'
 		gs 'beverage', 'afteralcohol'
 		'<center><img <<$set_imgh>> src="images/shared/drinks/redwine.jpg"></center>'
@@ -309,7 +309,7 @@ if $ARGS[0] = 'bev_mar':
 	if pcs_health > 20:
 		*clr & cla
 		minut += 15
-		money -= val($_drink['<<args[1]>>,price'])
+		money -= _drink['<<args[1]>>,price']
 		pcs_mood += 10
 		gs 'drugs', 'alcohol', 'vodka'
 		gs 'beverage', 'afteralcohol'
@@ -333,7 +333,7 @@ if $ARGS[0] = 'bev_cha':
 	if pcs_health > 20:
 		*clr & cla
 		minut += 15
-		money -= val($_drink['<<args[1]>>,price'])
+		money -= _drink['<<args[1]>>,price']
 		gs 'drugs', 'alcohol', 'champagne'
 		gs 'beverage', 'afteralcohol'
 		'<center><img <<$set_imgh>> src="images/shared/drinks/champagne.jpg"></center>'
@@ -356,7 +356,7 @@ if $ARGS[0] = 'bev_bee':
 	if pcs_health > 20:
 		*clr & cla
 		minut += 15
-		money -= val($_drink['<<args[1]>>,price'])
+		money -= _drink['<<args[1]>>,price']
 		gs 'drugs', 'alcohol', 'beer'
 		gs 'beverage', 'afteralcohol'
 		'<center><img <<$set_imgh>> src="images/shared/drinks/darkbeer.jpg"></center>'
@@ -379,7 +379,7 @@ if $ARGS[0] = 'bev_cocktail':
 	if pcs_health > 20:
 		*clr & cla
 		minut += 20
-		money -= val($_drink['<<args[1]>>,price'])
+		money -= _drink['<<args[1]>>,price']
 		pcs_mood += 15
 		gs 'drugs', 'alcohol', 'rum'
 		pcs_horny += rand(10, 50)
@@ -465,7 +465,7 @@ if $ARGS[0] = 'only_cost_bco':
 	*clr & cla
 	frost = 0
 	if alko > 0: alko -= 1
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	if pcs_sleep <= 20: pcs_sleep += 5
 	pcs_health += 5
 	pcs_mood += 20
@@ -490,7 +490,7 @@ if $ARGS[0] = 'only_cost_cof':
 	*clr & cla
 	frost = 0
 	if alko > 0: alko -= 1
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	if pcs_sleep <= 20: pcs_sleep += 5
 	pcs_health += 5
 	pcs_mood += 20
@@ -516,7 +516,7 @@ if $ARGS[0] = 'only_cost_tea':
 	*clr & cla
 	frost = 0
 	if alko > 0: alko -= 1
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 20
 	if pcs_hydra >= 100:
@@ -540,7 +540,7 @@ if $ARGS[0] = 'only_cost_esp':
 	*clr & cla
 	frost = 0
 	if alko > 0: alko -= 1
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	if pcs_sleep <= 20: pcs_sleep += 5
 	pcs_health += 5
 	pcs_mood += 20
@@ -558,7 +558,7 @@ end
 if $ARGS[0] = 'only_cost_kva':
 	frost = 1
 	fat += 2
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 5
 	pcs_mood += 15
 	if pcs_hydra >= 100:
@@ -582,7 +582,7 @@ if $ARGS[0] = 'only_cost_jui':
 	frost = 1
 	if alko > 0: alko -= 1
 	fat += 3
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 8
 	pcs_mood += 10
 	if pcs_hydra >= 100:
@@ -606,7 +606,7 @@ if $ARGS[0] = 'only_cost_mil':
 	*clr & cla
 	frost = 1
 	fat += 6
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 5
 	pcs_mood += 20
 	pcs_energy += 5
@@ -630,7 +630,7 @@ end
 if $ARGS[0] = 'only_cost_wat':
 	frost = 1
 	if alko > 0: alko -= 1
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 10
 	if pcs_hydra >= 100:
 		pcs_hydra += 25
@@ -651,7 +651,7 @@ end
 if $ARGS[0] = 'only_cost_bev_energy_drink':
 	frost = 1
 	if alko > 0: alko -= 1
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 20
 	pcs_energy += 10
@@ -674,7 +674,7 @@ if $ARGS[0] = 'only_cost_bev_energy_drink':
 end
 
 if $ARGS[0] = 'only_cost_bev_vod':
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	gs 'drugs', 'alcohol', 'vodka'
 	gs 'beverage', 'afteralcohol'
 	gs 'stat'
@@ -687,7 +687,7 @@ end
 
 if $ARGS[0] = 'only_cost_bev_bla':
 	pcs_mood += 10
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	gs 'drugs', 'alcohol', 'vodka'
 	gs 'beverage', 'afteralcohol'
 	gs 'stat'
@@ -699,7 +699,7 @@ if $ARGS[0] = 'only_cost_bev_bla':
 end
 
 if $ARGS[0] = 'only_cost_bev_sco':
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	gs 'drugs', 'alcohol', 'scotch'
 	gs 'beverage', 'afteralcohol'
 	gs 'stat'
@@ -711,7 +711,7 @@ if $ARGS[0] = 'only_cost_bev_sco':
 end
 
 if $ARGS[0] = 'only_cost_bev_win':
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	gs 'drugs', 'alcohol', 'wine'
 	gs 'beverage', 'afteralcohol'
 	gs 'stat'
@@ -723,7 +723,7 @@ if $ARGS[0] = 'only_cost_bev_win':
 end
 
 if $ARGS[0] = 'only_cost_bev_mar':
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_mood += 10
 	gs 'drugs', 'alcohol', 'vodka'
 	gs 'beverage', 'afteralcohol'
@@ -736,7 +736,7 @@ if $ARGS[0] = 'only_cost_bev_mar':
 end
 
 if $ARGS[0] = 'only_cost_bev_cha':
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	gs 'drugs', 'alcohol', 'champagne'
 	gs 'beverage', 'afteralcohol'
 	gs 'stat'
@@ -748,7 +748,7 @@ if $ARGS[0] = 'only_cost_bev_cha':
 end
 
 if $ARGS[0] = 'only_cost_bev_bee':
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	gs 'drugs', 'alcohol', 'beer'
 	gs 'beverage', 'afteralcohol'
 	gs 'stat'
@@ -760,7 +760,7 @@ if $ARGS[0] = 'only_cost_bev_bee':
 end
 
 if $ARGS[0] = 'only_cost_bev_cocktail':
-	money -= val($_drink['<<args[1]>>,price'])
+	money -= _drink['<<args[1]>>,price']
 	pcs_mood += 15
 	gs 'drugs', 'alcohol', 'rum'
 	pcs_horny += rand(10, 50)

+ 36 - 36
locations/food.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'pirosh':
 	*clr & cla
 	frost = 0
 	minut += 15
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += pcs_health/10
 	pcs_mood += 5
 	fat += 4
@@ -51,7 +51,7 @@ if $ARGS[0] = 'golub':
 	*clr & cla
 	frost = 0
 	minut += 20
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 5
 	fat += 8
@@ -87,7 +87,7 @@ if $ARGS[0] = 'pozhar':
 	*clr & cla
 	frost = 0
 	minut += 20
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 15
 	pcs_mood += 10
 	fat += 6
@@ -123,7 +123,7 @@ if $ARGS[0] = 'reuben':
 	*clr & cla
 	frost = 0
 	minut += 25
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 20
 	pcs_mood += 25
 	fat += 12
@@ -159,7 +159,7 @@ if $ARGS[0] = 'bliny':
 	*clr & cla
 	frost = 0
 	minut += 15
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 5
 	fat += 8
@@ -195,7 +195,7 @@ if $ARGS[0] = 'varenfan':
 	*clr & cla
 	frost = 0
 	minut += 25
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 15
 	pcs_mood += 15
 	fat += 10
@@ -224,7 +224,7 @@ if $ARGS[0] = 'salfan':
 	*clr & cla
 	frost = 0
 	minut += 40
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 20
 	pcs_mood += 20
 	fat += 12
@@ -254,7 +254,7 @@ if $ARGS[0] = 'strofan':
 	*clr & cla
 	frost = 0
 	minut += 35
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 20
 	pcs_mood += 30
 	fat += 6
@@ -284,7 +284,7 @@ if $ARGS[0] = 'borfan':
 	*clr & cla
 	frost = 0
 	minut += 25
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 25
 	fat += 4
@@ -314,7 +314,7 @@ if $ARGS[0] = 'blifan':
 	*clr & cla
 	frost = 0
 	minut += 20
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 30
 	pcs_mood += 40
 	fat += 6
@@ -344,7 +344,7 @@ if $ARGS[0] = 'ryesna':
 	*clr & cla
 	frost = 0
 	minut += 10
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += pcs_health/10
 	pcs_mood += 10
 	fat += 4
@@ -374,7 +374,7 @@ if $ARGS[0] = 'crisps':
 	*clr & cla
 	frost = 0
 	minut += 10
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += pcs_health/10
 	pcs_mood += 20
 	fat += 16
@@ -404,7 +404,7 @@ if $ARGS[0] = 'onring':
 	*clr & cla
 	frost = 0
 	minut += 10
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 5
 	fat += 16
@@ -434,7 +434,7 @@ if $ARGS[0] = 'vegburg':
 	*clr & cla
 	frost = 0
 	minut += 20
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 20
 	pcs_mood += 10
 	fat += 8
@@ -464,7 +464,7 @@ if $ARGS[0] = 'turburg':
 	*clr & cla
 	frost = 0
 	minut += 20
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 10
 	fat += 10
@@ -494,7 +494,7 @@ if $ARGS[0] = 'batfish':
 	*clr & cla
 	frost = 0
 	minut += 20
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 15
 	pcs_mood += 15
 	fat += 11
@@ -524,7 +524,7 @@ if $ARGS[0] = 'cheburg':
 	*clr & cla
 	frost = 0
 	minut += 25
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 20
 	pcs_mood += 20
 	fat += 14
@@ -554,7 +554,7 @@ if $ARGS[0] = 'snack':
 	*clr & cla
 	gs 'stat'
 	minut += 5
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 20
 	fat += 6
@@ -578,7 +578,7 @@ if $ARGS[0] = 'f_food':
 	*clr & cla
 	frost = 0
 	minut += 10
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	fat += 14
 	pcs_energy += 70
@@ -607,7 +607,7 @@ if $ARGS[0] = 's_meal':
 	*clr & cla
 	frost = 0
 	minut += 10
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	fat += 4
 	pcs_energy += 40
@@ -636,7 +636,7 @@ if $ARGS[0] = 'm_meal':
 	*clr & cla
 	frost = 0
 	minut += 15
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	fat += 8
 	pcs_energy += 60
@@ -666,7 +666,7 @@ if $ARGS[0] = 'l_meal':
 	*clr & cla
 	frost = 0
 	minut += 20
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	fat += 14
 	pcs_energy += 100
@@ -695,7 +695,7 @@ if $ARGS[0] = 'bag_lunch':
 	*clr & cla
 	frost = 0
 	minut += 15
-	! money -= val($_eat['<<args[1]>>,price'])
+	! money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	fat += 5
 	pcs_energy += 40
@@ -718,7 +718,7 @@ if $ARGS[0] = 'h_food':
 	*clr & cla
 	frost = 0
 	minut += 25
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	fat += 7
 	money -= 100
@@ -749,7 +749,7 @@ if $ARGS[0] = 'h_meal':
 	*clr & cla
 	frost = 0
 	minut += 25
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 20
 	fat += 1
 	pcs_energy += 50
@@ -778,7 +778,7 @@ if $ARGS[0] = 'jerky':
 	*clr & cla
 	frost = 0
 	minut += 10
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	fat += 1
 	pcs_hydra -= 15
@@ -803,7 +803,7 @@ if $ARGS[0] = 'meat_stew':
 	*clr & cla
 	frost = 0
 	minut += 30
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	fat += 3
 	pcs_energy += 50
@@ -833,7 +833,7 @@ if $ARGS[0] = 'mush_soup':
 	*clr & cla
 	frost = 0
 	minut += 30
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	fat += 3
 	pcs_energy += 40
@@ -863,7 +863,7 @@ if $ARGS[0] = 'bilberry':
 	*clr & cla
 	gs 'stat'
 	minut += 15
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += pcs_health/10
 	pcs_mood += 10
 	fat += 1
@@ -946,7 +946,7 @@ end
 if $ARGS[0] = 'only_cost_snack':
 	*clr & cla
 	gs 'stat'
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 20
 	fat += 6
@@ -963,7 +963,7 @@ end
 
 if $ARGS[0] = 'only_cost_light_snack':
 	*clr & cla
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += pcs_health/10
 	pcs_mood += 20
 	fat += 3
@@ -1053,7 +1053,7 @@ end
 if $ARGS[0] = 'only_cost_pirosh':
 	*clr & cla
 	frost = 0
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += pcs_health/10
 	pcs_mood += 5
 	fat += 4
@@ -1077,7 +1077,7 @@ end
 
 if $ARGS[0] = 'only_cost_golub':
 	frost = 0
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 5
 	fat += 8
@@ -1101,7 +1101,7 @@ end
 
 if $ARGS[0] = 'only_cost_pozhar':
 	frost = 0
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 15
 	pcs_mood += 10
 	fat += 6
@@ -1125,7 +1125,7 @@ end
 
 if $ARGS[0] = 'only_cost_reuben':
 	frost = 0
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 20
 	pcs_mood += 25
 	fat += 12
@@ -1149,7 +1149,7 @@ end
 
 if $ARGS[0] = 'only_cost_bliny':
 	frost = 0
-	money -= val($_eat['<<args[1]>>,price'])
+	money -= _eat['<<args[1]>>,price']
 	pcs_health += 10
 	pcs_mood += 5
 	fat += 8

+ 171 - 171
locations/food_menu.qsrc

@@ -34,38 +34,38 @@ if $loc = 'burger':
 	!'<center><img <<$set_imgh>> src="images/shared/drinks/dinerdrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Onion Rings'
 	$_eat['0,type'] = 'onring'
-	$_eat['0,price'] = 80
+	_eat['0,price'] = 80
 	$_eat['1,name'] = 'Vegie Burger'
 	$_eat['1,type'] = 'vegburg'
-	$_eat['1,price'] = 240
+	_eat['1,price'] = 240
 	$_eat['2,name'] = 'Turkey Burger'
 	$_eat['2,type'] = 'turburg'
-	$_eat['2,price'] = 260
+	_eat['2,price'] = 260
 	$_eat['3,name'] = 'Battered Fish & Fries'
 	$_eat['3,type'] = 'batfish'
-	$_eat['3,price'] = 290
+	_eat['3,price'] = 290
 	$_eat['4,name'] = 'Cheeseburger & Fries'
 	$_eat['4,type'] = 'cheburg'
-	$_eat['4,price'] = 310
+	_eat['4,price'] = 310
 
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Kvass'
 	$_drink['1,type'] = 'bev_kva'
-	$_drink['1,price'] = 55
+	_drink['1,price'] = 55
 	$_drink['2,name'] = 'Juice'
 	$_drink['2,type'] = 'bev_jui'
-	$_drink['2,price'] = 70
+	_drink['2,price'] = 70
 	$_drink['3,name'] = 'Spiced Tea'
 	$_drink['3,type'] = 'bev_tea'
-	$_drink['3,price'] = 110
+	_drink['3,price'] = 110
 	$_drink['4,name'] = 'Black Coffee'
 	$_drink['4,type'] = 'bev_cof'
-	$_drink['4,price'] = 120
+	_drink['4,price'] = 120
 	$_drink['5,name'] = 'Milkshake'
 	$_drink['5,type'] = 'bev_mil'
-	$_drink['5,price'] = 180
+	_drink['5,price'] = 180
 elseif $loc = 'gkafe':
 	'<center><b><font color="maroon">Borislav''s cafe</font></b></center>'
 	*nl
@@ -74,73 +74,73 @@ elseif $loc = 'gkafe':
 	if mid($start_type,1,2) = 'sg' and func('homes_properties', 'has_access', 'parents_home'):
 		$_eat['0,name'] = 'Vegetarian Piroshki'
 		$_eat['0,type'] = 'pirosh'
-		$_eat['0,price'] = 'Free'
+		_eat['0,price'] = 0
 		$_eat['1,name'] = 'Herring Blini'
 		$_eat['1,type'] = 'bliny'
-		$_eat['1,price'] = 'Free'
+		_eat['1,price'] = 0
 		$_eat['2,name'] = 'Golubtsy'
 		$_eat['2,type'] = 'golub'
-		$_eat['2,price'] = 'Free'
+		_eat['2,price'] = 0
 		$_eat['3,name'] = 'Pozharsky Cutlets'
 		$_eat['3,type'] = 'pozhar'
-		$_eat['3,price'] = 'Free'
+		_eat['3,price'] = 0
 		$_eat['4,name'] = 'Rueben Sandwich'
 		$_eat['4,type'] = 'reuben'
-		$_eat['4,price'] = 'Free'
+		_eat['4,price'] = 0
 
 		$_drink['0,name'] = 'Water'
 		$_drink['0,type'] = 'bev_wat'
-		$_drink['0,price'] = 'Free'
+		_drink['0,price'] = 0
 		$_drink['1,name'] = 'Kvass'
 		$_drink['1,type'] = 'bev_kva'
-		$_drink['1,price'] = 'Free'
+		_drink['1,price'] = 0
 		$_drink['2,name'] = 'Juice'
 		$_drink['2,type'] = 'bev_jui'
-		$_drink['2,price'] = 'Free'
+		_drink['2,price'] = 0
 		$_drink['3,name'] = 'Spiced Tea'
 		$_drink['3,type'] = 'bev_tea'
-		$_drink['3,price'] = 'Free'
+		_drink['3,price'] = 0
 		$_drink['4,name'] = 'Black Coffee'
 		$_drink['4,type'] = 'bev_cof'
-		$_drink['4,price'] = 'Free'
+		_drink['4,price'] = 0
 		$_drink['5,name'] = 'Milkshake'
 		$_drink['5,type'] = 'bev_mil'
-		$_drink['5,price'] = 'Free'
+		_drink['5,price'] = 0
 	else
 		$_eat['0,name'] = 'Vegetarian Piroshki'
 		$_eat['0,type'] = 'pirosh'
-		$_eat['0,price'] = 100
+		_eat['0,price'] = 100
 		$_eat['1,name'] = 'Herring Blini'
 		$_eat['1,type'] = 'bliny'
-		$_eat['1,price'] = 190
+		_eat['1,price'] = 190
 		$_eat['2,name'] = 'Golubtsy'
 		$_eat['2,type'] = 'golub'
-		$_eat['2,price'] = 210
+		_eat['2,price'] = 210
 		$_eat['3,name'] = 'Pozharsky Cutlets'
 		$_eat['3,type'] = 'pozhar'
-		$_eat['3,price'] = 290
+		_eat['3,price'] = 290
 		$_eat['4,name'] = 'Rueben Sandwich'
 		$_eat['4,type'] = 'reuben'
-		$_eat['4,price'] = 340
+		_eat['4,price'] = 340
 
 		$_drink['0,name'] = 'Water'
 		$_drink['0,type'] = 'bev_wat'
-		$_drink['0,price'] = 'Free'
+		_drink['0,price'] = 0
 		$_drink['1,name'] = 'Kvass'
 		$_drink['1,type'] = 'bev_kva'
-		$_drink['1,price'] = 60
+		_drink['1,price'] = 60
 		$_drink['2,name'] = 'Juice'
 		$_drink['2,type'] = 'bev_jui'
-		$_drink['2,price'] = 80
+		_drink['2,price'] = 80
 		$_drink['3,name'] = 'Spiced Tea'
 		$_drink['3,type'] = 'bev_tea'
-		$_drink['3,price'] = 120
+		_drink['3,price'] = 120
 		$_drink['4,name'] = 'Black Coffee'
 		$_drink['4,type'] = 'bev_cof'
-		$_drink['4,price'] = 130
+		_drink['4,price'] = 130
 		$_drink['5,name'] = 'Milkshake'
 		$_drink['5,type'] = 'bev_mil'
-		$_drink['5,price'] = 200
+		_drink['5,price'] = 200
 	end
 elseif $loc = 'brothel':
 	'<center><h3>Hotel Bar</h3></center>'
@@ -148,33 +148,33 @@ elseif $loc = 'brothel':
 	'<center><img <<$set_imgh>> src="images/shared/drinks/bardrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Toasted rye snacks'
 	$_eat['0,type'] = 'ryesna'
-	$_eat['0,price'] = 30
+	_eat['0,price'] = 30
 	$_eat['1,name'] = 'Bowl of flavoured crisps'
 	$_eat['1,type'] = 'crisps'
-	$_eat['1,price'] = 40
+	_eat['1,price'] = 40
 
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Beer on tap'
 	$_drink['1,type'] = 'bev_bee'
-	$_drink['1,price'] = 60
+	_drink['1,price'] = 60
 	$_drink['2,name'] = 'Vodka'
 	$_drink['2,type'] = 'bev_vod'
-	$_drink['2,price'] = 120
+	_drink['2,price'] = 120
 	$_drink['3,name'] = 'Scotch'
 	$_drink['3,type'] = 'bev_sco'
-	$_drink['3,price'] = 140
+	_drink['3,price'] = 140
 	$_drink['4,name'] = 'Glass of Wine'
 	$_drink['4,type'] = 'bev_win'
-	$_drink['4,price'] = 160
+	_drink['4,price'] = 160
 	$_drink['5,name'] = 'Black Russian'
 	$_drink['5,type'] = 'bev_bla'
-	$_drink['5,price'] = 250
+	_drink['5,price'] = 250
 	if hotelWhore = 1:
 		$_drink['6,name'] = 'Blue-blooded Russian'
 		$_drink['6,type'] = 'bev_bbr'
-		$_drink['6,price'] = 'Free'
+		_drink['6,price'] = 0
 	end
 elseif $loc = 'cafe_parco':
 	'<center><h4><font color="maroon">Cafe "Del Parco"</font></h4></center>'
@@ -183,38 +183,38 @@ elseif $loc = 'cafe_parco':
 	!'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Vegetarian Piroshki'
 	$_eat['0,type'] = 'pirosh'
-	$_eat['0,price'] = 100
+	_eat['0,price'] = 100
 	$_eat['1,name'] = 'Herring Blini'
 	$_eat['1,type'] = 'bliny'
-	$_eat['1,price'] = 190
+	_eat['1,price'] = 190
 	$_eat['2,name'] = 'Golubtsy'
 	$_eat['2,type'] = 'golub'
-	$_eat['2,price'] = 210
+	_eat['2,price'] = 210
 	$_eat['3,name'] = 'Pozharsky Cutlets'
 	$_eat['3,type'] = 'pozhar'
-	$_eat['3,price'] = 290
+	_eat['3,price'] = 290
 	$_eat['4,name'] = 'Rueben Sandwich'
 	$_eat['4,type'] = 'reuben'
-	$_eat['4,price'] = 340
+	_eat['4,price'] = 340
 
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Kvass'
 	$_drink['1,type'] = 'bev_kva'
-	$_drink['1,price'] = 60
+	_drink['1,price'] = 60
 	$_drink['2,name'] = 'Juice'
 	$_drink['2,type'] = 'bev_jui'
-	$_drink['2,price'] = 80
+	_drink['2,price'] = 80
 	$_drink['3,name'] = 'Spiced Tea'
 	$_drink['3,type'] = 'bev_tea'
-	$_drink['3,price'] = 120
+	_drink['3,price'] = 120
 	$_drink['4,name'] = 'Black Coffee'
 	$_drink['4,type'] = 'bev_cof'
-	$_drink['4,price'] = 130
+	_drink['4,price'] = 130
 	$_drink['5,name'] = 'Milkshake'
 	$_drink['5,type'] = 'bev_mil'
-	$_drink['5,price'] = 200
+	_drink['5,price'] = 200
 elseif $loc = 'city_kafe':
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
 	*nl
@@ -222,181 +222,181 @@ elseif $loc = 'city_kafe':
 	!'<center><img <<$set_imgh>> src="images/shared/drinks/dinerdrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Onion Rings'
 	$_eat['0,type'] = 'onring'
-	$_eat['0,price'] = 80
+	_eat['0,price'] = 80
 	$_eat['1,name'] = 'Vegie Burger'
 	$_eat['1,type'] = 'vegburg'
-	$_eat['1,price'] = 240
+	_eat['1,price'] = 240
 	$_eat['2,name'] = 'Turkey Burger'
 	$_eat['2,type'] = 'turburg'
-	$_eat['2,price'] = 260
+	_eat['2,price'] = 260
 	$_eat['3,name'] = 'Battered Fish & Fries'
 	$_eat['3,type'] = 'batfish'
-	$_eat['3,price'] = 290
+	_eat['3,price'] = 290
 	$_eat['4,name'] = 'Cheeseburger & Fries'
 	$_eat['4,type'] = 'cheburg'
-	$_eat['4,price'] = 310
+	_eat['4,price'] = 310
 
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Kvass'
 	$_drink['1,type'] = 'bev_kva'
-	$_drink['1,price'] = 55
+	_drink['1,price'] = 55
 	$_drink['2,name'] = 'Juice'
 	$_drink['2,type'] = 'bev_jui'
-	$_drink['2,price'] = 70
+	_drink['2,price'] = 70
 	$_drink['3,name'] = 'Spiced Tea'
 	$_drink['3,type'] = 'bev_tea'
-	$_drink['3,price'] = 110
+	_drink['3,price'] = 110
 	$_drink['4,name'] = 'Black Coffee'
 	$_drink['4,type'] = 'bev_cof'
-	$_drink['4,price'] = 120
+	_drink['4,price'] = 120
 	$_drink['5,name'] = 'Milkshake'
 	$_drink['5,type'] = 'bev_mil'
-	$_drink['5,price'] = 180
+	_drink['5,price'] = 180
 elseif $loc = 'lakecafe':
 	'<center><B><font color=maroon>The Lake Cafe</font></B></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Vegetarian Piroshki'
 	$_eat['0,type'] = 'pirosh'
-	$_eat['0,price'] = 100
+	_eat['0,price'] = 100
 	$_eat['1,name'] = 'Herring Blini'
 	$_eat['1,type'] = 'bliny'
-	$_eat['1,price'] = 190
+	_eat['1,price'] = 190
 	$_eat['2,name'] = 'Golubtsy'
 	$_eat['2,type'] = 'golub'
-	$_eat['2,price'] = 210
+	_eat['2,price'] = 210
 	$_eat['3,name'] = 'Pozharsky Cutlets'
 	$_eat['3,type'] = 'pozhar'
-	$_eat['3,price'] = 290
+	_eat['3,price'] = 290
 	$_eat['4,name'] = 'Rueben Sandwich'
 	$_eat['4,type'] = 'reuben'
-	$_eat['4,price'] = 340
+	_eat['4,price'] = 340
 
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Kvass'
 	$_drink['1,type'] = 'bev_kva'
-	$_drink['1,price'] = 60
+	_drink['1,price'] = 60
 	$_drink['2,name'] = 'Juice'
 	$_drink['2,type'] = 'bev_jui'
-	$_drink['2,price'] = 80
+	_drink['2,price'] = 80
 	$_drink['3,name'] = 'Spiced Tea'
 	$_drink['3,type'] = 'bev_tea'
-	$_drink['3,price'] = 120
+	_drink['3,price'] = 120
 	$_drink['4,name'] = 'Black Coffee'
 	$_drink['4,type'] = 'bev_cof'
-	$_drink['4,price'] = 130
+	_drink['4,price'] = 130
 	$_drink['5,name'] = 'Milkshake'
 	$_drink['5,type'] = 'bev_mil'
-	$_drink['5,price'] = 200
+	_drink['5,price'] = 200
 elseif $loc = 'pushkin_cafe':
 	'<center><B><font color=maroon>Tiny Cafe</font></B></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Onion Rings'
 	$_eat['0,type'] = 'onring'
-	$_eat['0,price'] = 80
+	_eat['0,price'] = 80
 	$_eat['1,name'] = 'Vegie Burger'
 	$_eat['1,type'] = 'vegburg'
-	$_eat['1,price'] = 240
+	_eat['1,price'] = 240
 	$_eat['2,name'] = 'Turkey Burger'
 	$_eat['2,type'] = 'turburg'
-	$_eat['2,price'] = 260
+	_eat['2,price'] = 260
 	$_eat['3,name'] = 'Battered Fish & Fries'
 	$_eat['3,type'] = 'batfish'
-	$_eat['3,price'] = 290
+	_eat['3,price'] = 290
 	$_eat['4,name'] = 'Cheeseburger & Fries'
 	$_eat['4,type'] = 'cheburg'
-	$_eat['4,price'] = 310
+	_eat['4,price'] = 310
 
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Kvass'
 	$_drink['1,type'] = 'bev_kva'
-	$_drink['1,price'] = 60
+	_drink['1,price'] = 60
 	$_drink['2,name'] = 'Juice'
 	$_drink['2,type'] = 'bev_jui'
-	$_drink['2,price'] = 80
+	_drink['2,price'] = 80
 	$_drink['3,name'] = 'Spiced Tea'
 	$_drink['3,type'] = 'bev_tea'
-	$_drink['3,price'] = 120
+	_drink['3,price'] = 120
 	$_drink['4,name'] = 'Black Coffee'
 	$_drink['4,type'] = 'bev_cof'
-	$_drink['4,price'] = 130
+	_drink['4,price'] = 130
 	$_drink['5,name'] = 'Milkshake'
 	$_drink['5,type'] = 'bev_mil'
-	$_drink['5,price'] = 200
+	_drink['5,price'] = 200
 elseif $loc = 'ParkKafe':
 	'<center><B><font color=maroon>Park Cafe</font></B></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Vegetarian Piroshki'
 	$_eat['0,type'] = 'pirosh'
-	$_eat['0,price'] = 100
+	_eat['0,price'] = 100
 	$_eat['1,name'] = 'Herring Blini'
 	$_eat['1,type'] = 'bliny'
-	$_eat['1,price'] = 190
+	_eat['1,price'] = 190
 	$_eat['2,name'] = 'Golubtsy'
 	$_eat['2,type'] = 'golub'
-	$_eat['2,price'] = 210
+	_eat['2,price'] = 210
 	$_eat['3,name'] = 'Pozharsky Cutlets'
 	$_eat['3,type'] = 'pozhar'
-	$_eat['3,price'] = 290
+	_eat['3,price'] = 290
 	$_eat['4,name'] = 'Rueben Sandwich'
 	$_eat['4,type'] = 'reuben'
-	$_eat['4,price'] = 340
+	_eat['4,price'] = 340
 
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Kvass'
 	$_drink['1,type'] = 'bev_kva'
-	$_drink['1,price'] = 60
+	_drink['1,price'] = 60
 	$_drink['2,name'] = 'Juice'
 	$_drink['2,type'] = 'bev_jui'
-	$_drink['2,price'] = 80
+	_drink['2,price'] = 80
 	$_drink['3,name'] = 'Spiced Tea'
 	$_drink['3,type'] = 'bev_tea'
-	$_drink['3,price'] = 120
+	_drink['3,price'] = 120
 	$_drink['4,name'] = 'Black Coffee'
 	$_drink['4,type'] = 'bev_cof'
-	$_drink['4,price'] = 130
+	_drink['4,price'] = 130
 	$_drink['5,name'] = 'Milkshake'
 	$_drink['5,type'] = 'bev_mil'
-	$_drink['5,price'] = 200
+	_drink['5,price'] = 200
 elseif $loc = 'qwBarPolet':
 	'<center><b><font color="maroon">Bar "Rabotnik"</font></b></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/drinks/bardrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Toasted rye snacks'
 	$_eat['0,type'] = 'ryesna'
-	$_eat['0,price'] = 30
+	_eat['0,price'] = 30
 	$_eat['1,name'] = 'Bowl of flavoured crisps'
 	$_eat['1,type'] = 'crisps'
-	$_eat['1,price'] = 40
+	_eat['1,price'] = 40
 
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Beer on tap'
 	$_drink['1,type'] = 'bev_bee'
-	$_drink['1,price'] = 60
+	_drink['1,price'] = 60
 	$_drink['2,name'] = 'Vodka'
 	$_drink['2,type'] = 'bev_vod'
-	$_drink['2,price'] = 120
+	_drink['2,price'] = 120
 	$_drink['3,name'] = 'Scotch'
 	$_drink['3,type'] = 'bev_sco'
-	$_drink['3,price'] = 140
+	_drink['3,price'] = 140
 	$_drink['4,name'] = 'Glass of Wine'
 	$_drink['4,type'] = 'bev_win'
-	$_drink['4,price'] = 160
+	_drink['4,price'] = 160
 	$_drink['5,name'] = 'Black Russian'
 	$_drink['5,type'] = 'bev_bla'
-	$_drink['5,price'] = 250
+	_drink['5,price'] = 250
 elseif $loc = 'restoran':
 	'<center><b><font color="maroon">Babel</font></b></center>'
 	*nl
@@ -404,76 +404,76 @@ elseif $loc = 'restoran':
 	!'<center><img <<$set_imgh>> src="images/shared/drinks/fancydrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Vareniki with Potatoes'
 	$_eat['0,type'] = 'varenfan'
-	$_eat['0,price'] = 760
+	_eat['0,price'] = 760
 	$_eat['1,name'] = 'Borscht and French Baguette'
 	$_eat['1,type'] = 'borfan'
-	$_eat['1,price'] = 900
+	_eat['1,price'] = 900
 	$_eat['2,name'] = 'Atlantic Salmon Steak'
 	$_eat['2,type'] = 'salfan'
-	$_eat['2,price'] = 1000
+	_eat['2,price'] = 1000
 	$_eat['3,name'] = 'Beef & Mushroom Stroganoff'
 	$_eat['3,type'] = 'strofan'
-	$_eat['3,price'] = 1200
+	_eat['3,price'] = 1200
 	$_eat['4,name'] = 'Red Caviar Blinchiki'
 	$_eat['4,type'] = 'blifan'
-	$_eat['4,price'] = 1360
+	_eat['4,price'] = 1360
 
 	$_drink['0,name'] = 'Spring Water'
 	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Imported Tea'
 	$_drink['1,type'] = 'bev_tea'
-	$_drink['1,price'] = 180
+	_drink['1,price'] = 180
 	$_drink['2,name'] = 'Imported Beer'
 	$_drink['2,type'] = 'bev_bee'
-	$_drink['2,price'] = 200
+	_drink['2,price'] = 200
 	$_drink['3,name'] = 'Vodka Martini'
 	$_drink['3,type'] = 'bev_mar'
-	$_drink['3,price'] = 400
+	_drink['3,price'] = 400
 	$_drink['4,name'] = 'Glass of Wine'
 	$_drink['4,type'] = 'bev_win'
-	$_drink['4,price'] = 800
+	_drink['4,price'] = 800
 	$_drink['5,name'] = 'Glass of Champagne'
 	$_drink['5,type'] = 'bev_cha'
-	$_drink['5,price'] = 900
+	_drink['5,price'] = 900
 elseif $loc = 'uni_cafe':
 	'<center><b><font color="maroon">University cafe</font></b></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Vegetarian Piroshki'
 	$_eat['0,type'] = 'pirosh'
-	$_eat['0,price'] = 100
+	_eat['0,price'] = 100
 	$_eat['1,name'] = 'Herring Blini'
 	$_eat['1,type'] = 'bliny'
-	$_eat['1,price'] = 190
+	_eat['1,price'] = 190
 	$_eat['2,name'] = 'Golubtsy'
 	$_eat['2,type'] = 'golub'
-	$_eat['2,price'] = 210
+	_eat['2,price'] = 210
 	$_eat['3,name'] = 'Pozharsky Cutlets'
 	$_eat['3,type'] = 'pozhar'
-	$_eat['3,price'] = 290
+	_eat['3,price'] = 290
 	$_eat['4,name'] = 'Rueben Sandwich'
 	$_eat['4,type'] = 'reuben'
-	$_eat['4,price'] = 340
+	_eat['4,price'] = 340
 
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'only_cost_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Kvass'
 	$_drink['1,type'] = 'only_cost_kva'
-	$_drink['1,price'] = 60
+	_drink['1,price'] = 60
 	$_drink['2,name'] = 'Juice'
 	$_drink['2,type'] = 'only_cost_jui'
-	$_drink['2,price'] = 80
+	_drink['2,price'] = 80
 	$_drink['3,name'] = 'Spiced Tea'
 	$_drink['3,type'] = 'only_cost_tea'
-	$_drink['3,price'] = 120
+	_drink['3,price'] = 120
 	$_drink['4,name'] = 'Black Coffee'
 	$_drink['4,type'] = 'only_cost_bco'
-	$_drink['4,price'] = 130
+	_drink['4,price'] = 130
 	$_drink['5,name'] = 'Milkshake'
 	$_drink['5,type'] = 'only_cost_mil'
-	$_drink['5,price'] = 200
+	_drink['5,price'] = 200
 elseif $loc = 'city_coffee_hole':
 	$loc_arg = 'eat'
 	'<center><B><font color=maroon>Cafe "Coffee hole"</font></B></center>'
@@ -481,88 +481,88 @@ elseif $loc = 'city_coffee_hole':
 	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Biscotti'
 	$_eat['0,type'] = 'only_cost_light_snack'
-	$_eat['0,price'] = 100
+	_eat['0,price'] = 100
 	$_eat['1,name'] = 'Cannoli'
 	$_eat['1,type'] = 'only_cost_snack'
-	$_eat['1,price'] = 120
+	_eat['1,price'] = 120
 	$_eat['2,name'] = 'Muffin'
 	$_eat['2,type'] = 'only_cost_snack'
-	$_eat['2,price'] = 120
+	_eat['2,price'] = 120
 	$_eat['3,name'] = 'Croissants'
 	$_eat['3,type'] = 'only_cost_snack'
-	$_eat['3,price'] = 120
+	_eat['3,price'] = 120
 	$_eat['4,name'] = 'Danish'
 	$_eat['4,type'] = 'only_cost_snack'
-	$_eat['4,price'] = 120
+	_eat['4,price'] = 120
 	$_eat['5,name'] = 'Cookies'
 	$_eat['5,type'] = 'only_cost_light_snack'
-	$_eat['5,price'] = 100
+	_eat['5,price'] = 100
 	$_eat['6,name'] = 'Miagkie Plushki s Sakharom'
 	$_eat['6,type'] = 'only_cost_snack'
-	$_eat['6,price'] = 120
+	_eat['6,price'] = 120
 	$_eat['7,name'] = 'Mannik'
 	$_eat['7,type'] = 'only_cost_snack'
-	$_eat['7,price'] = 120
+	_eat['7,price'] = 120
 	$_eat['8,name'] = 'Korzinochki'
 	$_eat['8,type'] = 'only_cost_snack'
-	$_eat['8,price'] = 120
+	_eat['8,price'] = 120
 
 	$_drink['0,name'] = 'Tea'
 	$_drink['0,type'] = 'only_cost_tea'
-	$_drink['0,price'] = 120
+	_drink['0,price'] = 120
 	$_drink['1,name'] = 'Espresso'
 	$_drink['1,type'] = 'only_cost_esp'
-	$_drink['1,price'] = 100
+	_drink['1,price'] = 100
 	$_drink['2,name'] = 'Black Coffee'
 	$_drink['2,type'] = 'only_cost_bco'
-	$_drink['2,price'] = 120
+	_drink['2,price'] = 120
 	$_drink['3,name'] = 'Cappuccino'
 	$_drink['3,type'] = 'only_cost_cof'
-	$_drink['3,price'] = 150
+	_drink['3,price'] = 150
 	$_drink['4,name'] = 'Cafe Latte'
 	$_drink['4,type'] = 'only_cost_cof'
-	$_drink['4,price'] = 150
+	_drink['4,price'] = 150
 	$_drink['5,name'] = 'Iced Latte'
 	$_drink['5,type'] = 'only_cost_cof'
-	$_drink['5,price'] = 150
+	_drink['5,price'] = 150
 elseif $loc = 'city_nightclub':
 	'<center><b><font color="maroon">Bar "Nightclub"</font></b></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/drinks/bardrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Toasted rye snacks'
 	$_eat['0,type'] = 'ryesna'
-	$_eat['0,price'] = 30
+	_eat['0,price'] = 30
 
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Energy Drink'
 	$_drink['1,type'] = 'bev_energy_drink'
-	$_drink['1,price'] = 60
+	_drink['1,price'] = 60
 	$_drink['2,name'] = 'Beer on tap'
 	$_drink['2,type'] = 'bev_bee'
-	$_drink['2,price'] = 60
+	_drink['2,price'] = 60
 	$_drink['3,name'] = 'Vodka'
 	$_drink['3,type'] = 'bev_vod'
-	$_drink['3,price'] = 120
+	_drink['3,price'] = 120
 	$_drink['4,name'] = 'Scotch'
 	$_drink['4,type'] = 'bev_sco'
-	$_drink['4,price'] = 140
+	_drink['4,price'] = 140
 	$_drink['5,name'] = 'Glass of Wine'
 	$_drink['5,type'] = 'bev_win'
-	$_drink['5,price'] = 160
+	_drink['5,price'] = 160
 	$_drink['6,name'] = 'Black Russian'
 	$_drink['6,type'] = 'bev_bla'
-	$_drink['6,price'] = 250
+	_drink['6,price'] = 250
 	$_drink['7,name'] = 'Champagne'
 	$_drink['7,type'] = 'bev_cha'
-	$_drink['7,price'] = 220
+	_drink['7,price'] = 220
 	$_drink['8,name'] = 'Vodka Martini'
 	$_drink['8,type'] = 'bev_mar'
-	$_drink['8,price'] = 250
+	_drink['8,price'] = 250
 	$_drink['9,name'] = 'Fancy cocktail'
 	$_drink['9,type'] = 'bev_cocktail'
-	$_drink['9,price'] = 300
+	_drink['9,price'] = 300
 elseif $loc = 'katja_nightclub' or $loc = 'katja_nightclub_sex':
 	'<center><b><font color="maroon">Bar "Nightclub"</font></b></center>'
 	*nl
@@ -573,34 +573,34 @@ elseif $loc = 'katja_nightclub' or $loc = 'katja_nightclub_sex':
 	end
 	$_drink['0,name'] = 'Water'
 	$_drink['0,type'] = 'only_cost_wat'
-	$_drink['0,price'] = 'Free'
+	_drink['0,price'] = 0
 	$_drink['1,name'] = 'Energy Drink'
 	$_drink['1,type'] = 'only_cost_bev_energy_drink'
-	$_drink['1,price'] = 60
+	_drink['1,price'] = 60
 	$_drink['2,name'] = 'Beer on tap'
 	$_drink['2,type'] = 'only_cost_bev_bee'
-	$_drink['2,price'] = 60
+	_drink['2,price'] = 60
 	$_drink['3,name'] = 'Vodka'
 	$_drink['3,type'] = 'only_cost_bev_vod'
-	$_drink['3,price'] = 120
+	_drink['3,price'] = 120
 	$_drink['4,name'] = 'Scotch'
 	$_drink['4,type'] = 'only_cost_bev_sco'
-	$_drink['4,price'] = 140
+	_drink['4,price'] = 140
 	$_drink['5,name'] = 'Glass of Wine'
 	$_drink['5,type'] = 'only_cost_bev_win'
-	$_drink['5,price'] = 160
+	_drink['5,price'] = 160
 	$_drink['6,name'] = 'Black Russian'
 	$_drink['6,type'] = 'only_cost_bev_bla'
-	$_drink['6,price'] = 250
+	_drink['6,price'] = 250
 	$_drink['7,name'] = 'Champagne'
 	$_drink['7,type'] = 'only_cost_bev_cha'
-	$_drink['7,price'] = 220
+	_drink['7,price'] = 220
 	$_drink['8,name'] = 'Vodka Martini'
 	$_drink['8,type'] = 'only_cost_bev_mar'
-	$_drink['8,price'] = 250
+	_drink['8,price'] = 250
 	$_drink['9,name'] = 'Fancy cocktail'
 	$_drink['9,type'] = 'only_cost_bev_cocktail'
-	$_drink['9,price'] = 300
+	_drink['9,price'] = 300
 end
 
 $_str = '<center><table border="0" width="800" cellpadding="0" cellspacing="1">'
@@ -612,12 +612,12 @@ food_loop = 0
 !!  column 1 - food
 	$_str += '<td bgcolor='+$temp_bcolor+' height="30" width="40%" align="center">' + $_eat['<<food_loop>>,name'] + '</td>'
 	$_str += '<td bgcolor='+$temp_bcolor+' height="30" width="10%" align="right">'
-	if money >= val($_eat['<<food_loop>>,price']):
-		$_str += '<a href="exec:pcs_ate += 1 & gt ''food'', $_eat[''<<food_loop>>,type''], <<food_loop>>">' + $_eat['<<food_loop>>,price'] + '</a>'
+	if money >= _eat['<<food_loop>>,price']:
+		$_str += '<a href="exec:pcs_ate += 1 & gt ''food'', $_eat[''<<food_loop>>,type''], <<food_loop>>">' + iif(_eat['<<food_loop>>,price'] ! 0, str(_eat['<<food_loop>>,price']),'Free') + '</a>'
 	else
-		$_str += $_eat['<<food_loop>>,price']
+		$_str += str(_eat['<<food_loop>>,price'])
 	end
-	$_str += iif(val($_eat['<<food_loop>>,price']) ! 0, '<b>&ensp;₽&ensp;</b>', '&ensp;&emsp;') + '</td>'
+	$_str += iif(_eat['<<food_loop>>,price'] ! 0, '<b>&ensp;₽&ensp;</b>', '&ensp;&emsp;') + '</td>'
 
 !!  separator
 	$_str += '<td bgcolor=<<$bcolor>> border="0" width="50" cellpadding="0" cellspacing="0"></td>'
@@ -625,12 +625,12 @@ food_loop = 0
 !!  column 2 - drinks
 	$_str += '<td bgcolor='+$temp_bcolor+' height="30" width="40%" align="center">' + $_drink['<<food_loop>>,name'] + '</td>'
 	$_str += '<td bgcolor='+$temp_bcolor+' height="30" width="10%" align="right">'
-	if money >= val($_drink['<<food_loop>>,price']):
-		$_str += '<a href="exec:pcs_drank += 1 & gt ''beverage'', $_drink[''<<food_loop>>,type''], <<food_loop>>">' + $_drink['<<food_loop>>,price'] + '</a>'
+	if money >= _drink['<<food_loop>>,price']:
+		$_str += '<a href="exec:pcs_drank += 1 & gt ''beverage'', $_drink[''<<food_loop>>,type''], <<food_loop>>">' + iif(_drink['<<food_loop>>,price'] ! 0, str(_drink['<<food_loop>>,price']),'Free') + '</a>'
 	else
-		$_str += $_drink['<<food_loop>>,price']
+		$_str += str(_drink['<<food_loop>>,price'])
 	end
-	$_str += iif(val($_drink['<<food_loop>>,price']) ! 0, '<b>&ensp;₽&ensp;</b>', '&ensp;&emsp;') + '</td>'
+	$_str += iif(_drink['<<food_loop>>,price'] ! 0, '<b>&ensp;₽&ensp;</b>', '&ensp;&emsp;') + '</td>'
 
 	$_str += '</tr>'
 	food_loop += 1

+ 6 - 0
locations/initg.qsrc

@@ -37,6 +37,12 @@ if $ARGS[0] = 'get_game_set':
 		'cheatVars[''full_morning_rout''] = <<cheatVars[''full_morning_rout'']>>'
 		'cheatVars[''track_period''] = <<cheatVars[''track_period'']>>'
 		'cheatVars[''enema''] = <<cheatVars[''enema'']>>'
+		'cheatVars[''pee''] = <<cheatVars[''pee'']>>'
+
+		'cheatVars[''random_lovers'']  = <<cheatVars[''random_lovers'']>>'
+		'cheatVars[''random_robbers''] = <<cheatVars[''random_robbers'']>>'
+		'cheatVars[''random_rapists''] = <<cheatVars[''random_rapists'']>>'
+		'cheatVars[''therapist_schedule''] = <<cheatVars[''therapist_schedule'']>>'
 		'cheatVars[''rename_porn''] = <<cheatVars[''rename_porn'']>>'
 		'difficulty = <<difficulty>>'
 

+ 9 - 3
locations/intro_initialization.qsrc

@@ -378,12 +378,18 @@ elseif pcs_inhib < 35:
 	gm_outfits[95] = 1
 	gm_outfits_h[95] = 100
 	gm_outfits_b[95] = pcs_hips
-	danilovich_outfits[48] = 1
-	danilovich_outfits_h[48] = 100
+	if $start_type['cat'] = 'dancer':
+		danilovich_outfits[82] = 1
+		danilovich_outfits_h[82] = 100
+		sportsclothingnumber = 82
+	else
+		danilovich_outfits[48] = 1
+		danilovich_outfits_h[48] = 100
+		sportsclothingnumber = 48
+	end
 	gm_dress[63] = 1
 	gm_dress_h[63] = 100
 	gm_dress_b[63] = pcs_hips
-	sportsclothingnumber = 48
 	gs 'clothing', 'wear', 'gm_dress', 63
 elseif pcs_inhib < 40:
 	gm_outfits[124] = 1

+ 12 - 6
locations/intro_initialization_city.qsrc

@@ -412,7 +412,7 @@ elseif pcs_inhib < 20:
 	gm_dress[7] = 1
 	gm_dress_h[7] = 100
 	gm_dress_b[7] = pcs_hips
-	sportsclothingnumber = 43
+	sportsclothingnumber = 64
 	gs 'clothing', 'wear', 'gm_outfits', 99
 elseif pcs_inhib < 25:
 	gm_outfits[58] = 1
@@ -432,7 +432,7 @@ elseif pcs_inhib < 25:
 	gm_dress[39] = 1
 	gm_dress_h[39] = 100
 	gm_dress_b[39] = pcs_hips
-	sportsclothingnumber = 1
+	sportsclothingnumber = 87
 	gs 'clothing', 'wear', 'flamingos_dress', 59
 elseif pcs_inhib < 30:
 	gm_outfits[91] = 1
@@ -452,14 +452,21 @@ elseif pcs_inhib < 30:
 	gm_dress[57] = 1
 	gm_dress_h[57] = 100
 	gm_dress_b[57] = pcs_hips
-	sportsclothingnumber = 48
+	sportsclothingnumber = 96
 	gs 'clothing', 'wear', 'flamingos_dress', 89
 elseif pcs_inhib < 35:
 	gm_outfits[95] = 1
 	gm_outfits_h[95] = 100
 	gm_outfits_b[95] = pcs_hips
-	danilovich_outfits[48] = 1
-	danilovich_outfits_h[48] = 100
+	if $start_type['cat'] = 'dancer':
+		danilovich_outfits[82] = 1
+		danilovich_outfits_h[82] = 100
+		sportsclothingnumber = 82
+	else
+		danilovich_outfits[48] = 1
+		danilovich_outfits_h[48] = 100
+		sportsclothingnumber = 48
+	end
 	scandalicious_dress[18] = 1
 	scandalicious_dress_h[18] = 100
 	scandalicious_dress_b[18] = pcs_hips
@@ -472,7 +479,6 @@ elseif pcs_inhib < 35:
 	gm_dress[63] = 1
 	gm_dress_h[63] = 100
 	gm_dress_b[63] = pcs_hips
-	sportsclothingnumber = 40
 	gs 'clothing', 'wear', 'bomba_outfits', 36
 elseif pcs_inhib < 40:
 	gm_outfits[124] = 1

+ 1 - 1
locations/npcstatic1.qsrc

@@ -1199,7 +1199,7 @@ $npc_dna['A<<npctemp>>'] = '1389808807 1404442169 1642165848 1673620649 15315971
 $npc_firstname['A<<npctemp>>'] = 'Margaret'
 $npc_nickname['A<<npctemp>>'] = 'Margo'
 $npc_usedname['A<<npctemp>>'] = 'A girl met outside of the Boutique'
-$npc_notes['A<<npctemp>>'] = 19940810
+$npc_notes['A<<npctemp>>'] = str(19940810)
 npc_dob['A<<npctemp>>'] = rand(10,30)
 npc_gender['A<<npctemp>>'] = 1