Browse Source

Slots are slots; blueprint logic not needed on back-end.

master
MagicBot 2 years ago
parent
commit
1cb103c156
  1. 6
      src/engine/objects/Mob.java
  2. 8
      src/engine/objects/NPC.java

6
src/engine/objects/Mob.java

@ -803,9 +803,11 @@ public class Mob extends AbstractIntelligenceAgent { @@ -803,9 +803,11 @@ public class Mob extends AbstractIntelligenceAgent {
} else
this.level = 1;
//add this npc to building
// Use slot locations and add as a hireling
// only if this building has a blueprint.
// otherwise use the mob cache location.
if (this.building != null) {
if (this.building != null && building.getBlueprintUUID() != 0) {
int maxSlots = 10;

8
src/engine/objects/NPC.java

@ -216,10 +216,12 @@ public class NPC extends AbstractCharacter { @@ -216,10 +216,12 @@ public class NPC extends AbstractCharacter {
}
this.name = rs.getString("npc_name");
this.buyPercent = rs.getFloat("npc_buyPercent");
if (this.buyPercent == 1)
this.buyPercent = .33f;
// Most objects from the cache have a default buy
// percentage of 100% which was a dupe source due
// to the way MB calculated item values.
// this.buyPercent = rs.getFloat("npc_buyPercent");
this.buyPercent = .33f;
this.sellPercent = 1;

Loading…
Cancel
Save