From ae5c6c5800f39ef169986e59e69b43241ccf3902 Mon Sep 17 00:00:00 2001 From: Patrick Davison Date: Fri, 25 Jan 2013 00:26:07 -0800 Subject: Added missing files, deleted some old files. --- css/profile.css | 56 ++++ images/OverlayTiles.xcf | Bin 63856 -> 66385 bytes images/Path1XRock.png | Bin 3162 -> 3262 bytes images/championpoints.png | Bin 1484 -> 1200 bytes pages/challengeOld.php | 362 ------------------------ pages/gallery.php | 692 ---------------------------------------------- pages/howtoplay.php | 127 --------- pages/test.php | 408 --------------------------- 8 files changed, 56 insertions(+), 1589 deletions(-) create mode 100644 css/profile.css delete mode 100644 pages/challengeOld.php delete mode 100644 pages/gallery.php delete mode 100644 pages/howtoplay.php delete mode 100644 pages/test.php diff --git a/css/profile.css b/css/profile.css new file mode 100644 index 0000000..3adf15e --- /dev/null +++ b/css/profile.css @@ -0,0 +1,56 @@ + + +@keyframes badgeAnimate +{ +0% {transform: rotate(-90deg);} +80% {transform: rotate(10deg);} +95% {transform: rotate(-4deg);} +97% {transform: rotate(1deg);} +99% {transform: rotate(-1deg);} +100% {transform: rotate(0deg);} +} +@-moz-keyframes badgeAnimate /* Firefox */ +{ +0% {-moz-transform: rotate(-90deg);} +80% {-moz-transform: rotate(10deg);} +95% {-moz-transform: rotate(-4deg);} +97% {-moz-transform: rotate(1deg);} +99% {-moz-transform: rotate(-1deg);} +100% {-moz-transform: rotate(0deg);} +} +@-o-keyframes badgeAnimate /* Opera */ +{ +0% {-o-transform: rotate(-90deg);} +80% {-o-transform: rotate(10deg);} +95% {-o-transform: rotate(-4deg);} +97% {-o-transform: rotate(1deg);} +99% {-o-transform: rotate(-1deg);} +100% {-o-transform: rotate(0deg);} +} +@-webkit-keyframes badgeAnimate /* Safari and Chrome */ +{ +0% {-webkit-transform: rotate(-90deg);} +90% {-webkit-transform: rotate(8deg);} +95% {-webkit-transform: rotate(-4deg);} +97% {-webkit-transform: rotate(1deg);} +99% {-webkit-transform: rotate(-1deg);} +100% {-webkit-transform: rotate(0deg);} +} + +.badge +{ + animation: badgeAnimate 1s linear; + -moz-animation: badgeAnimate 1s linear; /* Firefox */ + -o-animation: badgeAnimate 1s linear; /* Opera */ + -webkit-animation: badgeAnimate 1s linear; /* Safari and Chrome */ + + width:45px; + height:45px; + background-color: #666666; + background-size:100%; + padding: 1px 1px; + border-radius: 5px; + text-decoration: none; + border: 2px solid #888; + box-shadow: 0 0 3px #445; +} \ No newline at end of file diff --git a/images/OverlayTiles.xcf b/images/OverlayTiles.xcf index 76bfa09..6bf610c 100644 Binary files a/images/OverlayTiles.xcf and b/images/OverlayTiles.xcf differ diff --git a/images/Path1XRock.png b/images/Path1XRock.png index e64fcbb..dc21408 100644 Binary files a/images/Path1XRock.png and b/images/Path1XRock.png differ diff --git a/images/championpoints.png b/images/championpoints.png index f6625fe..ae5354f 100644 Binary files a/images/championpoints.png and b/images/championpoints.png differ diff --git a/pages/challengeOld.php b/pages/challengeOld.php deleted file mode 100644 index afb8741..0000000 --- a/pages/challengeOld.php +++ /dev/null @@ -1,362 +0,0 @@ - - - - - - - - - - - -
-
- Welcome to Advanced Training #1. Help for these puzzles will be limited.
Goal: 32 or more. -
-'; -echo DisplayMap($map1, 1, 'puzzle'); -echo '
'; - -?> - -
- - -
- - - - - diff --git a/pages/gallery.php b/pages/gallery.php deleted file mode 100644 index fce6256..0000000 --- a/pages/gallery.php +++ /dev/null @@ -1,692 +0,0 @@ - - - - -"; -echo soundManager2(); - - -$spin[] = 'ooooooooooooooo'; -$spin[] = 'oooooororoooooo'; -$spin[] = 'ooooooooooooooo'; -$spin[] = 'uoooroormoroooo'; -$spin[] = 'soooooratooooof'; -$spin[] = 'noooooororooooo'; -$spin[] = 'ooooorooooooooo'; -$spin[] = 'oooooooroororoo'; -$spin[] = 'ooooooooooooooo'; - - -$myparams['checkpoints'] = 3; -$myparams['teleports'] = 1; -$myparams['rockchance'] = 2000; -$myparams['walls'] = 12; -$myparams['name'] = 'Round and Round'; - -$map = GenerateShapedMap($spin, $myparams); - -include('./includes/mapclass.php'); - -$mapCode = GenerateMapCode($map); -echo $mapCode; -echo "
"; -echo "
"; - -$mapClass = new map($mapCode); -echo DisplayMapThumbnail($mapClass); - -echo "
"; -echo "
"; -echo $mapClass->width; -echo "
"; -echo $mapClass; -echo "
"; -echo "
"; -var_dump($mapClass); -echo "
"; -echo TileStart; -echo TileFinish; -echo "
"; - -exit; - - -echo DisplayMap($map, 2); - -//addNewChallengeMap($map, 0, 0, 'Round and Round'); - -//addNewChallenge(1194, "greater than", 163, 1, "Make it go around and around and around"); -//addNewChallenge(1194, "greater than", 161, 1, "Make it go around and around and around", 11); -//addNewChallenge(1194, "greater than", 173, 1, "Make it go around and around and around"); - -exit; - - -//Add's a new custom challenge map - returns mapid -function addNewChallengeMap($map, $tier, $subOrder, $name) { - $mapcode = GenerateMapCode($map); - - $sql = "INSERT INTO `maps` - (`code`, `isChallenge`, `ChallengeTier`, `ChallengeSuborder`, `ChallengeName`) - VALUES - ('$mapcode', true, $tier, $subOrder, '$name')"; - - echo $sql; - mysql_query($sql); - $mapID = mysql_insert_id(); - return $mapID; -} - -//Returns challenge ID -function addNewChallenge($mapID, $inequality, $goal, $ordering, $hint, - $restrictWallCount = null, $restrictWallPlacement = null, $restrictTeleportCount = null, - $restrictTeleportsUsed = null, $restrictStartPoint = null, $restrictEndPoint = null) { - - $sql = "INSERT INTO `challenges` ( - `mapID`, `inequality`, `goal`, `ordering`, `hint`, - `restrictWallCount`, `restrictWallPlacement`, `restrictTeleportCount`, - `restrictTeleportsUsed`, `restrictStartPoint`, `restrictEndPoint` - ) - VALUES ( - '$mapID', '$inequality', $goal, $ordering, '$hint', - '$restrictWallCount', '$restrictWallPlacement', '$restrictTeleportCount', - '$restrictTeleportsUsed', '$restrictStartPoint', '$restrictEndPoint' - )"; - - echo $sql; - mysql_query($sql); - $challengeID = mysql_insert_id(); - return $challengeID; -} - - -$reversePath[] = 'fo????????????oS'; -$reversePath[] = 'fo????????????oS'; -$reversePath[] = 'fo????????????oS'; -$reversePath[] = 'fo????????????oS'; -$reversePath[] = 'fo????????????oS'; -$reversePath[] = 'fo????????????oS'; -$reversePath[] = 'fo????????????oS'; - -$reversePath = insertPoint($reversePath, 'abc'); - -$myparams['checkpoints'] = 3; -$myparams['teleports'] = 0; -$myparams['rockchance'] = 7; -$myparams['walls'] = 12; -$myparams['name'] = 'Dualing paths'; - -//$map = GenerateShapedMap($reversePath, $myparams); - -$dualingPaths[] = 'so??????????????xf'; -$dualingPaths[] = 'so??????????????xf'; -$dualingPaths[] = 'so??????????????xf'; -$dualingPaths[] = 'so??????????????xf'; -$dualingPaths[] = 'Xo??????????????ox'; -$dualingPaths[] = 'fX??????????????oS'; -$dualingPaths[] = 'fX??????????????oS'; -$dualingPaths[] = 'fX??????????????oS'; -$dualingPaths[] = 'fX??????????????oS'; - -$dualingPaths = insertPoint($dualingPaths, 'abc'); -$dualingPaths = insertPoint($dualingPaths, weight('x', 'xx', 'xxx').weight('X', 'XX', 'XXX')); - -$myparams['checkpoints'] = 3; -$myparams['teleports'] = 0; -$myparams['rockchance'] = 9; -$myparams['walls'] = 12; -$myparams['name'] = 'Dualing paths'; - -$map = GenerateShapedMap($dualingPaths, $myparams); -echo DisplayMap($map, 1); - - - -$unlimited[] = 'so?o?o?o?o?o?o?of'; -$unlimited[] = 's???????????????f'; -$unlimited[] = 'so?????????????of'; -$unlimited[] = 's???????????????f'; -$unlimited[] = 'so?????????????of'; -$unlimited[] = 's???????????????f'; -$unlimited[] = 'so?????????????of'; -$unlimited[] = 's???????????????f'; -$unlimited[] = 'so?o?o?o?o?o?o?of'; - -$unlimited = insertPoint($unlimited, 'abc'); -$unlimited = insertPoint($unlimited, weight('tu', 'dtu')); - -$myparams['checkpoints'] = 3; -$myparams['teleports'] = 1; -$myparams['rockchance'] = 9; -$myparams['walls'] = 999; -$myparams['name'] = 'Unlimited'; - -$map = GenerateShapedMap($unlimited, $myparams); - - -echo "
"; -echo soundManager2(); -echo DisplayMap($map, 2); - -htmlfooter(); -exit; - -//$map = GenerateShapedMap($dualingPaths, $myparams); - -//$map = getRandomSpecialMap(); -//$map = getRandomComplexMap(); - - // DUALING PATHS MAP - - - -$openmaps[] = 'SouooooooXoooooooXooooxf'; -$openmaps[] = 'oooooooooXoooooooXooooox'; -$openmaps[] = 'oooooooooxooooooeXcooooo'; -$openmaps[] = 'oooooooooxoooooooXoooooo'; -$openmaps[] = 'oooooooooxaoootooXoooooo'; -$openmaps[] = 'oooooooooxxxxxxxxxoooooo'; -$openmaps[] = 'oooooooooooooooooooooooo'; -$openmaps[] = 'oooooooooooooooooooooooo'; -$openmaps[] = 'Xooooobdoooooooooooooooo'; -$openmaps[] = 'fXooooooooooooooooooooos'; - -$myparams['checkpoints'] = 5; -$myparams['teleports'] = 0; -$myparams['rockchance'] = 15; -$myparams['walls'] = 38; -$myparams['name'] = 'Dualing Starts'; - -//$map = GenerateShapedMap($openmaps, $myparams); - -//echo DisplayMap($map, 1); - -?> - - -Solution created in $time seconds\n
"; - -//Return an array of affected tiles. -function getAffected($route) { - //Determin starting location. - $start = explode(",", $route['start']); - $x=$start[0]; - $y=$start[1]; - - $tog = false; - - //Run through the path - $pathary = str_split($route['path']); - //echo "path:".$route['path']; - foreach ($pathary as $position => $char) { - - switch($char) { - case 'u': //tp1 - case 'n': //tp2 - case 'h': //tp3 - case 'j': //tp4 - case 'l': //tp5 - if ($tog == true) { - $tog = false; - continue; - } - $tog = true; - //Get teleport coords - $tmp = split($char, $route['path']); - $loc = split(',', $tmp[1]); - $x = $loc[0]; - $y = $loc[1]; - //echo "....$x,$y...."; - } - if ($tog == true) - continue; - - switch($char) { - case 1: $y--; break; //up - case 2: $x++; break; //right - case 3: $y++; break; //down - case 4: $x--; break; //left - default: continue 2; - } - //add the positions - $affected["$y,$x"]++; - } - //arsort($affected); - return $affected; -} -// http://awesomescreenshot.com/0d7nyx9b2 - -function executeTryMaze($mapMatrix, $intensity = 1) { - $mapdata['height'] = $mapMatrix[0][0]; - $mapdata['width'] = $mapMatrix[0][1]; - $mapdata['points'] = $mapMatrix[0][2]; - $mapdata['rocks'] = $mapMatrix[0][3]; - $mapdata['walls'] = $mapMatrix[0][4]; - //Override hack. - //$mapdata['walls'] = 12; - $mapdata['teleports'] = $mapMatrix[0][5]; - - - $routes = 0; - - //PROCSES BEGIN - $wallcount = 0; - $iterations = 0; - $lastRefresh = 0; - do { - $iterations++; - $done = false; - $path = routePath($mapMatrix); - $routes++; - $affected = getAffected($path); - - $curcount = 1000; - $bestmoves = 0; - $bestcount = 0; - - foreach ($affected as $position => $count) { - //Find location - $loc = explode(",", $position); - $x=$loc[0]; - $y=$loc[1]; - //Is it open? - if ($mapMatrix[$x][$y] != "o") { - continue; - } - - - //Set a wall and calculate the new path - $mapMatrix[$x][$y] = 'R'; - $curpath = routePath($mapMatrix); - $routes++; - $trymoves = $curpath['moves']; - - //if ("$x,$y" == "3,17") { - //echo "T($x,$y)\n:"; - //print_r($affected); - //return; - //} - //path blocked? - if ($curpath['blocked'] == true) { - //Sometimes it's better to remove a different wall; - - //Put a wall here. - //if ($iterations % 8 == 4) { - if (1 == 12) { - $arrayWalls[$x][$y] = true; - - //determin wall values. - $walllist = wallvalues($mapMatrix, $arrayWalls); - $routes++; - - //Put the best wall to remove on top; - A mono directional bubble sort would be better here. - $walllist["$x,$y"]--; - asort($walllist); - - //Get location of wall to remove. - $nwallposition = key($walllist); - - echo "*$nwallposition vs $x,$y*\n"; - - $nloc = explode(",", $nwallposition); - $bx=$nloc[0]; - $by=$nloc[1]; - - - $mapMatrix[$bx][$by] = 'R'; - $mapMatrix[$x][$y] = 'o'; - // $tmp = routePath($mapMatrix); - // if ($tmp['blocked']) { - // $mapMatrix[$bx][$by] = 'R'; - // $mapMatrix[$x][$y] = 'o'; - // echo "Unblocked"; - // continue; - // } - unset($arrayWalls[$bx][$by]); - continue; - } - $mapMatrix[$x][$y] = 'o'; - continue; - } - //The last choice, or first choice? - //if ($trymoves >= $bestmoves) { - //echo "[$x, $y: $trymoves]"; - if ($trymoves > $bestmoves OR ($trymoves >= $bestmoves AND $bestcount <= $count) ) { - $bestcount = $count; - $bestmoves = $trymoves; - $bestx = $x; - $besty = $y; - $mapMatrix[$x][$y] = 'o'; - //break; - } - $mapMatrix[$x][$y] = 'o'; - } - //Place the wall in the best spot we found; - $arrayWalls[$bestx][$besty] = true; - echo $mapMatrix[$bestx][$besty]; - $mapMatrix[$bestx][$besty] = 'R'; - $wallcount++; - echo "B($bestx,$besty)\n:"; - - //Refresh walls (Remove obsolete walls) - if ($iterations % 2 == 0 AND $wallcount > ($mapdata['walls'] * .6)) - { - echo "RW"; - $walllist = wallvalues($mapMatrix, $arrayWalls); - $routes++; - //Remove low valued wall; - $lowvaluewall = true; - $nullwalls = 0; - foreach ($walllist as $nwallposition => $wallvalue) { - if ($wallvalue == 0 OR ($lowvaluewall == true AND $wallvalue == 1)) - { - $nloc = explode(",", $nwallposition); - $x=$nloc[0]; - $y=$nloc[1]; - if ($x == $bestx AND $y == $besty) - continue; - $mapMatrix[$x][$y] = 'o'; - unset($arrayWalls[$x][$y]); - $wallcount--; - echo "RM($x, $y)"; - - $nullwalls++; - if ($nullwalls >= 2) { - break; - } - if ($lowvaluewall == true AND $wallvalue == 1) { - $lowvaluewall = false; - } - } - } - } - - //Refresh walls if we hit the wall count limit, once. - if($wallcount >= $mapdata['walls'] && $lastRefresh == 0) - { - $lastRefresh = 1; - $walllist = wallvalue($mapMatrix, "R"); - $routes++; - foreach ($walllist as $nwallposition => $wallvalue) { - if ($wallvalue <= 1) { - $nloc = explode(",", $nwallposition); - $i=$nloc[0]; - $j=$nloc[1]; - $mapMatrix[$i][$j] = 'o'; - unset($arrayWalls[$x][$y]); - $wallcount--; - echo "RM($x, $y)"; - } - } - echo "End Refresh walls to:[$wallcount]"; - } - - //If all walls are placed even after refresh, we're done - if ($wallcount >= $mapdata['walls']) { - echo "END;($wallcount) Solution routed the path $routes times."; - break; - } - } while ($done == false); - - //echo "print"; - //print_r(wallvalue($mapMatrix, "R")); - //echo "endprint"; - return $mapMatrix; -} - - -//Returns the essential 'move value' of individual walls in an array. -function wallValues($mapMatrix, $arrayWalls) { - $curpath = routePath($mapMatrix); - $curmoves = $curpath['moves']; - if ($curpath['blocked']) - $curmoves = 0; - //Prepare to return an array. - $r = Array(); - foreach ($arrayWalls as $x => $a) { - foreach ($a as $y => $v) { - //echo "{O".$mapMatrix[$x][$y]."O}"; - if ($mapMatrix[$x][$y] <> 'R') { - continue; - } - //Imagine the maze without the wall. - $mapMatrix[$x][$y] = 'o'; - $newpath = routePath($mapMatrix); - $newmoves = $newpath['moves']; - //Great; so the value of that wall is: - $r["$x,$y"] = $curmoves - $newmoves; - //Okay, you can have your wall back. - $mapMatrix[$x][$y] = 'R'; - } - } - return $r; -} - - -//Returns the essential 'move value' of a wall. -function wallvalue($mapMatrix, $wall) { - $curpath = routePath($mapMatrix); - $curmoves = $curpath['moves']; - for( $i = 1; $i <= $mapMatrix[0][1]; $i++) { //Number of Rows - for( $j = 0; $j < $mapMatrix[0][0]; $j++) { //Number of Columns - if ($mapMatrix[$i][$j] == $wall) { - $mapMatrix[$i][$j] = 'o'; - $newpath = routePath($mapMatrix); - $mapMatrix[$i][$j] = 'r'; - $newmoves = $newpath['moves']; - - $r["$i,$j"] = $curmoves - $newmoves; - - } - } - } - return $r; -} - - - - - -echo "
Path: "; -echo $bla['moves']; -echo "
"; -$mapdisplay = DisplayMap($map); -$code = GenerateMapCode($map); - - -echo "
$mapdisplay"; -echo "
$code"; -print_r ($map); - -echo "
"; -echo "
"; -echo "
"; -echo weight(1,2,3,4,5,6); -echo "
"; -echo weight(1,2,3,4,5,6); -echo "
"; -echo weight(1,2,3,4,5,6); -echo "
"; -echo weight(1,2,3,4,5,6); -echo "
"; -echo weight(1,2,3,4,5,6); -echo "
"; -echo weight(1,2,3,4,5,6); - - - - - -?> - - diff --git a/pages/howtoplay.php b/pages/howtoplay.php deleted file mode 100644 index 8c9f2f5..0000000 --- a/pages/howtoplay.php +++ /dev/null @@ -1,127 +0,0 @@ - - - -"; -//echo displaymap($map, 0, true); - -//Demo nothing. -$basicmapcode = '6x3.c0.r0.w9.t0.:0s.4f.0s.4f.0s.4f.'; -$basicmap = displaymap(GenerateMapByCode($basicmapcode), 1, 'example'); - -//Map Demoing the checkpoints -$cpcode = "6x3.c5.r0.w9.t0.:0s.0a.2b.0f.0s.1e.2f.0s.0d.2c.0f."; -$cpmap = displaymap(GenerateMapByCode($cpcode), 2, 'example'); - -//Map Demoing the teleports -$tpcode = "6x3.c0.r0.w5.t4.:0s.0n.2t.0f.0s.4f.0s.0u.2m.0f."; -$tpmap = displaymap(GenerateMapByCode($tpcode), 3, 'example'); - -?> - -
- - - - - - - -
- - - - diff --git a/pages/test.php b/pages/test.php deleted file mode 100644 index a5fe882..0000000 --- a/pages/test.php +++ /dev/null @@ -1,408 +0,0 @@ - - - - - - - Maze TowerD - - - -include('../mazetd/includes/maps.php'); - -//$mygrid = GenerateMap(20, 8, 4, 3); -if (isset($_GET[mapcode])) { - $mygrid = GenerateMapByCode($_GET[mapcode]); -} else { - $mygrid = GenerateMap(12, 12, 8); - $mygrid2 = GenerateMap(rand(12, 18), rand(10, 14), 8); - //$mygrid = GenerateMap(23, 13, 7, 3); -} -$code = GenerateMapCode($mygrid); - - -?> - - - - - - - -BP1:".$p['path']."
"; -//echo "
yx2:".$p['end']."
"; - -//$p = Findpath ($mygrid, explode(",", $p['end']), 'b'); -//echo "
BP:".$p['path']."
"; -//echo "
yx:".$p['end']."
"; -// $pathmap1 .= $p['path']; - -// $p = Findpath ($mygrid, explode(",", $p['end']), 'c'); -// $pathmap1 .= $p['path']; - -$p = Findpath ($mygrid, "2,4.3,4", 'f'); -$pathmap1 .= $p['path']; - -//echo DisplayMap($pathmap); - -//==Needs to contain mapid. -//echo "
Attempt Solution laaaaaaaaaaaaa laaaaaaaaaaaa CLick on this.."; -echo "
b
"; -echo "
"; -var_dump ($p); - - -echo "
"; - - // $time = microtime(); - // $time = explode(' ', $time); - // $time = $time[1] + $time[0]; - // $begintime = $time; - - //for($i = 1; $i <= 500; $i++) { - //$mygrid = generateMap(13, 8, 4, 3); - //echo "$i
"; - // $pathmap = Findpath ($mygrid, $start, 'a'); - // $pathmap = Findpath ($mygrid, $start, 'b'); - // $pathmap = Findpath ($mygrid, $start, 'c'); - // $pathmap = Findpath ($mygrid, $start, 'f'); - //} - // $time = microtime(); - // $time = explode(" ", $time); - // $time = $time[1] + $time[0]; - // $endtime = $time; - // $totaltime = round($endtime - $begintime, 5); - // echo "
500 paths executed in: $totaltime s"; - - //Starting result: - //500 paths executed in: 5.24884 s - //On a $mygrid = GenerateMap(13, 8, 4, 3); board. - //Now 1. -echo "Mapcode: $code"; -?> -
b
- -
-
-
-
-
-
- - \ No newline at end of file -- cgit v1.2.3