Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

.gitignore

@@ -52,3 +52,5 @@ plugins.dat
 *.stackdump
 
 *glife.html
+
+glife

glife

@@ -1 +0,0 @@
-Subproject commit 5aee05d9d8873e1b211f1c13dccc48e24f2eccfd

locations/pav_train_hall.qsrc

@@ -72,7 +72,7 @@ if $ARGS[0] = '':
 		act 'Go to the ticket office': gt 'pav_train_hall', 'ticket'
 	end
 
-	if drugVars['pav_dropoff'] = 1 and drugVars['heroin_day'] ! daystart and money >= 1500: act 'Find the drug dealer':gs 'events', 'pav_drug_dropoff'
+	if drugVars['pav_dropoff'] = 1 and drugVars['heroin_day'] ! daystart: act 'Find the drug dealer':gs 'events', 'pav_drug_dropoff'
 
 	if vokzalVork >= 1:
 		if cleZalDay ! daystart or cleMTDay ! daystart or cleWTDay ! daystart:

locations/piercing_management.qsrc

@@ -1,21 +1,21 @@
 # piercing_management
 
 if $ARGS[0] = 'totals':
-	if $ARSG[1] = 'ears':
+	if $ARGS[1] = 'ears':
 		result = 24
-	elseif $ARSG[1] = 'nose':
+	elseif $ARGS[1] = 'nose':
 		result = 7
-	elseif $ARSG[1] = 'brow':
+	elseif $ARGS[1] = 'brow':
 		result = 2
-	elseif $ARSG[1] = 'lip':
+	elseif $ARGS[1] = 'lip':
 		result = 7
 	elseif $ARGS[1] = 'tongue':
 		result = 4
-	elseif $ARSG[1] = 'navel':
+	elseif $ARGS[1] = 'navel':
 		result = 4
-	elseif $ARSG[1] = 'nipples':
+	elseif $ARGS[1] = 'nipples':
 		result = 7
-	elseif $ARSG[1] = 'pussy':
+	elseif $ARGS[1] = 'pussy':
 		result = 10
 	end
 	exit
@@ -350,13 +350,9 @@ if $ARGS[0] = 'ears':
 end
 
 if $ARGS[0] = 'ears_image':
-	if ARGS[1] = 0:
-		if pcs_piercings['ears'] > 0:
-			ARGS[1] = pcs_piercings['ears']
-		else
-			ARGS[1] = -pcs_piercings['ears']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_piercings['ears']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/piercings/c<<ARGS[1]>>.jpg'
 	exit
 end
@@ -375,13 +371,9 @@ if $ARGS[0] = 'nose':
 end
 
 if $ARGS[0] = 'nose_image':
-	if ARGS[1] = 0:
-		if pcs_piercings['nose'] > 0:
-			ARGS[1] = pcs_piercings['nose']
-		else
-			ARGS[1] = -pcs_piercings['nose']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_piercings['nose']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/piercings/d<<ARGS[1]>>.jpg'
 	exit
 end
@@ -400,13 +392,9 @@ if $ARGS[0] = 'brow':
 end
 
 if $ARGS[0] = 'brow_image':
-	if ARGS[1] = 0:
-		if pcs_piercings['brow'] > 0:
-			ARGS[1] = pcs_piercings['brow']
-		else
-			ARGS[1] = -pcs_piercings['brow']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_piercings['brow']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/piercings/e<<ARGS[1]>>.jpg'
 	exit
 end
@@ -425,13 +413,9 @@ if $ARGS[0] = 'lip':
 end
 
 if $ARGS[0] = 'lip_image':
-	if ARGS[1] = 0:
-		if pcs_piercings['lip'] > 0:
-			ARGS[1] = pcs_piercings['lip']
-		else
-			ARGS[1] = -pcs_piercings['lip']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_piercings['lip']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/piercings/b<<ARGS[1]>>.jpg'
 	exit
 end
@@ -450,13 +434,9 @@ if $ARGS[0] = 'tongue':
 end
 
 if $ARGS[0] = 'tongue_image':
