Przeglądaj źródła

simplify notes in journal

rachels 2 lat temu
rodzic
commit
60291f9a5c

+ 0 - 14
glife.qproj

@@ -30,7 +30,6 @@
 		<Location name="cikl"/>
 		<Location name="daystart"/>
 		<Location name="dina"/>
-		<Location name="MenuLoc"/>
 		<Location name="MenuMainLoc"/>
 		<Location name="starenie"/>
 		<Location name="stat"/>
@@ -1026,19 +1025,6 @@
 		<Location name="hotel"/>
 		<Location name="deckShuffle"/>
 	</Folder>
-	<Folder name="Menu">
-		<Location name="Menu.Info"/>
-		<Location name="Menu.Create"/>
-		<Location name="Menu.Add"/>
-		<Location name="Menu.AddCondition"/>
-		<Location name="Menu.AddModule"/>
-		<Location name="Menu.AddEvent"/>
-		<Location name="Menu.Call"/>
-		<Location name="Menu.Chosen"/>
-		<Location name="Menu.Time"/>
-		<Location name="Menu.Destroy"/>
-		<Location name="Menu.Treatment"/>
-	</Folder>
 	<Folder name="Game Menu">
 		<Location name="$menu_setting"/>
 		<Location name="$menu_skills"/>

+ 0 - 47
locations/Menu.Add.qsrc

