Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

add random 10-15 delay between patrolling for mobs

Browse Source
This commit is contained in:
FatBoy-DOTC
2023-04-16 13:23:42 -05:00
parent ef74d1ae8c
commit db0e9d1847
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/ai/MobileFSM.java
+9 -6
View File
@@ -381,8 +381,9 @@ public class MobileFSM {
mob.stopPatrolTime = System.currentTimeMillis(); mob.stopPatrolTime = System.currentTimeMillis();
return; return;
} }
//wait 10 seconds after reaching patrol point before moving again //wait between 10 and 15 seconds after reaching patrol point before moving
if(mob.stopPatrolTime + 10000 > System.currentTimeMillis()){ int patrolDelay = ThreadLocalRandom.current().nextInt(10000) + 5000;
if(mob.stopPatrolTime + patrolDelay > System.currentTimeMillis()){
//early exit while waiting to patrol again //early exit while waiting to patrol again
return; return;
} }
@@ -402,7 +403,7 @@ public class MobileFSM {
} }
if (MovementUtilities.canMove(mob)) { if (MovementUtilities.canMove(mob)) {
//get the next index of the patrol point from the patrolPoints list //get the next index of the patrol point from the patrolPoints list
if (mob.lastPatrolPointIndex > mob.patrolPoints.size()) { if (mob.lastPatrolPointIndex > mob.patrolPoints.size() - 1) {
mob.lastPatrolPointIndex = 0; mob.lastPatrolPointIndex = 0;
} }
MovementUtilities.aiMove(mob, mob.patrolPoints.get(mob.lastPatrolPointIndex), true); MovementUtilities.aiMove(mob, mob.patrolPoints.get(mob.lastPatrolPointIndex), true);
@@ -607,12 +608,14 @@ public class MobileFSM {
return; return;
} }
if (mob.isPet() == false && mob.isSummonedPet() == false && mob.isNecroPet() == false) { if (mob.isPet() == false && mob.isSummonedPet() == false && mob.isNecroPet() == false) {
if (mob.BehaviourType != null && mob.BehaviourType == MobBehaviourType.None) { //if (mob.BehaviourType != null && mob.BehaviourType == MobBehaviourType.None) {
return; // return;
} //}
//TEST CODE FOR BEHAVIOUR CHANGING START
if(mob.BehaviourType == null || mob.BehaviourType.ordinal() == MobBehaviourType.None.ordinal()){ if(mob.BehaviourType == null || mob.BehaviourType.ordinal() == MobBehaviourType.None.ordinal()){
mob.BehaviourType = MobBehaviourType.Simple; mob.BehaviourType = MobBehaviourType.Simple;
} }
//TEST CODE FOR BEHAVIOUR CHANGING END
if (mob.isAlive() == false) { if (mob.isAlive() == false) {
//no need to continue if mob is dead, check for respawn and move on //no need to continue if mob is dead, check for respawn and move on
CheckForRespawn(mob); CheckForRespawn(mob);
src/engine/objects/Mob.java
+3 -1
View File
@@ -299,9 +299,11 @@ public class Mob extends AbstractIntelligenceAgent {
this.equipmentSetID = this.contract.getEquipmentSet(); this.equipmentSetID = this.contract.getEquipmentSet();
this.nameOverride = rs.getString("mob_name"); this.nameOverride = rs.getString("mob_name");
try {
if (rs.getString("fsm").length() > 1) { if (rs.getString("fsm").length() > 1) {
this.BehaviourType = MobileFSM.MobBehaviourType.valueOf(rs.getString("fsm")); this.BehaviourType = MobileFSM.MobBehaviourType.valueOf(rs.getString("fsm"));
} else{ }
}catch(Exception ex) {
this.BehaviourType = MobileFSM.MobBehaviourType.None; this.BehaviourType = MobileFSM.MobBehaviourType.None;
} }
} catch (Exception e) { } catch (Exception e) {