|
|
@ -653,7 +653,7 @@ public class Mob extends AbstractIntelligenceAgent { |
|
|
|
minionMobile.guardedCity = guardCaptain.guardedCity; |
|
|
|
minionMobile.guardedCity = guardCaptain.guardedCity; |
|
|
|
|
|
|
|
|
|
|
|
minionMobile.parentZoneUUID = guardCaptain.parentZoneUUID; |
|
|
|
minionMobile.parentZoneUUID = guardCaptain.parentZoneUUID; |
|
|
|
minionMobile.bindLoc = guardCaptain.building.getLoc(); |
|
|
|
minionMobile.bindLoc = Vector3fImmutable.ZERO; |
|
|
|
|
|
|
|
|
|
|
|
//grab name from minionbase.
|
|
|
|
//grab name from minionbase.
|
|
|
|
|
|
|
|
|
|
|
@ -1689,10 +1689,12 @@ public class Mob extends AbstractIntelligenceAgent { |
|
|
|
else |
|
|
|
else |
|
|
|
this.contract = DbManager.ContractQueries.GET_CONTRACT(this.contractUUID); |
|
|
|
this.contract = DbManager.ContractQueries.GET_CONTRACT(this.contractUUID); |
|
|
|
|
|
|
|
|
|
|
|
// Setup mobile AI
|
|
|
|
// Setup mobile AI and equipset for contract
|
|
|
|
|
|
|
|
|
|
|
|
if (this.contract != null) { |
|
|
|
if (this.contract != null) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.equipmentSetID = this.contract.getEquipmentSet(); |
|
|
|
|
|
|
|
|
|
|
|
// Load AI for guard captains
|
|
|
|
// Load AI for guard captains
|
|
|
|
|
|
|
|
|
|
|
|
if (NPC.ISGuardCaptain(contract.getContractID()) || this.contract.getContractID() == 910) { // Guard Dog
|
|
|
|
if (NPC.ISGuardCaptain(contract.getContractID()) || this.contract.getContractID() == 910) { // Guard Dog
|
|
|
@ -1734,13 +1736,9 @@ public class Mob extends AbstractIntelligenceAgent { |
|
|
|
if (this.firstName.isEmpty()) |
|
|
|
if (this.firstName.isEmpty()) |
|
|
|
this.firstName = this.mobBase.getFirstName(); |
|
|
|
this.firstName = this.mobBase.getFirstName(); |
|
|
|
|
|
|
|
|
|
|
|
if (this.contract != null) { |
|
|
|
if (this.contract != null) |
|
|
|
|
|
|
|
|
|
|
|
this.equipmentSetID = this.contract.getEquipmentSet(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (this.lastName.isEmpty()) |
|
|
|
if (this.lastName.isEmpty()) |
|
|
|
this.lastName = this.getContract().getName(); |
|
|
|
this.lastName = this.getContract().getName(); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.healthMax = this.mobBase.getHealthMax(); |
|
|
|
this.healthMax = this.mobBase.getHealthMax(); |
|
|
|
this.manaMax = 0; |
|
|
|
this.manaMax = 0; |
|
|
@ -1787,10 +1785,10 @@ public class Mob extends AbstractIntelligenceAgent { |
|
|
|
// with the exceptions being mobiles
|
|
|
|
// with the exceptions being mobiles
|
|
|
|
// with a contract.
|
|
|
|
// with a contract.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.bindLoc = building.getLoc().add(bindLoc); |
|
|
|
|
|
|
|
|
|
|
|
if (this.contract != null || this.isSiege) |
|
|
|
if (this.contract != null || this.isSiege) |
|
|
|
NPCManager.slotCharacterInBuilding(this); |
|
|
|
NPCManager.slotCharacterInBuilding(this); |
|
|
|
else |
|
|
|
|
|
|
|
this.bindLoc = building.getLoc(); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Setup location for this Mobile
|
|
|
|
// Setup location for this Mobile
|
|
|
|