Bläddra i källkod

add the finish button

rachels 2 år sedan
förälder
incheckning
034daee0b2
1 ändrade filer med 27 tillägg och 5 borttagningar
  1. 27 5
      locations/mirror.qsrc

+ 27 - 5
locations/mirror.qsrc

@@ -161,7 +161,13 @@ if $ARGS[0] = 'start':
 			if dyefade > 0 and dyefade < 7: $serv['hdye']='Your hair dye is beginning to fade and your roots are showing.'
 			if dyefade = 0: $serv['hdye']='Your hair dye has faded and looks terrible.'
 		end
-		'<table cellspacing=0 cellpadding=0><tr><td><hr></td></tr><tr><td><<$serv["hhair"]>></td></tr><tr><td><<$serv["hbraids"]>></td></tr><tr><td><<$serv["hdye"]>></td></tr><tr><td><<$serv["ponytail desc"]>></td></tr><tr><td><<$serv["bun desc"]>></td></tr><tr><td><<$serv["pigtails desc"]>></td></tr><tr><td><<$serv["braid desc"]>></td></tr></table>'
+		if $serv['hhair'] ! ''			: '<<$serv["hhair"]>>'
+		if $serv['hbraids'] ! ''		: '<<$serv["hbraids"]>>'
+		if $serv['hdye'] ! ''			: '<<$serv["hdye"]>>'
+		if $serv['ponytail desc'] ! ''	: '<<$serv["ponytail desc"]>>'
+		if $serv['bun desc'] ! ''		: '<<$serv["bun desc"]>>'
+		if $serv['pigtails desc'] ! ''	: '<<$serv["pigtails desc"]>>'
+		if $serv['braid desc'] ! ''		: '<<$serv["braid desc"]>>'
 	else
 		if player_avatar = 1:
 			'<center><img <<$set_imgh>> src="images/avatar.jpg"></center>'
@@ -612,12 +618,28 @@ if $ARGS[0] = 'brush':
 	*clr & cla
 	minut += 3
 	pcs_hairbsh = 1
-	if player_avatar = 1:
-		'<center><img <<$set_imgh>> src="images/avatar.jpg"></center>'
+	if newstylemirror = 1:
+		$serv['noaction'] = '<img <<$set_imgh>> src="images/system/icons/action/blank.png">'
+		if player_avatar = 1:
+			$serv['avatar']='<img <<$set_imgh>> src="images/avatar.jpg">'
+		else
+			$serv['avatar']='<img <<$set_imgh>> src="<<FUNC(''$face_image'')>>">'
+		end
+		if $mirrorloc = 'mirror':
+			$serv['back']='<a href="exec: gt ''mirror'',''start''"><img src="images/system/icons/action/back.png"></a>'
+		else
+			$serv['back']='<a href="exec: gt ''mirror'',''fin''"><img src="images/system/icons/action/back.png"></a>'
+        end
+		'<center><table align=center cellspacing=0 cellpadding=0><tr><td align=center colspan=15><center><<$serv["avatar"]>></center></td></tr><tr><td colspan=15><hr></td></tr><tr><td colspan=10></td><td><<$serv["back"]>></td><td colspan=4></td></tr></table></center>'
+        killvar('$serv')
 	else
-		'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
+		if player_avatar = 1:
+			'<center><img <<$set_imgh>> src="images/avatar.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
+		end
+		'You brush your hair.'
 	end
-	'You brush your hair.'
 	if $mirrorloc = 'mirror':
 		act 'Finish': gt 'mirror', 'start'
 	else