Browse Source

[added] New location to view Sveta's selfies. I couldn't work out how to disable the camera etc when menu_off = 1, so please have a look at that.
During testing I tried to take a selfie in the park but it gave me the generic selfie instead of a random one from the park. I'm assuming $locclass = 'park' needs to be added there.

CroWke 5 years ago
parent
commit
2bf1833b5c
3 changed files with 187 additions and 80 deletions
  1. 1 0
      glife.qproj
  2. 176 0
      locations/phone_selfies.qsrc
  3. 10 80
      locations/telefon.qsrc

+ 1 - 0
glife.qproj

@@ -228,6 +228,7 @@
 		<Location name="mirror"/>
 		<Location name="stol"/>
 		<Location name="telefon"/>
+		<Location name="phone_selfies"/>
 		<Location name="$phone_theme"/>
 		<Location name="kit_din"/>
 		<Location name="TV"/>

+ 176 - 0
locations/phone_selfies.qsrc

@@ -0,0 +1,176 @@
+# phone_selfies
+
+if $ARGS[0] = 'selfies':
+	menu_off = 0
+	gs 'telefon', 'Phone_selfie_totals'
+	*clr & cla
+	
+	!!These variables determine which selfietypes need to be checked
+	clovar = 1
+	undvar = 1
+	nudvar = 1
+	
+	!!This variable will switch to bikini for beach selfies
+	$undname = 'underwear'
+	$undnamecap = 'Underwear'
+	
+	'<center><h4><font color="maroon">Selfie overview</font></h4></center>'
+	*nl
+	
+	!!default images that are used in any location not set
+	if phone_selfie[1] = 1:'<a href="exec:view''images/system/phone/selfie/phone_selfie1.jpg''"><b>Selfie number1</b></a>'
+	if phone_selfie[2] = 1:'<a href="exec:view''images/system/phone/selfie/phone_selfie2.jpg''"><b>Selfie number2</b></a>'
+
+	'<a href="exec:gt ''phone_selfies'', ''bathroom''">Bathroom selfies</a>'
+	'<a href="exec:gt ''phone_selfies'', ''bedroom''">Bedroom selfies</a>'
+	'<a href="exec:gt ''phone_selfies'', ''kitchen''">Kitchen selfies</a>'
+	'<a href="exec:gt ''phone_selfies'', ''livingroom''">Livingroom selfies</a>'
+	'<a href="exec:gt ''phone_selfies'', ''changingroom''">Changingroom selfies</a>'
+	'<a href="exec:gt ''phone_selfies'', ''park''">Park selfies</a>'
+	'<a href="exec:gt ''phone_selfies'', ''lockerroom''">Lockerroom selfies</a>'
+	'<a href="exec:gt ''phone_selfies'', ''beach''">Beach selfies</a>'
+	
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'listretrieve':
+	!!Loop for clothed selfies, dynamics set variables as mixing them in loop instructions is bad
+	if clovar = 1:
+		'<center><b>Clothed selfies</b></center>'
+		*nl
+		temp_clocnt = 1
+		dynamic 'temp_loop = <<$phone_loc>>_cloloop'
+		dynamic 'temp_total = <<$phone_loc>>_clotot'
+		:temp_loop
+			!!setting value to unmixed variable so it can be checked in the if below
+			dynamic '$phone_locval = <<$phone_loc>>_closelfie[<<temp_clocnt>>]'
+			!!if $phone_locval = 1: *p '<a href="exec:view''images/pc/selfies/<<$phone_loc>>/clothed/<<temp_clocnt>>.jpg''"><b>Selfie #<<temp_clocnt>></b></a>'
+			if $phone_locval = 1: *p '<a href="exec:view''images/pc/selfies/<<$phone_loc>>/clothed/<<temp_clocnt>>.jpg''"><img src="images/pc/selfies/<<$phone_loc>>/clothed/<<temp_clocnt>>.jpg"     height="150" /></a>  '
+			temp_clocnt += 1
+		if temp_clocnt <= temp_total: jump'temp_loop'
+	end
+		
+	!!loop for underwear selfies
+	if undvar = 1:
+		'<center><b><<$undnamecap>> selfies</b></center>'
+		*nl
+		temp_undcnt = 1
+		dynamic 'temp_loop1 = <<$phone_loc>>_undloop'
+		dynamic 'temp_total = <<$phone_loc>>_undtot'
+		:temp_loop1
+			dynamic '$phone_locval = <<$phone_loc>>_undselfie[<<temp_undcnt>>]'
+			!!if $phone_locval = 1: *p '<a href="exec:view''images/pc/selfies/<<$phone_loc>>/<<$undname>>/<<temp_undcnt>>.jpg''"><b>Selfie #<<temp_undcnt>></b></a>'
+			if $phone_locval = 1: *p '<a href="exec:view''images/pc/selfies/<<$phone_loc>>/<<$undname>>/<<temp_undcnt>>.jpg''"><img src="images/pc/selfies/<<$phone_loc>>/<<$undname>>/<<temp_undcnt>>.jpg"     height="150" /></a>  '
+			temp_undcnt += 1
+		if temp_undcnt <= temp_total: jump'temp_loop1'
+	end
+
+	!!loop for nude selfies
+	if nudvar = 1:
+		'<center><b>Nude selfies</b></center>'
+		*nl
+		temp_nudcnt = 1
+		dynamic 'temp_loop2 = <<$phone_loc>>_nudloop'
+		dynamic 'temp_total = <<$phone_loc>>_nudtot'
+		:temp_loop2
+			dynamic '$phone_locval = <<$phone_loc>>_nudselfie[<<temp_nudcnt>>]'
+			!!if $phone_locval = 1: *p '<a href="exec:view''images/pc/selfies/<<$phone_loc>>/nude/<<temp_nudcnt>>.jpg''"><b>Selfie #<<temp_nudcnt>></b></a>'
+			if $phone_locval = 1: *p '<a href="exec:view''images/pc/selfies/<<$phone_loc>>/nude/<<temp_nudcnt>>.jpg''"><img src="images/pc/selfies/<<$phone_loc>>/nude/<<temp_nudcnt>>.jpg"     height="150" /></a>  '
+			temp_nudcnt += 1
+		if temp_nudcnt <= temp_total: jump'temp_loop2'
+	end
+end
+
+if $ARGS[0] = 'bathroom':
+	'<center><h4><font color="maroon">Bathroom selfies</font></h4></center>'
+	$phone_loc = 'bathroom'
+	*nl
+	gs 'phone_selfies', 'listretrieve'
+	
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'bedroom':
+	'<center><h4><font color="maroon">Bedroom selfies</font></h4></center>'
+	$phone_loc = 'bedroom'
+	*nl
+	gs 'phone_selfies', 'listretrieve'
+	
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'kitchen':
+	'<center><h4><font color="maroon">Kitchen selfies</font></h4></center>'
+	$phone_loc = 'kitchen'
+	*nl
+	gs 'phone_selfies', 'listretrieve'
+	
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'livingroom':
+	'<center><h4><font color="maroon">Livingroom selfies</font></h4></center>'
+	$phone_loc = 'livingroom'
+	*nl
+	gs 'phone_selfies', 'listretrieve'
+	
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'changingroom':
+	'<center><h4><font color="maroon">Changingroom selfies</font></h4></center>'
+	$phone_loc = 'changingroom'
+	*nl
+	gs 'phone_selfies', 'listretrieve'
+	
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'park':
+	'<center><h4><font color="maroon">Park selfies</font></h4></center>'
+	$phone_loc = 'park'
+	*nl
+	gs 'phone_selfies', 'listretrieve'
+	
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'lockerroom':
+	'<center><h4><font color="maroon">Lockerroom selfies</font></h4></center>'
+	$phone_loc = 'lockerroom'
+	*nl
+	gs 'phone_selfies', 'listretrieve'
+		
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'beach':
+	'<center><h4><font color="maroon">Beach selfies</font></h4></center>'
+	$phone_loc = 'beach'
+	clovar = 0
+	$undname = 'bikini'
+	$undnamecap = 'Bikini'
+	*nl
+	gs 'phone_selfies', 'listretrieve'
+		
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+--- phone_selfies ---------------------------------

