Merge branch 'master' of git.raylu.net:pathery

55 files changed, 89 insertions, 24 deletions

diff --git a/css/chat.css b/css/chat.css
index 66cd086..5b849ac 100644
--- a/css/chat.css
+++ b/css/chat.css
@@ -3,7 +3,7 @@
 	font-family: 'Trebuchet MS1', 'Trebuchet MS', sans-serif;
 	border: 1px solid gray;
 	background-color:#999;
-	width: 680px;
+	width: 650px;
 	margin: 7px;
 	padding: 2px;
 	border-radius: 10px;
@@ -12,11 +12,26 @@
 }
 .chatButton {
 	margin: 0px;
+	width: 50px;
 }
 .chatMute {
 	margin: 0px;
 	width: 15px;
 }
+.chatMute_true, .chatMute_false {
+	display:inline-block;
+	border:1px solid gray;
+	margin-top:3px;
+	width:17px;
+	height:17px;
+	background-size: 100%;
+}
+.chatMute_true {
+	background-image:	url(../images/Sound.png);
+}
+.chatMute_false {
+	background-image:	url(../images/Mute.png);
+}
 
 #chatContainer {
 	width:800px;
diff --git a/images/Mute.png b/images/Mute.png
new file mode 100644
index 0000000..8210033
--- /dev/null
+++ b/images/Mute.png
diff --git a/images/Sound.png b/images/Sound.png
new file mode 100644
index 0000000..992d944
--- /dev/null
+++ b/images/Sound.png
diff --git a/images/smileys/Angel.png b/images/smileys/Angel.png
new file mode 100644
index 0000000..0cf707b
--- /dev/null
+++ b/images/smileys/Angel.png
diff --git a/images/smileys/Angry.png b/images/smileys/Angry.png
new file mode 100644
index 0000000..9ae5d18
--- /dev/null
+++ b/images/smileys/Angry.png
diff --git a/images/smileys/Aww.png b/images/smileys/Aww.png
new file mode 100644
index 0000000..3512863
--- /dev/null
+++ b/images/smileys/Aww.png
diff --git a/images/smileys/Aww_2.png b/images/smileys/Aww_2.png
new file mode 100644
index 0000000..60510bb
--- /dev/null
+++ b/images/smileys/Aww_2.png
diff --git a/images/smileys/Blushing.png b/images/smileys/Blushing.png
new file mode 100644
index 0000000..ab03ee8
--- /dev/null
+++ b/images/smileys/Blushing.png
diff --git a/images/smileys/Childish.png b/images/smileys/Childish.png
new file mode 100644
index 0000000..1a31c50
--- /dev/null
+++ b/images/smileys/Childish.png
diff --git a/images/smileys/Confused.png b/images/smileys/Confused.png
new file mode 100644
index 0000000..08ba7d3
--- /dev/null
+++ b/images/smileys/Confused.png
diff --git a/images/smileys/Creepy.png b/images/smileys/Creepy.png
new file mode 100644
index 0000000..5615058
--- /dev/null
+++ b/images/smileys/Creepy.png
diff --git a/images/smileys/Crying.png b/images/smileys/Crying.png
new file mode 100644
index 0000000..2532976
--- /dev/null
+++ b/images/smileys/Crying.png
diff --git a/images/smileys/Cthulhu.png b/images/smileys/Cthulhu.png
new file mode 100644
index 0000000..fafc4b3
--- /dev/null
+++ b/images/smileys/Cthulhu.png
diff --git a/images/smileys/Cute.png b/images/smileys/Cute.png
new file mode 100644
index 0000000..a883ac3
--- /dev/null
+++ b/images/smileys/Cute.png
diff --git a/images/smileys/Cute_Winking.png b/images/smileys/Cute_Winking.png
new file mode 100644
index 0000000..ad3383d
--- /dev/null
+++ b/images/smileys/Cute_Winking.png
diff --git a/images/smileys/Devil.png b/images/smileys/Devil.png
new file mode 100644
index 0000000..afc5c2c
--- /dev/null
+++ b/images/smileys/Devil.png
diff --git a/images/smileys/Gah.png b/images/smileys/Gah.png
new file mode 100644
index 0000000..b03ee1b
--- /dev/null
+++ b/images/smileys/Gah.png
diff --git a/images/smileys/Gah_2.png b/images/smileys/Gah_2.png
new file mode 100644
index 0000000..b682458
--- /dev/null
+++ b/images/smileys/Gah_2.png
diff --git a/images/smileys/Gasping.png b/images/smileys/Gasping.png
new file mode 100644
index 0000000..b6655ce
--- /dev/null
+++ b/images/smileys/Gasping.png
diff --git a/images/smileys/Greedy.png b/images/smileys/Greedy.png
new file mode 100644
index 0000000..a179638
--- /dev/null
+++ b/images/smileys/Greedy.png
diff --git a/images/smileys/Grinning.png b/images/smileys/Grinning.png
new file mode 100644
index 0000000..85ff915
--- /dev/null
+++ b/images/smileys/Grinning.png
diff --git a/images/smileys/Grinning_Winking.png b/images/smileys/Grinning_Winking.png
new file mode 100644
index 0000000..5b1d5b7
--- /dev/null
+++ b/images/smileys/Grinning_Winking.png
diff --git a/images/smileys/Happy.png b/images/smileys/Happy.png
new file mode 100644
index 0000000..51cf1a2
--- /dev/null
+++ b/images/smileys/Happy.png
diff --git a/images/smileys/Happy_2.png b/images/smileys/Happy_2.png
new file mode 100644
index 0000000..1332686
--- /dev/null
+++ b/images/smileys/Happy_2.png
diff --git a/images/smileys/Happy_3.png b/images/smileys/Happy_3.png
new file mode 100644
index 0000000..be79df0
--- /dev/null
+++ b/images/smileys/Happy_3.png
diff --git a/images/smileys/Heart.png b/images/smileys/Heart.png
new file mode 100644
index 0000000..dcd28b9
--- /dev/null
+++ b/images/smileys/Heart.png
diff --git a/images/smileys/Huh.png b/images/smileys/Huh.png
new file mode 100644
index 0000000..241f50f
--- /dev/null
+++ b/images/smileys/Huh.png
diff --git a/images/smileys/Huh_2.png b/images/smileys/Huh_2.png
new file mode 100644
index 0000000..a1a54e4
--- /dev/null
+++ b/images/smileys/Huh_2.png
diff --git a/images/smileys/Laughing.png b/images/smileys/Laughing.png
new file mode 100644
index 0000000..edefc95
--- /dev/null
+++ b/images/smileys/Laughing.png
diff --git a/images/smileys/Lips_Sealed.png b/images/smileys/Lips_Sealed.png
new file mode 100644
index 0000000..46e4701
--- /dev/null
+++ b/images/smileys/Lips_Sealed.png
diff --git a/images/smileys/Madness.png b/images/smileys/Madness.png
new file mode 100644
index 0000000..1c0946c
--- /dev/null
+++ b/images/smileys/Madness.png
diff --git a/images/smileys/Malicious.png b/images/smileys/Malicious.png
new file mode 100644
index 0000000..23f2579
--- /dev/null
+++ b/images/smileys/Malicious.png
diff --git a/images/smileys/Sick.png b/images/smileys/Sick.png
new file mode 100644
index 0000000..6f73e2f
--- /dev/null
+++ b/images/smileys/Sick.png
diff --git a/images/smileys/Smiling.png b/images/smileys/Smiling.png
new file mode 100644
index 0000000..725eef5
--- /dev/null
+++ b/images/smileys/Smiling.png
diff --git a/images/smileys/Speechless.png b/images/smileys/Speechless.png
new file mode 100644
index 0000000..4fc4246
--- /dev/null
+++ b/images/smileys/Speechless.png
diff --git a/images/smileys/Spiteful.png b/images/smileys/Spiteful.png
new file mode 100644
index 0000000..195ced8
--- /dev/null
+++ b/images/smileys/Spiteful.png
diff --git a/images/smileys/Stupid.png b/images/smileys/Stupid.png
new file mode 100644
index 0000000..3fcea49
--- /dev/null
+++ b/images/smileys/Stupid.png
diff --git a/images/smileys/Sunglasses.png b/images/smileys/Sunglasses.png
new file mode 100644
index 0000000..cad8379
--- /dev/null
+++ b/images/smileys/Sunglasses.png
diff --git a/images/smileys/Terrified.png b/images/smileys/Terrified.png
new file mode 100644
index 0000000..fad2e06
--- /dev/null
+++ b/images/smileys/Terrified.png
diff --git a/images/smileys/Thumb_Down.png b/images/smileys/Thumb_Down.png
new file mode 100644
index 0000000..4f70696
--- /dev/null
+++ b/images/smileys/Thumb_Down.png
diff --git a/images/smileys/Thumb_Up.png b/images/smileys/Thumb_Up.png
new file mode 100644
index 0000000..2ca0e0d
--- /dev/null
+++ b/images/smileys/Thumb_Up.png
diff --git a/images/smileys/Tired.png b/images/smileys/Tired.png
new file mode 100644
index 0000000..13f7d12
--- /dev/null
+++ b/images/smileys/Tired.png
diff --git a/images/smileys/Tongue_Out.png b/images/smileys/Tongue_Out.png
new file mode 100644
index 0000000..3d154f9
--- /dev/null
+++ b/images/smileys/Tongue_Out.png
diff --git a/images/smileys/Tongue_Out_Laughing.png b/images/smileys/Tongue_Out_Laughing.png
new file mode 100644
index 0000000..fba5d75
--- /dev/null
+++ b/images/smileys/Tongue_Out_Laughing.png
diff --git a/images/smileys/Tongue_Out_Left.png b/images/smileys/Tongue_Out_Left.png
new file mode 100644
index 0000000..8015de7
--- /dev/null
+++ b/images/smileys/Tongue_Out_Left.png
diff --git a/images/smileys/Tongue_Out_Up.png b/images/smileys/Tongue_Out_Up.png
new file mode 100644
index 0000000..46328fb
--- /dev/null
+++ b/images/smileys/Tongue_Out_Up.png
diff --git a/images/smileys/Tongue_Out_Up_Left.png b/images/smileys/Tongue_Out_Up_Left.png
new file mode 100644
index 0000000..b67b69f
--- /dev/null
+++ b/images/smileys/Tongue_Out_Up_Left.png
diff --git a/images/smileys/Tongue_Out_Winking.png b/images/smileys/Tongue_Out_Winking.png
new file mode 100644
index 0000000..2a22cf6
--- /dev/null
+++ b/images/smileys/Tongue_Out_Winking.png
diff --git a/images/smileys/Uncertain.png b/images/smileys/Uncertain.png
new file mode 100644
index 0000000..7176856
--- /dev/null
+++ b/images/smileys/Uncertain.png
diff --git a/images/smileys/Uncertain_2.png b/images/smileys/Uncertain_2.png
new file mode 100644
index 0000000..a7f5370
--- /dev/null
+++ b/images/smileys/Uncertain_2.png
diff --git a/images/smileys/Unhappy.png b/images/smileys/Unhappy.png
new file mode 100644
index 0000000..79fc0c0
--- /dev/null
+++ b/images/smileys/Unhappy.png
diff --git a/images/smileys/Winking.png b/images/smileys/Winking.png
new file mode 100644
index 0000000..1e01f94
--- /dev/null
+++ b/images/smileys/Winking.png
diff --git a/js/mapspecs.js b/js/mapspecs.js
index ecc5c9d..6ab7286 100644
--- a/js/mapspecs.js
+++ b/js/mapspecs.js
@@ -92,12 +92,6 @@ function grid_click(obj) {
 	y = tmp[1];

 	x = tmp[2];

 	

-	

-	if(typeof(mapdata[mapid]) == 'Object' && mapdata[mapid].editMap == true) {

-		mapClick(obj);

-		return;

-	}

-	

 	//The users solution - prepare it if it's not started

 	if (solution[mapid] == undefined) {

 		getmapdata(mapid);

@@ -591,14 +585,14 @@ function doanimate(x, y, p, c, mapid, pathNumber) {
 	rs = 84;

 	//How fast should we be going?

 	selectbox = document.getElementById(mapid+',speed');

-	selected = selectbox.options[selectbox.selectedIndex].value;

-	switch (selected) {

+	var selectedSpeed = selectbox.options[selectbox.selectedIndex].value;

+	switch (selectedSpeed) {

 		case '1':

-			rs =160;

+			rs =180;

 			break;

 		

 		case '2':

-			rs =84;

+			rs =94;

 			break;

 		

 		case '3':

@@ -637,7 +631,8 @@ function doanimate(x, y, p, c, mapid, pathNumber) {
 		

 		case 'a': case 'b': case 'c': 

 		case 'd': case 'e': case 'f':

-			rs = rs + 410; 

+			rs = rs + 410;

+			if (selectedSpeed <= 2) rs = rs + 200;

 			mapdata[mapid].pathColor[pathNumber] = targetColor(t);

 			break; 

 		

@@ -880,7 +875,10 @@ function mapAsHTML(map, targetWidth, mapEditor) {
 			//var idHandle = map.ID+','+x+','+y;

 		

 			//oldy is used for Position too... for now

-			if (type == 'o' || mapEditor == true) {

+			if (mapEditor == true) {

+				mapgrid += "<div style='float:left; width:"+tileWidth+"px; height:"+tileWidth+"px; ' class='mapcell "+type+value+"' title='Position: "+x+","+oldy+"' id='"+idHandle+"' onMouseOver='mapEditOver(this)' onMouseDown='mapEditClick(this)' >";

+				mapgrid += "<div id='child_"+idHandle+"' class='child'></div></div>";

+			} else if (type == 'o') {

 				mapgrid += "<div style='float:left; width:"+tileWidth+"px; height:"+tileWidth+"px; ' class='mapcell "+type+value+"' title='Position: "+x+","+oldy+"' id='"+idHandle+"' onClick='grid_click(this)' >";

 				mapgrid += "<div id='child_"+idHandle+"' class='child'></div></div>";

 			} else {

diff --git a/pages/chat.php b/pages/chat.php
index d2198c7..ee36262 100644
--- a/pages/chat.php
+++ b/pages/chat.php
@@ -141,7 +141,7 @@ function getChatDone(data) {
 			firstGetChat = false;

 		}

 		document.title = lastDisplay+': '+lastMessage.substring(0, 10)+'... Pathery Chat';

-		if (!document.getElementById('chatMute').checked) {

+		if (chatIsMuted == 'true') {

 			soundManager.setVolume('charm', 20);

 			soundManager.setPan('charm', -60)

 			soundManager.setPosition('charm',150);

@@ -156,6 +156,8 @@ function chatReplaceAndEncode(chat) {
 	chat = chat.replace(/\~\~(\S(.*?\S)?)\~\~/gm, "<s>$1</s>");

 	chat = chat.replace(/\*(\S(.*?\S)?)\*/gm, "<i>$1</i>");

 	

+	chat = replaceSmileys(chat);

+	

 	//Surround all URLs with a <a> link

 	var URLexp = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig;

 	chat = chat.replace(URLexp, "<a href='redirect?to=$1' target='_blank'>$1</a>");

@@ -169,6 +171,15 @@ function chatReplaceAndEncode(chat) {
 	return chat;

 }

 

+function replaceSmileys(chat) {

+	chat = chat.replace(/:\)/g, '<img class="chatSmiley" src="images/smileys/Smiling.png" />');

+	chat = chat.replace(/\(:/g, '<img class="chatSmiley" src="images/smileys/Smiling.png" />');

+	//chat = chat.replace(/:\//g, '<img class="chatSmiley" src="images/smileys/Uncertain.png" />');

+	chat = chat.replace(/:\(/g, '<img class="chatSmiley" src="images/smileys/Unhappy.png" />');

+	chat = chat.replace(/\&lt;3/g, '<img class="chatSmiley" src="images/smileys/Heart.png" />');

+	return chat;

+}

+

 function prepChat(chat) {

 	chat = chat.join('|:|');

 	chat = chat.replace(/\&/g,'%26')

@@ -223,7 +234,20 @@ function htmlEncode(value){
     }

 }

 

-function setChatMute(value) {

+

+<?

+$chatMute = (isset($_COOKIE['pref_chatMute']) && $_COOKIE['pref_chatMute'] == "true");

+$chatMute = ($chatMute) ? 'true' : 'false';

+?>

+var chatIsMuted = '<? echo $chatMute; ?>';

+function setChatMute() {

+	var value = chatIsMuted;

+	

+	$('#chatMute').removeClass("chatMute_"+value);

+	if (value == 'true')	value = 'false';

+	else value = 'true';

+	chatIsMuted = value;

+	$('#chatMute').addClass("chatMute_"+value);

 	savePref('chatMute', value);

 }

 

@@ -240,10 +264,8 @@ function setChatMute(value) {
 		<input type="hidden" name="stuff" value="1724">

 		

 		<?

-		$chatMute = '';

-		if (isset($_COOKIE['pref_chatMute']) && $_COOKIE['pref_chatMute'] == "true") $chatMute = "checked='checked' ";

 		echo "

-		<input title='Mute sound?' onClick='setChatMute(this.checked)' type='checkbox' id='chatMute' class='chatMute' $chatMute/>";

+		<a title='Mute sound?' class='chatMute_$chatMute' href='javascript:setChatMute()' id='chatMute'/></a>";

 		?>

 		

 		<input class='chatButton' type="button" class="send" id='chatSendBtn' value='Send' onClick="sendChat();">

diff --git a/pages/mapeditor.php b/pages/mapeditor.php
index 87fef32..0d6cf94 100644
--- a/pages/mapeditor.php
+++ b/pages/mapeditor.php
@@ -51,13 +51,28 @@ testMap.name = 'Testmap';
 testMap.walls = 5;
 
 setTimeout("reloadMap();", 500);
+setTimeout("start();", 500);
 function start() {
-	$('#testMapDisplay').html(mapAsHTML(testMap));
+	//$('#testMapDisplay').html(mapAsHTML(testMap));
+	
+	$(window).mousedown(function(){
+    mouseIsDown = true;
+
+	});
+
+	$(window).mouseup(function(){
+		 mouseIsDown = false;
+	});
+
 }
 
+var mouseIsDown = false;
 
-var grid_clickOverride = true;
-function mapClick(obj) {
+var mapHasChanged = false;
+function mapEditOver(obj) {
+	if (mouseIsDown == true) mapEditClick(obj);
+}
+function mapEditClick(obj) {
 
 	console.log("Map Click");
 	tmp = obj.id.split(',');
@@ -69,9 +84,19 @@ function mapClick(obj) {
 	testMap.tiles[y][x] = Array(palleteType, palleteValue);
 	y++;
 	$(obj).attr('class', 'mapcell '+palleteType+palleteValue);
-	loadPlayableMap();
+	mapHasChanged = true;
+}
+
+getMapTimer();
+function getMapTimer() {
+	setTimeout("getMapTimer()", 3000);
+	if (mapHasChanged) {
+		loadPlayableMap();
+		mapHasChanged = false;
+	}
 }
 
+
 var palleteType = 's';
 var palleteValue = '';
 function paletteSelect(type, value) {
@@ -120,8 +145,12 @@ function reloadMap() {
 	loadPlayableMap();
 }
 
+var isLoadingMap = false;
 function loadPlayableMap() {
 
+	if (isLoadingMap == true) return;
+	isLoadingMap = true;
+
 	var URLString = 'mapeditor?mapByMap='+JSON.stringify(testMap);
 	$.ajax({
 		type: "GET",  
@@ -135,6 +164,7 @@ function loadPlayableMap() {
 			playableMap.ID = -1;
 			$('#playableMapDisplay').html(mapAsHTML(playableMap, 960));
 			$('#playableMapCodeDisplay').val(playableMap.code);
+			isLoadingMap = false;
 		}
 	});
 }
@@ -268,10 +298,10 @@ function constructTiles(width, height, baseMap) {
 	</div></form>
 	<div style='clear:both;'></div>
 	
-	<div class="divide"></div>
+	<div class="divide"><strong>Playable Map</strong></div>
 	<div style='clear:both;'></div>
 	<div class='wrapper'>
-	<input id='playableMapCodeDisplay' size="100" type="text" value="" class="forminput"/>
+	MapCode: <input id='playableMapCodeDisplay' size="100" type="text" value="" class="forminput"/>
 	</div>
 	<div id='playableMapDisplay' style='float:left;'>
 		Returned map goes here.