added support for camonet and stashes

R4Z0R49 · Jun 20, 2014 · dede60d · dede60d
1 parent 9a34791
commit dede60d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/modules/leaf.php b/modules/leaf.php
@@ -34,8 +34,9 @@
 		trap = new Icon({ iconUrl: 'images/icons/trap.png' }),
 		wire = new Icon({ iconUrl: 'images/icons/wire.png' }),
 		tent = new Icon({ iconUrl: 'images/icons/tent.png' }),
-		StashSmall = new Icon({ iconUrl: 'images/icons/tent.png' }),
-		StashMedium = new Icon({ iconUrl: 'images/icons/tent.png' }),
+		CamoNet = new Icon({ iconUrl: 'images/icons/camonet.png' }),
+		StashSmall = new Icon({ iconUrl: 'images/icons/stashsmall.png' }),
+		StashMedium = new Icon({ iconUrl: 'images/icons/stashmedium.png' }),
 		hedgehog = new Icon({ iconUrl: 'images/icons/hedgehog.png' }),
 		Hedgehog = new Icon({ iconUrl: 'images/icons/hedgehog.png' }),
 		sandbag = new Icon({ iconUrl: 'images/icons/sandbag.png' }),

diff --git a/queries.php b/queries.php
@@ -114,7 +114,8 @@
 WHERE
 	(od.Classname LIKE '%TentStorage%' OR
 	od.Classname LIKE 'StashSmall%' OR
-	od.Classname LIKE 'StashMedium%')
+	od.Classname LIKE 'StashMedium%' OR
+    od.Classname IN ('Hedgehog_DZ', 'Sandbag1_DZ', 'BearTrap_DZ', 'Wire_cat1', 'TrapBearTrapFlare', 'TrapBearTrapSmoke', 'TrapTripwireCans', 'TrapTripwireFlare', 'TrapTripwireGrenade', 'TrapTripwireSmoke'))
 AND od.ObjectID = ?
 AND od.Instance = ?
 ";
@@ -285,7 +286,7 @@
 ON
     oc.Classname = od.Classname
 WHERE
-    od.Classname IN ('Hedgehog_DZ', 'Sandbag1_DZ', 'BearTrap_DZ', 'Wire_cat1', 'TrapBearTrapFlare', 'TrapBearTrapSmoke', 'TrapTripwireCans', 'TrapTripwireFlare', 'TrapTripwireGrenade', 'TrapTripwireSmoke')
+	od.Classname IN ('Hedgehog_DZ', 'Sandbag1_DZ', 'Wire_cat1', 'CamoNet_DZ', 'BearTrap_DZ', 'TrapBearTrapFlare', 'TrapBearTrapSmoke', 'Trap_Cans', 'Trap_Grenade', 'Trap_Smoke', 'TrapTripwireFlare', 'TrapTripwireGrenade', 'TrapTripwireSmoke')
 AND od.Instance = ?
 ";
 
@@ -315,7 +316,10 @@
 ON
     oc.Classname = od.Classname
 WHERE
-    od.Classname IN ('TentStorage','StashSmall','StashMedium', 'Hedgehog_DZ', 'Sandbag1_DZ', 'BearTrap_DZ', 'Wire_cat1', 'TrapBearTrapFlare', 'TrapBearTrapSmoke', 'TrapTripwireCans', 'TrapTripwireFlare', 'TrapTripwireGrenade', 'TrapTripwireSmoke')
+	od.Classname LIKE '%TentStorage%' OR
+	od.Classname LIKE 'StashSmall%' OR
+	od.Classname LIKE 'StashMedium%' OR
+	od.Classname IN ('Hedgehog_DZ', 'Sandbag1_DZ', 'Wire_cat1', 'CamoNet_DZ', 'BearTrap_DZ', 'TrapBearTrapFlare', 'TrapBearTrapSmoke', 'Trap_Cans', 'Trap_Grenade', 'Trap_Smoke', 'TrapTripwireFlare', 'TrapTripwireGrenade', 'TrapTripwireSmoke')
 AND od.Instance = ?
 
 ";
@@ -486,7 +490,8 @@
 ON
 	oc.Classname = od.Classname
 WHERE
-	od.Classname IN ('Hedgehog_DZ', 'Sandbag1_DZ', 'TrapBear', 'Wire_cat1', 'ItemTrapBearTrapFlare', 'ItemTrapBearTrapSmoke', 'ItemTrapTripwireCans', 'ItemTrapTripwireFlare', 'ItemTrapTripwireGrenade', 'ItemTrapTripwireSmoke')
+	(od.Classname IN ('Hedgehog_DZ', 'Sandbag1_DZ', 'Wire_cat1', 'CamoNet_DZ') OR
+    od.Classname LIKE('%trap%'))
 AND od.Instance = ?
 ";