-	if ARGS[1] = 0:
-		if pcs_piercings['tongue'] > 0:
-			ARGS[1] = pcs_piercings['tongue']
-		else
-			ARGS[1] = -pcs_piercings['tongue']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_piercings['tongue']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/piercings/a<<ARGS[1]>>.jpg'
 	exit
 end
@@ -475,13 +455,9 @@ if $ARGS[0] = 'navel':
 end
 
 if $ARGS[0] = 'navel_image':
-	if ARGS[1] = 0:
-		if pcs_piercings['navel'] > 0:
-			ARGS[1] = pcs_piercings['navel']
-		else
-			ARGS[1] = -pcs_piercings['navel']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_piercings['navel']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/piercings/n<<ARGS[1]>>.jpg'
 	exit
 end
@@ -500,13 +476,9 @@ if $ARGS[0] = 'nipples':
 end
 
 if $ARGS[0] = 'nipples_image':
-	if ARGS[1] = 0:
-		if pcs_piercings['nipples'] > 0:
-			ARGS[1] = pcs_piercings['nipples']
-		else
-			ARGS[1] = -pcs_piercings['nipples']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_piercings['nipples']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/piercings/f<<ARGS[1]>>.jpg'
 	exit
 end
@@ -525,13 +497,9 @@ if $ARGS[0] = 'pussy':
 end
 
 if $ARGS[0] = 'pussy_image':
-	if ARGS[1] = 0:
-		if pcs_piercings['pussy'] > 0:
-			ARGS[1] = pcs_piercings['pussy']
-		else
-			ARGS[1] = -pcs_piercings['pussy']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_piercings['pussy']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/piercings/g<<ARGS[1]>>.jpg'
 	exit
 end

locations/tattoo_management.qsrc

@@ -1,41 +1,42 @@
 # tattoo_management
 
 if $ARGS[0] = 'totals':
-	if $ARSG[1] = 'ankle':
+	result = 0
+	if $ARGS[1] = 'ankle':
 		result = 25
-	elseif $ARSG[1] = 'arm':
+	elseif $ARGS[1] = 'arm':
 		result = 77
-	elseif $ARSG[1] = 'ass':
+	elseif $ARGS[1] = 'ass':
 		result = 25
-	elseif $ARSG[1] = 'back':
+	elseif $ARGS[1] = 'back':
 		result = 61
-	elseif $ARSG[1] = 'belly':
+	elseif $ARGS[1] = 'belly':
 		result = 21
-	elseif $ARSG[1] = 'breast':
+	elseif $ARGS[1] = 'breast':
 		result = 11
-	elseif $ARSG[1] = 'chest':
+	elseif $ARGS[1] = 'chest':
 		result = 15
-	elseif $ARSG[1] = 'face':
+	elseif $ARGS[1] = 'face':
 		result = 8
-	elseif $ARSG[1] = 'hand':
+	elseif $ARGS[1] = 'hand':
 		result = 9
-	elseif $ARSG[1] = 'leg':
+	elseif $ARGS[1] = 'leg':
 		result = 47
-	elseif $ARSG[1] = 'lip':
+	elseif $ARGS[1] = 'lip':
 		result = 9
-	elseif $ARSG[1] = 'neck':
+	elseif $ARGS[1] = 'neck':
 		result = 30
-	elseif $ARSG[1] = 'pussy':
+	elseif $ARGS[1] = 'pussy':
 		result = 53
-	elseif $ARSG[1] = 'shoulder':
+	elseif $ARGS[1] = 'shoulder':
 		result = 25
-	elseif $ARSG[1] = 'side':
+	elseif $ARGS[1] = 'side':
 		result = 23
-	elseif $ARSG[1] = 'tramp':
+	elseif $ARGS[1] = 'tramp':
 		result = 32
-	elseif $ARSG[1] = 'under':
+	elseif $ARGS[1] = 'under':
 		result = 22
-	elseif $ARSG[1] = 'wrist':
+	elseif $ARGS[1] = 'wrist':
 		result = 51
 	end
 	exit