+ 10 - 80
locations/telefon.qsrc

@@ -801,86 +801,7 @@ end
 
 !!for viewing photos on your phone
 if $ARGS[0] = 'Phone_pictures':
-	gs 'telefon', 'Phone_selfie_totals'
-	clr
-	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
-	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
-	pl'<center><font size=6>Gallery</font></center>'
-	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_pictures.png" height="80" width="80"><br></center>'
-	!!default images that are used in any location not set
-	if phone_selfie[1] = 1:pl'<a href="exec:view''images/system/phone/selfie/phone_selfie1.jpg''"><b>Selfie number1</b></a>'
-	if phone_selfie[2] = 1:pl'<a href="exec:view''images/system/phone/selfie/phone_selfie2.jpg''"><b>Selfie number2</b></a>'
-
-	!!loop for locations where selfies can be taken starting with bathroom
-	$phone_loc = 'bathroom'
-	:phoneloc_loop
-		!!Loop for clothed selfies, dynamics set variables as mixing them in loop instructions is bad
-		temp_clocnt = 1
-		dynamic 'temp_loop = <<$phone_loc>>_cloloop'
-		dynamic 'temp_total = <<$phone_loc>>_clotot'
-		:temp_loop
-			!!setting value to unmixed variable so it can be checked in the if below
-			dyneval '$phone_locval = <<$phone_loc>>_closelfie[<<temp_clocnt>>]'
-			if $phone_locval = 1:pl '<a href="exec:view''images/pc/selfies/<<$phone_loc>>/clothed/<<temp_clocnt>>.jpg''"><b>Clothed <<$phone_loc>> selfie #<<temp_clocnt>></b></a>'
-			temp_clocnt += 1
-		if temp_clocnt <= temp_total: jump'temp_loop'
-
-		!!loop for underwwear selfies
-		temp_undcnt = 1
-		dynamic 'temp_loop1 = <<$phone_loc>>_undloop'
-		dynamic 'temp_total = <<$phone_loc>>_undtot'
-		:temp_loop1
-			dyneval '$phone_locval = <<$phone_loc>>_undselfie[<<temp_undcnt>>]'
-			if $phone_locval = 1:pl'<a href="exec:view''images/pc/selfies/<<$phone_loc>>/underwear/<<temp_undcnt>>.jpg''"><b>Underwear <<$phone_loc>> selfie #<<temp_undcnt>></b></a>'
-			temp_undcnt += 1
-		if temp_undcnt <= temp_total: jump'temp_loop1'
-
-		!!loop for nude selfies
-		temp_nudcnt = 1
-		dynamic 'temp_loop2 = <<$phone_loc>>_nudloop'
-		dynamic 'temp_total = <<$phone_loc>>_nudtot'
-		:temp_loop2
-			dyneval '$phone_locval = <<$phone_loc>>_nudselfie[<<temp_nudcnt>>]'
-			if $phone_locval = 1:pl'<a href="exec:view''images/pc/selfies/<<$phone_loc>>/nude/<<temp_nudcnt>>.jpg''"><b>Nude <<$phone_loc>> selfie #<<temp_nudcnt>></b></a>'
-			temp_nudcnt += 1
-		if temp_nudcnt <= temp_total: jump'temp_loop2'
-
-	!!Changes to location so all get processed 
-	if $phone_loc = 'bathroom':
-		$phone_loc = 'bedroom'
-		jump'phoneloc_loop'
-	elseif $phone_loc = 'bedroom':
-		$phone_loc = 'kitchen'
-		jump'phoneloc_loop'
-	elseif $phone_loc = 'kitchen':
-		$phone_loc = 'livingroom'
-		jump'phoneloc_loop'
-	elseif $phone_loc = 'livingroom':
-		$phone_loc = 'changingroom'
-		jump'phoneloc_loop'
-	elseif $phone_loc = 'changingroom':
-		$phone_loc = 'park'
-		jump'phoneloc_loop'
-	elseif $phone_loc = 'park':
-		$phone_loc = 'lockeroom'
-		jump'phoneloc_loop'
-	end
-
-	!!variant for beach selfies using swimwear and nude only
-	beach_swimcnt = 1
-	:beach_swimloop
-		if beach_swimselfie[beach_swimcnt] = 1:pl'<a href="exec:view''images/pc/selfies/bedroom/clothed/<<beach_swimcnt>>.jpg''"><b>Clothed bedroom selfie #<<beach_swimcnt>></b></a>'
-		beach_swimcnt += 1
-	if beach_swimcnt <= beach_swimtot: jump'beach_swimloop'
-
-	beach_nudcnt = 1
-	:beach_nudloop
-		if beach_nudselfie[beach_nudcnt] = 1:pl'<a href="exec:view''images/pc/selfies/beach/nude/<<beach_nudcnt>>.jpg''"><b>Nude beach selfie #<<beach_nudcnt>></b></a>'
-		beach_nudcnt += 1
-	if beach_nudcnt <= beach_nudtot: jump'beach_nudloop'
-
-	*nl
-	pl'<center><a href="exec:gs ''telefon'', ''Phone_menu'' "><img src="images/system/icon/back.png"></a></center>'
+	gt 'phone_selfies', 'selfies'
 end
 
 !!picking the selfie image when taking photos, this sets the location variable
@@ -899,6 +820,15 @@ if $ARGS[0] = 'Phone_camera_selfie':
 	elseif $locclass = 'livingr':
 		$phone_loc = 'livingroom'
 		gs 'telefon', 'Phone_selfie_image'
+	elseif $locclass = 'changingroom':
+		$phone_loc = 'changingroom'
+		gs 'telefon', 'Phone_selfie_image'
+	elseif $locclass = 'park':
+		$phone_loc = 'park'
+		gs 'telefon', 'Phone_selfie_image'
+	elseif $locclass = 'lockeroom':
+		$phone_loc = 'lockeroom'
+		gs 'telefon', 'Phone_selfie_image'
 	else
 		phone_rand = RAND(1,2)
 		phone_selfie[phone_rand] = 1