Browse Source

Removed the music initialization and counter based loop as they were badly setup and the killvar 'counter' in 'indik' was breaking the music.

KevinSmarts 7 years ago
parent
commit
816b135827

+ 1 - 1
locations/EvBoyBuh

@@ -116,7 +116,7 @@ $d_gorodok_boy_hj={
 	end
 }
 
-music_on = 0
+close all
 minut += 5
 $boydesc = $npc_firstname[$npclastcalled]
 gs 'stat'

+ 1 - 1
locations/EvOtelMan

@@ -1,7 +1,7 @@
 # EvOtelMan
 
 if $ARGS[0] = '':
-	music_on = 0
+	close all
 	minut += 15
 	gs 'boymass', 'B'
 	gs 'stat'

+ 1 - 1
locations/EvgopBuh

@@ -104,7 +104,7 @@ $d_gorodok_boy_hj={
 	end
 }
 
-music_on = 0
+close all
 minut += 5
 gs 'stat'
 $boydesc = $npc_firstname[$npclastcalled]

+ 6 - 12
locations/Gnpc2

@@ -5,7 +5,7 @@ $boydesc = $nameBoyfrend[numnpc]
 
 $din_gboy_end_to_disco = {
 	!!:markgoondisco
-	music_on = 0
+	close all
 	discofirsttime += 1
 	gs 'stat'
 
@@ -34,18 +34,12 @@ $din_gboy_go_to_disco = {
 	act 'Go to the club':
 		cls
 
-		if music_off = 0:
-			inited = 1
-			music_on = 1
-			volume = 100
-			$music_theme = 'gdis'
-			gs 'init_music'
-			pl '<a href="exec: music_off = 1 & gt $loc">Turn off the music</a>'
+		if music_on = 1:
+			if isplay 'sound/komb.mp3' = 0: play 'sound/komb.mp3'
+			pl '<a href="exec: music_on = 0 & gt $loc">Turn off the music</a>'
 		else
-			music_on = 0
-			volume = 100
-			gs 'init_music'
-			pl '<a href="exec: music_off = 0 & gt $loc">Play music</a>'
+			close all
+			pl '<a href="exec: music_on = 1 & gt $loc">Play music</a>'
 		end
 
 		minut += 120

+ 9 - 15
locations/NikoDreams

@@ -61,19 +61,13 @@ end
 
 if $ARGS[0] =  'Woods':
 	cls
-	$tracklist_HappyHome = 'sound/happyhome/HappyHome.mp3'
-	if music_off = 0:
-		inited = 1
-		music_on = 1
-		volume = 50
-		$music_theme = 'HappyHome'
-		pl '<a href="exec: music_off = 1 & gt $loc">Turn off the music</a>'
+	if music_on = 1:
+		if play 'sound/happyhome/HappyHome.mp3'
+		pl '<a href="exec: music_on = 0 & gt 'NikoDreams', 'Woods'">Turn off the music</a>'
 	else
-		music_on = 0
-		volume = 100
-		gs 'init_music'
-		pl '<a href="exec: music_off = 0 & gt $loc">Play music</a>'
-	end			
+		close all
+		pl '<a href="exec: music_on = 1 & gt 'NikoDreams', 'Woods'">Play music</a>'
+	end
 	PLAY 'sound/happyhome/Smiley.mp3', 25
 	VKWoods = 1
 	VKSmiley = 3
@@ -315,7 +309,7 @@ if $ARGS[0] =  'TeeHee':
 		'We meet again <<$pcs_firstname>>. Have you come to re-join your own path, or do you wish to stay, and face WeePee''s wrath?'
 	end
 	
-	act 'Accept TeeHee''s offer':music_on = 0 & VKTeeHee = 1 & VKWoods = -1 & VKSmiley = 3 & gt 'SoniaHome', 'Aftermath 2'
+	act 'Accept TeeHee''s offer': VKTeeHee = 1 & VKWoods = -1 & VKSmiley = 3 & gt 'SoniaHome', 'Aftermath 2'
 	
 	act 'Walk away':VKTeeHee = 1 & gt 'NikoDreams', 'Woods Home'
 end	
@@ -328,7 +322,7 @@ if $ARGS[0] =  'Smiley 1':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/residents/smiley2.jpg"></center>'
 	'As you are walking through the forest you hear loud laughing behind you then suddenly feel something rubbing across your throat, causing a stream of blood to begin pouring out of your neck. You let out a scream as your energy fades, and the ground rushes toward you...'
 
-	act 'Rest in peace':music_on = 0 & VKSmiley = 3 & gt 'SoniaHome', 'Aftermath 2'
+	act 'Rest in peace': VKSmiley = 3 & gt 'SoniaHome', 'Aftermath 2'
 end	
 
 if $ARGS[0] =  'WeePee 1':
@@ -339,7 +333,7 @@ if $ARGS[0] =  'WeePee 1':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/residents/weepee.jpg"></center>'
 	'As you approach the crying woman, she instantly turns around then lunges toward you, shoving her hand into your chest, and pulling out your heart, as she she stares into your eyes, watching your life slowly drain away...'
 
-	act 'Rest in peace':music_on = 0 & VKSmiley = 3 & gt 'SoniaHome', 'Aftermath 2'
+	act 'Rest in peace': VKSmiley = 3 & gt 'SoniaHome', 'Aftermath 2'
 end	
 
 if $ARGS[0] =  'Woods Hide':

+ 1 - 1
locations/SoniaHome

@@ -1,5 +1,6 @@
 # SoniaHome
 !! This house was created for the Niko Volkov romance, but I made sure to make it compatible for, use on it''s own, but it is VERY IMPORTANT that all new acts, or code added to this location has a "if NikoAftermath = 0" requirement added to them, or else it will break my quest. Please don''t break my quest. Please.  :(	<3 Violet Kitten   Feel free to PM me, if you have any further questions. ^_^
+close all
 
 if $ARGS[0] = 'Aftermath':
 	cls
@@ -65,7 +66,6 @@ if $ARGS[0] = 'Aftermath 2':
 	cls
 	pcs_sleep += 10
 	pcs_sweat += 10
-	if music_on = 1:music_on = 0
 	minut += 60
 	gs'stat'
 	'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'

+ 3 - 3
locations/Voltrenersex

@@ -516,7 +516,7 @@ if $ARGS[0] = 'discoSex':
 									Discoclose = 1
 									!closing disco on this day not to forget  stat
 									minut += 20
-									music_on = 0
+									close all
 									gs 'stat'
 									cls
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodok.jpg"></center>'
@@ -533,7 +533,7 @@ if $ARGS[0] = 'discoSex':
 				act 'Go with coach':
 					Discoclose = 1
 					minut += 20
-					music_on = 0
+					close all
 					gs 'stat'
 					cls
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodok.jpg"></center>'
@@ -544,7 +544,7 @@ if $ARGS[0] = 'discoSex':
 		else
 			Discoclose = 1
 			minut += 20
-			music_on = 0
+			close all
 			gs 'stat'
 			cls
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodok.jpg"></center>'

+ 43 - 54
locations/_attrib_shoe_dolls

@@ -4,152 +4,141 @@ if ARGS[1] = 1:
 	ShoQuality = 5
 	ShoHeels = 3
 	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 2:
 	ShoQuality = 5
 	ShoHeels = 4
-	ShoCut = 1
+	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 3:
 	ShoQuality = 6
 	ShoHeels = 4
-	ShoCut = 1
+	ShoCut = 3
+	ShoStyle = 3
 elseif ARGS[1] = 4:
 	ShoQuality = 7
 	ShoHeels = 3
-	ShoCut = 3
+	ShoCut = 2
+	ShoStyle = 3
 	ShoStlye = 2
 elseif ARGS[1] = 5:
 	ShoQuality = 6
 	ShoHeels = 4
 	ShoCut = 1
+	ShoStyle = 3
 elseif ARGS[1] = 6:
 	ShoQuality = 5
 	ShoHeels = 4
 	ShoCut = 1
+	ShoStyle = 3
 elseif ARGS[1] = 7:
 	ShoQuality = 6
 	ShoHeels = 4
 	ShoCut = 1
+	ShoStyle = 3
 elseif ARGS[1] = 8:
 	ShoQuality = 5
 	ShoHeels = 4
 	ShoCut = 1
+	ShoStyle = 3
+	ShoStyle = 2
 elseif ARGS[1] = 9:
 	ShoQuality = 6
 	ShoHeels = 4
-	ShoCut = 3
+	ShoCut = 1
+	ShoStyle = 3
 elseif ARGS[1] = 10:
 	ShoQuality = 4
 	ShoHeels = 4
-	ShoCut = 1
+	ShoCut = 2
+	ShoStyle = 3
+	ShoStyle = 2
 elseif ARGS[1] = 11:
 	ShoQuality = 6
 	ShoHeels = 4
 	ShoCut = 3
+	ShoStyle = 3
 elseif ARGS[1] = 12:
 	ShoQuality = 5
 	ShoHeels = 4
-	ShoCut = 1
+	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 13:
 	ShoQuality = 5
 	ShoHeels = 4
-	ShoCut = 2
+	ShoCut = 3
+	ShoStyle = 3
 elseif ARGS[1] = 14:
 	ShoQuality = 6
 	ShoHeels = 4
-	ShoCut = 3
+	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 15:
 	ShoQuality = 5
 	ShoHeels = 4
 	ShoCut = 1
+	ShoStyle = 3
 elseif ARGS[1] = 16:
 	ShoQuality = 5
 	ShoHeels = 4
 	ShoCut = 1
+	ShoStyle = 3
 elseif ARGS[1] = 17:
 	ShoQuality = 6
 	ShoHeels = 4
-	ShoCut = 1
-	ShoStlye = 1
+	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 18:
 	ShoQuality = 6
 	ShoHeels = 4
-	ShoCut = 4
+	ShoCut = 3
+	ShoStyle = 3
 elseif ARGS[1] = 19:
 	ShoQuality = 6
 	ShoHeels = 4
-	ShoCut = 1
+	ShoCut = 5
+	ShoStyle = 3
 elseif ARGS[1] = 20:
 	ShoQuality = 5
 	ShoHeels = 4
-	ShoCut = 1
+	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 21:
 	ShoQuality = 6
 	ShoHeels = 3
-	ShoCut = 2
+	ShoCut = 3
+	ShoStyle = 3
+	ShoStyle = 2
 elseif ARGS[1] = 22:
 	ShoQuality = 5
 	ShoHeels = 4
 	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 23:
 	ShoQuality = 5
 	ShoHeels = 4
 	ShoCut = 1
+	ShoStyle = 3
 elseif ARGS[1] = 24:
 	ShoQuality = 5
 	ShoHeels = 4
 	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 25:
 	ShoQuality = 5
 	ShoHeels = 4
 	ShoCut = 1
+	ShoStyle = 3
 elseif ARGS[1] = 26:
 	ShoQuality = 6
 	ShoHeels = 4
 	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 27:
 	ShoQuality = 6
 	ShoHeels = 4
 	ShoCut = 1
-elseif ARGS[1] = 28:
-	ShoQuality = 6
-	ShoHeels = 4
-	ShoCut = 2
-elseif ARGS[1] = 29:
-	ShoQuality = 5
-	ShoHeels = 4
-	ShoCut = 2
-elseif ARGS[1] = 30:
-	ShoQuality = 6
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 31:
-	ShoQuality = 5
-	ShoHeels = 4
-	ShoCut = 3
-elseif ARGS[1] = 32:
-	ShoQuality = 6
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 33:
-	ShoQuality = 5
-	ShoHeels = 4
-	ShoCut = 2
-elseif ARGS[1] = 34:
-	ShoQuality = 5
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 35:
-	ShoQuality = 6
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 36:
-	ShoQuality = 6
-	ShoHeels = 4
-	ShoCut = 3
-elseif ARGS[1] = 37:
-	ShoQuality = 6
-	ShoHeels = 4
-	ShoCut = 2
+	ShoStyle = 3
 end
 
 --- $attrib_shoe_dolls ---------------------------------

+ 0 - 60
locations/counter

@@ -1,64 +1,4 @@
 # counter
-if music_on <> music_on_prev or $music_theme <> $music_theme_prev:
-	close $cur_theme[track[$music_theme_prev]]
-	music_on_prev = music_on
-	$music_theme_prev = $music_theme
 
-	if $music_theme <> '':
-	! WD: Numeric arrays 'cur_theme' & 'tracklist_*' don''t exist use string arrays
-		copyarr '$cur_theme', '$tracklist_<<$music_theme>>'
-		track[$music_theme] = track[$music_theme] - 1
-
-		if track[$music_theme] < 0:track[$music_theme] = arrsize('$cur_theme')
-	end
-end
-
-if music_on = 1 and $music_theme <> '':
-	if no isplay ($cur_theme[track[$music_theme]]):
-		track[$music_theme] += 1
-
-		if arrsize('$cur_theme') <= track[$music_theme]:track[$music_theme] = 0
-	end
-
-	play $cur_theme[track[$music_theme]], volume
-end
-
-! WD: Code not called
-! WD: Uninitialised~ '$race1[]', '$showcar'
-! {
-if race_start = 1:
-	if night_mode = 1:
-		bcolor = rgb(0, 0, 0)
-	else
-		bcolor = rgb(255, 255, 255)
-	end
-	refint
-	*clr
-
-	if race_hit = 0:
-		race_miss += 1
-		race_hit = 1
-	elseif [race_row] <> ' ' and race_row > 0:
-		race_hit = 0
-	end
-
-	'<center><b><<$car>></b></center>'
-	!!interior of the vehicle and the line route
-	*pl $showcar
-	*p $race1[race_row]
-
-	if $race1[race_row] = '<center>-------FINISH--------</center>':
-		race_start = 0
-		!!return timer
-		settimer 500
-		wait 2000
-		$metka = 'finish'
-		$loc = 'RACE_COUNT'
-		gt $loc, $metka
-	end
-
-	race_row += 1
-end
-} !
 --- counter ---------------------------------
 

+ 27 - 1
locations/dolls

@@ -49,7 +49,7 @@ if $ARGS[0] = 'start':
 		*nl
 		'Coming soon - KS'
 !!		'<center><a href="exec:gt ''dolls'', ''clothing''">Look at the clothing</a></center>'
-!!		'<center><a href="exec:gt ''dolls'', ''shoes''">Look at the shoes</a></center>'
+		'<center><a href="exec:gt ''dolls'', ''shoes''">Look at the shoes</a></center>'
 !!		'<center><a href="exec:gt ''dolls'', ''jewelry''">Look at the jewelry</a></center>'
 !!		'<center><a href="exec:gt ''dolls'', ''piecrings''">Look at the piecrings</a></center>'
 
@@ -105,6 +105,32 @@ if $ARGS[0] = 'alternative':
 
 end
 
+if $ARGS[0] = 'shoes':
+	$metka = 'shoes'
+	$loc = 'dolls'
+	cls
+	gs'stat'
+
+	act 'Return':
+		cla
+		minut += 5
+		gt 'dolls', 'start'
+	end
+
+	if Clothingstock > 11:
+		i = 1
+	else
+		i = 2
+	end
+
+	:loopdolls_shoes
+		if sdolls[i] = 0:*p '<a href="exec: i = <<i>> & gt ''dolls'', ''dolls_shoes''"><img src="images/pc/shoes/Dolls/<<i>>.jpg" height="250" /></a>'
+		i += 2
+	if i <= 27:jump 'loopdolls_shoes'
+end
+
+if $ARGS[0] = 'dolls_shoes': gt 'clothing', 'view_clothing_item', 'shop', 'sdolls',i, 5000
+
 if $ARGS[0] = 'savva':		
 	'<center><b><font color="maroon">Patch Work Dolls</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/dolls/Savva.jpg"></center>'

+ 0 - 1
locations/gdk

@@ -3,7 +3,6 @@ CLOSE ALL
 $metka = $ARGS[0]
 $loc = $CURLOC
 $location_type = 'public_outdoors'
-music_on = 0
 gs 'stat'
 '<center><b><font color="maroon">Community Centre</font></b></center>'
 

+ 5 - 11
locations/gdkin

@@ -19,18 +19,12 @@ if $ARGS[0] = '':
 
 	pl ''
 
-	if music_off = 0:
-		inited = 1
-		music_on = 1
-		volume = 100
-		$music_theme = 'gdis'
-		gs 'init_music'
-		pl '<a href="exec: music_off = 1 & gt $loc">Turn off the music</a>'
+	if music_on = 1:
+		if isplay 'sound/komb.mp3' = 0: play 'sound/komb.mp3'
+		pl '<a href="exec: music_on = 0 & gt $loc">Turn off the music</a>'
 	else
-		music_on = 0
-		volume = 100
-		gs 'init_music'
-		pl '<a href="exec: music_off = 0 & gt $loc">Play music</a>'
+		close all
+		pl '<a href="exec: music_on = 1 & gt $loc">Play music</a>'
 	end
 
 	'<center><b><font color="maroon">Disco</font></b></center>'

+ 17 - 27
locations/gdktoilet

@@ -27,18 +27,12 @@ if $ARGS[0] = 'start':
 	end
 
 	if hour >=20 and hour <=23:
-		if music_off = 0:
-			inited = 1
-			music_on = 1
-			volume = 50
-			$music_theme = 'gdis'
-			gs 'init_music'
-			pl '<a href="exec: music_off = 1 & gt $loc">Turn off the music</a>'
+		if music_on = 1:
+			play 'sound/komb.mp3', 50
+			pl '<a href="exec: music_on = 0 & gt $loc">Turn off the music</a>'
 		else
-			music_on = 0
-			volume = 100
-			gs 'init_music'
-			pl '<a href="exec: music_off = 0 & gt $loc">Play music</a>'
+			close all
+			pl '<a href="exec: music_on = 1 & gt $loc">Play music</a>'
 		end
 		if gdkin_in = daystart:
 			act 'Return to the dance':gt 'gdkin'
@@ -77,18 +71,12 @@ if $ARGS[0] = 'mens':
 	temp = RAND(1,100)
 	gs 'stat'
 	if hour >=20 and hour <=23:
-		if music_off = 0:
-			inited = 1
-			music_on = 1
-			volume = 20
-			$music_theme = 'gdis'
-			gs 'init_music'
-			pl '<a href="exec: music_off = 1 & gt $loc">Turn off the music</a>'
+		if music_on = 1:
+			play 'sound/komb.mp3', 50
+			pl '<a href="exec: music_on = 0 & gt $loc">Turn off the music</a>'
 		else
-			music_on = 0
-			volume = 100
-			gs 'init_music'
-			pl '<a href="exec: music_off = 0 & gt $loc">Play music</a>'
+			close all
+			pl '<a href="exec: music_on = 1 & gt $loc">Play music</a>'
 		end
 	end
 !!Gloryhole1
@@ -1136,11 +1124,13 @@ if $ARGS[0] = 'rape':
 			end
 		end
 	elseif hour >= 20 and hour <= 23:
-		inited = 1
-		music_on = 1
-		volume = 100
-		$music_theme = 'gdis'
-		gs 'init_music'
+		if music_on = 1:
+			play 'sound/komb.mp3'
+			pl '<a href="exec: music_on = 0 & gt $loc">Turn off the music</a>'
+		else
+			close all
+			pl '<a href="exec: music_on = 1 & gt $loc">Play music</a>'
+		end
 		cla
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_yaho.jpg"></center>'

+ 0 - 46
locations/init_music

@@ -1,46 +0,0 @@
-# init_music
-$tracklist_start[0] = 'sound/start.mp3'
-
-$tracklist_pivbar[0] = 'sound/pivbar.mp3'
-
-$tracklist_kafe[0] = 'sound/kafe.mp3'
-$tracklist_kafe[1] = 'sound/kafe1.mp3'
-
-$tracklist_gdis[0] = 'sound/komb.mp3'
-$tracklist_gnewyear[0] = 'sound/newyear.mp3'
-$tracklist_sukizaebali[0] = 'sound/suki.mp3'
-
-$tracklist_club[0] = 'sound/club.mp3'
-$tracklist_club[1] = 'sound/club1.mp3'
-$tracklist_club[2] = 'sound/club2.mp3'
-$tracklist_club[3] = 'sound/club3.mp3'
-$tracklist_club[4] = 'sound/club4.mp3'
-
-$tracklist_fight[0] = 'sound/fight.mp3'
-$tracklist_fight[1] = 'sound/fight1.mp3'
-
-$tracklist_orochimaru[0] = 'sound/orochimaru.mp3'
-
-$tracklist_downtownstreet[0] = 'sound/street.mp3'
-$tracklist_metro[0] = 'sound/metro.mp3'
-$tracklist_shop[0] = 'sound/shop.mp3'
-
-if club = 1:
-	clubrand = RAND(0,5)
-	if clubrand = 0:
-		$tracklist_club[0] = 'sound/club.mp3'
-	elseif clubrand = 1:
-		$tracklist_club[0] = 'sound/club1.mp3'
-	elseif clubrand = 2:
-		$tracklist_club[0] = 'sound/club2.mp3'
-	elseif clubrand = 3:
-		$tracklist_club[0] = 'sound/club3.mp3'
-	elseif clubrand = 4:
-		$tracklist_club[0] = 'sound/club4.mp3'
-	elseif clubrand = 5:
-		$tracklist_club[0] = 'sound/club5.mp3'
-	end
-end
-
---- init_music ---------------------------------
-

+ 0 - 1
locations/korr

@@ -54,7 +54,6 @@ popolaini = 0
 saunaYouRoom = 0
 boycherdaksex = 0
 bonusZ = 0
-!music_on = 0
 minut += 1
 housrA = 1
 housrMir = 0

+ 0 - 1
locations/korrPar

@@ -1,7 +1,6 @@
 # korrPar
 CLOSE ALL
 if sound = 0:PLAY 'sound/korr.mp3',30
-music_on = 0
 
 $metkaM = $ARGS[0]
 $locM = $CURLOC

+ 2 - 6
locations/mqroom

@@ -25,11 +25,7 @@ act 'Put a roll on the floor and stamp his foot.':
 		act 'Look into her eyes.':
 			cla
 			*clr
-			inited = 1
-			music_on = 1
-			volume = 100
-			$music_theme = 'orochimaru'
-			gs 'init_music'
+			play 'sound/orochimaru.mp3'
 			'<center><img <<$set_imgh>> src= "images/characters/city/orotimaru/orotimaru.jpg"></center>'
 			'Mother of God. Just thought you looked into her eyes. Deathly pale skin, cold and cruel snake eyes. Creature grinned.'
 			'(Creature) - "So you see my true face. Wonderful." Hissed the snake creature voice.'
@@ -79,7 +75,7 @@ act 'Put a roll on the floor and stamp his foot.':
 								cla
 								*clr
 								cursed = 1
-								music_on = 0
+								close all
 								'<center><img <<$set_imgh>> src= "images/characters/city/orotimaru/orotimaru.jpg"></center>'
 								'You put a hand to scroll and scroll lightning burned. You embraced the same strange feeling that when approaching Toby. There was a feeling that reality has broken, but this time the center of this hole were you. The sensation you tore the fact that Orochimaru his teeth to you in the neck. You pierced stunning pain. Suddenly zmeeglazy let you go, and with all his strength hurled towards the ground away from the black hole. You understand that it is all spent force trying to save you from a devastating spell Payne.'
 								'You flew down against the force of the black hole, while watching the black hole reached Orochimaru and his body began to break apart. But Orochimaru smiled despite his terrible, deadly pain and agony of his dying body. Finally there was only from zmeeglazogo bloody mess that swallowed the hole. Momentum imparted to you last effort Orochimaru ended and you began again to draw a black hole. You flew to her side feeling as you gradually get out of reality, a little bit more and you will be far from this place.'

+ 0 - 1
locations/pavCommercial

@@ -28,7 +28,6 @@ cla
 litltown = 1
 alkoblock = 0
 boynumBlock = 0
-!music_on = 0
 
 !call random events from [street_events], and display them before show location.
 if streetevent_hour ! hour:gt'street_event','pavCommercial', 'main'

+ 0 - 1
locations/pavResidential

@@ -1,7 +1,6 @@
 # pavResidential
 
 CLOSE ALL
-music_on = 0
 $metka = ''
 $loc = 'pavResidential'
 $metkaM = ''

+ 2 - 2
locations/preALT

@@ -49,9 +49,9 @@ if $ARGS[0] = 'Three':
 		else
 			gs 'obj_din', 'old'
 		end
-		act 'Begin': music_on = 0 & gt 'bedrPar'
+		act 'Begin': close all & gt 'bedrPar'
 	else
-		act 'Continue': music_on = 0 & gt 'preALT', 'Cursed Schoolgirl Start'
+		act 'Continue': close all & gt 'preALT', 'Cursed Schoolgirl Start'
 	end
 	act 'Restart':
 		cls

+ 6 - 6
locations/sny

@@ -197,12 +197,12 @@ end
 if $ARGS[0] = '3':
 	cls
 	gs 'stat'
-	if music_on = 0:
-		inited = 1
-		music_on = 1
-		volume = 100
-		$music_theme = 'gnewyear'
-		gs 'init_music'
+	if music_on = 1:
+		play 'sound/newyear.mp3'
+		pl '<a href="exec: music_on = 0 & gt $loc">Turn off the music</a>'
+	else
+		close all
+		pl '<a href="exec: music_on = 1 & gt $loc">Play music</a>'
 	end
 
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/tusa3.jpg"></center>'

+ 1 - 4
locations/start

@@ -71,11 +71,8 @@ act '<center>Load Autosave for <b>original</b> start game</center>':OPENGAME 'au
 act '<center>Load Autosave for <b>schoolgirl</b> start game</center>':OPENGAME 'autosave_alt.sav'
 
 if music_on = 0:
-	inited = 1
 	music_on = 1
-	volume = 100
-	$music_theme = 'sukizaebali'
-	gs 'init_music'
+	play 'sound/suki.mp3'
 end
 
 ! WD: Set variable to store Image needed HTML code

+ 0 - 1
locations/street

@@ -1,7 +1,6 @@
 # street
 
 CLOSE ALL
-music_on = 0
 $metkaM = $ARGS[0]
 $locM = $CURLOC
 $metka = $ARGS[0]