@@ -88,218 +89,146 @@ end
 
 
 if $ARGS[0] = 'ankle_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['ankle'] > 0:
-			ARGS[1] = pcs_tattoos['ankle']
-		else
-			ARGS[1] = -pcs_tattoos['ankle']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['ankle']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/foot/tatankle<<ARGS[1]>>.jpg'
 	exit
 end
 
 
 if $ARGS[0] = 'arm_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['arm'] > 0:
-			ARGS[1] = pcs_tattoos['arm']
-		else
-			ARGS[1] = -pcs_tattoos['arm']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['arm']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/arms/tatarm<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'ass_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['ass'] > 0:
-			ARGS[1] = pcs_tattoos['ass']
-		else
-			ARGS[1] = -pcs_tattoos['ass']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['ass']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/ass/tatass<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'back_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['back'] > 0:
-			ARGS[1] = pcs_tattoos['back']
-		else
-			ARGS[1] = -pcs_tattoos['back']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['back']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/back/tatback<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'belly_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['belly'] > 0:
-			ARGS[1] = pcs_tattoos['belly']
-		else
-			ARGS[1] = -pcs_tattoos['belly']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['belly']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/belly/tatblly<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'breast_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['breast'] > 0:
-			ARGS[1] = pcs_tattoos['breast']
-		else
-			ARGS[1] = -pcs_tattoos['breast']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['breast']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/breasts/tatbrst<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'chest_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['chest'] > 0:
-			ARGS[1] = pcs_tattoos['chest']
-		else
-			ARGS[1] = -pcs_tattoos['chest']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['chest']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/chest/tatchst<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'face_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['face'] > 0:
-			ARGS[1] = pcs_tattoos['face']
-		else
-			ARGS[1] = -pcs_tattoos['face']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['face']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/face/tatfce<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'hand_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['hand'] > 0:
-			ARGS[1] = pcs_tattoos['hand']
-		else
-			ARGS[1] = -pcs_tattoos['hand']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['hand']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/hand/tathnd<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'leg_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['leg'] > 0:
-			ARGS[1] = pcs_tattoos['leg']
-		else
-			ARGS[1] = -pcs_tattoos['leg']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['leg']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/legs/tatleg<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'lip_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['lip'] > 0:
-			ARGS[1] = pcs_tattoos['lip']
-		else
-			ARGS[1] = -pcs_tattoos['lip']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['lip']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/lip/tatlip<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'neck_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['neck'] > 0:
-			ARGS[1] = pcs_tattoos['neck']
-		else
-			ARGS[1] = -pcs_tattoos['neck']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['neck']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/neck/tatnck<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'pussy_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['pussy'] > 0:
-			ARGS[1] = pcs_tattoos['pussy']
-		else
-			ARGS[1] = -pcs_tattoos['pussy']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['pussy']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/pubic/tatvag<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'shoulder_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['shoulder'] > 0:
-			ARGS[1] = pcs_tattoos['shoulder']
-		else
-			ARGS[1] = -pcs_tattoos['shoulder']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['shoulder']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/shoulder/tatshldr<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'side_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['side'] > 0:
-			ARGS[1] = pcs_tattoos['side']
-		else
-			ARGS[1] = -pcs_tattoos['side']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['side']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/side/tatside<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'tramp_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['tramp'] > 0:
-			ARGS[1] = pcs_tattoos['tramp']
-		else
-			ARGS[1] = -pcs_tattoos['tramp']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['tramp']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/trampStamp/tatlowbck<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'under_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['under'] > 0:
-			ARGS[1] = pcs_tattoos['under']
-		else
-			ARGS[1] = -pcs_tattoos['under']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['under']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/underBreast/tatundbreast<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'wrist_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['wrist'] > 0:
-			ARGS[1] = pcs_tattoos['wrist']
-		else
-			ARGS[1] = -pcs_tattoos['wrist']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['wrist']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/wrists/tatwrst<<ARGS[1]>>.jpg'
 	exit
 end