@@ -1,47 +0,0 @@
-# Menu.Add
-if $ARGS[0] = '' or $ARGS[1] = '':exit
-!----------
-if $ARGS[1] = '---' or lcase($ARGS[1]) = 'separator':
-	dynamic "$otg_Menyu_<<$ARGS[0]>>[]='-:-'"
-	exit
-end
-!----------
-ARGS[10] = arrsize('ARGS')
-if ARGS[10] < 3: $ARGS[2] = ''
-if ARGS[10] < 4: $ARGS[3] = ''
-!----------
-$ARGS[0] = 'otg_Menyu_<<$ARGS[0]>>'
-$ARGS[1] = replace($ARGS[1],'''','''''')
-if $ARGS[2] <> '':$ARGS[2] = ':'+replace($ARGS[2],'''','''''')
-if $ARGS[3] <> '':$ARGS[3] = replace($ARGS[3],'''','''''')
-!----------
-dynamic "
-	$<<$ARGS[0]>>[]='<<$ARGS[1]>>:menu.Treatment<<$ARGS[2]>>'
-	$<<$ARGS[0]>>_Parameters[str(arrsize('<<$ARGS[0]>>'))+'_W']='<<$ARGS[1]>>'
-	$<<$ARGS[0]>>_Parameters[str(arrsize('<<$ARGS[0]>>'))+'_F']='<<$ARGS[3]>>'
-"
-!----------
-$ARGS[3] = ''
-if ARGS[10] > 4:
-	ARGS[11] = 4
-	:otg_menyu_metka_1
-	if ARGS[11] < ARGS[10]:
-		if $ARGS[ARGS[11]] <> '':
-			$ARGS[3] += ','''+replace($ARGS[ARGS[11]],'''','''''')+''''
-		else
-			if ARGS[ARGS[11]] <> 0:
-				$ARGS[3] += ','+str(ARGS[ARGS[11]])
-			else
-				$ARGS[3] += ','''''
-			end
-		end
-		ARGS[11] += 1
-		jump 'otg_menyu_metka_1'
-	end
-end
-!----------
-dynamic "
-$<<$ARGS[0]>>_Parameters[str(arrsize('<<$ARGS[0]>>'))+'_P'] = '<<replace($ARGS[3],'''','''''')>>'
-"
---- Menu.Add ---------------------------------
-

+ 0 - 11
locations/Menu.AddCondition.qsrc

@@ -1,11 +0,0 @@
-# Menu.AddCondition
-if $ARGS[0] = '' or $ARGS[1] = '': exit
-!----------
-ARGS[10] = dyneval("Result = arrsize('otg_Menyu_<<$ARGS[0]>>')")
-if dyneval("$Result = $otg_Menyu_<<$ARGS[0]>>[<<ARGS[10]>>-1]") = '-:-': exit
-!----------
-dynamic "
-	$otg_Menyu_<<$ARGS[0]>>_Parameters['<<ARGS[10]>>_In'] = '<<replace($ARGS[1],'''','''''')>>'
-"
---- Menu.AddCondition ---------------------------------
-

+ 0 - 14
locations/Menu.AddEvent.qsrc

@@ -1,14 +0,0 @@
-# Menu.AddEvent
-if $ARGS[0] = '' or $ARGS[1] = '': exit
-!----------
-$ARGS[1] = lcase(trim($ARGS[1]))
-!----------
-if $ARGS[1] = 'when you select':
-	dynamic "$otg_Menyu_<<$ARGS[0]>>_ModuliSobyty['<<$ARGS[1]>>'] = '<<replace($ARGS[2],'''','''''')>>'"
-elseif $ARGS[1] = 'after selection processing':
-	dynamic "$otg_Menyu_<<$ARGS[0]>>_ModuliSobyty['<<$ARGS[1]>>'] = '<<replace($ARGS[2],'''','''''')>>'"
-elseif $ARGS[1] = 'failure of the choice':
-	dynamic "$otg_Menyu_<<$ARGS[0]>>_ModuliSobyty['<<$ARGS[1]>>'] = '<<replace($ARGS[2],'''','''''')>>'"
-end
---- Menu.AddEvent ---------------------------------
-

+ 0 - 11
locations/Menu.AddModule.qsrc

@@ -1,11 +0,0 @@
-# Menu.AddModule
-if $ARGS[0] = '' or $ARGS[1] = '': exit
-!----------
-ARGS[10] = dyneval("Result = arrsize('otg_Menyu_<<$ARGS[0]>>')")
-if dyneval("$Result = $otg_Menyu_<<$ARGS[0]>>[<<ARGS[10]>>-1]") = '-:-': exit
-!----------
-dynamic "
-	$otg_Menyu_<<$ARGS[0]>>_Parameters['<<ARGS[10]>>_M'] = '<<replace($ARGS[1],'''','''''')>>'
-"
---- Menu.AddModule ---------------------------------
-

+ 0 - 57
locations/Menu.Call.qsrc

@@ -1,57 +0,0 @@
-# Menu.Call
-if $ARGS[0] = '': exit
-!----------
-ARGS[10] = arrsize('otg_Menyu_<<$ARGS[0]>>')
-if ARGS[10] = 0: exit
-!----------
-$otg_Menu_Current = 'otg_Menyu_<<$ARGS[0]>>'
-killvar 'otg_Menyu_Vyzyvaemoe'
-killvar 'otg_Menu_Compliance'
-!----------
-ARGS[11] = 0
-:otg_menyu_metka_2
-if ARGS[11] < ARGS[10]:
-	dynamic "
-		$ARGS[0] = $<<$otg_Menu_Current>>_Parameters['<<ARGS[11]+1>>_In']
-		if $ARGS[0] = '':
-			$otg_Menyu_Vyzyvaemoe[] = $<<$otg_Menu_Current>>[<<ARGS[11]>>]
-			otg_Menu_Compliance[] = <<ARGS[11]+1>>
-		else
-			if dyneval($ARGS[0])<>0:
-				$otg_Menyu_Vyzyvaemoe[] = $<<$otg_Menu_Current>>[<<ARGS[11]>>]
-				otg_Menu_Compliance[] = <<ARGS[11]+1>>
-			end
-		end
-	"
-	ARGS[11] += 1
-	!----------
-	jump 'otg_menyu_metka_2'
-end
-!----------
-otg_Menu_Time = 0
-dynamic "
-	<<$otg_Menu_Current>>_Selected = 0
-	<<$otg_Menu_Current>>_VybrannyyPunkt = 0
-	<<$otg_Menu_Current>>_Time = MSECSCOUNT
-"
-!----------
-menu 'otg_Menyu_Vyzyvaemoe'
-!----------
-dynamic "
-	if <<$otg_Menu_Current>>_Selected = 0:
-		<<$otg_Menu_Current>>_Time = MSECSCOUNT-<<$otg_Menu_Current>>_Time
-		$ARGS[0] = $<<$otg_Menu_Current>>_ModuliSobyty['failure of the choice']
-		if $ARGS[0]<>'': dynamic $ARGS[0]
-	else
-		$ARGS[0] = $<<$otg_Menu_Current>>_ModuliSobyty['after selection processing']
-		if $ARGS[0]<>'': dynamic $ARGS[0],$<<$otg_Menu_Current>>_Parameters[str(<<$otg_Menu_Current>>_VybrannyyPunkt)+'_W']"+dyneval("$Result = $<<$otg_Menu_Current>>_Parameters[str(<<$otg_Menu_Current>>_VybrannyyPunkt)+'_P']")+"
-	end
-"
-!----------
-killvar 'otg_Menyu_Tekuschee'
-killvar 'otg_Menyu_Vyzyvaemoe'
-killvar 'otg_Menu_Compliance'
-!----------
-Result = dyneval("Result = otg_Menyu_<<$ARGS[0]>>_Selected")
---- Menu.Call ---------------------------------
-

+ 0 - 5
locations/Menu.Chosen.qsrc

@@ -1,5 +0,0 @@
-# Menu.Chosen
-if $ARGS[0] = '':exit
-Result = dyneval("Result = otg_Menyu_<<$ARGS[0]>>_selected")
---- Menu.Chosen ---------------------------------
-

+ 0 - 14
locations/Menu.Create.qsrc

@@ -1,14 +0,0 @@
-# Menu.Create
-if $ARGS[0] = '':EXIT
-!!----------
-$ARGS[0] = 'otg_Menyu_' + $ARGS[0]
-!!----------
-killvar '<<$ARGS[0]>>'
-killvar '<<$ARGS[0]>>_Parameters'
-killvar '<<$ARGS[0]>>_Selected'
-killvar '<<$ARGS[0]>>_VybrannyyPunkt'
-killvar '<<$ARGS[0]>>_Time'
-killvar '<<$ARGS[0]>>_ModuliSobyty'
-
---- Menu.Create ---------------------------------
-

+ 0 - 5
locations/Menu.Destroy.qsrc

@@ -1,5 +0,0 @@
-# Menu.Destroy
-if $ARGS[0] = '':exit
-GS 'Menu.Create', $ARGS[0]
---- Menu.Destroy ---------------------------------
-

+ 0 - 11
locations/Menu.Info.qsrc

@@ -1,11 +0,0 @@
-# Menu.Info
-*nl 'Module to work with the menu'
-*nl 'Version:1.0'
-*nl 'Author:Olegus t.Gl. (C) 2011'
-*nl 'Website:http://olegus.ifiction.ru'
-*nl 'e-mail:[email protected]'
-*nl 'icq:145 540 276'
-*nl 'Forum topic:http://forum.ifiction.ru/viewtopic.php?id=1527'
-
---- Menu.Info ---------------------------------
-

+ 0 - 8
locations/Menu.Time.qsrc

@@ -1,8 +0,0 @@
-# Menu.Time
-if $ARGS[0] = '':
-	Result = otg_Menu_Time
-else
-	Result = dyneval("Result = otg_Menyu_<<$ARGS[0]>>_time")
-end
---- Menu.Time ---------------------------------
-

+ 0 - 29
locations/Menu.Treatment.qsrc

@@ -1,29 +0,0 @@
-# Menu.Treatment
-ARGS[0] = otg_Menu_Compliance[ARGS[0]-1]
-!----------
-if ARGS[0] = 0: exit
-!----------
-$ARGS[0] = dyneval("$Result = $<<$otg_Menu_Current>>_Parameters['<<ARGS[0]>>_F']")
-$ARGS[1] = dyneval("$Result = $<<$otg_Menu_Current>>_Parameters['<<ARGS[0]>>_M']")
-!----------
-dynamic "
-	if $ARGS[1] <> '' or ($ARGS[0] <> '' and LOC $ARGS[0]):
-		<<$otg_Menu_Current>>_Time = MSECSCOUNT-<<$otg_Menu_Current>>_Time
-		otg_Menu_Time = <<$otg_Menu_Current>>_Time
-		<<$otg_Menu_Current>>_Selected = -1
-		<<$otg_Menu_Current>>_VybrannyyPunkt = <<ARGS[0]>>
-		!----------
-		$ARGS[3] = $<<$otg_Menu_Current>>_ModuliSobyty['when you select']
-		if $ARGS[3] <> '': dynamic $ARGS[3],$<<$otg_Menu_Current>>_Parameters['<<ARGS[0]>>_W']"+dyneval("$Result = $<<$otg_Menu_Current>>_Parameters['<<ARGS[0]>>_P']")+"
-		!----------
-		if $ARGS[1] <> '':
-			dynamic $ARGS[1]"+dyneval("$Result = $<<$otg_Menu_Current>>_Parameters['<<ARGS[0]>>_P']")+"
-		else
-			GS $ARGS[0]"+dyneval("$Result = $<<$otg_Menu_Current>>_Parameters['<<ARGS[0]>>_P']")+"
-		end
-	else
-		MSG 'Location ''<<$ARGS[0]>>'' Found!'
-end
-",$ARGS[0],$ARGS[1]
---- Menu.Treatment ---------------------------------
-

+ 0 - 161
locations/MenuLoc.qsrc

@@ -1,161 +0,0 @@
-# MenuLoc
-if $ARGS[0] = 'ot':
-	$zapis += ''
-	gs 'stat'
-end
-
-if $ARGS[0] = 'ot2':
-	$zapis2 += ''
-	gs 'stat'
-end
-
-if $ARGS[0] = 'ot3':
-	$zapis3 += ''
-	gs 'stat'
-end
-
-if $ARGS[0] = 'ot4':
-	$zapis += ''
-	gs 'stat'
-end
-
-if $ARGS[0] = 'ot5':
-	$zapis5 += ''
-	gs 'stat'
-end
-
-if $ARGS[0] = 'ot6':
-	$zapis6 += ''
-	gs 'stat'
-end
-
-if $ARGS[0] = 'ot7':
-	$zapis7 += ''
-	gs 'stat'
-end
-
-if $ARGS[0] = 'ot8':
-	$zapis8 += ''
-	gs 'stat'
-end
-
-if $ARGS[0] = 'ot9':
-	$zapis9 += ''
-	gs 'stat'
-end
-
-if $ARGS[0] = 'ot10':
-	$zapis10 += ''
-	gs 'stat'
-end
-
-if $ARGS[0] = 'zapisosn':
-	$zapisOsn += '<<day>> <<$month>>. <<$week[week]>>. '
-	$zapisOsn += input("What do you want to record?")
-	gs 'stat'
-end
-
-if $ARGS[0] = 'zapis':
-	$zapis += input("What do you want to record?")
-	gs 'stat'
-end
-
-
-if $ARGS[0] = 'zapis2':
-	$zapis2 += input("What do you want to record?")
-	gs 'stat'
-end
-
-if $ARGS[0] = 'zapis3':
-	$zapis3 += input("What do you want to record?")
-	gs 'stat'
-end
-
-if $ARGS[0] = 'zapis4':
-	$zapis4 += input("What do you want to record?")
-	gs 'stat'
-end
-
-if $ARGS[0] = 'zapis5':
-	$zapis5 += input("What do you want to record?")
-	gs 'stat'
-end
-
-if $ARGS[0] = 'zapis6':
-	$zapis6 += input("What do you want to record?")
-	gs 'stat'
-end
-
-if $ARGS[0] = 'zapis7':
-	$zapis7 += input("What do you want to record?")
-	gs 'stat'
-end
-
-if $ARGS[0] = 'zapis8':
-	$zapis8 += input("What do you want to record?")
-	gs 'stat'
-end
-
-if $ARGS[0] = 'zapis9':
-	$zapis9 += input("What do you want to record?")
-	gs 'stat'
-end
-
-if $ARGS[0] = 'zapis10':
-	$zapis10 += input("What do you want to record?")
-	gs 'stat'
-end
-
-
-if $ARGS[0] = 'diszapis':
-	$zapis = ''
-	gs 'stat'
-end
-
-if $ARGS[0] = 'diszapis2':
-	$zapis2 = ''
-	gs 'stat'
-end
-
-if $ARGS[0] = 'diszapis3':
-	$zapis3 = ''
-	gs 'stat'
-end
-
-if $ARGS[0] = 'diszapis4':
-	$zapis4 = ''
-	gs 'stat'
-end
-
-if $ARGS[0] = 'diszapis5':
-	$zapis5 = ''
-	gs 'stat'
-end
-
-if $ARGS[0] = 'diszapis6':
-	$zapis6 = ''
-	gs 'stat'
-end
-
-if $ARGS[0] = 'diszapis7':
-	$zapis7 = ''
-	gs 'stat'
-end
-
-if $ARGS[0] = 'diszapis8':
-	$zapis8 = ''
-	gs 'stat'
-end
-
-if $ARGS[0] = 'diszapis9':
-	$zapis9 = ''
-	gs 'stat'
-end
-
-if $ARGS[0] = 'diszapis10':
-	$zapis10 = ''
-	gs 'stat'
-end
-
---- MenuLoc ---------------------------------
-

+ 13 - 48
locations/journal.qsrc

@@ -268,54 +268,19 @@ if $ARGS[0] = 'records':
 !!	end
 
 	*nl
-	gs'Menu.Create','zapisMenu'
-	gs'Menu.Add','zapisMenu','Make a note with current date','','MenuLoc','zapisosn'
-	gs'Menu.Add','zapisMenu','Make a note on the 1st row','','MenuLoc','zapis'
-	gs'Menu.Add','zapisMenu','With a red row on the 1st row','','MenuLoc','ot'
-	gs'Menu.Add','zapisMenu','Make a note on the 2nd row','','MenuLoc','zapis2'
-	gs'Menu.Add','zapisMenu','With a red row on the 2nd row','','MenuLoc','ot2'
-	gs'Menu.Add','zapisMenu','Make a note on the 3rd row','','MenuLoc','zapis3'
-	gs'Menu.Add','zapisMenu','With a red row on the 3rd row','','MenuLoc','ot3'
-	gs'Menu.Add','zapisMenu','Make a note on the 4th row','','MenuLoc','zapis4'
-	gs'Menu.Add','zapisMenu','With a red row on the 4th row','','MenuLoc','ot4'
-	gs'Menu.Add','zapisMenu','Make a note on the 5th row','','MenuLoc','zapis5'
-	gs'Menu.Add','zapisMenu','With a red row on the 5th row','','MenuLoc','ot5'
-	gs'Menu.Add','zapisMenu','Make a note on the 6th row','','MenuLoc','zapis6'
-	gs'Menu.Add','zapisMenu','With a red row on the 6th row','','MenuLoc','ot6'
-	gs'Menu.Add','zapisMenu','Make a note on the 7th row','','MenuLoc','zapis7'
-	gs'Menu.Add','zapisMenu','With a red row on the 7th row','','MenuLoc','ot7'
-	gs'Menu.Add','zapisMenu','Make a note on the 8th row','','MenuLoc','zapis8'
-	gs'Menu.Add','zapisMenu','With a red row on the 8th row','','MenuLoc','ot8'
-	gs'Menu.Add','zapisMenu','Make a note on the 9th row','','MenuLoc','zapis9'
-	gs'Menu.Add','zapisMenu','With a red row on the 9th row','','MenuLoc','ot9'
-	gs'Menu.Add','zapisMenu','Make a note on the 10th row','','MenuLoc','zapis10'
-	gs'Menu.Add','zapisMenu','With a red row on the 10th row','','MenuLoc','ot10'
-
-	gs'Menu.Create','disMenu'
-	gs'Menu.Add','disMenu','Delete the entry on the 1st row','','MenuLoc','diszapis'
-	gs'Menu.Add','disMenu','Delete the entry on the 2nd row','','MenuLoc','diszapis2'
-	gs'Menu.Add','disMenu','Delete the entry on the 3rd row','','MenuLoc','diszapis3'
-	gs'Menu.Add','disMenu','Delete the entry on the 4th row','','MenuLoc','diszapis4'
-	gs'Menu.Add','disMenu','Delete the entry on the 5th row','','MenuLoc','diszapis5'
-	gs'Menu.Add','disMenu','Delete the entry on the 6th row','','MenuLoc','diszapis6'
-	gs'Menu.Add','disMenu','Delete the entry on the 7th row','','MenuLoc','diszapis7'
-	gs'Menu.Add','disMenu','Delete the entry on the 8th row','','MenuLoc','diszapis8'
-	gs'Menu.Add','disMenu','Delete the entry on the 9th row','','MenuLoc','diszapis9'
-	gs'Menu.Add','disMenu','Delete the entry on the 10th row','','MenuLoc','diszapis10'
-
-	'<a href="exec: gs''Menu.Call'',''zapisMenu''">Make a note</a> or <a href="exec: gs''Menu.Call'',''disMenu''">Delete a note</a>'
-
-	'<<$zapisOsn>>'
-	'<<$zapis>>'
-	'<<$zapis2>>'
-	'<<$zapis3>>'
-	'<<$zapis4>>'
-	'<<$zapis5>>'
-	'<<$zapis6>>'
-	'<<$zapis7>>'
-	'<<$zapis8>>'
-	'<<$zapis9>>'
-	'<<$zapis10>>'
+	
+	'<a href="exec: $zapis[] = input(''What do you want to record?'') & gt ''journal'',''records'' ">Make a note</a>'
+
+	jur_temp = 0
+	:jur_loop
+	if jur_temp < arrsize('$zapis'):
+		'<<$zapis[jur_temp]>>  <a href="exec: dynamic ''killvar''''$zapis'''',<<jur_temp>> & gt ''''journal'''', ''''records'''''' ">Delete</a>'
+		jur_temp += 1
+		jump 'jur_loop'
+	end
+	killvar 'jur_temp'
+	
+
 end
 
 if $ARGS[0] = 'locations':