diff --git a/src/api b/src/api index a5dcba72d..4b3010c98 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit a5dcba72db5246772daacb4cd86ae14403b85eab +Subproject commit 4b3010c98d2611a34ec8fb47d3ef8c8f06a0dd25 diff --git a/src/main/java/noppes/npcs/roles/RoleFollower.java b/src/main/java/noppes/npcs/roles/RoleFollower.java index 9853f9403..3927088ad 100644 --- a/src/main/java/noppes/npcs/roles/RoleFollower.java +++ b/src/main/java/noppes/npcs/roles/RoleFollower.java @@ -15,7 +15,7 @@ import noppes.npcs.entity.EntityNPCInterface; import java.util.HashMap; import java.util.UUID; -public class RoleFollower extends RoleInterface{ +public class RoleFollower extends RoleInterface { private String ownerUUID; public boolean isFollowing = true; @@ -153,6 +153,40 @@ public class RoleFollower extends RoleInterface{ ownerUUID = id.toString(); npc.stats.canDespawn = false; } - - + + public void setRate(int index, int amount) { + if(index > 2 || index < 0) + return; + + if(amount < 1) + return; + + rates.put(index, amount); + } + + public int getRate(int index) { + if(index > 2 || index < 0) + return -1; + + if(!rates.containsKey(index)) + return -1; + + return rates.get(index); + } + + public void setDialogHire(String dialogHire) { + this.dialogHire = dialogHire; + } + + public String getDialogHire() { + return dialogHire; + } + + public void setDialogFarewell(String dialogFarewell){ + this.dialogFarewell = dialogFarewell; + } + + public String getDialogFarewell(){ + return this.dialogFarewell; + } } diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptRoleFollower.java b/src/main/java/noppes/npcs/scripted/roles/ScriptRoleFollower.java index 46f63a631..8cd7eab19 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptRoleFollower.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptRoleFollower.java @@ -67,6 +67,51 @@ public class ScriptRoleFollower extends ScriptRoleInterface implements IRoleFoll role.disableGui = disabled; } + + /** + * @param index Index of Rate [0 - 2] + * @param amount Amount hired for + */ + public void setRate(int index, int amount){ + role.setRate(index, amount); + } + + /** + * @param index Index of Rate [0 - 2] + * @return amount fired for + */ + public int getRate(int index){ + return role.getRate(index); + } + + /** + * @param dialogHire New dialog hire string + */ + public void setDialogHire(String dialogHire){ + role.setDialogHire(dialogHire); + } + + /** + * @return dialog hire string + */ + public String getDialogHire(){ + return role.getDialogHire(); + } + + /** + * @param dialogFarewell New dialog farewell string + */ + public void setDialogFarewell(String dialogFarewell){ + role.setDialogFarewell(dialogFarewell); + } + + /** + * @return dialog farewell string + */ + public String getDialogFarewell(){ + return role.getDialogFarewell(); + } + @Override public int getType(){ return RoleType.FOLLOWER;