From 63050715ee54f1e8c39f69557d6d012bd6316d6b Mon Sep 17 00:00:00 2001
From: mmbob <mmbob+github@outlook.com>
Date: Mon, 22 Apr 2013 13:04:43 -0400
Subject: Replace __ImageBase.  Save + load window position.

Instead of using the __ImageBase global variable, use the
GetModuleHandle(NULL) function to get the exe's HMODULE/HINSTANCE.
Save the window position when the game is closed and restore it when it
is opened.  Defaults to being centered on the desktop.

diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp
index c57b3b9..d5d0949 100644
--- a/src/PowderToySDL.cpp
+++ b/src/PowderToySDL.cpp
@@ -53,10 +53,6 @@ Atom XA_CLIPBOARD, XA_TARGETS;
 
 char *clipboardText = NULL;
 
-#ifdef WIN
-extern "C" IMAGE_DOS_HEADER __ImageBase;
-#endif
-
 int desktopWidth = 1280, desktopHeight = 1024;
 
 SDL_Surface * sdl_scrn;
@@ -276,8 +272,11 @@ int SDLOpen()
 	    exit(-1);
 	}
 	HWND WindowHandle = SysInfo.window;
-	HICON hIconSmall = (HICON)LoadImage(reinterpret_cast<HMODULE>(&__ImageBase), MAKEINTRESOURCE(101), IMAGE_ICON, 16, 16, LR_SHARED);
-	HICON hIconBig = (HICON)LoadImage(reinterpret_cast<HMODULE>(&__ImageBase), MAKEINTRESOURCE(101), IMAGE_ICON, 32, 32, LR_SHARED);
+
+	// Use GetModuleHandle to get the Exe HMODULE/HINSTANCE
+	HMODULE hModExe = GetModuleHandle(NULL);
+	HICON hIconSmall = (HICON)LoadImage(hModExe, MAKEINTRESOURCE(101), IMAGE_ICON, 16, 16, LR_SHARED);
+	HICON hIconBig = (HICON)LoadImage(hModExe, MAKEINTRESOURCE(101), IMAGE_ICON, 32, 32, LR_SHARED);
 	SendMessage(WindowHandle, WM_SETICON, ICON_SMALL, (LPARAM)hIconSmall);
 	SendMessage(WindowHandle, WM_SETICON, ICON_BIG, (LPARAM)hIconBig);
 #elif defined(LIN)
@@ -543,6 +542,83 @@ int GetModifiers()
 	return SDL_GetModState();
 }
 
+#ifdef WIN
+
+// Returns true if the loaded position was set
+// Returns false if something went wrong: SDL_GetWMInfo failed or the loaded position was invalid
+bool LoadWindowPosition()
+{
+	SDL_SysWMinfo sysInfo;
+	SDL_VERSION(&sysInfo.version);
+	if (SDL_GetWMInfo(&sysInfo) > 0)
+	{
+		RECT rcWindow;
+		GetWindowRect(sysInfo.window, &rcWindow);
+
+		int windowW = rcWindow.right - rcWindow.left - 1;
+		int windowH = rcWindow.bottom - rcWindow.top - 1;
+
+		int windowX = Client::Ref().GetPrefInteger("WindowX", INT_MAX);
+		int windowY = Client::Ref().GetPrefInteger("WindowY", INT_MAX);
+
+		bool setDefaultPos = true;
+
+		if (windowX != INT_MAX && windowY != INT_MAX)
+		{
+			POINT windowPoints[] = {
+				{windowX, windowY},						// Top-left
+				{windowX + windowW, windowY + windowH}	// Bottom-right
+			};
+
+			MONITORINFO monitor;
+			monitor.cbSize = sizeof(monitor);
+			if (GetMonitorInfo(MonitorFromPoint(windowPoints[0], MONITOR_DEFAULTTOPRIMARY), &monitor) != 0)
+			{
+					// Only use the saved window position if it lies inside the visible screen
+				if (PtInRect(&monitor.rcMonitor, windowPoints[0]) && PtInRect(&monitor.rcMonitor, windowPoints[1]))
+				{
+					SetWindowPos(sysInfo.window, 0, windowX, windowY, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER);
+
+					setDefaultPos = false;
+				}
+			}
+		}
+		
+		if (setDefaultPos)
+		{
+				// Center the window on the primary desktop by default
+			SetWindowPos(sysInfo.window, 0, (desktopWidth - windowW) / 2, (desktopHeight - windowH) / 2, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER);
+		}
+
+			// True if we didn't use the default, i.e. the position was valid
+		return !setDefaultPos;
+	}
+
+	return false;
+}
+
+// Returns true if the window position was saved
+bool SaveWindowPosition()
+{
+	SDL_SysWMinfo sysInfo;
+	SDL_VERSION(&sysInfo.version);
+	if (SDL_GetWMInfo(&sysInfo) > 0)
+	{
+		WINDOWPLACEMENT placement;
+		placement.length = sizeof(placement);
+		GetWindowPlacement(sysInfo.window, &placement);
+
+		Client::Ref().SetPref("WindowX", placement.rcNormalPosition.left);
+		Client::Ref().SetPref("WindowY", placement.rcNormalPosition.top);
+
+		return true;
+	}
+
+	return false;
+}
+
+#endif
+
 int main(int argc, char * argv[])
 {
 	currentWidth = XRES+BARSIZE; 
@@ -603,6 +679,12 @@ int main(int argc, char * argv[])
 
 	int sdlStatus = SDLOpen();
 	sdl_scrn = SDLSetScreen(tempScale, tempFullscreen);
+
+#ifdef WIN
+		// Must be after SDLSetScreen to account for scale
+	LoadWindowPosition();
+#endif
+
 #ifdef OGLI
 	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
 	//glScaled(2.0f, 2.0f, 1.0f);
@@ -734,6 +816,10 @@ int main(int argc, char * argv[])
 
 	EngineProcess();
 	
+#ifdef WIN
+	SaveWindowPosition();
+#endif
+	
 	ui::Engine::Ref().CloseWindow();
 	delete gameController;
 	delete ui::Engine::Ref().g;
--
cgit v0.9.2-21-gd62e

From e166640cbbe6d990175e835ae9ff463d9bae34f1 Mon Sep 17 00:00:00 2001
From: mmbob <mmbob+github@outlook.com>
Date: Mon, 22 Apr 2013 13:05:10 -0400
Subject: Fix reading hexadecimal in TPTScriptInterface

Instead of subtracting 'A', subtract 'a'

diff --git a/src/cat/TPTScriptInterface.cpp b/src/cat/TPTScriptInterface.cpp
index 5d9a5e0..f8c6af6 100644
--- a/src/cat/TPTScriptInterface.cpp
+++ b/src/cat/TPTScriptInterface.cpp
@@ -137,7 +137,7 @@ int TPTScriptInterface::parseNumber(char * stringData)
 			if(cc >= '0' && cc <= '9')
 				currentNumber += cc - '0';
 			else if(cc >= 'a' && cc <= 'f')
-				currentNumber += (cc - 'A') + 10;
+				currentNumber += (cc - 'a') + 10;
 			else if(cc >= 'A' && cc <= 'F')
 				currentNumber += (cc - 'A') + 10;
 			else
--
cgit v0.9.2-21-gd62e

From df14a771240ca11c17299d2137d474dee1fb3c6e Mon Sep 17 00:00:00 2001
From: mmbob <mmbob+github@outlook.com>
Date: Thu, 2 May 2013 13:00:13 -0400
Subject: LoadWindowPosition has a better default position

LoadWindowPosition now positions the window on the nearest monitor if
the window is not inside a monitor.

diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp
index d5d0949..ab76bdf 100644
--- a/src/PowderToySDL.cpp
+++ b/src/PowderToySDL.cpp
@@ -558,40 +558,47 @@ bool LoadWindowPosition()
 		int windowW = rcWindow.right - rcWindow.left - 1;
 		int windowH = rcWindow.bottom - rcWindow.top - 1;
 
-		int windowX = Client::Ref().GetPrefInteger("WindowX", INT_MAX);
-		int windowY = Client::Ref().GetPrefInteger("WindowY", INT_MAX);
+		int savedWindowX = Client::Ref().GetPrefInteger("WindowX", INT_MAX);
+		int savedWindowY = Client::Ref().GetPrefInteger("WindowY", INT_MAX);
+		
+				// Center the window on the primary desktop by default
+		int newWindowX = (desktopWidth - windowW) / 2;
+		int newWindowY = (desktopHeight - windowH) / 2;
 
-		bool setDefaultPos = true;
+		bool success = false;
 
-		if (windowX != INT_MAX && windowY != INT_MAX)
+		if (savedWindowX != INT_MAX && savedWindowY != INT_MAX)
 		{
 			POINT windowPoints[] = {
-				{windowX, windowY},						// Top-left
-				{windowX + windowW, windowY + windowH}	// Bottom-right
+				{savedWindowX, savedWindowY},                       // Top-left
+				{savedWindowX + windowW, savedWindowY + windowH}    // Bottom-right
 			};
 
 			MONITORINFO monitor;
 			monitor.cbSize = sizeof(monitor);
-			if (GetMonitorInfo(MonitorFromPoint(windowPoints[0], MONITOR_DEFAULTTOPRIMARY), &monitor) != 0)
+			if (GetMonitorInfo(MonitorFromPoint(windowPoints[0], MONITOR_DEFAULTTONEAREST), &monitor) != 0)
 			{
 					// Only use the saved window position if it lies inside the visible screen
 				if (PtInRect(&monitor.rcMonitor, windowPoints[0]) && PtInRect(&monitor.rcMonitor, windowPoints[1]))
 				{
-					SetWindowPos(sysInfo.window, 0, windowX, windowY, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER);
+					newWindowX = savedWindowX;
+					newWindowY = savedWindowY;
 
-					setDefaultPos = false;
+					success = true;
+				}
+				else
+				{
+						// Center the window on the nearest monitor
+					newWindowX = monitor.rcMonitor.left + (monitor.rcMonitor.right - monitor.rcMonitor.left - windowW) / 2;
+					newWindowY = monitor.rcMonitor.top + (monitor.rcMonitor.bottom - monitor.rcMonitor.top - windowH) / 2;
 				}
 			}
 		}
 		
-		if (setDefaultPos)
-		{
-				// Center the window on the primary desktop by default
-			SetWindowPos(sysInfo.window, 0, (desktopWidth - windowW) / 2, (desktopHeight - windowH) / 2, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER);
-		}
+		SetWindowPos(sysInfo.window, 0, newWindowX, newWindowY, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER);
 
 			// True if we didn't use the default, i.e. the position was valid
-		return !setDefaultPos;
+		return success;
 	}
 
 	return false;
--
cgit v0.9.2-21-gd62e

From 29496cb6d3418eaed63f78a6624458ecf410bfc3 Mon Sep 17 00:00:00 2001
From: mniip <mniip@mniip.com>
Date: Thu, 2 May 2013 23:49:53 +0400
Subject: fix tpt.log so that when called multiple times, it doesn't overwrite
 the text


diff --git a/src/cat/LegacyLuaAPI.cpp b/src/cat/LegacyLuaAPI.cpp
index 75b6780..4abd041 100644
--- a/src/cat/LegacyLuaAPI.cpp
+++ b/src/cat/LegacyLuaAPI.cpp
@@ -958,7 +958,11 @@ int luatpt_log(lua_State* l)
 		lua_pop(l, 2);
 	}
 	if((*luacon_currentCommand))
-		(*luacon_lastError) = text;
+	{
+		if(luacon_lastError->length())
+			*luacon_lastError += "; ";
+		*luacon_lastError += text;
+	}
 	else
 		luacon_ci->Log(CommandInterface::LogNotice, text.c_str());
 	return 0;
--
cgit v0.9.2-21-gd62e

From d8023d21cd8240d4aedc9d63a0e1cd056b15c919 Mon Sep 17 00:00:00 2001
From: mniip <mniip@mniip.com>
Date: Fri, 3 May 2013 01:09:13 +0400
Subject: better luacon_geterror


diff --git a/src/cat/LegacyLuaAPI.cpp b/src/cat/LegacyLuaAPI.cpp
index 4abd041..45b7f96 100644
--- a/src/cat/LegacyLuaAPI.cpp
+++ b/src/cat/LegacyLuaAPI.cpp
@@ -664,12 +664,32 @@ void luacon_hook(lua_State * l, lua_Debug * ar)
 	}
 }
 
