Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 28836a7a4f | |||
| 5511dc7899 | |||
| e5b2247204 | |||
| 0404ca1a94 | |||
| 9ad5f239b0 | |||
| 3db8ee7afd |
@@ -265,12 +265,12 @@ public enum ForgeManager implements Runnable {
|
|||||||
|
|
||||||
// Assign a prefix and suffix to this item if random rolled
|
// Assign a prefix and suffix to this item if random rolled
|
||||||
|
|
||||||
if (workOrder.prefixToken == 0)
|
if (workOrder.prefixToken == 0 && workOrder.vendor.getItemModTable().contains((template.modTable)))
|
||||||
forgedItem.prefixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.PREFIX, template.modTable);
|
forgedItem.prefixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.PREFIX, template.modTable);
|
||||||
else
|
else
|
||||||
forgedItem.prefixToken = workOrder.prefixToken;
|
forgedItem.prefixToken = workOrder.prefixToken;
|
||||||
|
|
||||||
if (workOrder.suffixToken == 0)
|
if (workOrder.suffixToken == 0 && workOrder.vendor.getItemModTable().contains((template.modTable)))
|
||||||
forgedItem.suffixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.SUFFIX, template.modTable);
|
forgedItem.suffixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.SUFFIX, template.modTable);
|
||||||
else
|
else
|
||||||
forgedItem.suffixToken = workOrder.suffixToken;
|
forgedItem.suffixToken = workOrder.suffixToken;
|
||||||
|
|||||||
@@ -135,7 +135,8 @@ public class WorkOrder implements Delayed {
|
|||||||
if (!workOrder.vendor.charItemManager.hasRoomInventory(template.item_wt))
|
if (!workOrder.vendor.charItemManager.hasRoomInventory(template.item_wt))
|
||||||
return 30; //30: That person cannot carry that item
|
return 30; //30: That person cannot carry that item
|
||||||
|
|
||||||
if (!workOrder.vendor.getItemModTable().contains((template.modTable)))
|
if ((workOrder.prefixToken != 0 || workOrder.suffixToken != 0) &&
|
||||||
|
!workOrder.vendor.getItemModTable().contains((template.modTable)))
|
||||||
return 59; //59: This hireling does not have this formula
|
return 59; //59: This hireling does not have this formula
|
||||||
|
|
||||||
if (!Warehouse.calcCostOverrun(workOrder).isEmpty())
|
if (!Warehouse.calcCostOverrun(workOrder).isEmpty())
|
||||||
|
|||||||
@@ -2732,7 +2732,7 @@ public class mbEnums {
|
|||||||
DIAMOND(1580010, 1540225085, -1730704107, 2000, 20),
|
DIAMOND(1580010, 1540225085, -1730704107, 2000, 20),
|
||||||
GALVOR(1580017, -1683992404, -1596311545, 2000, 5),
|
GALVOR(1580017, -1683992404, -1596311545, 2000, 5),
|
||||||
IRON(1580002, -1673518119, 2504297, 2000, 20),
|
IRON(1580002, -1673518119, 2504297, 2000, 20),
|
||||||
LUMBER(1580004, 1628412684, -1603256692, 10000, 100),
|
LUMBER(1580004, -1628412684, -1603256692, 10000, 100),
|
||||||
MANDRAKE(1580007, 1519910613, 1191391799, 1000, 10),
|
MANDRAKE(1580007, 1519910613, 1191391799, 1000, 10),
|
||||||
MITHRIL(1580021, 626743397, -1761257186, 500, 5),
|
MITHRIL(1580021, 626743397, -1761257186, 500, 5),
|
||||||
OAK(1580005, -1653034775, 74767, 3000, 30),
|
OAK(1580005, -1653034775, 74767, 3000, 30),
|
||||||
|
|||||||
@@ -306,8 +306,22 @@ public class City extends AbstractWorldObject {
|
|||||||
if (city.parentZone == null)
|
if (city.parentZone == null)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
//can't repledge to a guild you're already part of
|
// Can't teleport to something without a tree
|
||||||
|
|
||||||
|
if (city.getTOL() == null)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
// No abandoned cities
|
||||||
|
|
||||||
|
if (city.getTOL().getGuild().isEmptyGuild())
|
||||||
|
continue;
|
||||||
|
|
||||||
|
// No destroyed cities
|
||||||
|
|
||||||
|
if (city.getTOL().getRank() == -1)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
//can't repledge to a guild you're already part of
|
||||||
if (repledge && city.getGuild().equals(playerCharacter.guild))
|
if (repledge && city.getGuild().equals(playerCharacter.guild))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
|||||||
@@ -220,8 +220,7 @@ public class Mine extends AbstractGameObject {
|
|||||||
// Only inactive mines are returned.
|
// Only inactive mines are returned.
|
||||||
|
|
||||||
for (Mine mine : Mine.mineMap.keySet()) {
|
for (Mine mine : Mine.mineMap.keySet()) {
|
||||||
if (mine.owningGuild.getObjectUUID() == guildID &&
|
if (mine.owningGuild.getObjectUUID() == guildID)
|
||||||
mine.isActive == false)
|
|
||||||
mineList.add(mine);
|
mineList.add(mine);
|
||||||
}
|
}
|
||||||
return mineList;
|
return mineList;
|
||||||
|
|||||||
@@ -95,6 +95,12 @@ public class DestroyCityThread implements Runnable {
|
|||||||
if (cityBuilding == null)
|
if (cityBuilding == null)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
// check null bluepritn and log error
|
||||||
|
if (cityBuilding.getBlueprint() == null){
|
||||||
|
Logger.error("Null Blueprint for building ID: " + cityBuilding.getObjectUUID());
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
// Do nothing with the banestone. It will be removed elsewhere
|
// Do nothing with the banestone. It will be removed elsewhere
|
||||||
|
|
||||||
if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.BANESTONE))
|
if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.BANESTONE))
|
||||||
|
|||||||
Reference in New Issue
Block a user