MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Method cleanup.

Browse Source
This commit is contained in:
MagicBot
2023-08-07 15:52:50 -04:00
parent e382ba2b9a
commit a392c5213c
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/ItemFactory.java
+25 -12
View File
@@ -646,7 +646,7 @@ public class ItemFactory {
} }
public static Item randomRoll(NPC vendor, PlayerCharacter pc, int itemsToRoll, int itemID) { public static Item randomRoll(NPC vendor, PlayerCharacter playerCharacter, int itemsToRoll, int itemBaseID) {
byte itemModTable; byte itemModTable;
int prefixMod = 0; int prefixMod = 0;
int suffixMod = 0; int suffixMod = 0;
@@ -656,28 +656,34 @@ public class ItemFactory {
ModTableEntry prefixEntry = null; ModTableEntry prefixEntry = null;
ModTableEntry suffixEntry = null; ModTableEntry suffixEntry = null;
ItemBase ib = ItemBase.getItemBase(itemID); ItemBase ib = ItemBase.getItemBase(itemBaseID);
if (ib == null) if (ib == null)
return null; return null;
if (!vendor.getCharItemManager().hasRoomInventory(ib.getWeight())) { if (!vendor.getCharItemManager().hasRoomInventory(ib.getWeight())) {
if (pc != null)
ChatManager.chatSystemInfo(pc, vendor.getName() + " " + vendor.getContract().getName() + " Inventory is full."); if (playerCharacter != null)
ChatManager.chatSystemInfo(playerCharacter, vendor.getName() + " " + vendor.getContract().getName() + " Inventory is full.");
return null; return null;
} }
itemModTable = (byte) ib.getModTable(); itemModTable = (byte) ib.getModTable();
if (!vendor.getItemModTable().contains(itemModTable)) { if (!vendor.getItemModTable().contains(itemModTable)) {
if (pc != null)
ErrorPopupMsg.sendErrorPopup(pc, 59); if (playerCharacter != null)
ErrorPopupMsg.sendErrorPopup(playerCharacter, 59);
return null; return null;
} }
for (byte temp : vendor.getItemModTable()) { for (byte temp : vendor.getItemModTable()) {
if (itemModTable != temp) if (itemModTable != temp)
continue; continue;
prefixMod = vendor.getModTypeTable().get(vendor.getItemModTable().indexOf(temp)); prefixMod = vendor.getModTypeTable().get(vendor.getItemModTable().indexOf(temp));
suffixMod = vendor.getModSuffixTable().get(vendor.getItemModTable().indexOf(temp)); suffixMod = vendor.getModSuffixTable().get(vendor.getItemModTable().indexOf(temp));
} }
@@ -711,6 +717,9 @@ public class ItemFactory {
int rollSuffix = ThreadLocalRandom.current().nextInt(1, 100 + 1); int rollSuffix = ThreadLocalRandom.current().nextInt(1, 100 + 1);
// Always have at least one mod on a magic rolled item.
// Suffix will be our backup plan.
if (rollSuffix < 80 || prefixEntry == null) { if (rollSuffix < 80 || prefixEntry == null) {
int randomSuffix = LootManager.TableRoll(vendor.getLevel(), false); int randomSuffix = LootManager.TableRoll(vendor.getLevel(), false);
@@ -720,7 +729,7 @@ public class ItemFactory {
suffix = suffixEntry.action; suffix = suffixEntry.action;
} }
MobLoot toRoll = ItemFactory.produceRandomRoll(vendor, pc, prefix, suffix, itemID); MobLoot toRoll = ItemFactory.produceRandomRoll(vendor, playerCharacter, prefix, suffix, itemBaseID);
if (toRoll == null) if (toRoll == null)
return null; return null;
@@ -739,9 +748,10 @@ public class ItemFactory {
} }
// No job is submitted, as object's upgradetime field // No job is submitted, as object's upgradetime field
// is used to determin whether or not an object has // is used to determine whether an object has
// compelted rolling. The game object exists previously // completed rolling. The game object exists previously
// to this, not when 'compelte' is pressed. // to this, not when 'complete' is pressed.
long upgradeTime = System.currentTimeMillis() + (long) (time * Float.parseFloat(ConfigManager.MB_PRODUCTION_RATE.getValue())); long upgradeTime = System.currentTimeMillis() + (long) (time * Float.parseFloat(ConfigManager.MB_PRODUCTION_RATE.getValue()));
DateTime dateTime = new DateTime(); DateTime dateTime = new DateTime();
@@ -750,14 +760,17 @@ public class ItemFactory {
int playerID = 0; int playerID = 0;
if (pc != null) if (playerCharacter != null)
playerID = pc.getObjectUUID(); playerID = playerCharacter.getObjectUUID();
DbManager.NPCQueries.ADD_TO_PRODUCTION_LIST(toRoll.getObjectUUID(), vendor.getObjectUUID(), toRoll.getItemBaseID(), dateTime, prefix, suffix, toRoll.getCustomName(), true, playerID); DbManager.NPCQueries.ADD_TO_PRODUCTION_LIST(toRoll.getObjectUUID(), vendor.getObjectUUID(), toRoll.getItemBaseID(), dateTime, prefix, suffix, toRoll.getCustomName(), true, playerID);
ProducedItem pi = new ProducedItem(toRoll.getObjectUUID(), vendor.getObjectUUID(), toRoll.getItemBaseID(), dateTime, true, prefix, suffix, toRoll.getCustomName(), playerID); ProducedItem pi = new ProducedItem(toRoll.getObjectUUID(), vendor.getObjectUUID(), toRoll.getItemBaseID(), dateTime, true, prefix, suffix, toRoll.getCustomName(), playerID);
pi.setProducedItemID(toRoll.getObjectUUID()); pi.setProducedItemID(toRoll.getObjectUUID());
pi.setAmount(itemsToRoll); pi.setAmount(itemsToRoll);
ItemQueue produced = ItemQueue.borrow(pi, (long) (time * Float.parseFloat(ConfigManager.MB_PRODUCTION_RATE.getValue()))); ItemQueue produced = ItemQueue.borrow(pi, (long) (time * Float.parseFloat(ConfigManager.MB_PRODUCTION_RATE.getValue())));
ItemProductionManager.send(produced); ItemProductionManager.send(produced);
return toRoll; return toRoll;
} }