-char *luacon_geterror(){
-	char *error = (char*)lua_tostring(luacon_ci->l, -1);
-	if(error==NULL || !error[0]){
-		error = "failed to execute";
+static int luaL_tostring (lua_State *L, int n) {
+	luaL_checkany(L, n);
+	switch (lua_type(L, n)) {
+		case LUA_TNUMBER:
+			lua_pushstring(L, lua_tostring(L, n));
+			break;
+		case LUA_TSTRING:
+			lua_pushvalue(L, n);
+			break;
+		case LUA_TBOOLEAN:
+			lua_pushstring(L, (lua_toboolean(L, n) ? "true" : "false"));
+			break;
+		case LUA_TNIL:
+			lua_pushliteral(L, "nil");
+			break;
+		default:
+			lua_pushfstring(L, "%s: %p", luaL_typename(L, n), lua_topointer(L, n));
+			break;
 	}
-	return error;
+	return 1;
+}
+char *luacon_geterror(){
+	luaL_tostring(luacon_ci->l, -1);
+	char* err = (char*)luaL_optstring(luacon_ci->l, -1, "failed to execute");
+	lua_pop(luacon_ci->l, 1);
+	return err;
 }
 /*void luacon_close(){
 	lua_close(l);
@@ -923,27 +943,6 @@ int luatpt_setconsole(lua_State* l)
 		luacon_controller->HideConsole();
 	return 0;
 }
-static int luaL_tostring (lua_State *L, int n) {
-	luaL_checkany(L, n);
-	switch (lua_type(L, n)) {
-		case LUA_TNUMBER:
-			lua_pushstring(L, lua_tostring(L, n));
-			break;
-		case LUA_TSTRING:
-			lua_pushvalue(L, n);
-			break;
-		case LUA_TBOOLEAN:
-			lua_pushstring(L, (lua_toboolean(L, n) ? "true" : "false"));
-			break;
-		case LUA_TNIL:
-			lua_pushliteral(L, "nil");
-			break;
-		default:
-			lua_pushfstring(L, "%s: %p", luaL_typename(L, n), lua_topointer(L, n));
-			break;
-	}
-	return 1;
-}
 int luatpt_log(lua_State* l)
 {
 	int args = lua_gettop(l);
--
cgit v0.9.2-21-gd62e

From 0233d8db466c6ef402e5008671cfa6555a2d896d Mon Sep 17 00:00:00 2001
From: mniip <mniip@mniip.com>
Date: Fri, 3 May 2013 01:54:21 +0400
Subject: print returned values; implicit return in console; console source


diff --git a/src/cat/LegacyLuaAPI.cpp b/src/cat/LegacyLuaAPI.cpp
index 45b7f96..2166b14 100644
--- a/src/cat/LegacyLuaAPI.cpp
+++ b/src/cat/LegacyLuaAPI.cpp
@@ -664,7 +664,7 @@ void luacon_hook(lua_State * l, lua_Debug * ar)
 	}
 }
 
-static int luaL_tostring (lua_State *L, int n) {
+int luaL_tostring (lua_State *L, int n) {
 	luaL_checkany(L, n);
 	switch (lua_type(L, n)) {
 		case LUA_TNUMBER:
diff --git a/src/cat/LuaScriptHelper.h b/src/cat/LuaScriptHelper.h
index fde1eb4..d1679a6 100644
--- a/src/cat/LuaScriptHelper.h
+++ b/src/cat/LuaScriptHelper.h
@@ -9,6 +9,7 @@ extern Graphics * luacon_g;
 extern Renderer * luacon_ren;
 
 extern bool *luacon_currentCommand;
+extern int luaL_tostring(lua_State* l, int n);
 extern std::string *luacon_lastError;
 
 extern int *lua_el_func, *lua_el_mode, *lua_gr_func;
diff --git a/src/cat/LuaScriptInterface.cpp b/src/cat/LuaScriptInterface.cpp
index 74757e5..8d499a0 100644
--- a/src/cat/LuaScriptInterface.cpp
+++ b/src/cat/LuaScriptInterface.cpp
@@ -2119,14 +2119,43 @@ int LuaScriptInterface::Command(std::string command)
 	}
 	else
 	{
-		int ret;
+		int level = lua_gettop(l), ret;
+		std::string text = "";
 		lastError = "";
 		currentCommand = true;
+		std::string tmp = "return " + command;
 		ui::Engine::Ref().LastTick(clock());
-		if((ret = luaL_dostring(l, command.c_str())))
+		luaL_loadbuffer(l, tmp.c_str(), tmp.length(), "@console");
+		if(lua_type(l, -1) != LUA_TFUNCTION)
 		{
+			lua_pop(l, 1);
+			luaL_loadbuffer(l, command.c_str(), command.length(), "@console");
+		}
+		if(lua_type(l, -1) != LUA_TFUNCTION)
 			lastError = luacon_geterror();
-			//Log(LogError, lastError);
+		else
+		{
+			ret = lua_pcall(l, 0, LUA_MULTRET, 0);
+			if(ret)
+				lastError = luacon_geterror();
+			else
+			{
+				for(level++;level<=lua_gettop(l);level++)
+				{
+					luaL_tostring(l, level);
+					if(text.length())
+						text += ", " + std::string(luaL_optstring(l, -1, ""));
+					else
+						text = std::string(luaL_optstring(l, -1, ""));
+					lua_pop(l, 1);
+				}
+				if(text.length())
+					if(lastError.length())
+						lastError += "; " + text;
+					else
+						lastError = text;
+
+			}
 		}
 		currentCommand = false;
 		return ret;
--
cgit v0.9.2-21-gd62e

From 4cd12e8561b71ce32598d791ddedf5f1aef9203c Mon Sep 17 00:00:00 2001
From: mniip <mniip@mniip.com>
Date: Fri, 3 May 2013 09:56:13 +0400
Subject: allow multiline code input, command will be executed when enough code
 given


diff --git a/src/cat/LuaScriptInterface.cpp b/src/cat/LuaScriptInterface.cpp
index 8d499a0..587be8c 100644
--- a/src/cat/LuaScriptInterface.cpp
+++ b/src/cat/LuaScriptInterface.cpp
@@ -57,6 +57,7 @@ Renderer * luacon_ren;
 
 bool *luacon_currentCommand;
 std::string *luacon_lastError;
+std::string lastCode;
 
 int *lua_el_func, *lua_el_mode, *lua_gr_func;
 
@@ -178,6 +179,8 @@ LuaScriptInterface::LuaScriptInterface(GameController * c, GameModel * m):
 	luacon_currentCommand = &currentCommand;
 	luacon_lastError = &lastError;
 
+	lastCode = "";
+
 	//Replace print function with our screen logging thingy
 	lua_pushcfunction(l, luatpt_log);
 	lua_setglobal(l, "print");
@@ -2123,18 +2126,28 @@ int LuaScriptInterface::Command(std::string command)
 		std::string text = "";
 		lastError = "";
 		currentCommand = true;
-		std::string tmp = "return " + command;
+		if(lastCode.length())
+			lastCode += "\n";
+		lastCode += command;
+		std::string tmp = "return " + lastCode;
 		ui::Engine::Ref().LastTick(clock());
 		luaL_loadbuffer(l, tmp.c_str(), tmp.length(), "@console");
 		if(lua_type(l, -1) != LUA_TFUNCTION)
 		{
 			lua_pop(l, 1);
-			luaL_loadbuffer(l, command.c_str(), command.length(), "@console");
+			luaL_loadbuffer(l, lastCode.c_str(), lastCode.length(), "@console");
 		}
 		if(lua_type(l, -1) != LUA_TFUNCTION)
+		{
 			lastError = luacon_geterror();
+			if(std::string(lastError).find("near '<eof>'")!=-1) //the idea stolen from lua-5.1.5/lua.c
+				lastError = ">";
+			else
+				lastCode = "";
+		}
 		else
 		{
+			lastCode = "";
 			ret = lua_pcall(l, 0, LUA_MULTRET, 0);
 			if(ret)
 				lastError = luacon_geterror();
--
cgit v0.9.2-21-gd62e

From d4391cc19eb694f12aecfedbe03fc01730f776a0 Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Fri, 3 May 2013 19:11:44 -0400
Subject: set window position before displaying it


diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp
index ab76bdf..93a8996 100644
--- a/src/PowderToySDL.cpp
+++ b/src/PowderToySDL.cpp
@@ -546,22 +546,19 @@ int GetModifiers()
 
 // Returns true if the loaded position was set
 // Returns false if something went wrong: SDL_GetWMInfo failed or the loaded position was invalid
-bool LoadWindowPosition()
+bool LoadWindowPosition(int scale)
 {
 	SDL_SysWMinfo sysInfo;
 	SDL_VERSION(&sysInfo.version);
 	if (SDL_GetWMInfo(&sysInfo) > 0)
 	{
-		RECT rcWindow;
-		GetWindowRect(sysInfo.window, &rcWindow);
-
-		int windowW = rcWindow.right - rcWindow.left - 1;
-		int windowH = rcWindow.bottom - rcWindow.top - 1;
+		int windowW = (XRES + BARSIZE) * scale;
+		int windowH = (YRES + MENUSIZE) * scale;
 
 		int savedWindowX = Client::Ref().GetPrefInteger("WindowX", INT_MAX);
 		int savedWindowY = Client::Ref().GetPrefInteger("WindowY", INT_MAX);
 		
-				// Center the window on the primary desktop by default
+		// Center the window on the primary desktop by default
 		int newWindowX = (desktopWidth - windowW) / 2;
 		int newWindowY = (desktopHeight - windowH) / 2;
 
@@ -578,7 +575,7 @@ bool LoadWindowPosition()
 			monitor.cbSize = sizeof(monitor);
 			if (GetMonitorInfo(MonitorFromPoint(windowPoints[0], MONITOR_DEFAULTTONEAREST), &monitor) != 0)
 			{
-					// Only use the saved window position if it lies inside the visible screen
+				// Only use the saved window position if it lies inside the visible screen
 				if (PtInRect(&monitor.rcMonitor, windowPoints[0]) && PtInRect(&monitor.rcMonitor, windowPoints[1]))
 				{
 					newWindowX = savedWindowX;
@@ -588,7 +585,7 @@ bool LoadWindowPosition()
 				}
 				else
 				{
-						// Center the window on the nearest monitor
+					// Center the window on the nearest monitor
 					newWindowX = monitor.rcMonitor.left + (monitor.rcMonitor.right - monitor.rcMonitor.left - windowW) / 2;
 					newWindowY = monitor.rcMonitor.top + (monitor.rcMonitor.bottom - monitor.rcMonitor.top - windowH) / 2;
 				}
@@ -597,7 +594,7 @@ bool LoadWindowPosition()
 		
 		SetWindowPos(sysInfo.window, 0, newWindowX, newWindowY, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER);
 
-			// True if we didn't use the default, i.e. the position was valid
+		// True if we didn't use the default, i.e. the position was valid
 		return success;
 	}
 
@@ -685,12 +682,10 @@ int main(int argc, char * argv[])
 		tempScale = 1;
 
 	int sdlStatus = SDLOpen();
-	sdl_scrn = SDLSetScreen(tempScale, tempFullscreen);
-
 #ifdef WIN
-		// Must be after SDLSetScreen to account for scale
-	LoadWindowPosition();
+	LoadWindowPosition(tempScale);
 #endif
+	sdl_scrn = SDLSetScreen(tempScale, tempFullscreen);
 
 #ifdef OGLI
 	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
--
cgit v0.9.2-21-gd62e

From 3018c597c4cc2e58751d52020f5c927a3329a56f Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Fri, 3 May 2013 19:47:09 -0400
Subject: make GOLD sparkle slightly, and it kills NEUT


diff --git a/src/simulation/elements/GOLD.cpp b/src/simulation/elements/GOLD.cpp
index 00c93c5..09ff5cb 100644
--- a/src/simulation/elements/GOLD.cpp
+++ b/src/simulation/elements/GOLD.cpp
@@ -32,7 +32,7 @@ Element_GOLD::Element_GOLD()
 	Description = "Corrosion resistant metal, will reverse corrosion of iron";
 
 	State = ST_SOLID;
-	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_HOT_GLOW|PROP_LIFE_DEC;
+	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_HOT_GLOW|PROP_LIFE_DEC|PROP_NEUTPASS;
 
 	LowPressure = IPL;
 	LowPressureTransition = NT;
@@ -44,7 +44,7 @@ Element_GOLD::Element_GOLD()
 	HighTemperatureTransition = PT_LAVA;
 
 	Update = &Element_GOLD::update;
-	
+	Graphics = &Element_GOLD::graphics;
 }
 
 //#TPT-Directive ElementHeader Element_GOLD static int update(UPDATE_FUNC_ARGS)
@@ -85,8 +85,23 @@ int Element_GOLD::update(UPDATE_FUNC_ARGS)
 			}
 		}
 	}
+	if ((sim->photons[y][x]&0xFF) == PT_NEUT)
+	{
+		if (!(rand()%7))
+		{
+			sim->kill_part(sim->photons[y][x]>>8);
+		}
+	}
 	return 0;
 }
 
+//#TPT-Directive ElementHeader Element_GOLD static int graphics(GRAPHICS_FUNC_ARGS)
+int Element_GOLD::graphics(GRAPHICS_FUNC_ARGS)
+{
+	*colr += rand()%10-5;
+	*colg += rand()%10-5;
+	*colb += rand()%10-5;
+	return 0;
+}
 
 Element_GOLD::~Element_GOLD() {}
--
cgit v0.9.2-21-gd62e

From 88cbb81ec44ae0688d7e0b570e906b23b50d3c9e Mon Sep 17 00:00:00 2001
From: mniip <mniip@mniip.com>
Date: Sat, 4 May 2013 04:11:52 +0400
Subject: fix crash on non-string error in step and other functions


diff --git a/src/cat/LegacyLuaAPI.cpp b/src/cat/LegacyLuaAPI.cpp
index 2166b14..4d3c0c8 100644
--- a/src/cat/LegacyLuaAPI.cpp
+++ b/src/cat/LegacyLuaAPI.cpp
@@ -514,7 +514,7 @@ int luacon_keyevent(int key, int modifier, int event)
 		callret = lua_pcall(l, 4, 1, 0);
 		if (callret)
 		{
-			if (!strcmp(luaL_optstring(l, -1, ""), "Error: Script not responding"))
+			if (!strcmp(luacon_geterror(), "Error: Script not responding"))
 			{
 				ui::Engine::Ref().LastTick(clock());
 				for(j=i;j<=c-1;j++)
@@ -566,7 +566,7 @@ int luacon_mouseevent(int mx, int my, int mb, int event, int mouse_wheel)
 		callret = lua_pcall(l, 5, 1, 0);
 		if (callret)
 		{
-			if (!strcmp(luaL_optstring(l, -1, ""), "Error: Script not responding"))
+			if (!strcmp(luacon_geterror(), "Error: Script not responding"))
 			{
 				ui::Engine::Ref().LastTick(clock());
 				for(j=i;j<=c-1;j++)
@@ -579,7 +579,7 @@ int luacon_mouseevent(int mx, int my, int mb, int event, int mouse_wheel)
 				c--;
 				i--;
 			}
-			luacon_ci->Log(CommandInterface::LogError, luaL_optstring(l, -1, ""));
+			luacon_ci->Log(CommandInterface::LogError, luacon_geterror());
 			lua_pop(l, 1);
 		}
 		else
@@ -627,7 +627,7 @@ int luacon_step(int mx, int my, std::string selectl, std::string selectr, std::s
 		callret = lua_pcall(l, 0, 0, 0);
 		if (callret)
 		{
-			if (!strcmp(luaL_optstring(l, -1, ""), "Error: Script not responding"))
+			if (!strcmp(luacon_geterror(), "Error: Script not responding"))
 			{
 				ui::Engine::Ref().LastTick(clock());
 				for(j=i;j<=c-1;j++)
@@ -640,7 +640,7 @@ int luacon_step(int mx, int my, std::string selectl, std::string selectr, std::s
 				c--;
 				i--;
 			}
-			luacon_ci->Log(CommandInterface::LogError, luaL_optstring(l, -1, ""));
+			luacon_ci->Log(CommandInterface::LogError, luacon_geterror());
 			lua_pop(l, 1);
 		}
 	}
@@ -796,7 +796,7 @@ int luacon_graphicsReplacement(GRAPHICS_FUNC_ARGS, int i)
 	callret = lua_pcall(luacon_ci->l, 4, 10, 0);
 	if (callret)
 	{
-		luacon_ci->Log(CommandInterface::LogError, luaL_optstring(luacon_ci->l, -1, ""));
+		luacon_ci->Log(CommandInterface::LogError, luacon_geterror());
 		lua_pop(luacon_ci->l, 1);
 	}
 	else
--
cgit v0.9.2-21-gd62e

From c68e4b1393f92fadfe4cf4b6dcca212414dd8646 Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Fri, 3 May 2013 22:42:36 -0400
Subject: change descriptions of many elements to be more consistent, contain
 more info, and be more helpful.


diff --git a/src/simulation/elements/116.cpp b/src/simulation/elements/116.cpp
index bd359e8..e99f0cf 100644
--- a/src/simulation/elements/116.cpp
+++ b/src/simulation/elements/116.cpp
@@ -28,7 +28,7 @@ Element_116::Element_116()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 70;
-	Description = "Shared velocity test";
+	Description = "A failed shared velocity test.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_PART;
diff --git a/src/simulation/elements/ACEL.cpp b/src/simulation/elements/ACEL.cpp
index c5d0f38..15e1b89 100644
--- a/src/simulation/elements/ACEL.cpp
+++ b/src/simulation/elements/ACEL.cpp
@@ -28,7 +28,7 @@ Element_ACEL::Element_ACEL()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 251;
-	Description = "Accelerator";
+	Description = "Accelerator, speeds up nearby elements.";
 	
 	State = ST_NONE;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/AMTR.cpp b/src/simulation/elements/AMTR.cpp
index ccd166a..f62670e 100644
--- a/src/simulation/elements/AMTR.cpp
+++ b/src/simulation/elements/AMTR.cpp
@@ -28,7 +28,7 @@ Element_AMTR::Element_AMTR()
 	
 	Temperature = R_TEMP+0.0f +273.15f;
 	HeatConduct = 70;
-	Description = "Anti-Matter, Destroys a majority of particles";
+	Description = "Anti-Matter, destroys a majority of particles.";
 	
 	State = ST_NONE;
 	Properties = TYPE_PART;
diff --git a/src/simulation/elements/ARAY.cpp b/src/simulation/elements/ARAY.cpp
index 7da2621..f7d3194 100644
--- a/src/simulation/elements/ARAY.cpp
+++ b/src/simulation/elements/ARAY.cpp
@@ -28,7 +28,7 @@ Element_ARAY::Element_ARAY()
 	
 	Temperature = R_TEMP+0.0f +273.15f;
 	HeatConduct = 0;
-	Description = "Ray Emitter. Rays create points when they collide";
+	Description = "Ray Emitter. Rays create points when they collide.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/BANG.cpp b/src/simulation/elements/BANG.cpp
index 37ada4a..fa1ebae 100644
--- a/src/simulation/elements/BANG.cpp
+++ b/src/simulation/elements/BANG.cpp
@@ -28,7 +28,7 @@ Element_BANG::Element_BANG()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 88;
-	Description = "Explosive.";
+	Description = "TNT, explodes all at once.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID | PROP_NEUTPENETRATE;
diff --git a/src/simulation/elements/BGLA.cpp b/src/simulation/elements/BGLA.cpp
index 12c779a..3c7e9ba 100644
--- a/src/simulation/elements/BGLA.cpp
+++ b/src/simulation/elements/BGLA.cpp
@@ -28,7 +28,7 @@ Element_BGLA::Element_BGLA()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 150;
-	Description = "Broken Glass, Heavy particles. Meltable. Bagels.";
+	Description = "Broken Glass, heavy particles formed when glass breaks under pressure. Meltable. Bagels.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_PART | PROP_HOT_GLOW;
diff --git a/src/simulation/elements/BIZR.cpp b/src/simulation/elements/BIZR.cpp
index d821190..e79c721 100644
--- a/src/simulation/elements/BIZR.cpp
+++ b/src/simulation/elements/BIZR.cpp
@@ -28,7 +28,7 @@ Element_BIZR::Element_BIZR()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 29;
-	Description = "Bizarre... contradicts the normal state changes.";
+	Description = "Bizarre... contradicts the normal state changes. Paints other elements with it's deco color.";
 	
 	State = ST_LIQUID;
 	Properties = TYPE_LIQUID;
diff --git a/src/simulation/elements/BIZRG.cpp b/src/simulation/elements/BIZRG.cpp
index 04b9bbb..aa1f0d2 100644
--- a/src/simulation/elements/BIZRG.cpp
+++ b/src/simulation/elements/BIZRG.cpp
@@ -28,7 +28,7 @@ Element_BIZRG::Element_BIZRG()
 	
 	Temperature = R_TEMP-200.0f+273.15f;
 	HeatConduct = 42;
-	Description = "Bizarre gas";
+	Description = "Bizarre gas.";
 	
 	State = ST_GAS;
 	Properties = TYPE_GAS;
diff --git a/src/simulation/elements/BIZRS.cpp b/src/simulation/elements/BIZRS.cpp
index 7ef6ebf..4fd15ae 100644
--- a/src/simulation/elements/BIZRS.cpp
+++ b/src/simulation/elements/BIZRS.cpp
@@ -28,7 +28,7 @@ Element_BIZRS::Element_BIZRS()
 	
 	Temperature = R_TEMP+300.0f+273.15f;
 	HeatConduct = 251;
-	Description = "Bizarre solid";
+	Description = "Bizarre solid.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/BOMB.cpp b/src/simulation/elements/BOMB.cpp
index ea53497..ad1a193 100644
--- a/src/simulation/elements/BOMB.cpp
+++ b/src/simulation/elements/BOMB.cpp
@@ -28,7 +28,7 @@ Element_BOMB::Element_BOMB()
 	
 	Temperature = R_TEMP-2.0f	+273.15f;
 	HeatConduct = 29;
-	Description = "Bomb.";
+	Description = "Bomb. Explodes and destroys all surrounding particles when it touches something.";
 	
 	State = ST_NONE;
 	Properties = TYPE_PART|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC|PROP_SPARKSETTLE;
diff --git a/src/simulation/elements/BRAY.cpp b/src/simulation/elements/BRAY.cpp
index 7c43d42..5030020 100644
--- a/src/simulation/elements/BRAY.cpp
+++ b/src/simulation/elements/BRAY.cpp
@@ -28,7 +28,7 @@ Element_BRAY::Element_BRAY()
 	
 	Temperature = R_TEMP+0.0f +273.15f;
 	HeatConduct = 251;
-	Description = "Ray Point. Rays create points when they collide";
+	Description = "Ray Point. Rays create points when they collide.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_LIFE_DEC|PROP_LIFE_KILL;
diff --git a/src/simulation/elements/BTRY.cpp b/src/simulation/elements/BTRY.cpp
index 2458313..f4a5d06 100644
--- a/src/simulation/elements/BTRY.cpp
+++ b/src/simulation/elements/BTRY.cpp
@@ -28,7 +28,7 @@ Element_BTRY::Element_BTRY()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 251;
-	Description = "Solid. Generates Electricity.";
+	Description = "Solid. Generates infinite electricity.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/C5.cpp b/src/simulation/elements/C5.cpp
index 98d9bf0..ed87504 100644
--- a/src/simulation/elements/C5.cpp
+++ b/src/simulation/elements/C5.cpp
@@ -28,7 +28,7 @@ Element_C5::Element_C5()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 88;
-	Description = "Cold explosive";
+	Description = "Cold explosive, set off by CFLM.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID | PROP_NEUTPENETRATE;
diff --git a/src/simulation/elements/CAUS.cpp b/src/simulation/elements/CAUS.cpp
index 2a97fd2..0118fad 100644
--- a/src/simulation/elements/CAUS.cpp
+++ b/src/simulation/elements/CAUS.cpp
@@ -28,7 +28,7 @@ Element_CAUS::Element_CAUS()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 70;
-	Description = "Caustic Gas, acts like Acid";
+	Description = "Caustic Gas, acts like ACID.";
 	
 	State = ST_GAS;
 	Properties = TYPE_GAS|PROP_DEADLY;
diff --git a/src/simulation/elements/CBNW.cpp b/src/simulation/elements/CBNW.cpp
index 36e3a08..3f07730 100644
--- a/src/simulation/elements/CBNW.cpp
+++ b/src/simulation/elements/CBNW.cpp
@@ -28,7 +28,7 @@ Element_CBNW::Element_CBNW()
 	
 	Temperature = R_TEMP-2.0f	+273.15f;
 	HeatConduct = 29;
-	Description = "Carbonated water. Conducts electricity. Freezes. Extinguishes fires.";
+	Description = "Carbonated water. Slowly releases CO2.";
 	
 	State = ST_LIQUID;
 	Properties = TYPE_LIQUID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_NEUTPENETRATE;
diff --git a/src/simulation/elements/CO2.cpp b/src/simulation/elements/CO2.cpp
index eb4bcb6..c3bb7c9 100644
--- a/src/simulation/elements/CO2.cpp
+++ b/src/simulation/elements/CO2.cpp
@@ -28,7 +28,7 @@ Element_CO2::Element_CO2()
 	
 	Temperature = R_TEMP+273.15f;
 	HeatConduct = 88;
-	Description = "Carbon Dioxide";
+	Description = "Carbon Dioxide. Heavy gas, drifts downwards. Carbonates water and turns to dry ice when cold.";
 	
 	State = ST_GAS;
 	Properties = TYPE_GAS;
diff --git a/src/simulation/elements/COAL.cpp b/src/simulation/elements/COAL.cpp
index 47fe1a4..3186167 100644
--- a/src/simulation/elements/COAL.cpp
+++ b/src/simulation/elements/COAL.cpp
@@ -28,7 +28,7 @@ Element_COAL::Element_COAL()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 200;
-	Description = "Solid. Burns slowly.";
+	Description = "Coal, Burns very slowly. Gets red when hot.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/CRAY.cpp b/src/simulation/elements/CRAY.cpp
index 3cba72a..736eaa1 100644
--- a/src/simulation/elements/CRAY.cpp
+++ b/src/simulation/elements/CRAY.cpp
@@ -28,7 +28,7 @@ Element_CRAY::Element_CRAY()
 	
 	Temperature = R_TEMP+0.0f +273.15f;
 	HeatConduct = 0;
-	Description = "Particle Ray Emitter. Creates a beam of particles set by ctype, range is set by tmp";
+	Description = "Particle Ray Emitter. Creates a beam of particles set by it's ctype, range is set by tmp.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/DCEL.cpp b/src/simulation/elements/DCEL.cpp
index 6e3a411..f36f144 100644
--- a/src/simulation/elements/DCEL.cpp
+++ b/src/simulation/elements/DCEL.cpp
@@ -28,7 +28,7 @@ Element_DCEL::Element_DCEL()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 251;
-	Description = "Decelerator";
+	Description = "Decelerator, slows down nearby elements.";
 	
 	State = ST_NONE;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/DESL.cpp b/src/simulation/elements/DESL.cpp
index 7427363..dc34dc8 100644
--- a/src/simulation/elements/DESL.cpp
+++ b/src/simulation/elements/DESL.cpp
@@ -28,7 +28,7 @@ Element_DESL::Element_DESL()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 42;
-	Description = "Liquid. Explodes under high pressure and temperatures";
+	Description = "Liquid diesel. Explodes under high pressure and temperatures.";
 	
 	State = ST_LIQUID;
 	Properties = TYPE_LIQUID;
diff --git a/src/simulation/elements/DEST.cpp b/src/simulation/elements/DEST.cpp
index 6dcca59..d6f24f5 100644
--- a/src/simulation/elements/DEST.cpp
+++ b/src/simulation/elements/DEST.cpp
@@ -28,7 +28,7 @@ Element_DEST::Element_DEST()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 150;
-	Description = "More destructive Bomb.";
+	Description = "More destructive Bomb, can break through virtually anything.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_PART|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC;
diff --git a/src/simulation/elements/DMG.cpp b/src/simulation/elements/DMG.cpp
index 6241e8e..a796701 100644
--- a/src/simulation/elements/DMG.cpp
+++ b/src/simulation/elements/DMG.cpp
@@ -28,7 +28,7 @@ Element_DMG::Element_DMG()
 	
 	Temperature = R_TEMP-2.0f	+273.15f;
 	HeatConduct = 29;
-	Description = "DMG.";
+	Description = "Generates damaging pressure and breaks elements it hits.";
 	
 	State = ST_NONE;
 	Properties = TYPE_PART|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC|PROP_SPARKSETTLE;
diff --git a/src/simulation/elements/DRIC.cpp b/src/simulation/elements/DRIC.cpp
index de4a66c..f1e37ec 100644
--- a/src/simulation/elements/DRIC.cpp
+++ b/src/simulation/elements/DRIC.cpp
@@ -28,7 +28,7 @@ Element_DRIC::Element_DRIC()
 	
 	Temperature = 172.65f;
 	HeatConduct = 2;
-	Description = "Dry Ice.";
+	Description = "Dry Ice, formed when CO2 is cooled.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/DTEC.cpp b/src/simulation/elements/DTEC.cpp
index 71bbf8b..8ecaf2e 100644
--- a/src/simulation/elements/DTEC.cpp
+++ b/src/simulation/elements/DTEC.cpp
@@ -28,7 +28,7 @@ Element_DTEC::Element_DTEC()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 0;
-	Description = "Creates a spark when something with its ctype is nearby";
+	Description = "Detector, creates a spark when something with its ctype is nearby.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/ELEC.cpp b/src/simulation/elements/ELEC.cpp
index fe056f3..8ab4af1 100644
--- a/src/simulation/elements/ELEC.cpp
+++ b/src/simulation/elements/ELEC.cpp
@@ -28,7 +28,7 @@ Element_ELEC::Element_ELEC()
 	
 	Temperature = R_TEMP+200.0f+273.15f;
 	HeatConduct = 251;
-	Description = "Electrons";
+	Description = "Electrons. Sparks electronics, reacts with NEUT and WATR.";
 	
 	State = ST_GAS;
 	Properties = TYPE_ENERGY|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC;
diff --git a/src/simulation/elements/EMP.cpp b/src/simulation/elements/EMP.cpp
index 395e015..0440aa9 100644
--- a/src/simulation/elements/EMP.cpp
+++ b/src/simulation/elements/EMP.cpp
@@ -28,7 +28,7 @@ Element_EMP::Element_EMP()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 121;
-	Description = "Breaks activated electronics.";
+	Description = "Electromagnetic pulse. Breaks activated electronics.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/EXOT.cpp b/src/simulation/elements/EXOT.cpp
index 8f8d874..2746695 100644
--- a/src/simulation/elements/EXOT.cpp
+++ b/src/simulation/elements/EXOT.cpp
@@ -28,7 +28,7 @@ Element_EXOT::Element_EXOT()
 	
 	Temperature = R_TEMP-2.0f	+273.15f;
 	HeatConduct = 250;
-	Description = "Exotic matter. Explodes with excess exposure to electrons.";
+	Description = "Exotic matter. Explodes with excess exposure to electrons. Has many other odd reactions.";
 	
 	State = ST_LIQUID;
 	Properties = TYPE_LIQUID|PROP_NEUTPASS;
diff --git a/src/simulation/elements/FIGH.cpp b/src/simulation/elements/FIGH.cpp
index 146c3db..767805b 100644
--- a/src/simulation/elements/FIGH.cpp
+++ b/src/simulation/elements/FIGH.cpp
@@ -28,7 +28,7 @@ Element_FIGH::Element_FIGH()
 	
 	Temperature = R_TEMP+14.6f+273.15f;
 	HeatConduct = 0;
-	Description = "Fighter. Tries to kill stickmen.";
+	Description = "Fighter. Tries to kill stickmen. You must first give it an element to kill him with.";
 	
 	State = ST_NONE;
 	Properties = 0;
diff --git a/src/simulation/elements/FIRW.cpp b/src/simulation/elements/FIRW.cpp
index 5d1c895..aeedaf0 100644
--- a/src/simulation/elements/FIRW.cpp
+++ b/src/simulation/elements/FIRW.cpp
@@ -32,7 +32,7 @@ Element_FIRW::Element_FIRW()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 70;
-	Description = "Fireworks!";
+	Description = "Fireworks! Colorful, set off by fire";
 	
 	State = ST_SOLID;
 	Properties = TYPE_PART|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/FOG.cpp b/src/simulation/elements/FOG.cpp
index f5d76f9..6971e0e 100644
--- a/src/simulation/elements/FOG.cpp
+++ b/src/simulation/elements/FOG.cpp
@@ -28,7 +28,7 @@ Element_FOG::Element_FOG()
 	
 	Temperature = 243.15f;
 	HeatConduct = 100;
-	Description = "Not quite Steam";
+	Description = "Fog, created when an electric current is passed through RIME.";
 	
 	State = ST_GAS;
 	Properties = TYPE_GAS|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/FRAY.cpp b/src/simulation/elements/FRAY.cpp
index ab45cb6..a140a12 100644
--- a/src/simulation/elements/FRAY.cpp
+++ b/src/simulation/elements/FRAY.cpp
@@ -28,7 +28,7 @@ Element_FRAY::Element_FRAY()
 	
 	Temperature = 20.0f+0.0f +273.15f;
 	HeatConduct = 0;
-	Description = "Force Emitter. Push or pull objects based on temp value, use like ARAY";
+	Description = "Force Emitter. Pushes or pulls objects based on it's temp value, use like ARAY.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/FRME.cpp b/src/simulation/elements/FRME.cpp
index f5b6a09..c1d3a79 100644
--- a/src/simulation/elements/FRME.cpp
+++ b/src/simulation/elements/FRME.cpp
@@ -28,7 +28,7 @@ Element_FRME::Element_FRME()
 	
 	Temperature = R_TEMP+0.0f +273.15f;
 	HeatConduct = 0;
-	Description = "Frame, can be used with pistons to push many particles";
+	Description = "Frame, can be used with pistons to push many particles.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/FSEP.cpp b/src/simulation/elements/FSEP.cpp
index 6b8ae47..b79b28a 100644
--- a/src/simulation/elements/FSEP.cpp
+++ b/src/simulation/elements/FSEP.cpp
@@ -28,7 +28,7 @@ Element_FSEP::Element_FSEP()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 70;
-	Description = "Fuse Powder. See FUSE.";
+	Description = "Fuse Powder. Burns slowly like FUSE.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_PART;
diff --git a/src/simulation/elements/FUSE.cpp b/src/simulation/elements/FUSE.cpp
index 9267e5e..9eb5e37 100644
--- a/src/simulation/elements/FUSE.cpp
+++ b/src/simulation/elements/FUSE.cpp
@@ -28,7 +28,7 @@ Element_FUSE::Element_FUSE()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 200;
-	Description = "Solid. Burns slowly. Ignites at somewhat high temperatures and electricity.";
+	Description = "Burns slowly. Ignites at somewhat high temperatures or with electricity.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/FWRK.cpp b/src/simulation/elements/FWRK.cpp
index afb9a9c..cb8e23a 100644
--- a/src/simulation/elements/FWRK.cpp
+++ b/src/simulation/elements/FWRK.cpp
@@ -28,7 +28,7 @@ Element_FWRK::Element_FWRK()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 100;
-	Description = "First fireworks made, activated by heat/neutrons.";
+	Description = "Original version of fireworks, activated by heat/neutrons.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_PART|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/GAS.cpp b/src/simulation/elements/GAS.cpp
index 5eff93f..f7190f8 100644
--- a/src/simulation/elements/GAS.cpp
+++ b/src/simulation/elements/GAS.cpp
@@ -28,7 +28,7 @@ Element_GAS::Element_GAS()
 	
 	Temperature = R_TEMP+2.0f	+273.15f;
 	HeatConduct = 42;
-	Description = "Gas. Diffuses. Flammable. Liquefies under pressure.";
+	Description = "Diffuses quickly and flammable. Liquefies into OIL under pressure.";
 	
 	State = ST_GAS;
 	Properties = TYPE_GAS | PROP_NEUTPASS;
diff --git a/src/simulation/elements/GBMB.cpp b/src/simulation/elements/GBMB.cpp
index 4257477..b9a603f 100644
--- a/src/simulation/elements/GBMB.cpp
+++ b/src/simulation/elements/GBMB.cpp
@@ -28,7 +28,7 @@ Element_GBMB::Element_GBMB()
 	
 	Temperature = R_TEMP-2.0f	+273.15f;
 	HeatConduct = 29;
-	Description = "Sticks to first object it touches then produces strong gravity push.";
+	Description = "Gravity bomb. Sticks to the first object it touches then produces a strong gravity push.";
 	
 	State = ST_NONE;
 	Properties = TYPE_PART|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC;
diff --git a/src/simulation/elements/GEL.cpp b/src/simulation/elements/GEL.cpp
index 5fd9a96..8ea7f0f 100644
--- a/src/simulation/elements/GEL.cpp
+++ b/src/simulation/elements/GEL.cpp
@@ -28,7 +28,7 @@ Element_GEL::Element_GEL()
 	
 	Temperature = R_TEMP-2.0f  +273.15f;
 	HeatConduct = 29;
-	Description = "Gel. A liquid with variable viscosity and heat conductivity";
+	Description = "Gel. A liquid with variable viscosity and heat conductivity.";
 	
 	State = ST_LIQUID;
 	Properties = TYPE_LIQUID|PROP_LIFE_DEC|PROP_NEUTPENETRATE;
diff --git a/src/simulation/elements/GLAS.cpp b/src/simulation/elements/GLAS.cpp
index 5baa59c..347e809 100644
--- a/src/simulation/elements/GLAS.cpp
+++ b/src/simulation/elements/GLAS.cpp
@@ -28,7 +28,7 @@ Element_GLAS::Element_GLAS()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 150;
-	Description = "Solid. Meltable. Shatters under pressure";
+	Description = "Glass. Meltable. Shatters under pressure, and refracts photons.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID | PROP_NEUTPASS | PROP_HOT_GLOW | PROP_SPARKSETTLE;
diff --git a/src/simulation/elements/GLOW.cpp b/src/simulation/elements/GLOW.cpp
index d8c07ba..b466069 100644
--- a/src/simulation/elements/GLOW.cpp
+++ b/src/simulation/elements/GLOW.cpp
@@ -28,7 +28,7 @@ Element_GLOW::Element_GLOW()
 	
 	Temperature = R_TEMP+20.0f+273.15f;
 	HeatConduct = 44;
-	Description = "Glow, Glows under pressure";
+	Description = "Glow, Glows under pressure.";
 	
 	State = ST_LIQUID;
 	Properties = TYPE_LIQUID|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/GOO.cpp b/src/simulation/elements/GOO.cpp
index 0d55ba5..f23360d 100644
--- a/src/simulation/elements/GOO.cpp
+++ b/src/simulation/elements/GOO.cpp
@@ -28,7 +28,7 @@ Element_GOO::Element_GOO()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 75;
-	Description = "Solid. Deforms and disappears under pressure.";
+	Description = "Deforms and disappears under pressure.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID | PROP_NEUTPENETRATE|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC;
diff --git a/src/simulation/elements/GPMP.cpp b/src/simulation/elements/GPMP.cpp
index cbef4ed..970f797 100644
--- a/src/simulation/elements/GPMP.cpp
+++ b/src/simulation/elements/GPMP.cpp
@@ -28,7 +28,7 @@ Element_GPMP::Element_GPMP()
 	
 	Temperature = 0.0f		+273.15f;
 	HeatConduct = 0;
-	Description = "Changes gravity to its temp when activated. (use HEAT/COOL).";
+	Description = "Gravity pump. Changes gravity to its temp when activated. (use HEAT/COOL)";
 	
 	State = ST_NONE;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/GUNP.cpp b/src/simulation/elements/GUNP.cpp
index 5e191e9..7dc78db 100644
--- a/src/simulation/elements/GUNP.cpp
+++ b/src/simulation/elements/GUNP.cpp
@@ -28,7 +28,7 @@ Element_GUNP::Element_GUNP()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 97;
-	Description = "Light dust. Explosive.";
+	Description = "Gunpowder. Light dust, explosive.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_PART;
diff --git a/src/simulation/elements/H2.cpp b/src/simulation/elements/H2.cpp
index e066dfd..1ba935e 100644
--- a/src/simulation/elements/H2.cpp
+++ b/src/simulation/elements/H2.cpp
@@ -28,7 +28,7 @@ Element_H2::Element_H2()
 	
 	Temperature = R_TEMP+0.0f +273.15f;
 	HeatConduct = 251;
-	Description = "Combines with O2 to make WATR";
+	Description = "Hydrogen. Combines with OXYG to make WATR. Undergoes fusion at high temperature and pressure";
 	
 	State = ST_GAS;
 	Properties = TYPE_GAS;
diff --git a/src/simulation/elements/HSWC.cpp b/src/simulation/elements/HSWC.cpp
index 499ce50..ab7fcb3 100644
--- a/src/simulation/elements/HSWC.cpp
+++ b/src/simulation/elements/HSWC.cpp
@@ -28,7 +28,7 @@ Element_HSWC::Element_HSWC()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 251;
-	Description = "Heat switch. Conducts Heat only when activated";
+	Description = "Heat switch. Conducts heat only when activated.";
 	
 	State = ST_NONE;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/ICEI.cpp b/src/simulation/elements/ICEI.cpp
index 9449b4a..7edfd22 100644
--- a/src/simulation/elements/ICEI.cpp
+++ b/src/simulation/elements/ICEI.cpp
@@ -28,7 +28,7 @@ Element_ICEI::Element_ICEI()
 	
 	Temperature = R_TEMP-50.0f+273.15f;
 	HeatConduct = 46;
-	Description = "Solid. Freezes water. Crushes under pressure. Cools down air.";
+	Description = "Crushes under pressure. Cools down air.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_LIFE_DEC|PROP_NEUTPASS;
diff --git a/src/simulation/elements/IGNT.cpp b/src/simulation/elements/IGNT.cpp
index c827e6a..500d1a1 100644
--- a/src/simulation/elements/IGNT.cpp
+++ b/src/simulation/elements/IGNT.cpp
@@ -28,7 +28,7 @@ Element_IGNT::Element_IGNT()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 88;
-	Description = "Ignition cord.";
+	Description = "Ignition cord. Burns slowly with fire and sparks.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID | PROP_NEUTPENETRATE | PROP_SPARKSETTLE | PROP_LIFE_KILL;
diff --git a/src/simulation/elements/INSL.cpp b/src/simulation/elements/INSL.cpp
index 61ded31..c185352 100644
--- a/src/simulation/elements/INSL.cpp
+++ b/src/simulation/elements/INSL.cpp
@@ -28,7 +28,7 @@ Element_INSL::Element_INSL()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 0;
-	Description = "Insulator, does not conduct heat or electricity.";
+	Description = "Insulator, does not conduct heat and blocks electricity.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/INVIS.cpp b/src/simulation/elements/INVIS.cpp
index 18c78b9..5e7f87d 100644
--- a/src/simulation/elements/INVIS.cpp
+++ b/src/simulation/elements/INVIS.cpp
@@ -28,7 +28,7 @@ Element_INVIS::Element_INVIS()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 164;
-	Description = "Invisible to everything while under pressure.";
+	Description = "Invisible to particles while under pressure.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID | PROP_NEUTPASS;
diff --git a/src/simulation/elements/IRON.cpp b/src/simulation/elements/IRON.cpp
index 5f92136..5c0cdf6 100644
--- a/src/simulation/elements/IRON.cpp
+++ b/src/simulation/elements/IRON.cpp
@@ -28,7 +28,7 @@ Element_IRON::Element_IRON()
 	
 	Temperature = R_TEMP+0.0f +273.15f;
 	HeatConduct = 251;
-	Description = "Rusts with salt, can be used for electrolysis of WATR";
+	Description = "Rusts with salt, can be used for electrolysis of WATR.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW;
diff --git a/src/simulation/elements/ISOZ.cpp b/src/simulation/elements/ISOZ.cpp
index a4036dd..d3d6e6e 100644
--- a/src/simulation/elements/ISOZ.cpp
+++ b/src/simulation/elements/ISOZ.cpp
@@ -28,7 +28,7 @@ Element_ISOZ::Element_ISOZ()
 	
 	Temperature = R_TEMP-2.0f	+273.15f;
 	HeatConduct = 29;
-	Description = "Radioactive liquid";
+	Description = "Radioactive liquid. Decays into photons when touching PHOT or under negative pressure.";
 	
 	State = ST_LIQUID;
 	Properties = TYPE_LIQUID|PROP_NEUTPENETRATE;
diff --git a/src/simulation/elements/ISZS.cpp b/src/simulation/elements/ISZS.cpp
index f810223..df9c022 100644
--- a/src/simulation/elements/ISZS.cpp
+++ b/src/simulation/elements/ISZS.cpp
@@ -28,7 +28,7 @@ Element_ISZS::Element_ISZS()
 	
 	Temperature = 140.00f;
 	HeatConduct = 251;
-	Description = "Solid form of ISOZ, slowly decays.";
+	Description = "Solid form of ISOZ, slowly decays into PHOT.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/LAVA.cpp b/src/simulation/elements/LAVA.cpp
index 796af14..062dcf8 100644
--- a/src/simulation/elements/LAVA.cpp
+++ b/src/simulation/elements/LAVA.cpp
@@ -28,7 +28,7 @@ Element_LAVA::Element_LAVA()
 	
 	Temperature = R_TEMP+1500.0f+273.15f;
 	HeatConduct = 60;
-	Description = "Heavy liquid. Ignites flammable materials. Solidifies when cold.";
+	Description = "Molten lava. Ignites flammable materials. Generated when metals and other materials melt, solidifies when cold.";
 	
 	State = ST_LIQUID;
 	Properties = TYPE_LIQUID|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/LIGH.cpp b/src/simulation/elements/LIGH.cpp
index 1556110..bf41f77 100644
--- a/src/simulation/elements/LIGH.cpp
+++ b/src/simulation/elements/LIGH.cpp
@@ -29,7 +29,7 @@ Element_LIGH::Element_LIGH()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 0;
-	Description = "More realistic lightning. Set pen size to set the size of the lightning.";
+	Description = "Lightning. Change the brush size to set the size of the lightning.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/LNTG.cpp b/src/simulation/elements/LNTG.cpp
index f5c08c0..da3199f 100644
--- a/src/simulation/elements/LNTG.cpp
+++ b/src/simulation/elements/LNTG.cpp
@@ -28,7 +28,7 @@ Element_LNTG::Element_LNTG()
 	
 	Temperature = 70.15f;
 	HeatConduct = 70;
-	Description = "Liquid Nitrogen. Very cold.";
+	Description = "Liquid Nitrogen. Very cold, disappears whenever it touches anything warmer.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_LIQUID;
diff --git a/src/simulation/elements/LO2.cpp b/src/simulation/elements/LO2.cpp
index 2b291f3..41a5053 100644
--- a/src/simulation/elements/LO2.cpp
+++ b/src/simulation/elements/LO2.cpp
@@ -28,7 +28,7 @@ Element_LO2::Element_LO2()
 	
 	Temperature = 80.0f;
 	HeatConduct = 70;
-	Description = "Liquid Oxygen. Very cold. Reacts with fire";
+	Description = "Liquid Oxygen. Very cold. Reacts with fire.";
 	
 	State = ST_LIQUID;
 	Properties = TYPE_LIQUID;
diff --git a/src/simulation/elements/METL.cpp b/src/simulation/elements/METL.cpp
index 7432790..a194793 100644
--- a/src/simulation/elements/METL.cpp
+++ b/src/simulation/elements/METL.cpp
@@ -28,7 +28,7 @@ Element_METL::Element_METL()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 251;
-	Description = "Solid. Conducts electricity. Meltable.";
+	Description = "The basic conductor, meltable and breaks under pressure.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW;
diff --git a/src/simulation/elements/MWAX.cpp b/src/simulation/elements/MWAX.cpp
index 604a50d..cb0cfbd 100644
--- a/src/simulation/elements/MWAX.cpp
+++ b/src/simulation/elements/MWAX.cpp
@@ -28,7 +28,7 @@ Element_MWAX::Element_MWAX()
 	
 	Temperature = R_TEMP+28.0f+273.15f;
 	HeatConduct = 44;
-	Description = "Liquid Wax.";
+	Description = "Liquid Wax. Hardens into WAX at 45 degrees.";
 	
 	State = ST_LIQUID;
 	Properties = TYPE_LIQUID;
diff --git a/src/simulation/elements/NBHL.cpp b/src/simulation/elements/NBHL.cpp
index d10f44a..425be81 100644
--- a/src/simulation/elements/NBHL.cpp
+++ b/src/simulation/elements/NBHL.cpp
@@ -28,7 +28,7 @@ Element_NBHL::Element_NBHL()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 186;
-	Description = "Black hole (Requires newtonian gravity)";
+	Description = "Black hole, sucks in particles using gravity. (Requires Newtonian gravity)";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/NBLE.cpp b/src/simulation/elements/NBLE.cpp
index ada32a9..1c569f6 100644
--- a/src/simulation/elements/NBLE.cpp
+++ b/src/simulation/elements/NBLE.cpp
@@ -28,7 +28,7 @@ Element_NBLE::Element_NBLE()
 	
 	Temperature = R_TEMP+2.0f	+273.15f;
 	HeatConduct = 106;
-	Description = "Noble Gas. Diffuses. Conductive. Ionizes into plasma when introduced to electricity";
+	Description = "Noble Gas. Diffuses and conductive. Ionizes into plasma when introduced to electricity.";
 	
 	State = ST_GAS;
 	Properties = TYPE_GAS|PROP_CONDUCTS|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/NITR.cpp b/src/simulation/elements/NITR.cpp
index 55375b9..d4bce87 100644
--- a/src/simulation/elements/NITR.cpp
+++ b/src/simulation/elements/NITR.cpp
@@ -28,7 +28,7 @@ Element_NITR::Element_NITR()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 50;
-	Description = "Liquid. Pressure sensitive explosive.";
+	Description = "Nitroglycerin. Pressure sensitive explosive. Mix with CLST to make TNT.";
 	
 	State = ST_LIQUID;
 	Properties = TYPE_LIQUID;
diff --git a/src/simulation/elements/NTCT.cpp b/src/simulation/elements/NTCT.cpp
index c6c065e..24a190b 100644
--- a/src/simulation/elements/NTCT.cpp
+++ b/src/simulation/elements/NTCT.cpp
@@ -28,7 +28,7 @@ Element_NTCT::Element_NTCT()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 251;
-	Description = "Semi-conductor. Only conducts electricity when hot (More than 100C)";
+	Description = "Semi-conductor. Only conducts electricity when hot. (More than 100C)";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/NWHL.cpp b/src/simulation/elements/NWHL.cpp
index 7db070c..b1c10e5 100644
--- a/src/simulation/elements/NWHL.cpp
+++ b/src/simulation/elements/NWHL.cpp
@@ -28,7 +28,7 @@ Element_NWHL::Element_NWHL()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 186;
-	Description = "White hole (Requires newtonian gravity)";
+	Description = "White hole, pushes away other particles with gravity. (Requires Newtonian gravity)";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/O2.cpp b/src/simulation/elements/O2.cpp
index 9f543a1..31dfe31 100644
--- a/src/simulation/elements/O2.cpp
+++ b/src/simulation/elements/O2.cpp
@@ -28,7 +28,7 @@ Element_O2::Element_O2()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 70;
-	Description = "Gas. Ignites easily.";
+	Description = "Oxygen gas. Ignites easily.";
 	
 	State = ST_GAS;
 	Properties = TYPE_GAS;
diff --git a/src/simulation/elements/OIL.cpp b/src/simulation/elements/OIL.cpp
index 3d2239d..d78660e 100644
--- a/src/simulation/elements/OIL.cpp
+++ b/src/simulation/elements/OIL.cpp
@@ -28,7 +28,7 @@ Element_OIL::Element_OIL()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 42;
-	Description = "Liquid. Flammable.";
+	Description = "Flammable, turns into GAS at low pressure or high temperature. Can be formed with NEUT and NITR.";
 	
 	State = ST_LIQUID;
 	Properties = TYPE_LIQUID | PROP_NEUTPASS;
diff --git a/src/simulation/elements/PBCN.cpp b/src/simulation/elements/PBCN.cpp
index 86514f2..ca24782 100644
--- a/src/simulation/elements/PBCN.cpp
+++ b/src/simulation/elements/PBCN.cpp
@@ -28,7 +28,7 @@ Element_PBCN::Element_PBCN()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 251;
-	Description = "Powered breakable clone";
+	Description = "Powered breakable clone.";
 	
 	State = ST_NONE;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/PCLN.cpp b/src/simulation/elements/PCLN.cpp
index 6ad4964..441014a 100644
--- a/src/simulation/elements/PCLN.cpp
+++ b/src/simulation/elements/PCLN.cpp
@@ -28,7 +28,7 @@ Element_PCLN::Element_PCLN()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 251;
-	Description = "Solid. When activated, duplicates any particles it touches.";
+	Description = "Powered clone. When activated, duplicates any particles it touches.";
 	
 	State = ST_NONE;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/PHOT.cpp b/src/simulation/elements/PHOT.cpp
index 943e603..e132d3d 100644
--- a/src/simulation/elements/PHOT.cpp
+++ b/src/simulation/elements/PHOT.cpp
@@ -28,7 +28,7 @@ Element_PHOT::Element_PHOT()
 	
 	Temperature = R_TEMP+900.0f+273.15f;
 	HeatConduct = 251;
-	Description = "Photons. Travel in straight lines.";
+	Description = "Photons. Refracts through glass, scattered by quartz, and color-changed by different elements. Ignites flammable materials.";
 	
 	State = ST_GAS;
 	Properties = TYPE_ENERGY|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC;
diff --git a/src/simulation/elements/PIPE.cpp b/src/simulation/elements/PIPE.cpp
index 0e49890..44e75db 100644
--- a/src/simulation/elements/PIPE.cpp
+++ b/src/simulation/elements/PIPE.cpp
@@ -28,7 +28,7 @@ Element_PIPE::Element_PIPE()
 	
 	Temperature = 273.15f;
 	HeatConduct = 0;
-	Description = "Moves elements around, read FAQ on website for help.";
+	Description = "PIPE, moves particles around. Once the BRCK generates, erase some for the exit. Then the PIPE generates and is useable.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/PLEX.cpp b/src/simulation/elements/PLEX.cpp
index 13672a1..a4bd63e 100644
--- a/src/simulation/elements/PLEX.cpp
+++ b/src/simulation/elements/PLEX.cpp
@@ -28,7 +28,7 @@ Element_PLEX::Element_PLEX()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 88;
-	Description = "Solid. Pressure sensitive explosive.";
+	Description = "Solid pressure sensitive explosive.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID | PROP_NEUTPENETRATE;
diff --git a/src/simulation/elements/PRTI.cpp b/src/simulation/elements/PRTI.cpp
index 4f5a0f5..ce91087 100644
--- a/src/simulation/elements/PRTI.cpp
+++ b/src/simulation/elements/PRTI.cpp
@@ -28,7 +28,7 @@ Element_PRTI::Element_PRTI()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 0;
-	Description = "Portal IN.  Things go in here, now with channels (same as WIFI)";
+	Description = "Portal IN. Things go in here, now with temperature dependent channels (same as WIFI)";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/PRTO.cpp b/src/simulation/elements/PRTO.cpp
index d4a6cda..af3e7f8 100644
--- a/src/simulation/elements/PRTO.cpp
+++ b/src/simulation/elements/PRTO.cpp
@@ -28,7 +28,7 @@ Element_PRTO::Element_PRTO()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 0;
-	Description = "Portal OUT.  Things come out here, now with channels (same as WIFI)";
+	Description = "Portal OUT. Things come out here, now with temperature dependent channels (same as WIFI)";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/PSTE.cpp b/src/simulation/elements/PSTE.cpp
index 1dc12fa..add4370 100644
--- a/src/simulation/elements/PSTE.cpp
+++ b/src/simulation/elements/PSTE.cpp
@@ -28,7 +28,7 @@ Element_PSTE::Element_PSTE()
 	
 	Temperature = R_TEMP-2.0f	+273.15f;
 	HeatConduct = 29;
-	Description = "Colloid, Hardens under pressure";
+	Description = "Colloid, Hardens under pressure.";
 	
 	State = ST_LIQUID;
 	Properties = TYPE_LIQUID;
diff --git a/src/simulation/elements/PSTN.cpp b/src/simulation/elements/PSTN.cpp
index f1c9fd7..4da1b73 100644
--- a/src/simulation/elements/PSTN.cpp
+++ b/src/simulation/elements/PSTN.cpp
@@ -28,7 +28,7 @@ Element_PSTN::Element_PSTN()
 	
 	Temperature = R_TEMP+0.0f +273.15f;
 	HeatConduct = 0;
-	Description = "Piston, extends and pushes particles";
+	Description = "Piston, extends and pushes particles.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/PSTS.cpp b/src/simulation/elements/PSTS.cpp
index d6cfdc4..06a8c1e 100644
--- a/src/simulation/elements/PSTS.cpp
+++ b/src/simulation/elements/PSTS.cpp
@@ -28,7 +28,7 @@ Element_PSTS::Element_PSTS()
 	
 	Temperature = R_TEMP-2.0f	+273.15f;
 	HeatConduct = 29;
-	Description = "Solid form of PSTE, temporary";
+	Description = "Solid form of PSTE.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/PTCT.cpp b/src/simulation/elements/PTCT.cpp
index 7d3738d..be3c231 100644
--- a/src/simulation/elements/PTCT.cpp
+++ b/src/simulation/elements/PTCT.cpp
@@ -28,7 +28,7 @@ Element_PTCT::Element_PTCT()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 251;
-	Description = "Semi-conductor. Only conducts electricity when cold (Less than 100C)";
+	Description = "Semi-conductor. Only conducts electricity when cold. (Less than 100C)";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/PUMP.cpp b/src/simulation/elements/PUMP.cpp
index 4c02cdc..6f2d3b7 100644
--- a/src/simulation/elements/PUMP.cpp
+++ b/src/simulation/elements/PUMP.cpp
@@ -28,7 +28,7 @@ Element_PUMP::Element_PUMP()
 	
 	Temperature = 273.15f;
 	HeatConduct = 0;
-	Description = "Changes pressure to its temp when activated. (use HEAT/COOL).";
+	Description = "Pressure pump. Changes pressure to its temp when activated. (use HEAT/COOL).";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/PVOD.cpp b/src/simulation/elements/PVOD.cpp
index 34e44be..0c08584 100644
--- a/src/simulation/elements/PVOD.cpp
+++ b/src/simulation/elements/PVOD.cpp
@@ -28,7 +28,7 @@ Element_PVOD::Element_PVOD()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 251;
-	Description = "Solid. When activated, destroys entering particles";
+	Description = "Powered VOID. When activated, destroys entering particles.";
 	
 	State = ST_NONE;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/RBDM.cpp b/src/simulation/elements/RBDM.cpp
index eb25df4..9e08bc3 100644
--- a/src/simulation/elements/RBDM.cpp
+++ b/src/simulation/elements/RBDM.cpp
@@ -28,7 +28,7 @@ Element_RBDM::Element_RBDM()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 240;
-	Description = "Rubidium, explosive, especially on contact with water, low melting point";
+	Description = "Rubidium. Explosive, especially on contact with water. Low melting point.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/REPL.cpp b/src/simulation/elements/REPL.cpp
index aa513e9..81b7c84 100644
--- a/src/simulation/elements/REPL.cpp
+++ b/src/simulation/elements/REPL.cpp
@@ -28,7 +28,7 @@ Element_REPL::Element_REPL()
 	
 	Temperature = 20.0f+0.0f  +273.15f;
 	HeatConduct = 0;
-	Description = "Repel or attract particles based on temp value.";
+	Description = "Repels or attracts particles based on it's temp value.";
 	
 	State = ST_NONE;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/RIME.cpp b/src/simulation/elements/RIME.cpp
index ab61988..c735866 100644
--- a/src/simulation/elements/RIME.cpp
+++ b/src/simulation/elements/RIME.cpp
@@ -28,7 +28,7 @@ Element_RIME::Element_RIME()
 	
 	Temperature = 243.15f;
 	HeatConduct = 100;
-	Description = "Not quite Ice";
+	Description = "Solid, created when steam cools rapidly and goes through sublimation.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/SAND.cpp b/src/simulation/elements/SAND.cpp
index a0262e3..dade4f1 100644
--- a/src/simulation/elements/SAND.cpp
+++ b/src/simulation/elements/SAND.cpp
@@ -28,7 +28,7 @@ Element_SAND::Element_SAND()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 150;
-	Description = "Sand, Heavy particles. Meltable.";
+	Description = "Sand, Heavy particles. Melts into glass.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_PART;
diff --git a/src/simulation/elements/SHLD1.cpp b/src/simulation/elements/SHLD1.cpp
index d6abdf0..db06feb 100644
--- a/src/simulation/elements/SHLD1.cpp
+++ b/src/simulation/elements/SHLD1.cpp
@@ -28,7 +28,7 @@ Element_SHLD1::Element_SHLD1()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 0;
-	Description = "Shield, spark it to grow";
+	Description = "Shield, spark it to grow.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/SHLD2.cpp b/src/simulation/elements/SHLD2.cpp
index 5202182..26e66ab 100644
--- a/src/simulation/elements/SHLD2.cpp
+++ b/src/simulation/elements/SHLD2.cpp
@@ -28,7 +28,7 @@ Element_SHLD2::Element_SHLD2()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 0;
-	Description = "Shield lvl 2";
+	Description = "Shield lvl 2.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/SHLD3.cpp b/src/simulation/elements/SHLD3.cpp
index 6eaae1c..ceb390f 100644
--- a/src/simulation/elements/SHLD3.cpp
+++ b/src/simulation/elements/SHLD3.cpp
@@ -28,7 +28,7 @@ Element_SHLD3::Element_SHLD3()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 0;
-	Description = "Shield lvl 3";
+	Description = "Shield lvl 3.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/SHLD4.cpp b/src/simulation/elements/SHLD4.cpp
index 85e01db..199eb13 100644
--- a/src/simulation/elements/SHLD4.cpp
+++ b/src/simulation/elements/SHLD4.cpp
@@ -28,7 +28,7 @@ Element_SHLD4::Element_SHLD4()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 0;
-	Description = "Shield lvl 4";
+	Description = "Shield lvl 4.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/SING.cpp b/src/simulation/elements/SING.cpp
index e0ec3db..e39a55b 100644
--- a/src/simulation/elements/SING.cpp
+++ b/src/simulation/elements/SING.cpp
@@ -28,7 +28,7 @@ Element_SING::Element_SING()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 70;
-	Description = "Singularity";
+	Description = "Singularity. Creates huge amounts of negative pressure and destroys everything.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_PART|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/SMKE.cpp b/src/simulation/elements/SMKE.cpp
index e3344b4..b4572d0 100644
--- a/src/simulation/elements/SMKE.cpp
+++ b/src/simulation/elements/SMKE.cpp
@@ -28,7 +28,7 @@ Element_SMKE::Element_SMKE()
 	
 	Temperature = R_TEMP+320.0f+273.15f;
 	HeatConduct = 88;
-	Description = "Smoke";
+	Description = "Smoke, created by fire.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_GAS|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC;
diff --git a/src/simulation/elements/SNOW.cpp b/src/simulation/elements/SNOW.cpp
index 58ea878..76c0494 100644
--- a/src/simulation/elements/SNOW.cpp
+++ b/src/simulation/elements/SNOW.cpp
@@ -28,7 +28,7 @@ Element_SNOW::Element_SNOW()
 	
 	Temperature = R_TEMP-30.0f+273.15f;
 	HeatConduct = 46;
-	Description = "Light particles.";
+	Description = "Light particles. Created when ICE breaks under pressure.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_PART|PROP_LIFE_DEC|PROP_NEUTPASS;
diff --git a/src/simulation/elements/SOAP.cpp b/src/simulation/elements/SOAP.cpp
index fcdac37..472dbd7 100644
--- a/src/simulation/elements/SOAP.cpp
+++ b/src/simulation/elements/SOAP.cpp
@@ -28,7 +28,7 @@ Element_SOAP::Element_SOAP()
 	
 	Temperature = R_TEMP-2.0f	+273.15f;
 	HeatConduct = 29;
-	Description = "Soap. Creates bubbles.";
+	Description = "Soap. Creates bubbles. Washes off deco color.";
 	
 	State = ST_LIQUID;
 	Properties = TYPE_LIQUID|PROP_NEUTPENETRATE|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/SPAWN.cpp b/src/simulation/elements/SPAWN.cpp
index 8414178..517c712 100644
--- a/src/simulation/elements/SPAWN.cpp
+++ b/src/simulation/elements/SPAWN.cpp
@@ -28,7 +28,7 @@ Element_SPAWN::Element_SPAWN()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 0;
-	Description = "STKM spawn point";
+	Description = "STKM spawn point.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/SPAWN2.cpp b/src/simulation/elements/SPAWN2.cpp
index db9af4b..4ce0ceb 100644
--- a/src/simulation/elements/SPAWN2.cpp
+++ b/src/simulation/elements/SPAWN2.cpp
@@ -28,7 +28,7 @@ Element_SPAWN2::Element_SPAWN2()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 0;
-	Description = "STK2 spawn point";
+	Description = "STK2 spawn point.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/SPNG.cpp b/src/simulation/elements/SPNG.cpp
index ac60a38..47a3b77 100644
--- a/src/simulation/elements/SPNG.cpp
+++ b/src/simulation/elements/SPNG.cpp
@@ -28,7 +28,7 @@ Element_SPNG::Element_SPNG()
 	
 	Temperature = R_TEMP+0.0f +273.15f;
 	HeatConduct = 251;
-	Description = "A sponge, absorbs water.";
+	Description = "Sponge, absorbs water. Is not a moving solid.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/SPRK.cpp b/src/simulation/elements/SPRK.cpp
index d441455..e255f90 100644
--- a/src/simulation/elements/SPRK.cpp
+++ b/src/simulation/elements/SPRK.cpp
@@ -28,7 +28,7 @@ Element_SPRK::Element_SPRK()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 251;
-	Description = "Electricity. Conducted by metal and water.";
+	Description = "Electricity. The basis of all electronics in TPT, travels along wires and other conductive elements.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/STKM.cpp b/src/simulation/elements/STKM.cpp
index 9fdead2..52deee1 100644
--- a/src/simulation/elements/STKM.cpp
+++ b/src/simulation/elements/STKM.cpp
@@ -28,7 +28,7 @@ Element_STKM::Element_STKM()
 	
 	Temperature = R_TEMP+14.6f+273.15f;
 	HeatConduct = 0;
-	Description = "Stickman. Don't kill him!";
+	Description = "Stickman. Don't kill him! Control with the arrow keys.";
 	
 	State = ST_NONE;
 	Properties = 0;
diff --git a/src/simulation/elements/STKM2.cpp b/src/simulation/elements/STKM2.cpp
index 0621d75..6583b70 100644
--- a/src/simulation/elements/STKM2.cpp
+++ b/src/simulation/elements/STKM2.cpp
@@ -28,7 +28,7 @@ Element_STKM2::Element_STKM2()
 	
 	Temperature = R_TEMP+14.6f+273.15f;
 	HeatConduct = 0;
-	Description = "Stickman. Don't kill him!";
+	Description = "second stickman. Don't kill him! Control with wasd.";
 	
 	State = ST_NONE;
 	Properties = 0;
diff --git a/src/simulation/elements/STOR.cpp b/src/simulation/elements/STOR.cpp
index 5b51677..92dd80f 100644
--- a/src/simulation/elements/STOR.cpp
+++ b/src/simulation/elements/STOR.cpp
@@ -28,7 +28,7 @@ Element_STOR::Element_STOR()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 0;
-	Description = "Solid. Stores a single particle, releases when charged with PSCN, also passes to PIPE";
+	Description = "Stores a single particle, releases when charged with PSCN, also passes to PIPE.";
 	
 	State = ST_NONE;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/SWCH.cpp b/src/simulation/elements/SWCH.cpp
index fd8fd26..824929d 100644
--- a/src/simulation/elements/SWCH.cpp
+++ b/src/simulation/elements/SWCH.cpp
@@ -28,7 +28,7 @@ Element_SWCH::Element_SWCH()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 251;
-	Description = "Solid. Only conducts when switched on. (PSCN switches on, NSCN switches off)";
+	Description = "Only conducts when switched on. (PSCN switches on, NSCN switches off)";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/TSNS.cpp b/src/simulation/elements/TSNS.cpp
index d82194c..97fd7a2 100644
--- a/src/simulation/elements/TSNS.cpp
+++ b/src/simulation/elements/TSNS.cpp
@@ -28,7 +28,7 @@ Element_TSNS::Element_TSNS()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 0;
-	Description = "Creates a spark when there's a nearby particle with a greater temperature";
+	Description = "Temperature sensor, creates a spark when there's a nearby particle with a greater temperature.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/VINE.cpp b/src/simulation/elements/VINE.cpp
index 798fe35..398cce6 100644
--- a/src/simulation/elements/VINE.cpp
+++ b/src/simulation/elements/VINE.cpp
@@ -28,7 +28,7 @@ Element_VINE::Element_VINE()
 	
 	Temperature = R_TEMP+0.0f +273.15f;
 	HeatConduct = 65;
-	Description = "Vine, grows";
+	Description = "Vine, can grow along WOOD.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/WATR.cpp b/src/simulation/elements/WATR.cpp
index 64b777f..ab5b814 100644
--- a/src/simulation/elements/WATR.cpp
+++ b/src/simulation/elements/WATR.cpp
@@ -28,7 +28,7 @@ Element_WATR::Element_WATR()
 	
 	Temperature = R_TEMP-2.0f	+273.15f;
 	HeatConduct = 29;
-	Description = "Liquid. Conducts electricity. Freezes. Extinguishes fires.";
+	Description = "Conducts electricity, freezes, and extinguishes fires.";
 	
 	State = ST_LIQUID;
 	Properties = TYPE_LIQUID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_NEUTPASS;
diff --git a/src/simulation/elements/WIFI.cpp b/src/simulation/elements/WIFI.cpp
index 6b04040..a20e6de 100644
--- a/src/simulation/elements/WIFI.cpp
+++ b/src/simulation/elements/WIFI.cpp
@@ -28,7 +28,7 @@ Element_WIFI::Element_WIFI()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 0;
-	Description = "Wireless transmitter, color coded.";
+	Description = "Wireless transmitter, transfers spark to any other wifi on the same temperature channel.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/WIRE.cpp b/src/simulation/elements/WIRE.cpp
index 41f2170..6d4c1a7 100644
--- a/src/simulation/elements/WIRE.cpp
+++ b/src/simulation/elements/WIRE.cpp
@@ -28,7 +28,7 @@ Element_WIRE::Element_WIRE()
 	
 	Temperature = R_TEMP+0.0f +273.15f;
 	HeatConduct = 250;
-	Description = "WireWorld wires, probably not what you want. For normal wires, use METL";
+	Description = "WireWorld wires, conducts based on a set of GOL-like rules";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/WOOD.cpp b/src/simulation/elements/WOOD.cpp
index d15849e..589aa2f 100644
--- a/src/simulation/elements/WOOD.cpp
+++ b/src/simulation/elements/WOOD.cpp
@@ -28,7 +28,7 @@ Element_WOOD::Element_WOOD()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 164;
-	Description = "Solid. Flammable.";
+	Description = "Wood, flammable.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID | PROP_NEUTPENETRATE;
--
cgit v0.9.2-21-gd62e

From 0b2e8a412ec3d5b43281ce3cda1fc8aed55c8a2f Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Fri, 3 May 2013 23:19:16 -0400
Subject: fix some descriptions


diff --git a/src/simulation/elements/BIZR.cpp b/src/simulation/elements/BIZR.cpp
index e79c721..8b61543 100644
--- a/src/simulation/elements/BIZR.cpp
+++ b/src/simulation/elements/BIZR.cpp
@@ -28,7 +28,7 @@ Element_BIZR::Element_BIZR()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 29;
-	Description = "Bizarre... contradicts the normal state changes. Paints other elements with it's deco color.";
+	Description = "Bizarre... contradicts the normal state changes. Paints other elements with its deco color.";
 	
 	State = ST_LIQUID;
 	Properties = TYPE_LIQUID;
diff --git a/src/simulation/elements/C5.cpp b/src/simulation/elements/C5.cpp
index ed87504..81bb643 100644
--- a/src/simulation/elements/C5.cpp
+++ b/src/simulation/elements/C5.cpp
@@ -28,7 +28,7 @@ Element_C5::Element_C5()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 88;
-	Description = "Cold explosive, set off by CFLM.";
+	Description = "Cold explosive, set off by anything cold.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID | PROP_NEUTPENETRATE;
diff --git a/src/simulation/elements/CRAY.cpp b/src/simulation/elements/CRAY.cpp
index 736eaa1..20e3f92 100644
--- a/src/simulation/elements/CRAY.cpp
+++ b/src/simulation/elements/CRAY.cpp
@@ -28,7 +28,7 @@ Element_CRAY::Element_CRAY()
 	
 	Temperature = R_TEMP+0.0f +273.15f;
 	HeatConduct = 0;
-	Description = "Particle Ray Emitter. Creates a beam of particles set by it's ctype, range is set by tmp.";
+	Description = "Particle Ray Emitter. Creates a beam of particles set by its ctype, range is set by tmp.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/FRAY.cpp b/src/simulation/elements/FRAY.cpp
index a140a12..c529b87 100644
--- a/src/simulation/elements/FRAY.cpp
+++ b/src/simulation/elements/FRAY.cpp
@@ -28,7 +28,7 @@ Element_FRAY::Element_FRAY()
 	
 	Temperature = 20.0f+0.0f +273.15f;
 	HeatConduct = 0;
-	Description = "Force Emitter. Pushes or pulls objects based on it's temp value, use like ARAY.";
+	Description = "Force Emitter. Pushes or pulls objects based on its temp value, use like ARAY.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/H2.cpp b/src/simulation/elements/H2.cpp
index 1ba935e..f652d59 100644
--- a/src/simulation/elements/H2.cpp
+++ b/src/simulation/elements/H2.cpp
@@ -28,7 +28,7 @@ Element_H2::Element_H2()
 	
 	Temperature = R_TEMP+0.0f +273.15f;
 	HeatConduct = 251;
-	Description = "Hydrogen. Combines with OXYG to make WATR. Undergoes fusion at high temperature and pressure";
+	Description = "Hydrogen. Combusts with OXYG to make WATR. Undergoes fusion at high temperature and pressure";
 	
 	State = ST_GAS;
 	Properties = TYPE_GAS;
diff --git a/src/simulation/elements/REPL.cpp b/src/simulation/elements/REPL.cpp
index 81b7c84..d0e2aaf 100644
--- a/src/simulation/elements/REPL.cpp
+++ b/src/simulation/elements/REPL.cpp
@@ -28,7 +28,7 @@ Element_REPL::Element_REPL()
 	
 	Temperature = 20.0f+0.0f  +273.15f;
 	HeatConduct = 0;
-	Description = "Repels or attracts particles based on it's temp value.";
+	Description = "Repels or attracts particles based on its temp value.";
 	
 	State = ST_NONE;
 	Properties = TYPE_SOLID;
--
cgit v0.9.2-21-gd62e

From 124ba1712a5363b70f44c80d5f3a8153fd2e1efb Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Fri, 3 May 2013 23:25:20 -0400
Subject: update introtext / readme a little


diff --git a/README b/README
index a98ee4e..1a0fef9 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-The Powder Toy - March 2013
+The Powder Toy - May 2013
 
 Get the latest version here:  http://powdertoy.co.uk/Download.html
 
@@ -23,11 +23,13 @@ Catelite
 Bryan Hoyle
 Nathan Cousins
 jacksonmj
+Felix Wallin
 Lieuwe Mosch
 Anthony Boot
 Matthew Miller
 MaksProg
 jacob1
+mniip
 
 
 Instructions:
diff --git a/data/IntroText.h b/data/IntroText.h
index e16db49..34da1d8 100644
--- a/data/IntroText.h
+++ b/data/IntroText.h
@@ -9,18 +9,18 @@ static const char *introTextData =
 	"Shift+drag will create straight lines of particles.\n"
 	"Ctrl+drag will result in filled rectangles.\n"
 	"Ctrl+Shift+click will flood-fill a closed area.\n"
-	"Ctrl+Z will act as Undo.\n"
+	"Use the mouse scroll wheel, or '[' and ']', to change the tool size for particles.\n"
 	"Middle click or Alt+Click to \"sample\" the particles.\n"
+	"Ctrl+Z will act as Undo.\n"
 	"\n\boUse 'Z' for a zoom tool. Click to make the drawable zoom window stay around. Use the wheel to change the zoom strength\n"
+	"The spacebar can be used to pause physics.\n"
 	"Use 'S' to save parts of the window as 'stamps'.\n"
 	"'L' will load the most recent stamp, 'K' shows a library of stamps you saved.\n"
-	"Use the mouse scroll wheel to change the tool size for particles.\n"
-	"The spacebar can be used to pause physics.\n"
 	"'P' will take a screenshot and save it into the current directory.\n"
 	"\n"
-	"Contributors: \bgStanislaw K Skowronek (\brhttp://powder.unaligned.org\bg, \bbirc.unaligned.org #wtf\bg),\n"
+	"Contributors: \bgStanislaw K Skowronek (Designed the original Powder Toy),\n"
 	"\bgSimon Robertshaw, Skresanov Savely, cracker64, Catelite, Bryan Hoyle, Nathan Cousins, jacksonmj,\n"
-	"\bgLieuwe Mosch, Anthony Boot, Matthew \"me4502\", MaksProg, jacob1\n"
+	"\bgFelix Wallin, Lieuwe Mosch, Anthony Boot, Matthew \"me4502\", MaksProg, jacob1, mniip\n"
 	"\n"
 	"\bgTo use online features such as saving, you need to register at: \brhttp://powdertoy.co.uk/Register.html\n"
 	"\n"
--
cgit v0.9.2-21-gd62e

From ae34c43c66750575eefe3b05223ba29b0e30dc84 Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Fri, 3 May 2013 23:54:08 -0400
Subject: update with latest rules, fix grammar, fixes #126


diff --git a/src/gui/save/ServerSaveActivity.cpp b/src/gui/save/ServerSaveActivity.cpp
index e8dfc1d..1d99f74 100644
--- a/src/gui/save/ServerSaveActivity.cpp
+++ b/src/gui/save/ServerSaveActivity.cpp
@@ -249,23 +249,26 @@ void ServerSaveActivity::Exit()
 void ServerSaveActivity::ShowRules()
 {
 	const char *rules =
-		"These are the rules you should follow when uploading saves. They may change at any time as new problems arise, and how each rule is handled changes depending on the situation.\n"
+		"These are the rules you should follow when uploading saves to avoid having them deleted or otherwise hidden from public view. If you fail to follow them, don't be surprised if your saves get lousy votes, unpublished, or removed from the front page should they make it there. They may change at any time as new problems arise, and how each rule is handled changes depending on the situation.\n"
 		"\n"
-		"\bt1. No image plotting.\bw If you use a program to draw out pixels from an image outside of TPT without drawing it by hand, then don't be surprised when it gets deleted and you get banned.\n"
-		"\bt2. No self voting.\bw This means making more than one account, and then using that account to vote on any save multiple times. We can see this stuff, and people get banned for doing this. Don't do it.\n"
-		"\bt3. No hate saves.\bw This means things like shooting Jews or killing Beiber, these will not be allowed.\n"
-		"\bt4. No penis drawings.\bw Or any other explicit or non-explicit sex please. We like to think this is a game that kids can play, don't post anything too inappropriate for children.\n"
-		"\bt5. Don't ask people to vote.\bw If your stuff is awesome, you shouldn't have to beg for popularity to make it so. People tend to downvote when they see a lot of vote begging anyway.\n"
+		"\bt1. No image plotting.\bw If you use a program to draw out pixels from an image outside of TPT without drawing it by hand, don't be surprised when it gets deleted and you get banned.\n"
+		"\bt2. No self voting.\bw This means making more than one account, and then using that account to vote on any save multiple times. We can see this stuff, and people get banned for doing it. Don't do it.\n"
+		"\bt3. No hate saves.\bw This means things like shooting Jews or killing Beiber; these will not be allowed.\n"
+		"\bt4. No penis drawings.\bw Or any other explicit or non-explicit sex please. We like to think this is a game that kids can play with their family around, don't post anything too inappropriate.\n"
+		"\bt5. Don't ask people to vote.\bw If your stuff is awesome, you shouldn't have to beg for popularity to get votes. People tend to downvote when they see vote begging anyway.\n"
 		   "- This includes vote signs in the game, drawings of vote arrows, and comments on the save telling people to vote up.\n"
 		   "- Gimmicks for getting votes like '100 votes and I'll make a better version' are similarly frowned upon.\n"
-		"\bt6. Keep the number of logos and signs to a minimum.\bw They not only slow the game down, but it makes saves unappealing for people to use. \n"
+		"\bt6. Keep the number of logos and signs to a minimum.\bw They not only slow the game down, but it can also make saves unappealing for people to use. \n"
+		   "- Please do not make fake update or similar update signs either.\n"
 		"\bt7. Please don't swear excessively.\bw Saves containing excessive swearing or rude language will be unpublished. Don't make rude or offensive comments either.\n"
-		"\bt8. Don't make text only saves.\bw Saves are much better when they actually use some of the features in the game. Text only saves will be removed from the front page if they should get there.\n"
-		   "- This also relates to art on the front page. Art saves that rely only on the deco layer are generally removed. Other art using elements may stay longer if they are more impressive.\n"
-		"\bt9. Don't claim other's work as your own.\bw If you didn't make it, don't resave it for yourself. You can fav. a save if you want to see it later instead of publishing a copy.\n"
-		   "- This doesn't mean you can't modify or improve saves, building on the works of others in encouraged. If you give credit to the original author, it is usually ok to do resave unless the author specifically prohibits it.\n"
+		"\bt8. Don't make text only saves.\bw Saves are much better when they actually use some of the features in the game. Text only saves will be removed from the front page should they ever get there.\n"
+		   "- Also, element suggestion saves will be removed from the front page. It's recommended you make a thread on the forum instead so you can get actual criticism from other users and devs.\n"
+		   "- This is also related to art on the front page. Art saves that only rely on the deco layer are generally removed. Art using elements may stay longer if it's more impressive.\n"
+		"\bt9. Don't claim others' work as your own.\bw If you didn't make it, don't resave it for yourself. You can fav. a save instead of publishing a copy if you want to see it later.\n"
+		   "- This doesn't mean you can't modify or improve saves; building on the works of others in encouraged. If you give credit to the original author, it is usually OK to resave unless the author specifically prohibits it.\n"
+		"\bt10. Do not make laggy saves.\bw If a save is so laggy that it crashes the game for some people, it's just really annoying. Saves that do make it to the front page that purposely lag the game will be demoted.\n"
 		"\n"
-		"You can report a save breaking any one of these rules, the moderators are busy in real life too and don't always have the time to search through all the saves for these kinds of things. If reporting a copied save, just give the id of the original, but if not an id isn't needed.";
+		"You can report a save breaking any one of these rules, as the moderators are busy in real life too and don't always have the time to search through all saves for these kinds of things. If reporting a copied save, just give the ID of the original, but if not an ID isn't needed.";
 
 	new InformationMessage("Save Uploading Rules", rules, true);
 }
--
cgit v0.9.2-21-gd62e

From 630216c2531545c232edb45d3054c903c2c205c4 Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Sat, 4 May 2013 00:20:33 -0400
Subject: change ">" to "..." (from mniip)


diff --git a/src/cat/LuaScriptInterface.cpp b/src/cat/LuaScriptInterface.cpp
index 587be8c..452e47a 100644
--- a/src/cat/LuaScriptInterface.cpp
+++ b/src/cat/LuaScriptInterface.cpp
@@ -2141,7 +2141,7 @@ int LuaScriptInterface::Command(std::string command)
 		{
 			lastError = luacon_geterror();
 			if(std::string(lastError).find("near '<eof>'")!=-1) //the idea stolen from lua-5.1.5/lua.c
-				lastError = ">";
+				lastError = "...";
 			else
 				lastCode = "";
 		}
--
cgit v0.9.2-21-gd62e