Bläddra i källkod

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	locations/pav_disco.qsrc
Kevin_Smarts 2 veckor sedan
förälder
incheckning
dfc9adf35d
2 ändrade filer med 487 tillägg och 284 borttagningar
  1. 3 76
      locations/pav_disco.qsrc
  2. 484 208
      locations/selfplay.qsrc

+ 3 - 76
locations/pav_disco.qsrc

@@ -353,88 +353,16 @@ if $ARGS[0] = 'disco_dance':
 						gt 'pav_disco', 'albina_too_drunk'
 					end
 				end
-				gs 'stat'
-				act 'Continue': gt 'pav_disco'
-				if alko < 6:
-					verprigrand = rand(0, 100)
-					if verprigrand <= pcs_danc:
-						gs 'pav_disco', 'dance_partner'
-						gs 'stat'
-					end
-				end
-			end
-		end
-		act 'Stand at the wall':
-			*clr & cla
-			menu_off = 1
-			minut += 5
-			!!fat -= 1
-			pcs_mood -= 5
-			frost = 0
-			gs 'stat'
-			'<center><b><font color="maroon">Disco</font></b></center>'
-			if (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1:
-				pav_discocum = daystart
-				gs 'fame', 'pav', 'sex', 5
-				pcs_mood -= 40
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/cumface1.jpg"></center>'
-				'While standing by the wall, a guy notices the cum on your clothes and points and shouts. "Look, this chick is covered in cum! Did you forget to swallow slut?" he says mockingly while laughing. Your cheeks blush with shame and you head for the exit.'
-				act 'Leave': gt 'pav_commcenter'
-				exit
-			end
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/wallflower.jpg"></center>'
-			if alko > 0:
-				if alko = 1:
-					'You''re buzzed and stand against the wall while watching the others dance.'
-				elseif alko < 4:
-					'You''re tipsy and stand against the wall while watching the others dance.'
-				elseif alko < 6:
-					if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,10) = 1:
-						gt 'pav_disco', 'katja_too_drunk'
-					elseif mid($start_type,1,2) = 'sg' and npc_rel['A25'] >= 50 and rand(1,10) = 1:
-						gt 'pav_disco', 'sonia_too_drunk'
-					elseif mid($start_type,1,2) = 'sg' and npc_rel['A144'] >= 50 and rand(1,10) = 1 and locat['A144'] = 25:
-						gt 'pav_disco', 'anushka_too_drunk'
-					elseif mid($start_type,1,2) = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand (1,10) = 1:
-						gt 'pav_disco', 'albina_too_drunk'
-					else
-						'You''re pretty drunk and stand against the wall for support as you watch the others dance.'
-					end
-				else
-					if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,5) = 1:
-						gt 'pav_disco', 'katja_too_drunk'
-					elseif mid($start_type,1,2) = 'sg' and npc_rel['A25'] >= 50 and rand(1,7) = 1:
-						gt 'pav_disco', 'sonia_too_drunk'
-					elseif mid($start_type,1,2) = 'sg' and npc_rel['A144'] >= 50 and rand(1,7) = 1 and locat['A144'] = 25:
-						gt 'pav_disco', 'anushka_too_drunk'
-					elseif mid($start_type,1,2) = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand(1,7) = 1:
-						gt 'pav_disco', 'albina_too_drunk'
-					end
-				end
-			else
-
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/wasted_dance.jpg"></center>'
-				'You''re far too drunk and are barely able to stay on your feet. You''re mostly just drunkenly bumping into other people as you try and dance.'
-				if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,3) = 1: 
-					gt 'pav_disco', 'katja_too_drunk'
-				elseif mid($start_type,1,2) = 'sg' and npc_rel['A25'] >= 50 and rand(1,5) = 1:
-					gt 'pav_disco', 'sonia_too_drunk' 
-				elseif mid($start_type,1,2) = 'sg' and npc_rel['A144'] >= 50 and rand(1,5) = 1 and locat['A144'] = 25: 
-					gt 'pav_disco', 'anushka_too_drunk'
-				elseif mid($start_type,1,2) = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand(1,5) = 1:
-					gt 'pav_disco', 'albina_too_drunk'
-				end
 			end
 			gs 'stat'
 			act 'Continue': gt 'pav_disco'
 			if alko < 6:
-				if rand(0, 100) <= pcs_danc * pcs_hotcat:
+				verprigrand = rand(0, 100)
+				if verprigrand <= pcs_danc:
 					gs 'pav_disco', 'dance_partner'
 					gs 'stat'
 				end
 			end
-			
 		end
 	end
 end
@@ -499,7 +427,6 @@ if $ARGS[0] = 'wall_stand':
 			if rand(0, 10) <= pcs_hotcat:
 				gs 'pav_disco', 'dance_partner'
 				gs 'stat'
-				exit
 			end
 		end
 	end
@@ -509,7 +436,7 @@ if $ARGS[0] = 'dance_partner':
 	cla
 	!!the creation of a partner to dance
 	temp['pav_disco_partner'] = rand(1,300)
-	if temp['pav_disco_partner'] > boynum or arrsize('$hookup_partners') = 0:
+	if temp['pav_disco_partner'] > boynum or (arrsize '$hookup_partners' = 0):
 		gs 'npcgeneratec', 0, 'guy from the disco', 0, rand(1,4)
 		if npc_finance[$npcID] = 2 and npc_age[$npcID] < 26: npc_age[$npcID] = rand(26, 45)
 		gs 'boystat', $npclastgenerated

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 484 - 208
locations/selfplay.qsrc


Vissa filer visades inte eftersom för många filer har ändrats