diff --git a/src/main/java/noppes/npcs/scripted/constants/RoleType.java b/src/main/java/noppes/npcs/scripted/constants/RoleType.java index 7fbc1f421..c06b501cb 100644 --- a/src/main/java/noppes/npcs/scripted/constants/RoleType.java +++ b/src/main/java/noppes/npcs/scripted/constants/RoleType.java @@ -2,9 +2,10 @@ package noppes.npcs.scripted.constants; public class RoleType { public static final int UNKNOWN = 0; - public static final int MAILMAN = 1; - public static final int TRADER = 2; - public static final int FOLLOWER = 3; - public static final int BANK = 4; - public static final int TRANSPORTER = 5; + public static final int TRADER = 1; + public static final int FOLLOWER = 2; + public static final int BANK = 3; + public static final int TRANSPORTER = 4; + public static final int POSTMAN = 5; + public static final int COMPANION = 6; } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java index 34f6ffafc..da55bca12 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java @@ -404,6 +404,8 @@ public class ScriptNpc extends ScriptLiving imp return new ScriptRoleTrader(npc); else if(npc.advanced.role == EnumRoleType.Transporter) return new ScriptRoleTransporter(npc); + else if(npc.advanced.role == EnumRoleType.Companion) + return new ScriptRoleCompanion(npc); return new ScriptRoleInterface(npc); } diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptRoleCompanion.java b/src/main/java/noppes/npcs/scripted/roles/ScriptRoleCompanion.java new file mode 100644 index 000000000..db20a3d4f --- /dev/null +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptRoleCompanion.java @@ -0,0 +1,17 @@ +package noppes.npcs.scripted.roles; + +import noppes.npcs.api.roles.IRoleMailman; +import noppes.npcs.entity.EntityNPCInterface; +import noppes.npcs.scripted.constants.RoleType; + +public class ScriptRoleCompanion extends ScriptRoleInterface implements IRoleMailman { + + public ScriptRoleCompanion(EntityNPCInterface npc) { + super(npc); + } + + @Override + public int getType(){ + return RoleType.COMPANION; + } +} diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptRoleMailman.java b/src/main/java/noppes/npcs/scripted/roles/ScriptRoleMailman.java index 47693fd59..5f6c3199e 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptRoleMailman.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptRoleMailman.java @@ -12,6 +12,6 @@ public class ScriptRoleMailman extends ScriptRoleInterface implements IRoleMailm @Override public int getType(){ - return RoleType.MAILMAN; + return RoleType.POSTMAN; } }