MagicBane
/
Server
92
0
Fork 2
Code Issues 11 Pull Requests Projects Releases Wiki Activity
Browse Source

resource merchant work

lakebane-master
FatBoy-DOTC 9 months ago
parent
8f0e19a10c
commit
8e8876587c
1 changed files with 39 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 49
      src/engine/server/world/WorldServer.java

49
src/engine/server/world/WorldServer.java
Unescape View File

@ -649,28 +649,57 @@ public class WorldServer {
Logger.error("FAILED TO ADD RUNE MERCHANT"); Logger.error("FAILED TO ADD RUNE MERCHANT");
} }
try { try {
Building sdrHut = BuildingManager.getBuilding(27984); Building sdrHut = BuildingManager.getBuilding(27979);
if(sdrHut.getHirelings().size() < 2) { if (sdrHut.getHirelings().size() < 1) {
NPC resourceMerchant = NPC.createNPC("Resource Merchant", 830, Vector3fImmutable.ZERO, Guild.getGuild(6), ZoneManager.getZoneByUUID(656), (short) 70, null); NPC resourceMerchant = NPC.createNPC("Resource Merchant", 12287, Vector3fImmutable.ZERO, Guild.getGuild(6), ZoneManager.getZoneByUUID(656), (short) 70, null);
resourceMerchant.sellPercent = 0; resourceMerchant.sellPercent = 0;
resourceMerchant.contract.vendorDialog = VendorDialog.getVendorDialog(623);
resourceMerchant.buildingUUID = sdrHut.getObjectUUID(); resourceMerchant.buildingUUID = sdrHut.getObjectUUID();
resourceMerchant.building = sdrHut; resourceMerchant.building = sdrHut;
NPCManager.slotCharacterInBuilding(resourceMerchant); NPCManager.slotCharacterInBuilding(resourceMerchant);
resourceMerchant.setLoc(resourceMerchant.bindLoc); resourceMerchant.setLoc(resourceMerchant.bindLoc);
//resourceMerchant.contract.getSellInventory().clear(); resourceMerchant.contract.getSellInventory().clear();
for(int resourceID : Warehouse.getMaxResources().keySet()){ for(int resourceID : Warehouse.getMaxResources().keySet()) {
if(resourceID == 7 || resourceID == 1580021) if (resourceID == 7 || resourceID == 1580021)
continue; continue;
MobLoot resource = new MobLoot(resourceMerchant,ItemBase.getItemBase(resourceID), 1, true); //MobLoot resource = new MobLoot(resourceMerchant, ItemBase.getItemBase(resourceID), 1, true);
resource.setValue(Warehouse.getCostForResource(resourceID)); //resource.setValue(Warehouse.getCostForResource(resourceID));
resourceMerchant.getCharItemManager().addItemToInventory(resource); //resourceMerchant.getCharItemManager().addItemToInventory(resource);
MobEquipment resource = new MobEquipment(ItemBase.getItemBase(resourceID),0,0);
resourceMerchant.contract.getSellInventory().add(resource);
}
for (MobEquipment item : resourceMerchant.contract.getSellInventory()) {
item.magicValue = Warehouse.getCostForResource(item.getItemBase().getUUID());
} }
} }
} }
catch(Exception e){ catch(Exception e){
Logger.error("FAILED TO ADD RUNE MERCHANT"); Logger.error("FAILED TO ADD RUNE MERCHANT");
} }
//try {
// Building sdrHut = BuildingManager.getBuilding(27984);
// if(sdrHut.getHirelings().size() < 2) {
// NPC resourceMerchant = NPC.createNPC("Resource Merchant", 830, Vector3fImmutable.ZERO, Guild.getGuild(6), ZoneManager.getZoneByUUID(656), (short) 70, null);
// resourceMerchant.sellPercent = 0;
// resourceMerchant.contract.vendorDialog = VendorDialog.getVendorDialog(623);
// resourceMerchant.buildingUUID = sdrHut.getObjectUUID();
// resourceMerchant.building = sdrHut;
// NPCManager.slotCharacterInBuilding(resourceMerchant);
// resourceMerchant.setLoc(resourceMerchant.bindLoc);
// //resourceMerchant.contract.getSellInventory().clear();
// Contract contract = resourceMerchant.contract.
// for(int resourceID : Warehouse.getMaxResources().keySet()){
// if(resourceID == 7 || resourceID == 1580021)
// continue;
// MobLoot resource = new MobLoot(resourceMerchant,ItemBase.getItemBase(resourceID), 1, true);
// resource.setValue(Warehouse.getCostForResource(resourceID));
// resourceMerchant.getCharItemManager().addItemToInventory(resource);
// }
// }
//}
//catch(Exception e){
// Logger.error("FAILED TO ADD RUNE MERCHANT");
//}
Logger.info("time to load World Objects: " + (System.currentTimeMillis() - start) + " ms"); Logger.info("time to load World Objects: " + (System.currentTimeMillis() - start) + " ms");
} }

Write Preview
Loading…
Cancel
Save