[changed] chance to meet a robber/purse snatcher depends on the amount of money sveta has and what kind of purse she wears

[changed] purse snatcher never rape sveta, robbers have a 40% chance to rape sveta
[fixed] missing argument for pavIndustrial

locations/ender.qsrc

@@ -117,7 +117,7 @@ if $ARGS[0] = 'loss':
 		killvar 'autocombat_surrender'
 		if succubusQW >= 4: gt 'succubus', 'RapistFight'
 		RapistFight = 0
-		SUB += 1
+		sub += 1
 		Loss += 1
 		if rikudo > 10:rikudo -= 10
 		pcs_vag += 1
@@ -155,16 +155,26 @@ if $ARGS[0] = 'loss':
 		gs 'stat'
 
 		act 'Cry': gt $loc, $metka
+		
+	elseif ThiefFight = 1:
+		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
+		killvar 'autocombat_surrender'
+		ThiefFight = 0
+		sub += 1
+		Loss += 1
+		money = 0
+		'He knocks you down with one final hit. The moment he puts you out of commission he grabs the money and runs away.'
+		act 'Get back on your feet': gt $loc, $metka
 		exit
 	elseif DimaFight = 1:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
 		DimaFight = 0
 		grupvalue[4] -= 2
-		Loss = 0
+		if Loss < 0: Loss = 0
 		'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/girlbeatsguy2.jpg"></center>'
 		'"Where the hell did you learn how to fight, <<$pcs_nickname>>," Lera asks in an annoyed tone before sweeping Dimka''s legs out from under him. Lena and Lera proceed to kick and stomp Dimka until he starts begging them to stop.'
-		'After a few more hits, they get bored and check his pockets for cash. "10000 rubles! Sweet!" They split the money among themselves leaving none for you.'
+		'After a few more hits, they get bored and check his pockets for cash. "10.000 rubles! Sweet!" They split the money among themselves leaving none for you.'
 		'Lena turns to you and says tauntingly, "You either need to learn how to fight or get used to serving us, little bunny." Before you can say anything, the bell rings for class.'
 
 		act 'Continue': gt 'gschool_lessons', 'short_break'
@@ -297,7 +307,7 @@ if $ARGS[0] = 'win':
 
 		act 'Further':gt'street'
 		exit
-	elseif RapistFight = 1:
+	elseif RapistFight = 1 or ThiefFight = 1:
 		if succubusQW >= 4 and scpopt < 2:
 			$sclocrt = 'ender'
 			$scargrt = 'win'
@@ -306,13 +316,15 @@ if $ARGS[0] = 'win':
 			gt 'succubus', 'RapistFight'
 		end
 		scpopt = 0
-		RapistFight = 0
 		if rikudo > 10:rikudo += 100
 		pcs_dom += 1
 		Win += 1
-		money += RAND(500,2000)
+		money += rand(500,2000)
 
-		'You fought back the rapist and took his wallet.'
+		'You fought back the '+iif(RapistFight = 1, 'rapist', 'thief')+' and took his wallet.'
+		
+		RapistFight = 0
+		ThiefFight = 0
 
 		act 'Leave': gt $loc, $metka
 		exit

locations/street_event.qsrc

@@ -25,8 +25,8 @@ streetev_home = 0
 !!not sure what all this if and elseif below is for, but the images need to be changed to our new images for if it is day, night, winter etc. If they are going to be used. Since it has image calls.
 if $ARGS[0] = 'street':
 	$streetev_title = '<center><b>Residential Area</b></center>'
-	streetev_rob = 3
-	streetev_hijack = 2
+	streetev_rob = 1
+	streetev_hijack = 1
 	streetev_bf = 50
 	streetev_mistmeet = 15
 	if home_owned[1] > 0:
@@ -35,8 +35,8 @@ if $ARGS[0] = 'street':
 	end
 elseif $ARGS[0] = 'down':
 	$streetev_title = '<center><b>City center</b></center>'
-	streetev_rob = 1
-	streetev_hijack = 6
+	streetev_rob = 0
+	streetev_hijack = 2
 	streetev_bf = 90
 	streetev_mistmeet = 20
 	if tanwork = 1:
@@ -45,8 +45,8 @@ elseif $ARGS[0] = 'down':
 	end
 elseif $ARGS[0] = 'Nord':
 	$streetev_title = '<center><b>City industrial region</b></center>'
-	streetev_rob = 5
-	streetev_hijack = 1
+	streetev_rob = 2
+	streetev_hijack = 0
 	streetev_bf = 30
 	streetev_mistmeet = 5
 	if home_owned[1] = 0 and tanwork = 0 and student = 0:
