summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--images/OverlayStart50b.pngbin2767 -> 4740 bytes
-rw-r--r--includes/datas.php7
-rw-r--r--includes/maps.php34
-rw-r--r--index.php10
-rw-r--r--pages/faq.php2
-rw-r--r--pages/leaderboard.php67
-rw-r--r--pages/tutorial.php5
7 files changed, 68 insertions, 57 deletions
diff --git a/images/OverlayStart50b.png b/images/OverlayStart50b.png
index a42210a..94067eb 100644
--- a/images/OverlayStart50b.png
+++ b/images/OverlayStart50b.png
Binary files differ
diff --git a/includes/datas.php b/includes/datas.php
index 81184cd..86fbb54 100644
--- a/includes/datas.php
+++ b/includes/datas.php
@@ -504,9 +504,10 @@ function getWinsArray() {
$r[3] = array(15, 2, 'OffsetStripesDiagonal_B.png', 'Dark Diagonal Stripes', 0);
$r[4] = array(30, 2, 'DiamondLargeDonut_W_I.png', 'Inverted Light Annulated Diamond', 0);
$r[5] = array(50, 2, 'StarsR_B.png', 'Dark Stars', 0);
- $r[6] = array(75, 2, 'CrossXL_B_I.png', 'Inverted Dark Large Present', 0);
- $r[7] = array(75, 2, 'CircleSmall_W_I.png', 'Inverted Bright Small Circle', 0);
-
+ $r[6] = array(75, 2, 'OffsetStripesHorizontal_B_I.png', 'Inverted Dark Horizontal Stripes', 0);
+ $r[7] = array(100, 2, 'CrossXLDonut_B_I.png', 'Inverted Dark Large Intersection', 0);
+ //$r[7] = array(75, 2, 'CircleSmall_W_I.png', 'Inverted Bright Small Circle', 0);
+
return $r;
}
diff --git a/includes/maps.php b/includes/maps.php
index 4978411..4618ff8 100644
--- a/includes/maps.php
+++ b/includes/maps.php
@@ -33,43 +33,43 @@ function DisplayMap($mapMatrix, $idprefix = 1, $style = 'normal', $speed = NULL)
$mapItemCode = $mapMatrix[$i][$j];
switch($mapMatrix[$i][$j])
{
- case 's': $maptable .= "<td title='Start tile. Position: $i,$j' class='grid_td_start' id='$handle' >
+ case 's': $maptable .= "<td title='Start tile. Position: $j,$i' class='grid_td_start' id='$handle' >
<div id='child_$handle' class='grid_inner'></div></td>"; break;
- case 'f': $maptable .= "<td title='Finish tile. Position: $i,$j' class='grid_td_finish' id='$handle' >
+ case 'f': $maptable .= "<td title='Finish tile. Position: $j,$i' class='grid_td_finish' id='$handle' >
<div id='child_$handle' class='grid_inner'></div></td>"; break;
//TP1
- case 't': $maptable .= "<td title='Teleport 1 in. Position: $i,$j' class='grid_td_tp1_in' id='$handle' >
+ case 't': $maptable .= "<td title='Teleport 1 in. Position: $j,$i' class='grid_td_tp1_in' id='$handle' >
<div id='child_$handle' class='grid_inner'></div></td>"; break;
- case 'u': $maptable .= "<td title='Teleport 1 out. Position: $i,$j' class='grid_td_tp1_out' id='$handle' >
+ case 'u': $maptable .= "<td title='Teleport 1 out. Position: $j,$i' class='grid_td_tp1_out' id='$handle' >
<div id='child_$handle' class='grid_inner'></div></td>"; break;
//TP2
- case 'm': $maptable .= "<td title='Teleport 2 in. Position: $i,$j' class='grid_td_tp2_in' id='$handle' >
+ case 'm': $maptable .= "<td title='Teleport 2 in. Position: $j,$i' class='grid_td_tp2_in' id='$handle' >
<div id='child_$handle' class='grid_inner'></div></td>"; break;
- case 'n': $maptable .= "<td title='Teleport 2 out. Position: $i,$j' class='grid_td_tp2_out' id='$handle' >
+ case 'n': $maptable .= "<td title='Teleport 2 out. Position: $j,$i' class='grid_td_tp2_out' id='$handle' >
<div id='child_$handle' class='grid_inner'></div></td>"; break;
//TP3
- case 'g': $maptable .= "<td title='Teleport 3 in. Position: $i,$j' class='grid_td_tp3_in' id='$handle' >
+ case 'g': $maptable .= "<td title='Teleport 3 in. Position: $j,$i' class='grid_td_tp3_in' id='$handle' >
<div id='child_$handle' class='grid_inner'></div></td>"; break;
- case 'h': $maptable .= "<td title='Teleport 3 out. Position: $i,$j' class='grid_td_tp3_out' id='$handle' >
+ case 'h': $maptable .= "<td title='Teleport 3 out. Position: $j,$i' class='grid_td_tp3_out' id='$handle' >
<div id='child_$handle' class='grid_inner'></div></td>"; break;
//TP4
- case 'i': $maptable .= "<td title='Teleport 4 in. Position: $i,$j' class='grid_td_tp4_in' id='$handle' >
+ case 'i': $maptable .= "<td title='Teleport 4 in. Position: $j,$i' class='grid_td_tp4_in' id='$handle' >
<div id='child_$handle' class='grid_inner'></div></td>"; break;
- case 'j': $maptable .= "<td title='Teleport 4 out. Position: $i,$j' class='grid_td_tp4_out' id='$handle' >
+ case 'j': $maptable .= "<td title='Teleport 4 out. Position: $j,$i' class='grid_td_tp4_out' id='$handle' >
<div id='child_$handle' class='grid_inner'></div></td>"; break;
//TP5
- case 'k': $maptable .= "<td title='Teleport 5 in. Position: $i,$j' class='grid_td_tp5_in' id='$handle' >
+ case 'k': $maptable .= "<td title='Teleport 5 in. Position: $j,$i' class='grid_td_tp5_in' id='$handle' >
<div id='child_$handle' class='grid_inner'></div></td>"; break;
- case 'l': $maptable .= "<td title='Teleport 5 out. Position: $i,$j' class='grid_td_tp5_out' id='$handle' >
+ case 'l': $maptable .= "<td title='Teleport 5 out. Position: $j,$i' class='grid_td_tp5_out' id='$handle' >
<div id='child_$handle' class='grid_inner'></div></td>"; break;
case 'a': case 'b': case 'c': case 'd': case 'e':
- $maptable .= "<td title='Checkpoint A. Position: $i,$j' class='grid_td_cp$mapItemCode' id='$handle' >
+ $maptable .= "<td title='Checkpoint A. Position: $j,$i' class='grid_td_cp$mapItemCode' id='$handle' >
<div id='child_$handle' class='grid_inner'></div></td>";
break;
- case 'r': $maptable .= "<td title='Rock. Position: $i,$j' class='grid_td_rocks' id='$handle' ></td>"; break; //rock
- case 'R': $maptable .= "<td title='Silver rock. Position: $i,$j' class='grid_td_gray' id='$handle' ></td>"; break; //metalic looking rock
+ case 'r': $maptable .= "<td title='Rock. Position: $j,$i' class='grid_td_rocks' id='$handle' ></td>"; break; //rock
+ case 'R': $maptable .= "<td title='Silver rock. Position: $j,$i' class='grid_td_gray' id='$handle' ></td>"; break; //metalic looking rock
case 'p': $maptable .= "<td class='grid_td_path' id='$handle' >
<div id='child_$handle' class='grid_inner'></div></td>"; break; //path
@@ -78,9 +78,9 @@ function DisplayMap($mapMatrix, $idprefix = 1, $style = 'normal', $speed = NULL)
//Technically shouldn't ever be used to display a wall...
case 'w': $maptable .= "<td class='grid_td_walls' id='$handle' name='true' onClick='grid_click(this)' ></td>"; break; //wall
// default; normally 'o'.
- //default: $maptable .= "<td title='Position: $i,$j' class='grid_td' id='$handle' onClick='grid_click(this)' ></td>";
+ //default: $maptable .= "<td title='Position: $j,$i' class='grid_td' id='$handle' onClick='grid_click(this)' ></td>";
- default: $maptable .= "<td class='grid_td' title='Position: $i,$j' id='$handle' onClick='grid_click(this)' >
+ default: $maptable .= "<td class='grid_td' title='Position: $j,$i' id='$handle' onClick='grid_click(this)' >
<div id='child_$handle' class='grid_inner'></div></td>";
}
}
diff --git a/index.php b/index.php
index 7144d63..2769b99 100644
--- a/index.php
+++ b/index.php
@@ -26,10 +26,14 @@ $Links['about'] = "About Us";
$request = strtolower($_GET[page]);
if ($request == '' AND $_SESSION['accepted'] <> 1)
- $request = 'tutorial';
+ $request = 'hometutorial';
switch ($request) {
+ case "tutorial": case "hometutorial":
+ require("pages/tutorial.php");
+ break;
+
case "test":
require("pages/test.php");
break;
@@ -46,10 +50,6 @@ switch ($request) {
require("pages/share.php");
break;
- case "tutorial":
- require("pages/tutorial.php");
- break;
-
case "embed":
require("pages/embed.php");
break;
diff --git a/pages/faq.php b/pages/faq.php
index 429f48b..2b42e23 100644
--- a/pages/faq.php
+++ b/pages/faq.php
@@ -1,5 +1,5 @@
<?php
-htmlHeader(array());
+htmlHeader(array(), 'FAQ', 'How does the pathing work?');
?>
<body>
diff --git a/pages/leaderboard.php b/pages/leaderboard.php
index fafcb23..8f8d782 100644
--- a/pages/leaderboard.php
+++ b/pages/leaderboard.php
@@ -134,19 +134,32 @@ if ($daysago > 1) {
echo "<a href='leaderboard?date=$dateNextDay' title='Newer'>Next Day</a>";
}
echo "<a href='leaderboard?date=$datePrevDay' title='Older'>Previous Day</a>";
+
+$statContent .= displayPastMaze(1, 'Simple', $daysago);
+$statContent .= displayPastMaze(2, 'Normal', $daysago);
+$statContent .= displayPastMaze(3, 'Complex', $daysago);
+$statContent .= displayPastMaze(4, 'Special', $daysago);
+
+$special = 'Special';
+if ($specialMapName != '')
+ $special = $specialMapName;
+
?>
</div>
<div id="difficulties">
-<a href="javascript:showStats(1)" id="dl-1">Simple</a>
-<a href="javascript:showStats(2)" id="dl-2">Normal</a>
-<a href="javascript:showStats(3)" id="dl-3">Complex</a>
-<a href="javascript:showStats(4)" id="dl-4">Special</a>
-<a href="javascript:showStats(5)" id="dl-5">Overall</a>
-<a href="javascript:showStats(6)" id="dl-6">Week/Month</a>
+ <a href="javascript:showStats(1)" id="dl-1">Simple</a>
+ <a href="javascript:showStats(2)" id="dl-2">Normal</a>
+ <a href="javascript:showStats(3)" id="dl-3">Complex</a>
+ <a href="javascript:showStats(4)" id="dl-4"><? echo $special; ?></a>
+ <a href="javascript:showStats(5)" id="dl-5">Overall</a>
+ <a href="javascript:showStats(6)" id="dl-6">Week/Month</a>
</div>
<?
+
+echo $statContent;
+
function displayPastMaze($mapType, $name, $daysago = 1) {
//Ensure no cheating
if ($daysago < 1)
@@ -187,11 +200,14 @@ function displayPastMaze($mapType, $name, $daysago = 1) {
}
$stats = displayStats($result, $statname);
-
$pastMap = pastMap($mapType, $daysago);
$mapID = $pastMap;
$mapcode = getMapCode($mapID);
$map = GenerateMapByCode($mapcode);
+
+ //Sucky temporary solution:
+ $GLOBALS['specialMapName'] = $map[0][6];
+
$sql = "SELECT `moves`, `displayName`, `solution`
FROM `solutions`, `users`
WHERE `mapID` = '$mapID' AND
@@ -205,17 +221,20 @@ function displayPastMaze($mapType, $name, $daysago = 1) {
//$map = MergeMapSolution($map, $solution);
//echo DisplayMap($map, $mapID);
}
- echo '<div style="clear: both"></div>';
- echo "<div id=\"yms-$mapType\">";
- echo '<div class="col1">';
- echo $stats;
- echo '</div>';
-
- echo '<div class="col2">';
- echo "Best solution for this map: <b>$bestMoves by $byName </b>";
- echo DisplayMap($map, $mapID, 'example', 2);
- echo '</div>';
- echo '</div>';
+ $r = '';
+
+ $r .= '<div style="clear: both"></div>';
+ $r .= "<div id=\"yms-$mapType\">";
+ $r .= '<div class="col1">';
+ $r .= $stats;
+ $r .= '</div>';
+
+ $r .= '<div class="col2">';
+ $r .= "Best solution for this map: <b>$bestMoves by $byName </b>";
+ $r .= DisplayMap($map, $mapID, 'example', 2);
+ $r .= '</div>';
+ $r .= '</div>';
+ return $r;
}
function displaystats($result, $caption = NULL) {
@@ -268,18 +287,6 @@ function mysql_field_array( $query ) {
return $names;
}
-// $sql = 'select columnname etc'
-// $result = mysql_query($sql);
-// while ($data[] = mysql_fetch_row($result));
-
-// $data[1]['columnname'] == 'my data';
-
-
-
-displayPastMaze(1, 'Simple', $daysago);
-displayPastMaze(2, 'Normal', $daysago);
-displayPastMaze(3, 'Complex', $daysago);
-displayPastMaze(4, 'Special', $daysago);
?>
diff --git a/pages/tutorial.php b/pages/tutorial.php
index 7830ef4..d962f68 100644
--- a/pages/tutorial.php
+++ b/pages/tutorial.php
@@ -1,5 +1,8 @@
<?php
-htmlHeader(array('tutorial'), "Pathery Tutorial");
+if ($request == 'tutorial')
+ htmlHeader(array('tutorial'), 'Pathery Tutorial', 'How to play Pathery');
+else
+ htmlHeader(array('tutorial'), 'Pathery', 'Compete to create the longest maze possible. 4 New maps every day at 9 PM Pacific');
?>
<body>
generated by cgit v1.2.3 (git 2.46.0) at 2025-06-29 07:57:25 +0000