Merge branch 'master' into maven-plugin-upgrades

This commit is contained in:
William Collishaw
2019-05-16 22:22:24 -06:00
168 changed files with 2311 additions and 390 deletions

View File

@@ -29,7 +29,7 @@
<parent>
<groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId>
<version>1.5.23-SNAPSHOT</version>
<version>1.5.24-SNAPSHOT</version>
</parent>
<artifactId>runelite-api</artifactId>

View File

@@ -176,6 +176,7 @@ public final class AnimationID
public static final int MAGIC_LUNAR_SHARED = 4413; // Utilized by Fertile Soil, Boost/Stat Potion Share, NPC Contact, Bake Pie
public static final int MAGIC_LUNAR_CURE_PLANT = 4432;
public static final int MAGIC_LUNAR_GEOMANCY = 7118;
public static final int MAGIC_LUNAR_PLANK_MAKE = 6298;
public static final int MAGIC_LUNAR_STRING_JEWELRY = 4412;
// Arceuus spellbook

View File

@@ -89,4 +89,12 @@ public class Constants
* the maximum framerate of 50 fps.
*/
public static final int CLIENT_TICK_LENGTH = 20;
/**
* The number of milliseconds in a server game tick.
* <p>
* This is the length of a single game cycle under ideal conditions.
* All game-play actions operate within multiples of this duration.
*/
public static final int GAME_TICK_LENGTH = 600;
}

View File

@@ -133,6 +133,7 @@ public class WidgetID
public static final int BARROWS_PUZZLE_GROUP_ID = 25;
public static final int KEPT_ON_DEATH_GROUP_ID = 4;
public static final int GUIDE_PRICE_GROUP_ID = 464;
public static final int SEED_VAULT_INVENTORY_GROUP_ID = 630;
static class WorldMap
{