@@ -55,8 +55,8 @@ elseif $ARGS[0] = 'Nord':
 	end
 elseif $ARGS[0] = 'pavResidential':
 	$streetev_title = '<center><b>Pavlovsk residential area</b></center>'
-	streetev_rob = 3
-	streetev_hijack = 2
+	streetev_rob = 1
+	streetev_hijack = 1
 	streetev_bf = 50
 	streetev_mistmeet = 15
 	if home_owned[2] = 1:
@@ -65,18 +65,24 @@ elseif $ARGS[0] = 'pavResidential':
 	end
 elseif $ARGS[0] = 'pavCommercial':
 	$streetev_title = '<center><b>Pavlovsk high street</b></center>'
-	streetev_rob = 1
-	streetev_hijack = 6
+	streetev_rob = 0
+	streetev_hijack = 2
 	streetev_bf = 90
 	streetev_mistmeet = 20
 	if home_owned[1] = 0 and tanwork = 0 and student = 0:
 		streetev_home = 0
 		$streetev_home = 'on the high street'
 	end
+elseif $ARGS[0] = 'pavIndustrial':
+	$streetev_title = '<center><b>Pavlovsk Industrial District</b></center>'
+	streetev_rob = 2
+	streetev_hijack = 0
+	streetev_bf = 30
+	streetev_mistmeet = 5
 elseif $ARGS[0] = 'island':
 	$streetev_title = '<center><b>Island</b></center>'
-	streetev_rob = 1
-	streetev_hijack = 6
+	streetev_rob = 0
+	streetev_hijack = 2
 	streetev_bf = 90
 	streetev_mistmeet = 20
 	if student > 0:
@@ -91,6 +97,34 @@ else
 	streetev_bf = 90
 end
 
+if $currentpursetype = 'dolls' or $currentpursetype = 'kats':
+	if streetev_rob > streetev_hijack:
+		streetev_rob += 1
+	else
+		streetev_hijack += 1
+	end
+elseif $currentpursetype = 'fashionista':
+	if streetev_rob > streetev_hijack:
+		streetev_rob += 2
+	else
+		streetev_hijack += 2
+	end
+elseif $currentpursetype = 'boutique':
+	if streetev_rob > streetev_hijack:
+		streetev_rob += 3
+	else
+		streetev_hijack += 3
+	end
+end
+
+if money >= 2500:
+	if streetev_rob > streetev_hijack:
+		streetev_rob += money / 2500
+	else
+		streetev_hijack += money / 2500
+	end
+end
+
 if $ARGS[1] = 'extras':
 	if rand(0, 100) < streetev_bf and pcs_lover < 3 and streetbfhour ! hour:
 		streetbfhour = hour
@@ -464,8 +498,7 @@ if $ARGS[1] = 'main':
 	end
 
 	streetrand = rand(0, 100)
-	if streetrand < streetev_rob and money >= 1000 and daystart >= 10 and (hour < 6 or hour >= 20) and streetev_day ! daystart and bag = 1:
-	!!I would like this one only to happen from 20:00 till 06:00 as the times it can happen.
+	if streetrand < streetev_rob and daystart >= 10 and (hour < 6 or hour >= 20) and streetev_day ! daystart and bag = 1:
 		*clr & cla
 		menu_off = 1
 		streetev_day = daystart
@@ -544,7 +577,11 @@ if $ARGS[1] = 'main':
 				BonusDefV = 0
 				!!Programme of Action
 				program = 0
-				RapistFight = 1
+				if rand(0,10) < 5:
+					RapistFight = 1
+				else
+					ThiefFight = 1
+				end
 
 				if spellavtoklon = 1:klon = 3
 				if spellbefshild = 1:defence = 500
@@ -556,8 +593,7 @@ if $ARGS[1] = 'main':
 
 	streetrand = rand(0, 100)
 
-	if streetrand < streetev_hijack and money >= 1000 and daystart >= 10 and (hour >= 6 or hour < 20) and streetev_day ! daystart and bag = 1:
-	!!this one takes the place of the above mugging if the hours are 06:00 till 20:00
+	if streetrand < streetev_hijack and daystart >= 10 and hour >= 6 and hour < 20 and streetev_day ! daystart and bag = 1:
 		*clr & cla
 		menu_off = 1
 		gs'stat'
@@ -598,7 +634,7 @@ if $ARGS[1] = 'main':
 				BonusDefV = 0
 				!!Programme of Action
 				program = 0
-				RapistFight = 1
+				ThiefFight = 1
 				if spellavtoklon = 1:klon = 3
 				if spellbefshild = 1:defence = 500
 				'<<$streetev_title>>'