Merge branch 'master' of http://git.tfgamessite.com/KevinSmarts/girllife-ecv

glife.qproj

@@ -17,6 +17,7 @@
       <Location name="inputProcessing"/>
       <Location name="restoreposition"/>
       <Location name="saveposition"/>
+      <Location name="mod_setting"/>
     </Folder>
     <Folder name="clothing">
       <Location name="wardrobe"/>

locations/LOCA

@@ -2,5 +2,18 @@
 
 if Enable_settingmode!2: killvar '$cheatmenu'
 
+if mod_list > 0:
+	mod_i=1
+	:mod_exec
+	if $mod_name[mod_i] ! '':
+		gs 'mod_<<$mod_name[mod_i]>>', $ARGS[0], $ARGS[1], $ARGS[2], $ARGS[3], $ARGS[4], $ARGS[5], $ARGS[6], $ARGS[7], $ARGS[8]
+	end
+	
+	if mod_list > mod_i:
+		mod_i+=1
+		jump 'mod_exec'
+	end
+end
+
 --- LOCA ---------------------------------
 

locations/Snpc

@@ -2,7 +2,7 @@
 
 gs 'dinnpc'
 gs 'stat'
-$static_num = $static_num[numnpc]
+$static_num = $school_static_num[numnpc]
 '<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
 '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
 '<<$npc_notes[$static_num]>>'

locations/gschool_lessonsev1

@@ -337,6 +337,7 @@ if $ARGS[0] = 'biology':
 			end
 			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
+		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 	else
 		gt 'gschool_lessons', 'short_break'
 	end
@@ -481,6 +482,7 @@ if $ARGS[0] = 'science':
 			end
 			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
+		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 	else
 		gt 'gschool_lessons', 'short_break'
 	end
@@ -767,6 +769,7 @@ if $ARGS[0] = 'computer':
 				act 'Go to the Principals office': gt 'gschool_office', 'principal'
 			end
 		end
+		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 	else
 		gt 'gschool_lessons', 'short_break'
 	end
@@ -1096,6 +1099,7 @@ if $ARGS[0] = 'russian':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		end
+		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 	else
 		gt 'gschool_lessons', 'short_break'
 	end

locations/gschool_lessonsev2

@@ -266,6 +266,7 @@ if $ARGS[0] = 'geography':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		end
+		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 	else
 		gt 'gschool_lessons', 'short_break'
 	end
@@ -437,6 +438,7 @@ if $ARGS[0] = 'math':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		end
+		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 	else
 		gt 'gschool_lessons', 'short_break'
 	end
@@ -717,6 +719,7 @@ if $ARGS[0] = 'history':
 			end
 			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
+		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 	else
 		gt 'gschool_lessons', 'short_break'
 	end
@@ -935,6 +938,7 @@ if $ARGS[0] = 'shop':
 			end
 			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
+		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 	else
 		gt 'gschool_lessons', 'short_break'
 	end

locations/gschool_lessonsev3

@@ -175,6 +175,7 @@ if $ARGS[0] = 'literature':
 			*nl
 			'As you wait for the end of the lesson, you notice you''re not the only one being a bit drowsy; Lizaveta is very close to falling asleep on her desk.'
 		end
+		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 	else
 		gt 'gschool_lessons', 'short_break'
 	end
@@ -498,6 +499,7 @@ if $ARGS[0] = 'english':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		end
+		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 	else
 		gt 'gschool_lessons', 'short_break'
 	end
@@ -890,6 +892,7 @@ if $ARGS[0] = 'music':
 			end
 			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
+		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 	else
 		gt 'gschool_lessons', 'short_break'
 	end
@@ -1079,6 +1082,7 @@ if $ARGS[0] = 'art':
 			end
 			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
+		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 	else
 		gt 'gschool_lessons', 'short_break'
 	end

locations/gschool_lunch

@@ -659,21 +659,21 @@ if $ARGS[0] = 'events':
 
 					act 'Go to roof with him': gt 'gschool_sex', 'lunch_sex'
 				end
+			end
 
-				act 'Hell no':
-					*clr & cla
-					'<center><video autoplay loop src="images/locations/pavlovsk/school/lunch/flipoff.mp4"></video></center>'
-					'You can not believe he asked that, well yes you can. That seems to be the only thing boys are even remotely capable of thinking about. "No! What kind of girl do you think I am anyways? Whatever, I don''t even want to know." With that you turn and storm off, leaving him behind.'
+			act 'Hell no':
+				*clr & cla
+				'<center><video autoplay loop src="images/locations/pavlovsk/school/lunch/flipoff.mp4"></video></center>'
+				'You can not believe he asked that, well yes you can. That seems to be the only thing boys are even remotely capable of thinking about. "No! What kind of girl do you think I am anyways? Whatever, I don''t even want to know." With that you turn and storm off, leaving him behind.'
 
