Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/Cheatmenu_din.qsrc

@@ -714,8 +714,7 @@ $cheatmenu['vneshpara'] = {
 	'pcs_apprncbase = <<pcs_apprncbase>>'
 	'PXCloThinness = <<PXCloThinness>>'
 	'PXCloTopCut = <<PXCloTopCut>>'
-	'PXCloSkirtShortness = <<PXCloSkirtShortness>>'
-	'PXCloPantsShortness = <<PXCloPantsShortness>>'
+	'PXCloBottomShortness = <<PXCloBottomShortness>>'
 	'CloTotalBeauty = <<CloTotalBeauty>>'
 	'mopkoef = <<mopkoef>>'
 	'pcs_hairbsh = <<pcs_hairbsh>>'

locations/body.qsrc

@@ -1742,7 +1742,7 @@ end
 if $clothingworntype = 'nude':
 	CloAdjustedBeauty =  pcs_apprncbase
 else
-	CloAdjustedBeauty = bonusZ + pcs_apprncbase * (PXCloThinness + PXCloTopCut + PXCloSkirtShortness + PXCloPantsShortness) * PCloQuality / 5000 + PShoQuality
+	CloAdjustedBeauty = bonusZ + pcs_apprncbase * (PXCloThinness + PXCloTopCut + PXCloBottomShortness) * PCloQuality / 5000 + PShoQuality
 end
 
 if $clothingworntype = 'exercise': CloAdjustedBeauty = CloAdjustedBeauty * 2 / 3

locations/bras.qsrc

@@ -186,13 +186,13 @@ if $ARGS[0] = 'view_bra_item':
 			end	
 		end
 		if $ARGS[1] ! 'store':
-			act 'Move to storage': gt 'bras', 'dest1', $ARGS[0], $ARGS[1], ARGS[2]
+			act 'Move to storage': gt 'bras', 'dest1', $ARGS[1], $ARGS[2], ARGS[3]
 		end
 		if $ARGS[1] ! 'unwanted':
-			act 'Move to unwanted': gt 'bras', 'dest2', $ARGS[0], $ARGS[1], ARGS[2]
+			act 'Move to unwanted': gt 'bras', 'dest2', $ARGS[1], $ARGS[2], ARGS[3]
 		end
-		if $ARGS[1] ! 'store':
-			act 'Move to wardrobe': gt 'bras', 'dest0', $ARGS[0], $ARGS[1], ARGS[2]
+		if $ARGS[1] ! 'wardrobe':
+			act 'Move to wardrobe': gt 'bras', 'dest0', $ARGS[1], $ARGS[2], ARGS[3]
 		end
 	end
 end

locations/clothing.qsrc

@@ -656,8 +656,7 @@ if $ARGS[0] = 'strip':
 	PCloInhibit = 0
 	PXCloThinness = 0
 	PXCloTopCut = 0
-	PXCloSkirtShortness = 0
-	PXCloPantsShortness = 0
+	PXCloBottomShortness = 0
 	glamur = 0
 	sport = 0
 	ski = 0
@@ -790,41 +789,41 @@ if $ARGS[0] = 'wear':
 
 	if PCloSkirt > 0:
 		if PCloSkirt = 1:
-			PXCloSkirtShortness = 25
+			PXCloBottomShortness = 25
 		elseif PCloSkirt = 2:
-			PXCloSkirtShortness = 50
+			PXCloBottomShortness = 50
 		elseif PCloSkirt = 3:
-			PXCloSkirtShortness = 100
+			PXCloBottomShortness = 100
 		elseif PCloSkirt = 4:
-			PXCloSkirtShortness = 150
+			PXCloBottomShortness = 150
 		elseif PCloSkirt = 5:
-			PXCloSkirtShortness = 200
+			PXCloBottomShortness = 200
 		elseif PCloSkirt = 6:
-			PXCloSkirtShortness = 300
+			PXCloBottomShortness = 300
 		elseif PCloSkirt >= 7:
-			PXCloSkirtShortness = 400
+			PXCloBottomShortness = 400
 		end
 	end
 
 	if PCloPants > 0:
 		if PCloPants = 1:
-			PXCloPantsShortness = 25
+			PXCloBottomShortness = 25
 		elseif PCloPants = 2:
-			PXCloPantsShortness = 50
+			PXCloBottomShortness = 50
 		elseif PCloPants = 3:
-			PXCloPantsShortness = 100
+			PXCloBottomShortness = 100
 		elseif PCloPants = 4:
-			PXCloPantsShortness = 150
+			PXCloBottomShortness = 150
 		elseif PCloPants = 5:
-			PXCloPantsShortness = 200
+			PXCloBottomShortness = 200
 		elseif PCloPants = 6:
-			PXCloPantsShortness = 300
+			PXCloBottomShortness = 300
 		elseif PCloPants >= 7:
-			PXCloPantsShortness = 400
+			PXCloBottomShortness = 400
 		end
 	end
 
-	if PCloPanties = 1: PXCloPantsShortness = 400
+	if PCloPanties = 1: PXCloBottomShortness = 400
 
 end
 

locations/panties.qsrc

@@ -186,13 +186,13 @@ if $ARGS[0] = 'view_panty_item':
 			end
 		end
 		if $ARGS[1] ! 'store':
-			act 'Move to storage': gt 'panties', 'dest1', $ARGS[0], $ARGS[1], ARGS[2]
+			act 'Move to storage': gt 'panties', 'dest1', $ARGS[1], $ARGS[2], ARGS[3]
 		end
 		if $ARGS[1] ! 'unwanted':
-			act 'Move to unwanted': gt 'panties', 'dest2', $ARGS[0], $ARGS[1], ARGS[2]
+			act 'Move to unwanted': gt 'panties', 'dest2', $ARGS[1], $ARGS[2], ARGS[3]
 		end
-		if $ARGS[1] ! 'store':
-			act 'Move to wardrobe': gt 'panties', 'dest0', $ARGS[0], $ARGS[1], ARGS[2]
+		if $ARGS[1] ! 'wardrobe':
+			act 'Move to wardrobe': gt 'panties', 'dest0', $ARGS[1], $ARGS[2], ARGS[3]
 		end
 	end
 end