Allow DEST to be cloned with CLNE, PCLN, BCLN and PBCN. Add icon for Force elements, minor edits to Gas and Atomic element icons

9 files changed, 14 insertions, 10 deletions

diff --git a/includes/font.h b/includes/font.h
index 09d4cdf..77d387f 100644
--- a/includes/font.h
+++ b/includes/font.h
@@ -199,9 +199,9 @@ char font_data[] = {
     0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x3F, 0x02, 0xC2, 0xAB, 0xAA, 0x3E, 0x20, 0xE0, 0xAB, 0xAA, 0x3E, 0x02, 0xC2, 0xFF, 0xFF, 0x0F, 0x00, 0x00, 
     0x0A, 0x00, 0x00, 0x00, 0x08, 0x02, 0xC0, 0x30, 0x00, 0x0C, 0x03, 0xF0, 0xFF, 0x00, 0xFE, 0x0B, 0xD0, 0x7F, 0x00, 0xA4, 0x01, 0x00, 0x0A, 0x00, 0xA0, 0x00, 
     0x0A, 0x00, 0x80, 0x00, 0x81, 0x24, 0x10, 0x85, 0x00, 0x20, 0x66, 0x40, 0x15, 0x45, 0x62, 0x90, 0x4D, 0xD0, 0xF1, 0x23, 0x01, 0xFD, 0x41, 0x41, 0x07, 0x00, 
-    0x0A, 0x00, 0x05, 0x00, 0xA0, 0x00, 0x40, 0x1F, 0x00, 0xF8, 0x02, 0xD0, 0x7F, 0x00, 0xFE, 0x0B, 0xF0, 0xFF, 0x00, 0xFF, 0x0F, 0xD0, 0x7F, 0x00, 0xF4, 0x01, 
-    0x0A, 0x00, 0x00, 0x00, 0x00, 0x34, 0x00, 0xD4, 0x01, 0xD0, 0x06, 0x40, 0x7F, 0x00, 0xFD, 0x01, 0xF4, 0x07, 0xD0, 0x1F, 0x00, 0x7F, 0x00, 0xD0, 0x01, 0x00, 
-    0x0A, 0x40, 0x15, 0x00, 0xFE, 0x0B, 0x88, 0x2F, 0x52, 0xF0, 0x50, 0x01, 0x0A, 0xD4, 0xAF, 0x7F, 0xFD, 0xF5, 0xC7, 0x0B, 0x3E, 0x70, 0xD0, 0x00, 0xA4, 0x01, 
+    0x0A, 0x00, 0x05, 0x00, 0xA0, 0x00, 0x40, 0x1F, 0x00, 0xF8, 0x02, 0xD0, 0x7F, 0x00, 0xFE, 0x0B, 0xF0, 0xEF, 0x00, 0xFF, 0x0D, 0xD0, 0x77, 0x00, 0xF4, 0x01, 
+    0x0A, 0x00, 0x20, 0x00, 0x00, 0x3C, 0x00, 0xD4, 0x01, 0xD0, 0x06, 0x40, 0x7F, 0x00, 0xFD, 0x01, 0xF4, 0x07, 0xD0, 0x1F, 0x00, 0x7F, 0x00, 0xD0, 0x01, 0x00, 
+    0x0A, 0x40, 0x15, 0x00, 0xFE, 0x0B, 0x88, 0x2F, 0x52, 0xF0, 0x50, 0x01, 0x0A, 0xD4, 0xAF, 0x7F, 0xFD, 0xF5, 0xC7, 0x0B, 0x3E, 0x70, 0xD0, 0x00, 0xA8, 0x02, 
     0x0A, 0x80, 0x2F, 0x80, 0x5F, 0x2F, 0x0C, 0x00, 0xC3, 0x00, 0x30, 0x0C, 0x00, 0xC3, 0x01, 0x34, 0x34, 0xC0, 0x01, 0x07, 0x0D, 0xD0, 0x75, 0x00, 0xF4, 0x01, 
     0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0xF4, 0x01, 0xC0, 0x3F, 0x00, 0xF0, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
     0x0A, 0x00, 0x00, 0x00, 0xF0, 0x00, 0xE0, 0xEF, 0x00, 0xBB, 0x0B, 0xA0, 0xAA, 0x00, 0xAA, 0x0A, 0x80, 0x19, 0x00, 0x64, 0x02, 0x00, 0x05, 0x00, 0x00, 0x00, 
@@ -229,7 +229,7 @@ char font_data[] = {
     0x0A, 0x00, 0x00, 0x00, 0x54, 0x00, 0x90, 0x1A, 0x40, 0xFE, 0x06, 0xE4, 0x6F, 0x40, 0xFE, 0x06, 0x90, 0x1A, 0x00, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
     0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x88, 0x88, 0x88, 0x55, 0x55, 0x55, 0xFF, 0x00, 0x54, 0x55, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
     0x0A, 0x00, 0x01, 0x00, 0x10, 0x00, 0x00, 0x02, 0x00, 0x64, 0x00, 0xA5, 0x6B, 0x01, 0x64, 0x00, 0x00, 0x02, 0x00, 0x10, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-    0x06, 0x74, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0x99, 0x31, 0x30, 0x89, 0x41, 0x07, 
+    0x0A, 0x00, 0x00, 0xC0, 0x00, 0x00, 0xFF, 0x86, 0xC0, 0x00, 0x2C, 0x40, 0xFE, 0x0B, 0xE4, 0xBF, 0x0C, 0xC0, 0xF2, 0x6F, 0x08, 0x0C, 0x00, 0x00, 0x00, 0x00, 
     0x06, 0x74, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0x99, 0x31, 0x30, 0x89, 0x41, 0x07, 
     0x06, 0x74, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0x99, 0x31, 0x30, 0x89, 0x41, 0x07, 
     0x06, 0x74, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0x99, 0x31, 0x30, 0x89, 0x41, 0x07, 
@@ -289,10 +289,10 @@ short font_ptrs[] = {
     0x0D7A, 0x0D94, 0x0DAE, 0x0DC8, 0x0DE2, 0x0DFC, 0x0E16, 0x0E30,
     0x0E48, 0x0E62, 0x0E7C, 0x0E96, 0x0EB0, 0x0ECA, 0x0EE4, 0x0EFE,
     0x0F18, 0x0F26, 0x0F3B, 0x0F53, 0x0F6D, 0x0F87, 0x0FA1, 0x0FBB,
-    0x0FD5, 0x0FF2, 0x100C, 0x101C, 0x102C, 0x103C, 0x104C, 0x105C,
-    0x106C, 0x107C, 0x108C, 0x109C, 0x10AA, 0x10BA, 0x10CA, 0x10DA,
-    0x10EA, 0x10FA, 0x110A, 0x111A, 0x112A, 0x113A, 0x114A, 0x115A,
-    0x116A, 0x117A, 0x118A, 0x119A, 0x11AA, 0x11BA, 0x11CA, 0x11DA,
+    0x0FD5, 0x0FF2, 0x100C, 0x1026, 0x1036, 0x1046, 0x1056, 0x1066,
+    0x1076, 0x1086, 0x1096, 0x10A6, 0x10B4, 0x10C4, 0x10D4, 0x10E4,
+    0x10F4, 0x1104, 0x1114, 0x1124, 0x1134, 0x1144, 0x1154, 0x1164,
+    0x1174, 0x1184, 0x1194, 0x11A4, 0x11B4, 0x11C4, 0x11D4, 0x11E4,
 };
 #endif
 #endif
diff --git a/includes/interface.h b/includes/interface.h
index 2c1a290..57f75b6 100644
--- a/includes/interface.h
+++ b/includes/interface.h
@@ -56,7 +56,7 @@ static menu_section msections[] = //doshow does not do anything currently.
 	{"\xC1", "Walls", 0, 1},
 	{"\xC2", "Electronics", 0, 1},
 	{"\xD6", "Powered Materials", 0, 1},
-	{">",	 "Force", 0, 1},
+	{"\xE2", "Force Creating", 0, 1},
 	{"\xC3", "Explosives", 0, 1},
 	{"\xC5", "Gasses", 0, 1},
 	{"\xC4", "Liquids", 0, 1},
diff --git a/src/Resources/icon/powder-16.png b/src/Resources/icon/powder-16.png
new file mode 100644
index 0000000..5934240
--- /dev/null
+++ b/src/Resources/icon/powder-16.png
diff --git a/src/Resources/icon/powder-24.png b/src/Resources/icon/powder-24.png
new file mode 100644
index 0000000..6c2ef69
--- /dev/null
+++ b/src/Resources/icon/powder-24.png
diff --git a/src/Resources/icon/powder-256.png b/src/Resources/icon/powder-256.png
new file mode 100644
index 0000000..73b04de
--- /dev/null
+++ b/src/Resources/icon/powder-256.png
diff --git a/src/Resources/icon/powder-32.png b/src/Resources/icon/powder-32.png
new file mode 100644
index 0000000..bdc038e
--- /dev/null
+++ b/src/Resources/icon/powder-32.png
diff --git a/src/Resources/icon/powder-48.png b/src/Resources/icon/powder-48.png
new file mode 100644
index 0000000..8a896e7
--- /dev/null
+++ b/src/Resources/icon/powder-48.png
diff --git a/src/elements/dest.c b/src/elements/dest.c
index a315b09..3a979f5 100644
--- a/src/elements/dest.c
+++ b/src/elements/dest.c
@@ -6,7 +6,7 @@ int update_DEST(UPDATE_FUNC_ARGS) {
 	ry=rand()%5-2;
 
 	r = pmap[y+ry][x+rx];
-	if (!r || (r&0xFF)==PT_DEST || (r&0xFF)==PT_DMND)
+	if (!r || (r&0xFF)==PT_DEST || (r&0xFF)==PT_DMND || (r&0xFF)==PT_BCLN  || (r&0xFF)==PT_CLNE  || (r&0xFF)==PT_PCLN  || (r&0xFF)==PT_PBCN)
 		return 0;
 
 	if (parts[i].life<=0 || parts[i].life>37)
diff --git a/src/powder.c b/src/powder.c
index 187a0d9..95b8333 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -105,6 +105,10 @@ void init_can_move()
 		}
 	}
 	can_move[PT_DEST][PT_DMND] = 0;
+	can_move[PT_DEST][PT_CLNE] = 0;
+	can_move[PT_DEST][PT_PCLN] = 0;
+	can_move[PT_DEST][PT_BCLN] = 0;
+	can_move[PT_DEST][PT_PBCN] = 0;
 	can_move[PT_BIZR][PT_FILT] = 2;
 	can_move[PT_BIZRG][PT_FILT] = 2;
 	for (t=0;t<PT_NUM;t++)