simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-12-13 14:49:03 +00:00
Code Issues Projects Releases Wiki Activity

Fixes #170, #155

Browse Source
This commit is contained in:
Simon
2018-11-27 16:02:21 -05:00
parent 54ed05b86c
commit 3776070689
18 changed files with 36 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Plugin NPC/src/main/java/net/simon987/npcplugin/ElectricBox.java
View File

@@ -16,6 +16,7 @@ import java.util.ArrayList;
*/
public class ElectricBox extends GameObject implements Updatable, Attackable {
private static final char MAP_INFO = 0x0301;
/**
* Hit points
*/
@@ -98,7 +99,7 @@ public class ElectricBox extends GameObject implements Updatable, Attackable {
@Override
public char getMapInfo() {
return Obstacle.MAP_INFO;
return MAP_INFO;
}
/**

2
Plugin NPC/src/main/java/net/simon987/npcplugin/Factory.java
View File

@@ -15,7 +15,7 @@ import java.util.List;
*/
public class Factory extends Structure implements Updatable {
private static final int MAP_INFO = 0x0200;
private static final int MAP_INFO = 0x0401;
/**
* Maximum number of NonPlayerCharacters assigned to this Factory

1
Plugin NPC/src/main/java/net/simon987/npcplugin/HarvesterNPC.java
View File

@@ -12,7 +12,6 @@ public class HarvesterNPC extends NonPlayerCharacter {
public static final int MAX_HEALTH = GameServer.INSTANCE.getConfig().getInt("harvester_hp_max");
public static final int HEAL_RATE = GameServer.INSTANCE.getConfig().getInt("harvester_regen");
public HarvesterNPC() {
setTask(new HarvestTask());

2
Plugin NPC/src/main/java/net/simon987/npcplugin/NonPlayerCharacter.java
View File

@@ -15,7 +15,7 @@ import java.util.ArrayList;
*/
public abstract class NonPlayerCharacter extends GameObject implements Updatable, Attackable {
private static final int MAP_INFO = 0x0040;
private static final char MAP_INFO = 0x0501;
/**
* Maximum distance to travel from its factory, in Worlds

2
Plugin NPC/src/main/java/net/simon987/npcplugin/Obstacle.java
View File

@@ -10,7 +10,7 @@ import org.json.simple.JSONObject;
*/
public class Obstacle extends GameObject implements Attackable {
public static final int MAP_INFO = 0x0400;
public static final int MAP_INFO = 0x0701;
/**
* Style of the obstacle. Will tell the client which sprite to display

2
Plugin NPC/src/main/java/net/simon987/npcplugin/Portal.java
View File

@@ -17,7 +17,7 @@ public class Portal extends Structure implements Enterable {
*/
private Location destination;
public static final int MAP_INFO = 0x0020;
public static final int MAP_INFO = 0x0801;
public Portal() {
super(1, 1);

2
Plugin NPC/src/main/java/net/simon987/npcplugin/RadioTower.java
View File

@@ -12,7 +12,7 @@ import java.util.ArrayList;
public class RadioTower extends Structure implements MessageReceiver, Updatable {
private static final int MAP_INFO = 0x1000;
private static final int MAP_INFO = 0x0901;
public static final int MAX_RANGE = GameServer.INSTANCE.getConfig().getInt("radio_tower_range");

2
Plugin NPC/src/main/java/net/simon987/npcplugin/VaultDoor.java
View File

@@ -12,7 +12,7 @@ import java.util.Arrays;
public class VaultDoor extends Structure implements MessageReceiver, Enterable, Updatable {
private static final int MAP_INFO = 0x0800;
private static final int MAP_INFO = 0x0B00;
/**
* Password to open the vault door

2
Plugin NPC/src/main/java/net/simon987/npcplugin/VaultExitPortal.java
View File

@@ -29,9 +29,7 @@ public class VaultExitPortal extends Portal {
@Override
public boolean enter(GameObject object) {
//TODO: Trigger vault complete event instead
return super.enter(object);
}
}