-					act 'Continue': gt 'gschool_lessons', 'short_break'
-				end
-				act 'Not today':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/hallflirt.jpg"></center>'
-					'You pause for a bit, acting like you are giving his suggestion some serious thought, just to fuck with him, until you realize you''re not pretending: you really are considering it! Damn, maybe you are a bit of a slut. After a few moments you shake your head. "You seem nice but I hardly know you, maybe some other time, but now I need to run. Talk to you later." With that you hurry off leaving him unsure if this was a good or bad thing.'
+				act 'Continue': gt 'gschool_lessons', 'short_break'
+			end
+			act 'Not today':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/hallflirt.jpg"></center>'
+				'You pause for a bit, acting like you are giving his suggestion some serious thought, just to fuck with him, until you realize you''re not pretending: you really are considering it! Damn, maybe you are a bit of a slut. After a few moments you shake your head. "You seem nice but I hardly know you, maybe some other time, but now I need to run. Talk to you later." With that you hurry off leaving him unsure if this was a good or bad thing.'
 
-					act 'Continue': gt 'gschool_lessons', 'short_break'
-				end
+				act 'Continue': gt 'gschool_lessons', 'short_break'
 			end
 		end
 	elseif rand(1,100) < 3 and soniaPS > 2:

locations/mod_setting

@@ -0,0 +1,73 @@
+# mod_setting
+
+!'Mod system 1.0 by illume'
+*nl '<center><h1>MODs</h1></center>'
+
+'<center>'
+'WARNING: install too much mods, or some bad-structure mod, may cause seirous lag!'
+if mod_list > 0:
+
+	'<table border=1><tr><td>id</td><td>Name</td><td>Version</td><td>Author</td><td>Description</td></tr>'
+	mod_i=1
+	:mod_alllist
+	if $mod_name[mod_i] ! '':
+		gs 'mod_<<$mod_name[mod_i]>>_setup'
+		*p '<tr><td><<mod_i>></td><td><<$mod_info[0]>></td>'
+		!name
+		*p '<td><<val($mod_info[1])/10000>>.<<(val($mod_info[1]) mod 10000)/100>> <<iif(val($mod_info[1]) mod 100 > 0, ''fix <<val($mod_info[1]) mod 100>> '', '' '')>></td>'
+		!version
+		*p '<td><<$mod_info[2]>></td>'
+		!author
+		*p '<td><a href="exec:gs ''mod_<<$mod_info[0]>>_readme''"><img src="images/system/icon/anptekainfo.jpg"></a> <<$mod_info[3]>></td></tr>'
+		!description and readme		
+	else
+		'ERROR loading mod id <<mod_i>>, no mod name available'
+	end
+	
+	if mod_list > mod_i:
+		mod_i+=1
+		jump 'mod_alllist'
+	end	
+	killvar 'mod_info'	
+	'</table>'
+else
+	'<br>No Mod actived.'
+end
+'<img src="images/system/icon/mod_sample.jpg">'
+'</center>'
+act 'Install new mod':
+	killvar 'mod_info'
+	$mod_temp=input('input mod name (as for the example image above, input <B>isample</B>)')
+	if $mod_temp='':exit
+	ADDQST 'mod/<<$mod_temp>>.qsp'
+	gs 'mod_<<$mod_temp>>_setup'
+	if $mod_info[0] = '':
+		msg '<b><<$mod_temp>>.qsp</b> is not a Girl life ECV mod, please contract its author for help'
+		exit
+	end
+	mod_list += 1
+	$mod_name[mod_list] = $mod_info[0]
+	$mod_version[mod_list] = $mod_info[1]
+	$mod_author[mod_list] = $mod_info[2]
+	$mod_desc[mod_list] = $mod_info[3]
+	gt curloc
+end 
+act 'Disable all mods':
+	if input('Are you sure? ALL mod will be disabled!<br>please input <b>qqq</B> to confirm') = 'qqq':
+		KILLQST 
+		set mod_list=0
+		KILLVAR '$mod_name'
+		KILLVAR '$mod_version'
+		KILLVAR '$mod_author'
+		KILLVAR '$mod_desc'
+		'All mod disabled. You can re-install them later.'
+		cla
+		act 'Continue':goto curloc
+	end
+end
+act 'Return':
+	gt $loc,$metka
+end
+
+--- mod_setting ---------------------------------
+

locations/preALT

@@ -123,6 +123,8 @@ if $ARGS[0] = 'Cursed Schoolgirl Start':
 		end
 	end
 	act 'Skip intro':
+		*clr
+		cla
 		hour = 18
 		showstat 1
 		showobjs 1