rachels 6 роки тому
батько
коміт
0690dd4965
4 змінених файлів з 11 додано та 14 видалено
  1. 1 0
      glife.qproj
  2. 5 0
      locations/_menu_calendar
  3. 1 0
      locations/onobjsel
  4. 4 14
      locations/shortgs

+ 1 - 0
glife.qproj

@@ -886,6 +886,7 @@
       <Location name="$menu_skills"/>
       <Location name="$menu_descrip"/>
       <Location name="$menu_statistika"/>
+      <Location name="$menu_calendar"/>
       <Location name="$menu_reputation"/>
       <Location name="$menu_mobila"/>
       <Location name="$menu_magic"/>

+ 5 - 0
locations/_menu_calendar

@@ -0,0 +1,5 @@
+# $menu_calendar
+gs 'shortgs', 'mk'
+
+--- $menu_calendar ---------------------------------
+

+ 1 - 0
locations/onobjsel

@@ -7,6 +7,7 @@ $menu_character[1] = 'Skills:$menu_skills'
 $menu_character[2] = 'Statistics:$menu_statistika'
 $menu_character[3] = 'Fame:$menu_reputation'
 $menu_character[4] = 'Pain:$menu_pain'
+$menu_character[5] = 'Calendar:$menu_calendar'
 
 if pcs_magik > 0:$menu_character[5] = 'Magic:$menu_magic'
 

+ 4 - 14
locations/shortgs

@@ -166,6 +166,7 @@ end
 if $ARGS[0] = 'mk':
 	gs 'saveposition'
 	*clr & cla
+	$mk_subst['0'] = 'M' & $mk_subst['1'] = 'F' & $mk_subst['2'] = 'O' & $mk_subst['3'] = 'L' & $mk_subst['4'] = 'R' & $mk_subst['5'] = 'P'
 	'<center><font face="courier" size=1>'
 	'<table border = 1>'
 	'<tr><th>Mon</th><th>Tue</th><th>Wen</th><th>Thu</th><th>Fri</th><th>Sat</th><th>Sun</th><th>Mon</th><th>Tue</th><th>Wen</th><th>Thu</th><th>Fri</th><th>Sat</th><th>Sun</th>
@@ -184,7 +185,7 @@ if $ARGS[0] = 'mk':
 :tabmcl2
 	if full1 > 0: 
 		full1 -=1 
-		if $MenCal[count]='0': $tabmc +='<td bgcolor="red"><<$MenCal[count]>></td>' else $tabmc +='<td><<$MenCal[count]>></td>'
+		if $MenCal[count]='0': $tabmc +='<td bgcolor="red"><<$mk_subst[$MenCal[count]]>></td>' else $tabmc +='<td><<$mk_subst[$MenCal[count]]>></td>'
 		count +=1
 		jump 'tabmcl1'
 	end
@@ -194,7 +195,7 @@ if $ARGS[0] = 'mk':
 :tabmcl4
 	if full2 > 0:
 		full2 -=1
-		if $MenCal[count]='0': $tabmc +='<td bgcolor="red"><<$MenCal[count]>></td>' else $tabmc +='<td><<$MenCal[count]>></td>'
+		if $MenCal[count]='0': $tabmc +='<td bgcolor="red"><<$mk_subst[$MenCal[count]]>></td>' else $tabmc +='<td><<$mk_subst[$MenCal[count]]>></td>'
 		count +=1
 		jump 'tabmcl4'
 	end
@@ -202,19 +203,8 @@ if $ARGS[0] = 'mk':
 	if empty3 > 0: empty3 -=1 & $tabmc +='<td></td>' & jump 'tabmcl5'
 	$tabmc += '</tr><table></font></center>'
 	$tabmc
-	act 'Return': gt 'restoreposition'
+	act 'Back': gt 'restoreposition'
 end
 
-if $ARGS[0] = 'test':
-	i = 24*28*3
-	j = 0
-:testlb1
-	if i>0: 
-		'<<cycle>>,<<mesec>>,<<EggRH>>,<<Foch>>,<<ovulate>>,<<LutH>>,<<Fertegg>>,<<UnFertegg>>,<<ferteggage>>,<<RecovH>>'
-		i -=1
-		gs 'femcyc'
-		jump 'testlb1'
-	end
-end
 --- shortgs ---------------------------------