summaryrefslogtreecommitdiffstats
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/datas.php7
-rw-r--r--includes/maps.php34
2 files changed, 21 insertions, 20 deletions
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>";
}
}