3 Commits fd22189811 ... bd37181715

Author SHA1 Message Date
  3xpurt bd37181715 Merge branch 'master' of https://git.catrenelle.com/julzor/glife 4 years ago
  julzor ed677ae445 [added] third night_mode (white background) 4 years ago
  julzor 5af7c69a96 [fixed] stuff in stat_display 4 years ago
3 changed files with 28 additions and 17 deletions
  1. 5 4
      locations/Cheatmenu_din.qsrc
  2. 18 13
      locations/stat_display.qsrc
  3. 5 0
      locations/themes.qsrc

+ 5 - 4
locations/Cheatmenu_din.qsrc

@@ -1890,10 +1890,11 @@ $cheatmenu['display'] = {
 	!night_mode 1: black
 	!night_mode 2: grey
 	!night_mode 99: no theme
-	if night_mode = 0:'Girl Life Theme Selection: Dynamic | <a href="exec:night_mode = 1 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Pitch Black</a> | <a href="exec:night_mode = 2 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Modern Grey</a> | <a href="exec:night_mode = 99 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">No Theme</a>'
-	if night_mode = 1:'Girl Life Theme Selection: <a href="exec:night_mode = 0 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Dynamic</a> | Pitch Black | <a href="exec:night_mode = 2 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Modern Grey</a> | <a href="exec:night_mode = 99 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">No Theme</a>'
-	if night_mode = 2:'Girl Life Theme Selection: <a href="exec:night_mode = 0 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Dynamic</a> | <a href="exec:night_mode = 1 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Pitch Black</a> | Modern Grey | <a href="exec:night_mode = 99 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">No Theme</a>'
-	if night_mode = 99:'Girl Life Theme Selection: <a href="exec:night_mode = 0 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Dynamic</a> | <a href="exec:night_mode = 1 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Pitch Black</a> | <a href="exec:night_mode = 2 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Modern Grey</a> | No Theme'
+	if night_mode = 0:'Girl Life Theme Selection: Dynamic | <a href="exec:night_mode = 1 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Pitch Black</a> | <a href="exec:night_mode = 2 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Modern Grey</a> | <a href="exec:night_mode = 3 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">White</a> | <a href="exec:night_mode = 99 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">No Theme</a>'
+	if night_mode = 1:'Girl Life Theme Selection: <a href="exec:night_mode = 0 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Dynamic</a> | Pitch Black | <a href="exec:night_mode = 2 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Modern Grey</a> | <a href="exec:night_mode = 3 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">White</a> | <a href="exec:night_mode = 99 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">No Theme</a>'
+	if night_mode = 2:'Girl Life Theme Selection: <a href="exec:night_mode = 0 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Dynamic</a> | <a href="exec:night_mode = 1 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Pitch Black</a> | Modern Grey | <a href="exec:night_mode = 3 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">White</a> | <a href="exec:night_mode = 99 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">No Theme</a>'
+	if night_mode = 3:'Girl Life Theme Selection: Dynamic | <a href="exec:night_mode = 1 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Pitch Black</a> | <a href="exec:night_mode = 2 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Modern Grey</a> | White | <a href="exec:night_mode = 99 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">No Theme</a>'
+	if night_mode = 99:'Girl Life Theme Selection: <a href="exec:night_mode = 0 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Dynamic</a> | <a href="exec:night_mode = 1 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Pitch Black</a> | <a href="exec:night_mode = 2 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Modern Grey</a> | <a href="exec:night_mode = 3 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">White</a> | No Theme'
 
 	'<font color="grey">Dynamic theme (default) will change colour based on the game hour. No theme will remove table backgrounds.</font>'
 	*nl

+ 18 - 13
locations/stat_display.qsrc

@@ -212,12 +212,12 @@ else
 	end
 end
 
-$stat_msg += '<br><br>'
-
 !!-----------------Status Icons (Start)------------------
 
 if cheatStatusIcons = 0:
 
+	$stat_msg += '<br><br>'
+
 	!!Row 1: Appearance
 	
 	$statusIconBarTab_1 = '<table><tr>'
@@ -361,15 +361,15 @@ if cheatStatusIcons = 0:
 	
 	if $stat_cum_msg ! '': $statusIconBarTab_2 += '<td><a href="exec:msg $stat_cum_msg"><img title="You have cum in and/or on your body. Click to find out more." height = 54 src="images/system/icon/status_icons/cum_covered.png"></a></td>'
 		
-	if stat_cumeater_check = 1 and trt_cumeater = 1 and cumeater_cheat = 0 and menu_off = 0:
+	if stat_cumloc_check = 1 and trt_cumeater = 1 and cumeater_cheat = 0 and menu_off = 0:
 		$statusIconBarTab_2 += '<td><a href="exec: gs ''cum_manage'', ''cumeater_icon'' & gs ''stat''"><img title="Click to lick up all that delicious cum." height = 54 src="images/system/icon/status_icons/cum_eater.png"></a></td>'
-	elseif stat_cumeater_check = 1 and trt_cumeater = 1 and cumeater_cheat = 0 and menu_off = 1:
+	elseif stat_cumloc_check = 1 and trt_cumeater = 1 and cumeater_cheat = 0 and menu_off = 1:
 		$statusIconBarTab_2 += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = 54 src="images/system/icon/status_icons/cum_eater.png"></a></td>'
 	end
 		
 	if stat_cumloc_check = 1 and salfetka > 0 and menu_off = 0: 
 		$statusIconBarTab_2 += '<td><a href="exec:dynamic $d_salf"><img title="Click to use your wipes." height = 54 src="images/system/icon/status_icons/wipes.png"></a></td>'
-	elseif stat_cumloc_check = 1 and salfetka > 0 and menu_off = 0:
+	elseif stat_cumloc_check = 1 and salfetka > 0 and menu_off = 1:
 		$statusIconBarTab_2 += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = 54 src="images/system/icon/status_icons/wipes.png"></a></td>'
 	end
 		
@@ -1174,7 +1174,6 @@ $stat_cum_msg = ''
 $stat_visible_cum_temp = ''
 stat_visible_cum = 0
 stat_cumloc_check = 0
-stat_cumeater_check = 0
 
 i = 0
 :cumlocloop
@@ -1398,23 +1397,22 @@ i = 0
 					end
 				end
 			end
-			if j <= 4 and trt_cumeater = 1 and $txtiscum = 'cum':
-				$txtiscum = '<a href="exec:gs ''cum_manage'', ''cumeater'', <<i>>"><font color=#0064FF>' + $txtiscum + '</font></a>'
-				stat_cumeater_check = 1
-			end
+			$icon_txtiscum = $txtiscum
+			if j <= 4 and trt_cumeater = 1 and $txtiscum = 'cum': $txtiscum = '<a href="exec:gs ''cum_manage'', ''cumeater'', <<i>>"><font color=#0064FF>' + $txtiscum + '</font></a>'
 			$txtiscum += ' from '
+			$icon_txtiscum += ' from '
 			if i = 0 and j = 4 and vibratorIN = 0 and pcs_vag*10 < cumvolume['<<i>>:<<j>>'] and cumvolume['<<i>>:<<j>>'] >= 20:
 				if enable_extra_msg = 1: $stat_msg += '<BR><b><font color="red">' + $txtamount + 'amounts of ' + $txtiscum + $txtperson + 'is ' + $txtproxy + $txtloc + iif($pantyworntype ! 'none', ' into your panties.', ' down your legs.')+'</font></b>'
 				if $stat_cum_msg ! '': $stat_cum_msg += '<br>'
-				$stat_cum_msg += $txtamount + 'amounts of ' + $txtiscum + $txtperson + 'is ' + $txtproxy + $icon_txtloc + iif($pantyworntype ! 'none', ' into your panties.', ' down your legs.')
+				$stat_cum_msg += $txtamount + 'amounts of ' + $icon_txtiscum + $txtperson + 'is ' + $txtproxy + $icon_txtloc + iif($pantyworntype ! 'none', ' into your panties.', ' down your legs.')
 			elseif sparragestage >= 5:
 				if cumcondslip_aware > 0 and enable_extra_msg = 1: $stat_msg += '<BR><b><font color="red">' + $txtamount + 'amounts of ' + $txtiscum + $txtperson + 'is ' + $txtproxy + $txtloc + '.</font></b>'
 				if $stat_cum_msg ! '': $stat_cum_msg += '<br>'
-				$stat_cum_msg += $txtamount + 'amounts of ' + $txtiscum + $txtperson + 'is ' + $txtproxy + $icon_txtloc + '.'
+				$stat_cum_msg += $txtamount + 'amounts of ' + $icon_txtiscum + $txtperson + 'is ' + $txtproxy + $icon_txtloc + '.'
 			elseif j ! 0:
 				if enable_extra_msg = 1: $stat_msg += '<BR><b><font color="red">' + $txtamount + 'amounts of ' + $txtiscum + $txtperson + 'is ' + $txtproxy + $txtloc + '.</font></b>'
 				if $stat_cum_msg ! '': $stat_cum_msg += '<br>'
-				$stat_cum_msg += $txtamount + 'amounts of ' + $txtiscum + $txtperson + 'is ' + $txtproxy + $icon_txtloc + '.'
+				$stat_cum_msg += $txtamount + 'amounts of ' + $icon_txtiscum + $txtperson + 'is ' + $txtproxy + $icon_txtloc + '.'
 			else
 				if enable_extra_msg = 1: $stat_msg += '<BR><b><font color="red">Your breath smells like sperm.</font></b>'
 				if $stat_cum_msg ! '': $stat_cum_msg += '<br>'
@@ -2150,5 +2148,12 @@ else
 	$stat_msg = 'Android mode, <a href="exec:gs ''$menu_obnovit''">Refresh</a><<$stat_msg>>'
 end
 
+if icon_reset = 0:
+	icon_reset = 1
+	gs 'stat'
+else
+	icon_reset = 0
+end
+
 --- stat_display ---------------------------------
 

+ 5 - 0
locations/themes.qsrc

@@ -3,6 +3,7 @@
 !night_mode 0: dynamic
 !night_mode 1: black
 !night_mode 2: grey
+!night_mode 3: white
 !night_mode 99: no theme (may break tables)
 
 !outdoor theme 0 is dynamic, and changes colour with time of day.
@@ -32,6 +33,10 @@ if $ARGS[0] = 'outdoors':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(20, 20, 20)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 3:
+		bcolor = rgb(255, 255, 255)
+		lcolor = rgb(106, 90, 205)
+		fcolor = rgb(0, 0, 0)
 	elseif night_mode = 99:
 		killvar 'fcolor'
 		killvar 'bcolor'