Browse Source

Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

Myles Croft (Hooded Silence) 3 months ago
parent
commit
bede61ad3b

+ 1 - 0
locations/city_commcenter.qsrc

@@ -131,6 +131,7 @@ if $ARGS[0] = 'drivingschool':
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/community/dk2.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/community/dk2.jpg"></center>'
 	*nl
 	*nl
 	'You enter the community center with excitement with your thoughts full about getting your driving licence and the freedom to achieve your dreams.'
 	'You enter the community center with excitement with your thoughts full about getting your driving licence and the freedom to achieve your dreams.'
+	'The driving school is government run and they check personal details against state registration database. As such a fake ID will not work, you have to be 18 or above.'
 	*nl
 	*nl
 
 
 	if prava ! 0:
 	if prava ! 0:

File diff suppressed because it is too large
+ 840 - 420
locations/clothing_QV.qsrc


+ 21 - 0
qsrc2tw/tools/QSRC2TW/resources/QSP-macros/EXIT.js

@@ -0,0 +1,21 @@
+Macro.add('EXIT', {
+	skipArgs : true,
+	handler  : function () {
+		try{
+			window.SweetCube.globalBreak = true;
+		}
+		catch (ex) {
+			return this.error('ERROR in EXIT-widget: ' + ex.message);
+		}
+	}
+});
+
+/*$(document).on(':passagestart', function (ev) {
+    window.SweetCube.globalBreak = false;
+});*/
+$(document).on(':passagerender', function (ev) {
+    window.SweetCube.globalBreak = false;
+});
+/*$(document).on(':passagedisplay', function (ev) {
+    window.SweetCube.globalBreak = false;
+});*/

+ 1 - 0
qsrc2tw/tools/QSRC2TW/resources/QSP-macros/GS.js

@@ -55,6 +55,7 @@ setup.qsp_gs = function(output,...args){
 		setup.qsp_performAnal_current = oldScope;
 		setup.qsp_performAnal_current = oldScope;
 		State.variables.ARGSstack.pop();
 		State.variables.ARGSstack.pop();
 		setup.qsp_callStack.pop();
 		setup.qsp_callStack.pop();
+		window.SweetCube.globalBreak = false;
 	}
 	}
 
 
 	setup.updateActions();
 	setup.updateActions();

+ 0 - 4
qsrc2tw/tools/QSRC2TW/resources/resources/exit.tw

@@ -1,4 +0,0 @@
-:: SYSTEM_MACRO_EXIT[widget]
-<<widget 'EXIT'>>
-    <div class="debugNotice">EXIT does nothing.</div>
-<</widget>>

File diff suppressed because it is too large
+ 0 - 0
qsrc2tw/tools/tweeGo/storyFormats/sugarcube-2/format.js


Some files were not shown because too many files changed in this diff