Merge pull request #136 from TeamSpen210/dev

Pre-Release 13
BEEmod · Nov 24, 2015 · 24b52ce · 24b52ce
2 parents 9d91c74 + dbb088a
commit 24b52ce
Show file tree

Hide file tree

Showing 262 changed files with 20,583 additions and 28,522 deletions.
diff --git a/icons/items/blocks/angled.pdn b/icons/items/blocks/angled.pdn
diff --git a/icons/items/blocks/angled_all.pdn b/icons/items/blocks/angled_all.pdn
diff --git a/icons/items/blocks/flat.pdn b/icons/items/blocks/flat.pdn
diff --git a/icons/items/blocks/special.pdn b/icons/items/blocks/special.pdn
diff --git a/packages/apTag/tagItems/info.txt b/packages/apTag/tagItems/info.txt
@@ -1,5 +1,6 @@
 "ID"		"APERTURE_TAG_ITEMS"
 "Name"		"Aperture Tag Items"
+"Desc"      "Adds Aperture Tag-specific items, like the Paint Gun Activator."
 
 "Item"
 	{

diff --git a/packages/apTag/tagMusic/info.txt b/packages/apTag/tagMusic/info.txt
@@ -1,5 +1,6 @@
 "ID"		"TAG_MUSIC"
 "Name"		"Aperture Tag Music"
+"Desc"      "Music used in Aperture Tag. Does not function in other games."
 
 // Extra tracks:
 // Slow 2 (Harry song)

diff --git a/packages/bee1/beemod/info.txt b/packages/bee1/beemod/info.txt
@@ -1,5 +1,7 @@
 "ID"		"BEEMOD_1"
 "Name"		"BEEMOD 1"
+"Desc"      "Items added in the original BEEMOD 1. This includes Crushers, Triggers, Logic Gates, Diversity Vents, Drawbridges, and Doors."
+
 "Item"
 	{
 	"ID" "ITEM_BEE_LOGIC"
@@ -34,6 +36,16 @@
 	"Enabled"	"0"
 	}
 
+"PackList"
+	{
+	"ID"       "PACK_UNDER_HOTSURFACE_WORLD"
+	"AddIfMat" "BEE2/underground_woodwall003c"
+	"Config" 
+		{
+		"File" "materials/BEE2/world/underground_hotsurface.vmt"
+		}
+	}
+
 "Item"
 	{
 	"ID" "ITEM_DRAW_BRIDGE"

diff --git a/packages/bee1/beemod/items/60s_flamethrower/vbsp_config.cfg b/packages/bee1/beemod/items/60s_flamethrower/vbsp_config.cfg
@@ -2,7 +2,7 @@
 	{
 	"Condition"
 		{
-		"instance"	"instances/BEE2/50s/items/bee/flamethrower.vmf"
+		"instance"	"<ITEM_CRUSHER>"
 		"Result"
 			{
 			"Has"
@@ -12,6 +12,20 @@
 				"Fire"			"1"
 				"Flamethrower"	"1"
 				}
+			"Pack"  "PACK_UNDER_HOTSURFACE_WORLD"
+			}
+		}
+	"Condition"
+		{
+		"Priority"	"10"
+		"instance"	"[elevatorEntry]"
+		"Has" "Flamethrower"
+		"Result"
+			{
+			"addOverlay"
+				{
+				"File"	"instances/BEE2/60s/sphere_sp/sphere/flamethrower.vmf"
+				}
 			}
 		}
 	}
diff --git a/packages/bee1/beemod/items/logic/editoritems.txt b/packages/bee1/beemod/items/logic/editoritems.txt
@@ -88,32 +88,32 @@
 		{
 			"0"
 			{
-				"Name"			"instances/BEE2/clean/items/bee/logic_and.vmf"
+				"Name"			"instances/BEE2/logic/bee/logic_and.vmf"
 				"EntityCount"	"5"
 			}
 			"1"
 			{
-				"Name"			"instances/BEE2/clean/items/bee/logic_and.vmf"
+				"Name"			"instances/BEE2/logic/bee/logic_and.vmf"
 				"EntityCount"	"5"
 			}
 			"2"
 			{
-				"Name"			"instances/BEE2/clean/items/bee/logic_or.vmf"
+				"Name"			"instances/BEE2/logic/bee/logic_or.vmf"
 				"EntityCount"	"5"
 			}
 			"3"
 			{
-				"Name"			"instances/BEE2/clean/items/bee/logic_or.vmf"
+				"Name"			"instances/BEE2/logic/bee/logic_or.vmf"
 				"EntityCount"	"5"
 			}
 			"4"
 			{
-				"Name"			"instances/BEE2/clean/items/bee/logic_nor.vmf"
+				"Name"			"instances/BEE2/logic/bee/logic_nor.vmf"
 				"EntityCount"	"5"
 			}
 			"5"
 			{
-				"Name"			"instances/BEE2/clean/items/bee/logic_nor.vmf"
+				"Name"			"instances/BEE2/logic/bee/logic_nor.vmf"
 				"EntityCount"	"5"
 			}
 		}