3 Commits 4e45e6344e ... 2b1cc562f4

Author SHA1 Message Date
  3xpurt 2b1cc562f4 [changed] Safer mod removal for Emergency menu (now asks for confirmation). Option to disable mods only displays if mods are installed. 1 year ago
  3xpurt eca807b5e8 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 year ago
  Kevin_Smarts 43f80d6614 [added] Image for braiding hair with Anya and dream about that momment for city starts 1 year ago
4 changed files with 59 additions and 32 deletions
  1. 4 0
      locations/dreams.qsrc
  2. 26 24
      locations/mod_setting.qsrc
  3. 28 8
      locations/obj_din.qsrc
  4. 1 0
      locations/sister_chat.qsrc

+ 4 - 0
locations/dreams.qsrc

@@ -8,6 +8,10 @@ if $ARGS[0] = 'start':
 		'Today you had a very strange dream: You were blindfolded, having sex with a stranger. After the two of you are done you remove the blindfold and recognize the stranger to be your stepfather.'
 		pcs_horny = 100
 		stepdadqw += 1
+	elseif canBraidHair = 0 and mid($start_type,1,2) ! 'sg' and pcs_hairlng > 80:
+		canBraidHair = 1
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/braid.jpg"></center>'
+		'You dream about the time your sister taught you how to braid your hair. She was happy to help you out and teach you how to do it, it was one of your more memorable sister bonding moments the two of you had not long before you moved out.'
 	elseif succubusQW = 1 or succubusQW = 2:
 		!this is for initial dream and a reoccuring dream if the feeling was ignored
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/succubdream.jpg"></center>'

+ 26 - 24
locations/mod_setting.qsrc

@@ -68,32 +68,34 @@ act ''+iif(settingmode = 1, '<center><b>Install new mod</b></center>','Install n
 	gt 'mod_setting'
 end
 
-act ''+iif(settingmode = 1, '<center><b>Disable all mods</b></center>','Disable all mods')+'':
-	if input('Are you sure? ALL mod will be disabled!<br>please input <b>qqq</B> to confirm') = 'qqq':
-		if mod_list > 0:
-			mod_i=mod_list
-			:mod_data_remover
-			if $mod_name[mod_i] ! '':
-				$mod_su_name = 'mod_<<$mod_name[mod_i]>>_onremove'
-				if LOC($mod_su_name): gs $mod_su_name
-			end
-			if mod_i > 0:
-				mod_i-=1
-				jump 'mod_data_remover'
+if mod_list > 0:
+	act ''+iif(settingmode = 1, '<center><b>Disable all mods</b></center>','Disable all mods')+'':
+		if input('Are you sure? ALL mod will be disabled!<br>please input <b>qqq</B> to confirm') = 'qqq':
+			if mod_list > 0:
+				mod_i=mod_list
+				:mod_data_remover
+				if $mod_name[mod_i] ! '':
+					$mod_su_name = 'mod_<<$mod_name[mod_i]>>_onremove'
+					if LOC($mod_su_name): gs $mod_su_name
+				end
+				if mod_i > 0:
+					mod_i-=1
+					jump 'mod_data_remover'
+				end
+				killvar '$mod_su_name'
+				killvar 'mod_i'
 			end
-			killvar '$mod_su_name'
-			killvar 'mod_i'
-		end
 
-		killqst
-		set mod_list=0
-		killvar '$mod_name'
-		killvar '$mod_version'
-		killvar '$mod_author'
-		killvar '$mod_desc'
-		killvar '$mod_opt'
-		msg 'All mod disabled. You can re-install them later.'
-		gt 'mod_setting'
+			killqst
+			set mod_list=0
+			killvar '$mod_name'
+			killvar '$mod_version'
+			killvar '$mod_author'
+			killvar '$mod_desc'
+			killvar '$mod_opt'
+			msg 'All mod disabled. You can re-install them later.'
+			gt 'mod_setting'
+		end
 	end
 end
 --- mod_setting ---------------------------------

+ 28 - 8
locations/obj_din.qsrc

@@ -2144,14 +2144,34 @@ if $ARGS[0] = 'emergency':
 	cla
 	act 'Go to Pavlovsk':gt 'pav_residential'
 	act 'Go to City Residental':gt 'city_residential'
-	act 'Remove all mods':
-		killqst
-		set mod_list=0
-		killvar '$mod_name'
-		killvar '$mod_version'
-		killvar '$mod_author'
-		killvar '$mod_desc'
-		killvar '$mod_opt'
+	if mod_list > 0:
+		act 'Disable all mods':
+			if input('Are you sure? ALL mod will be disabled!<br>please input <b>qqq</B> to confirm') = 'qqq':
+				if mod_list > 0:
+					mod_i=mod_list
+					:mod_data_remover
+					if $mod_name[mod_i] ! '':
+						$mod_su_name = 'mod_<<$mod_name[mod_i]>>_onremove'
+						if LOC($mod_su_name): gs $mod_su_name
+					end
+					if mod_i > 0:
+						mod_i-=1
+						jump 'mod_data_remover'
+					end
+					killvar '$mod_su_name'
+					killvar 'mod_i'
+				end
+
+				killqst
+				set mod_list=0
+				killvar '$mod_name'
+				killvar '$mod_version'
+				killvar '$mod_author'
+				killvar '$mod_desc'
+				killvar '$mod_opt'
+				msg 'All mod disabled. You can re-install them later.'
+			end
+		end
 	end
 	if $loc ! '' and $loc_arg ! '':
 		act 'Cancel':gt $loc, $loc_arg

+ 1 - 0
locations/sister_chat.qsrc

@@ -99,6 +99,7 @@ if $ARGS[0] = 'checks':
 					canBraidHair = 1
 					npc_rel['A33'] += 5
 					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/braid.jpg"></center>'
 					'You make plenty of mistakes and get your hair in a knot a couple of times, but eventually you feel confident enough to braid your hair on your own.'
 					act 'Thank your sister and leave': gt $loc, $loc_arg
 					act 'Chat': gt 'sister_chat', 'sister_chat'