Browse Source

[added] feature branch with journal ui rework

Pepegass 1 year ago
parent
commit
1a8a9f2870
3 changed files with 81 additions and 0 deletions
  1. 1 0
      glife.qproj
  2. 2 0
      locations/journal.qsrc
  3. 78 0
      locations/journal_quests_build.qsrc

+ 1 - 0
glife.qproj

@@ -16,6 +16,7 @@
 	<Location name="journal_portfolio"/>
 	<Location name="Cheatmenu_din"/>
 	<Location name="themes"/>
+	<Location name="journal_quests_build"/>
 	<Folder name="System">
 		<Location name="counter"/>
 		<Location name="loadg"/>

+ 2 - 0
locations/journal.qsrc

@@ -634,5 +634,7 @@ if $ARGS[0] = 'leaveactions':
 		jclose = 1
 		gt $loc, $loc_arg
 	end	
+	!!Temporary enter for testing
+	act 'Check new journal': gs 'journal_quests_build'
 end
 --- journal ---------------------------------

+ 78 - 0
locations/journal_quests_build.qsrc

@@ -0,0 +1,78 @@
+#journal_quests_build
+!!this will eventually split into 2 files, all quest building texts will be in one file, quest filtering sorting and displaying will be in second file probably existing journal_quests.qsrc
+!!gs 'journal_quests_build'
+
+$questsList[1] = "loremIpsum"
+$questsList[2] = "loremIpsum1"
+$questsList[3] = "loremIpsum2"
+$questsList[4] = "loremIpsum3"
+$questsList[5] = "loremIpsum4"
+$questsList[6] = "loremIpsum5"
+$questsList[7] = "loremIpsum6"
+$questsList[8] = "loremIpsum7"
+
+$questsDisplay 
+
+!! All - display all quests
+!! St.Petersburg - city quests filter
+!! Pavlovsk - pavlovsk quests filter
+!! Gadukino - gadukino quests filter
+
+journalBuilder['trackedQuests'] = 0
+!!journalBuilder['hideHeader'] toggle header on/off
+!!journalBuilder['questsMenu'] shows what menu item is currently active
+
+$journalQuestsMenuOptions[0] = "Selected"
+$journalQuestsMenuOptions[1] = "All"
+$journalQuestsMenuOptions[2] = "St.Petersburg"
+$journalQuestsMenuOptions[3] = "Pavlovsk"
+$journalQuestsMenuOptions[4] = "Gadukino"
+
+$journalMenuItem = {
+    *p '<th><a href="exec:dynamic ''journalBuilder['questsMenu'] = val($args[0])'' & gs ''journal_quests_build''">'+ iif(journalBuilder['questsMenu'] = val($args[0]), '><h2><<$journalQuestsMenuOptions[val($args[0])]>><h2><','<h3><<$journalQuestsMenuOptions[val($args[0])]>></h3>') +'</a></th>'
+}
+
+*clr & cla
+act 'Put your journal down': gt $menu_loc, $menu_arg
+act 'Return to top journal page': gt 'journal', 'records'
+$jumploc = 'questtab'
+
+!!hiding journal header to clear more space
+if journalBuilder['hideHeader'] = 0:
+    gs 'journal', 'journalmenu'
+    '<center><h2>Quests</h2></center>' 
+end
+!!*p '<table width="90%" align="center" width="90%" cellspacing="0" cellpadding="0" valign="top"><tr>' 
+*p '<table width="90%" align="center" cellspacing="10" cellpadding="0" valign="top"><tr>' 
+!!dynamic "$buildJournalMenuItems"
+i = 0
+size = arrsize('$journalQuestsMenuOptions')
+:loopJournalMenu
+*p '<th><a href="exec:journalBuilder[''questsMenu''] = <<i>> & gs ''journal_quests_build''">'+ iif(journalBuilder['questsMenu'] = i, '<h2>' + '> <<$journalQuestsMenuOptions[i]>> <' + '<h2>','<h3><<$journalQuestsMenuOptions[i]>></h3>') +'</a></th>'
+if i < size: i += 1 & jump 'loopJournalMenu'
+*p '<th><a href="exec:journalBuilder[''hideHeader''] = '+iif(journalBuilder['hideHeader'] = 0, 1, 0)+' & gs ''journal_quests_build''">'+iif(journalBuilder['hideHeader'] = 0, '^', 'v')+'</a></th>'
+killvar 'i' & killvar 'size'
+*p '</tr></table>'
+
+if journalBuilder['questsMenu'] = 0:
+    *pl "Display pinned quests"
+    *nl
+    *pl "Display other quests"
+end
+
+if journalBuilder['questsMenu'] = 1:
+    *pl "Display all quests"
+end
+if journalBuilder['questsMenu'] = 2:
+    *pl "Display City quests"
+end
+if journalBuilder['questsMenu'] = 3:
+    *pl "Display Pavlovsk quests"
+end
+if journalBuilder['questsMenu'] = 4:
+    *pl "Display Gadukino quests"
+end
+
+
+--- journal_quests_build ---------------------------------
+