Merge remote-tracking branch 'upstream/master' into master

cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java

@@ -64,4 +64,5 @@ public class NpcDefinition
 	public boolean rotationFlag = true;
 	public boolean isPet;
 	public Map<Integer, Object> params;
+	public int category;
 }

cache/src/main/java/net/runelite/cache/definitions/ObjectDefinition.java

@@ -75,5 +75,6 @@ public class ObjectDefinition
 	private int anInt2112 = 0;
 	private int anInt2113 = 0;
 	private boolean blocksProjectile = true;
+	private boolean randomizeAnimStart;
 	private Map<Integer, Object> params = null;
 }

cache/src/main/java/net/runelite/cache/definitions/loaders/NpcLoader.java

@@ -98,6 +98,10 @@ public class NpcLoader
 			def.rotate90RightAnimation = stream.readUnsignedShort();
 			def.rotate90LeftAnimation = stream.readUnsignedShort();
 		}
+		else if (opcode == 18)
+		{
+			def.category = stream.readUnsignedShort();
+		}
 		else if (opcode >= 30 && opcode < 35)
 		{
 			def.actions[opcode - 30] = stream.readString();

cache/src/main/java/net/runelite/cache/definitions/loaders/ObjectLoader.java

@@ -306,6 +306,10 @@ public class ObjectLoader
 		{
 			def.setMapAreaId(is.readUnsignedShort());
 		}
+		else if (opcode == 89)
+		{
+			def.setRandomizeAnimStart(true);
+		}
 		else if (opcode == 92)
 		{
 			int varpID = is.readUnsignedShort();