Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b944847b8a | |||
| cdf6465f60 |
+2
-2
@@ -24,5 +24,5 @@
|
||||
hs_err_pid*
|
||||
replay_pid*
|
||||
|
||||
.idea/
|
||||
*.iml
|
||||
*.code-workspace
|
||||
|
||||
|
||||
@@ -1196,6 +1196,7 @@ public class Enum {
|
||||
Durability,
|
||||
ExclusiveDamageCap,
|
||||
Fade,
|
||||
Fear,
|
||||
Fly,
|
||||
Health,
|
||||
HealthFull,
|
||||
|
||||
@@ -280,6 +280,9 @@ public class dbEffectsBaseHandler extends dbHandlerBase {
|
||||
case Stunned:
|
||||
abstractEffectModifier = new StunnedEffectModifier(rs);
|
||||
break;
|
||||
case Fear:
|
||||
abstractEffectModifier = new FearEffectModifier(rs);
|
||||
break;
|
||||
case Value:
|
||||
abstractEffectModifier = new ValueEffectModifier(rs);
|
||||
if (effectBase != null) {
|
||||
|
||||
@@ -14,7 +14,6 @@ import engine.gameManager.ChatManager;
|
||||
import engine.objects.AbstractGameObject;
|
||||
import engine.objects.Item;
|
||||
import engine.objects.PlayerCharacter;
|
||||
import engine.server.MBServerStatics;
|
||||
|
||||
/**
|
||||
* @author Eighty
|
||||
@@ -47,10 +46,10 @@ public class AddGoldCmd extends AbstractDevCmd {
|
||||
throwbackError(pc, "Quantity must be a number, " + words[0] + " is invalid");
|
||||
return;
|
||||
}
|
||||
if (amt < 1 || amt > MBServerStatics.PLAYER_GOLD_LIMIT) {
|
||||
throwbackError(pc, "Quantity must be between 1 and " + MBServerStatics.PLAYER_GOLD_LIMIT);
|
||||
if (amt < 1 || amt > 10000000) {
|
||||
throwbackError(pc, "Quantity must be between 1 and 10000000 (10 million)");
|
||||
return;
|
||||
} else if ((curAmt + amt) > MBServerStatics.PLAYER_GOLD_LIMIT) {
|
||||
} else if ((curAmt + amt) > 10000000) {
|
||||
throwbackError(pc, "This would place your inventory over 10,000,000 gold.");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -16,7 +16,6 @@ import engine.devcmd.AbstractDevCmd;
|
||||
import engine.gameManager.DbManager;
|
||||
import engine.objects.*;
|
||||
import engine.powers.EffectsBase;
|
||||
import engine.server.MBServerStatics;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
@@ -32,82 +31,47 @@ public class MakeItemCmd extends AbstractDevCmd {
|
||||
@Override
|
||||
protected void _doCmd(PlayerCharacter pc, String[] words,
|
||||
AbstractGameObject target) {
|
||||
|
||||
if (words[0].equals("resources")) {
|
||||
|
||||
int resourceAmount = 1000;
|
||||
|
||||
if (words.length > 1) {
|
||||
try {
|
||||
resourceAmount = Integer.parseInt(words[1]);
|
||||
} catch (NumberFormatException e) {
|
||||
throwbackError(pc, "Resource amount must be a number.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (resourceAmount < 1)
|
||||
resourceAmount = 1;
|
||||
|
||||
resourceAmount = Math.min(
|
||||
resourceAmount,
|
||||
MBServerStatics.RESOURCE_STACK_LIMIT
|
||||
);
|
||||
|
||||
for (int ibID : Warehouse.getMaxResources().keySet()) {
|
||||
|
||||
if (ibID == 7)
|
||||
continue;
|
||||
|
||||
ItemBase ib = ItemBase.getItemBase(ibID);
|
||||
|
||||
if (ib == null)
|
||||
continue;
|
||||
|
||||
short weight = ib.getWeight();
|
||||
|
||||
if (!pc.getCharItemManager().hasRoomInventory(weight)) {
|
||||
throwbackError(pc, "Not enough room in inventory for any more resources.");
|
||||
throwbackError(pc, "Not enough room in inventory for any more of this item");
|
||||
|
||||
pc.getCharItemManager().updateInventory();
|
||||
return;
|
||||
}
|
||||
|
||||
Item item = new Item(
|
||||
ib,
|
||||
pc.getObjectUUID(),
|
||||
OwnerType.PlayerCharacter,
|
||||
(byte) 0,
|
||||
(byte) 0,
|
||||
(short) ib.getDurability(),
|
||||
(short) ib.getDurability(),
|
||||
true,
|
||||
false,
|
||||
ItemContainerType.INVENTORY,
|
||||
(byte) 0,
|
||||
new ArrayList<>(),
|
||||
""
|
||||
);
|
||||
boolean worked = false;
|
||||
Item item = new Item(ib, pc.getObjectUUID(),
|
||||
OwnerType.PlayerCharacter, (byte) 0, (byte) 0, (short) ib.getDurability(), (short) ib.getDurability(),
|
||||
true, false, ItemContainerType.INVENTORY, (byte) 0,
|
||||
new ArrayList<>(), "");
|
||||
|
||||
item.setNumOfItems(resourceAmount);
|
||||
item.setNumOfItems(Warehouse.getMaxResources().get(ibID));
|
||||
|
||||
try {
|
||||
item = DbManager.ItemQueries.ADD_ITEM(item);
|
||||
worked = true;
|
||||
} catch (Exception e) {
|
||||
throwbackError(
|
||||
pc,
|
||||
"Unable to create resource " + ib.getName() + ": " + e.getMessage()
|
||||
);
|
||||
throwbackError(pc, "DB error 1: Unable to create item. " + e.getMessage());
|
||||
return;
|
||||
}
|
||||
|
||||
if (item == null) {
|
||||
throwbackError(pc, "Unable to create resource " + ib.getName() + ".");
|
||||
if (item == null || !worked) {
|
||||
throwbackError(pc, "DB error 2: Unable to create item.");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
//add item to inventory
|
||||
pc.getCharItemManager().addItemToInventory(item);
|
||||
}
|
||||
|
||||
pc.getCharItemManager().updateInventory();
|
||||
return;
|
||||
}
|
||||
if (words.length < 3 || words.length > 5) {
|
||||
@@ -136,7 +100,7 @@ public class MakeItemCmd extends AbstractDevCmd {
|
||||
return;
|
||||
}
|
||||
numItems = (numItems < 1) ? 1 : numItems;
|
||||
numItems = Math.min(numItems, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
numItems = (numItems > 5000) ? 5000 : numItems;
|
||||
}
|
||||
|
||||
int itembaseID;
|
||||
|
||||
@@ -39,13 +39,6 @@ public class SlotTestCmd extends AbstractDevCmd {
|
||||
|
||||
Building building = (Building) target;
|
||||
|
||||
outString += "Rank: " + building.getRank() + "\r\n";
|
||||
outString += "MaxSlots: " + building.getBlueprint().getMaxSlots() + "\r\n";
|
||||
outString += "SlotsForRank: "
|
||||
+ building.getBlueprint().getSlotsForRank(building.getRank())
|
||||
+ "\r\n";
|
||||
outString += "Hireling Count: " + building.getHirelings().size() + "\r\n\r\n";
|
||||
|
||||
buildingLocations = BuildingManager._slotLocations.get(building.meshUUID);
|
||||
|
||||
if (buildingLocations == null) {
|
||||
|
||||
@@ -433,6 +433,11 @@ public enum CombatManager {
|
||||
if (bonus != null && bonus.getBool(ModType.Stunned, SourceType.None))
|
||||
attackFailure = true;
|
||||
|
||||
//see if attacker is feared. If so, stop here
|
||||
|
||||
if (bonus != null && bonus.getBool(ModType.Fear, SourceType.None))
|
||||
attackFailure = true;
|
||||
|
||||
//Get Range of weapon
|
||||
|
||||
float range;
|
||||
|
||||
@@ -79,6 +79,11 @@ public enum MovementManager {
|
||||
return;
|
||||
}
|
||||
|
||||
// Will this prevent movement at all or only player input for movement?
|
||||
if (toMove.getBonuses().getBool(ModType.Fear, SourceType.None)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (msg.getEndLat() > MBServerStatics.MAX_WORLD_WIDTH)
|
||||
msg.setEndLat((float) MBServerStatics.MAX_WORLD_WIDTH);
|
||||
|
||||
@@ -407,6 +412,10 @@ public enum MovementManager {
|
||||
PlayerBonuses bonus = member.getBonuses();
|
||||
if (bonus.getBool(ModType.Stunned, SourceType.None) || bonus.getBool(ModType.CannotMove, SourceType.None))
|
||||
continue;
|
||||
|
||||
//don't move if player is feared
|
||||
if (bonus.getBool(ModType.Fear, SourceType.None))
|
||||
continue;
|
||||
|
||||
member.update();
|
||||
|
||||
|
||||
@@ -313,6 +313,9 @@ public enum PowersManager {
|
||||
if (bonus != null && (bonus.getBool(ModType.Stunned, SourceType.None) || bonus.getBool(ModType.CannotCast, SourceType.None) || bonus.getBool(ModType.BlockedPowerType, sourceType)))
|
||||
return true;
|
||||
|
||||
if (bonus != null && bonus.getBool(ModType.Fear, SourceType.None))
|
||||
return true;
|
||||
|
||||
// if moving make sure spell valid for movement
|
||||
Vector3fImmutable endLoc = playerCharacter.getEndLoc();
|
||||
|
||||
@@ -595,6 +598,9 @@ public enum PowersManager {
|
||||
SourceType sourceType = SourceType.GetSourceType(pb.getCategory());
|
||||
if (bonus != null && (bonus.getBool(ModType.Stunned, SourceType.None) || bonus.getBool(ModType.CannotCast, SourceType.None) || bonus.getBool(ModType.BlockedPowerType, sourceType)))
|
||||
return true;
|
||||
|
||||
if (bonus != null && bonus.getBool(ModType.Fear, SourceType.None))
|
||||
return true;
|
||||
|
||||
// if moving make sure spell valid for movement
|
||||
// if flying, make sure spell valid for flying.
|
||||
@@ -761,6 +767,11 @@ public enum PowersManager {
|
||||
finishRecycleTime(msg.getPowerUsedID(), playerCharacter, true);
|
||||
return;
|
||||
}
|
||||
|
||||
if (bonus.getBool(ModType.Fear, SourceType.None)) {
|
||||
finishRecycleTime(msg.getPowerUsedID(), playerCharacter, true);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// get target loc
|
||||
@@ -1042,6 +1053,9 @@ public enum PowersManager {
|
||||
return;
|
||||
}
|
||||
|
||||
if (bonus != null && bonus.getBool(ModType.Fear, SourceType.None))
|
||||
return;
|
||||
|
||||
msg.setNumTrains(9999);
|
||||
msg.setUnknown04(2);
|
||||
DispatchMessage.sendToAllInRange(caster, msg);
|
||||
@@ -2565,6 +2579,10 @@ public enum PowersManager {
|
||||
|
||||
}
|
||||
|
||||
public static void cancelOnFear(AbstractCharacter ac) {
|
||||
|
||||
}
|
||||
|
||||
private static PowersBase getLastPower(AbstractCharacter ac) {
|
||||
if (ac == null)
|
||||
return null;
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
package engine.jobs;
|
||||
|
||||
import engine.job.AbstractJob;
|
||||
import engine.objects.AbstractCharacter;
|
||||
import engine.math.Vector3fImmutable;
|
||||
import engine.server.MBServerStatics;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
public class FearWanderJob extends AbstractJob {
|
||||
private final AbstractCharacter target;
|
||||
private final Random rand = new Random();
|
||||
|
||||
public FearWanderJob(AbstractCharacter target) {
|
||||
super();
|
||||
this.target = target;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void doJob() {
|
||||
// Only wander if still feared
|
||||
if (target == null || !target.getBonuses().getBool(engine.Enum.ModType.Fear, engine.Enum.SourceType.None))
|
||||
return;
|
||||
|
||||
// Pick a random direction and distance
|
||||
float angle = rand.nextFloat() * (float)Math.PI * 2f;
|
||||
float distance = 5f + rand.nextFloat() * 10f; // 5-15 units
|
||||
|
||||
Vector3fImmutable current = target.getLoc();
|
||||
float newX = current.x + (float)Math.cos(angle) * distance;
|
||||
float newZ = current.z + (float)Math.sin(angle) * distance;
|
||||
|
||||
// Clamp to world bounds if needed
|
||||
newX = (float) Math.max(0, Math.min(newX, MBServerStatics.MAX_WORLD_WIDTH));
|
||||
newZ = (float) Math.max(0, Math.min(newZ, MBServerStatics.MAX_WORLD_HEIGHT));
|
||||
|
||||
Vector3fImmutable dest = new Vector3fImmutable(newX, current.y, newZ);
|
||||
|
||||
// Issue movement (implement setEndLoc or similar in your AbstractCharacter)
|
||||
target.setEndLoc(dest);
|
||||
}
|
||||
}
|
||||
@@ -124,7 +124,7 @@ public class CombatUtilities {
|
||||
}
|
||||
|
||||
public static boolean canSwing(Mob agent) {
|
||||
return (agent.isAlive() && !agent.getBonuses().getBool(ModType.Stunned, SourceType.None));
|
||||
return (agent.isAlive() && !agent.getBonuses().getBool(ModType.Stunned, SourceType.None) && !agent.getBonuses().getBool(ModType.Fear, SourceType.None));
|
||||
}
|
||||
|
||||
public static void swingIsMiss(Mob agent, AbstractWorldObject target, int animation) {
|
||||
|
||||
@@ -169,7 +169,7 @@ public class MovementUtilities {
|
||||
if (agent.getMobBase() != null && Enum.MobFlagType.SENTINEL.elementOf(agent.getMobBase().getFlags()))
|
||||
return false;
|
||||
|
||||
return (agent.isAlive() && !agent.getBonuses().getBool(ModType.Stunned, SourceType.None) && !agent.getBonuses().getBool(ModType.CannotMove, SourceType.None));
|
||||
return (agent.isAlive() && !agent.getBonuses().getBool(ModType.Stunned, SourceType.None) && !agent.getBonuses().getBool(ModType.Fear, SourceType.None) && !agent.getBonuses().getBool(ModType.CannotMove, SourceType.None));
|
||||
}
|
||||
|
||||
public static Vector3fImmutable randomPatrolLocation(Mob agent, Vector3fImmutable center, float radius) {
|
||||
|
||||
@@ -1259,7 +1259,7 @@ public class ClientMessagePump implements NetMsgHandler {
|
||||
|
||||
cost *= profit;
|
||||
|
||||
if (gold.getNumOfItems() + cost > MBServerStatics.PLAYER_GOLD_LIMIT) {
|
||||
if (gold.getNumOfItems() + cost > 10000000) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -1653,6 +1653,30 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
|
||||
PowersManager.cancelOnStun(this);
|
||||
}
|
||||
|
||||
public final void cancelOnFear() {
|
||||
boolean changed = false;
|
||||
for (String s : this.effects.keySet()) {
|
||||
Effect eff = this.effects.get(s);
|
||||
if (eff == null)
|
||||
continue;
|
||||
if (eff.cancelOnFear() && eff.cancel()) {
|
||||
eff.cancelJob();
|
||||
this.effects.remove(s);
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
|
||||
JobContainer wanderJob = this.getTimers().get("FearWander");
|
||||
if (wanderJob != null) {
|
||||
wanderJob.cancelJob();
|
||||
this.getTimers().remove("FearWander");
|
||||
}
|
||||
if (changed) {
|
||||
applyBonuses();
|
||||
}
|
||||
PowersManager.cancelOnFear(this);
|
||||
}
|
||||
|
||||
//Call to apply any new effects to player
|
||||
public synchronized void applyBonuses() {
|
||||
PlayerCharacter player;
|
||||
|
||||
@@ -335,7 +335,7 @@ public class Blueprint {
|
||||
availableSlots = 3;
|
||||
break;
|
||||
case 8:
|
||||
availableSlots = Math.min(3, this.maxSlots);
|
||||
availableSlots = 1;
|
||||
break;
|
||||
default:
|
||||
availableSlots = 0;
|
||||
|
||||
@@ -2335,14 +2335,15 @@ public class CharacterItemManager {
|
||||
}
|
||||
|
||||
|
||||
if (this.getGoldInventory().getNumOfItems() + goldFrom2 > MBServerStatics.PLAYER_GOLD_LIMIT) {
|
||||
if (this.getGoldInventory().getNumOfItems() + goldFrom2 > 10000000) {
|
||||
PlayerCharacter pc = (PlayerCharacter) this.absCharacter;
|
||||
if (pc.getClientConnection() != null)
|
||||
ErrorPopupMsg.sendErrorPopup(pc, 202);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (tradingWith.getGoldInventory().getNumOfItems() + goldFrom1 > MBServerStatics.PLAYER_GOLD_LIMIT) {
|
||||
|
||||
if (tradingWith.getGoldInventory().getNumOfItems() + goldFrom1 > 10000000) {
|
||||
PlayerCharacter pc = (PlayerCharacter) tradingWith.absCharacter;
|
||||
if (pc.getClientConnection() != null)
|
||||
ErrorPopupMsg.sendErrorPopup(pc, 202);
|
||||
|
||||
@@ -48,6 +48,7 @@ public class Effect {
|
||||
private boolean cancelOnTerritoryClaim;
|
||||
private boolean cancelOnUnEquip;
|
||||
private boolean cancelOnStun;
|
||||
private boolean cancelOnFear;
|
||||
private boolean bakedInStat = false;
|
||||
private boolean isStatic = false;
|
||||
private int effectSourceType = 0;
|
||||
@@ -80,6 +81,7 @@ public class Effect {
|
||||
this.cancelOnTerritoryClaim = false;
|
||||
this.cancelOnUnEquip = false;
|
||||
this.cancelOnStun = false;
|
||||
this.cancelOnFear = false;
|
||||
this.eb = eb;
|
||||
this.trains = trains;
|
||||
}
|
||||
@@ -99,6 +101,7 @@ public class Effect {
|
||||
this.cancelOnTerritoryClaim = false;
|
||||
this.cancelOnUnEquip = false;
|
||||
this.cancelOnStun = false;
|
||||
this.cancelOnFear = false;
|
||||
this.eb = eb;
|
||||
this.trains = trains;
|
||||
this.isStatic = isStatic;
|
||||
@@ -581,6 +584,12 @@ public class Effect {
|
||||
return this.cancelOnStun;
|
||||
}
|
||||
|
||||
public boolean cancelOnFear() {
|
||||
if (this.eb == null)
|
||||
return true;
|
||||
return this.cancelOnFear;
|
||||
}
|
||||
|
||||
public boolean cancelOnTakeDamage() {
|
||||
if (this.eb == null)
|
||||
return true;
|
||||
|
||||
@@ -674,6 +674,46 @@ public class Item extends AbstractWorldObject {
|
||||
public static Item newGoldItem(AbstractWorldObject awo, ItemBase ib, Enum.ItemContainerType containerType) {
|
||||
return newGoldItem(awo, ib, containerType, true);
|
||||
}
|
||||
|
||||
//used for vault!
|
||||
public static Item newGoldItem(int accountID, ItemBase ib, Enum.ItemContainerType containerType) {
|
||||
return newGoldItem(accountID, ib, containerType, true);
|
||||
}
|
||||
|
||||
private static Item newGoldItem(int accountID, ItemBase ib, Enum.ItemContainerType containerType, boolean persist) {
|
||||
|
||||
int ownerID;
|
||||
OwnerType ownerType;
|
||||
|
||||
ownerID = accountID;
|
||||
ownerType = OwnerType.Account;
|
||||
|
||||
|
||||
Item newGold = new Item(ib, ownerID, ownerType,
|
||||
(byte) 0, (byte) 0, (short) 0, (short) 0, true, false, containerType, (byte) 0,
|
||||
new ArrayList<>(), "");
|
||||
|
||||
synchronized (newGold) {
|
||||
newGold.numberOfItems = 0;
|
||||
}
|
||||
|
||||
if (persist) {
|
||||
try {
|
||||
newGold = DbManager.ItemQueries.ADD_ITEM(newGold);
|
||||
if (newGold != null) {
|
||||
synchronized (newGold) {
|
||||
newGold.numberOfItems = 0;
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Logger.error(e);
|
||||
}
|
||||
DbManager.ItemQueries.ZERO_ITEM_STACK(newGold);
|
||||
}
|
||||
|
||||
return newGold;
|
||||
}
|
||||
|
||||
private static Item newGoldItem(AbstractWorldObject awo, ItemBase ib, Enum.ItemContainerType containerType, boolean persist) {
|
||||
|
||||
int ownerID;
|
||||
@@ -731,49 +771,10 @@ public class Item extends AbstractWorldObject {
|
||||
}
|
||||
DbManager.ItemQueries.ZERO_ITEM_STACK(newGold);
|
||||
}
|
||||
|
||||
newGold.containerType = containerType;
|
||||
|
||||
return newGold;
|
||||
}
|
||||
//used for vault!
|
||||
public static Item newGoldItem(int accountID, ItemBase ib, Enum.ItemContainerType containerType) {
|
||||
return newGoldItem(accountID, ib, containerType, true);
|
||||
}
|
||||
|
||||
private static Item newGoldItem(int accountID, ItemBase ib, Enum.ItemContainerType containerType, boolean persist) {
|
||||
|
||||
int ownerID;
|
||||
OwnerType ownerType;
|
||||
|
||||
ownerID = accountID;
|
||||
ownerType = OwnerType.Account;
|
||||
|
||||
|
||||
Item newGold = new Item(ib, ownerID, ownerType,
|
||||
(byte) 0, (byte) 0, (short) 0, (short) 0, true, false, containerType, (byte) 0,
|
||||
new ArrayList<>(), "");
|
||||
|
||||
synchronized (newGold) {
|
||||
newGold.numberOfItems = 0;
|
||||
}
|
||||
|
||||
if (persist) {
|
||||
try {
|
||||
newGold = DbManager.ItemQueries.ADD_ITEM(newGold);
|
||||
if (newGold != null) {
|
||||
synchronized (newGold) {
|
||||
newGold.numberOfItems = 0;
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Logger.error(e);
|
||||
}
|
||||
DbManager.ItemQueries.ZERO_ITEM_STACK(newGold);
|
||||
}
|
||||
|
||||
return newGold;
|
||||
}
|
||||
|
||||
// This is to be used for trades - the new item is not stored in the database
|
||||
public static Item newGoldItemTemp(AbstractWorldObject awo, ItemBase ib) {
|
||||
|
||||
@@ -1249,7 +1249,7 @@ public class Mob extends AbstractIntelligenceAgent {
|
||||
if (!this.isMoving())
|
||||
return;
|
||||
|
||||
if (this.isAlive() == false || this.getBonuses().getBool(ModType.Stunned, SourceType.None) || this.getBonuses().getBool(ModType.CannotMove, SourceType.None)) {
|
||||
if (this.isAlive() == false || this.getBonuses().getBool(ModType.Stunned, SourceType.None) || this.getBonuses().getBool(ModType.Fear, SourceType.None) || this.getBonuses().getBool(ModType.CannotMove, SourceType.None)) {
|
||||
//Target is stunned or rooted. Don't move
|
||||
|
||||
this.stopMovement(this.getMovementLoc());
|
||||
|
||||
@@ -1239,17 +1239,12 @@ public class PlayerCharacter extends AbstractCharacter {
|
||||
playerCharacter.deactivateCharacter();
|
||||
return null;
|
||||
}
|
||||
// Ebonreach: give new characters starter gold.
|
||||
Item starterGold = Item.newGoldItem(playerCharacter, ItemBase.getItemBase(7), Enum.ItemContainerType.INVENTORY);
|
||||
|
||||
if (starterGold != null)
|
||||
DbManager.ItemQueries.UPDATE_GOLD(starterGold, 10000);
|
||||
|
||||
// Get any new skills that belong to the player
|
||||
playerCharacter.calculateSkills();
|
||||
|
||||
a.setLastCharacter(playerCharacter.getObjectUUID());
|
||||
playerCharacter.getCharItemManager().load();
|
||||
playerCharacter.charItemManager.load();
|
||||
|
||||
playerCharacter.activateCharacter();
|
||||
|
||||
@@ -4412,6 +4407,10 @@ public class PlayerCharacter extends AbstractCharacter {
|
||||
if (this.bonuses.getBool(ModType.Stunned, SourceType.None))
|
||||
return 0f;
|
||||
|
||||
if (this.bonuses.getBool(
|
||||
ModType.Fear, SourceType.None))
|
||||
return 0f;
|
||||
|
||||
// Get base skill amount
|
||||
CharacterSkill sk = this.skills.get(type);
|
||||
float amount;
|
||||
@@ -4441,6 +4440,10 @@ public class PlayerCharacter extends AbstractCharacter {
|
||||
// must not be stunned
|
||||
if (this.bonuses.getBool(ModType.Stunned, SourceType.None))
|
||||
return 0f;
|
||||
|
||||
if (this.bonuses.getBool(ModType.Fear, SourceType.None))
|
||||
return 0f;
|
||||
|
||||
|
||||
// Get base skill amount
|
||||
CharacterSkill sk = this.skills.get(sourceType.name());
|
||||
@@ -4902,6 +4905,12 @@ public class PlayerCharacter extends AbstractCharacter {
|
||||
this.region = AbstractWorldObject.GetRegionByWorldObject(this);
|
||||
return;
|
||||
}
|
||||
if (this.isAlive() == false || this.getBonuses().getBool(ModType.Fear, SourceType.None)) {
|
||||
//Target is feared. Don't move
|
||||
this.stopMovement(newLoc);
|
||||
this.region = AbstractWorldObject.GetRegionByWorldObject(this);
|
||||
return;
|
||||
}
|
||||
if (newLoc.equals(this.getEndLoc())) {
|
||||
this.stopMovement(newLoc);
|
||||
this.region = AbstractWorldObject.GetRegionByWorldObject(this);
|
||||
|
||||
@@ -99,29 +99,29 @@ public class Warehouse extends AbstractWorldObject {
|
||||
|
||||
public static ConcurrentHashMap<Integer, Integer> getMaxResources() {
|
||||
if (maxResources.size() != 23) {
|
||||
maxResources.put(7, 1000000000);
|
||||
maxResources.put(1580000, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(1580001, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(1580002, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(1580003, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(1580004, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(1580005, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(1580006, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(1580007, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(1580008, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(1580009, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(1580010, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(1580011, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(1580012, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(1580013, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(1580014, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(1580015, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(1580016, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(1580017, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(1580018, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(1580019, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(1580020, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(1580021, MBServerStatics.RESOURCE_STACK_LIMIT);
|
||||
maxResources.put(7, 100000000);
|
||||
maxResources.put(1580000, 10000);
|
||||
maxResources.put(1580001, 2000);
|
||||
maxResources.put(1580002, 2000);
|
||||
maxResources.put(1580003, 1000);
|
||||
maxResources.put(1580004, 10000);
|
||||
maxResources.put(1580005, 3000);
|
||||
maxResources.put(1580006, 3000);
|
||||
maxResources.put(1580007, 1000);
|
||||
maxResources.put(1580008, 3000);
|
||||
maxResources.put(1580009, 2000);
|
||||
maxResources.put(1580010, 2000);
|
||||
maxResources.put(1580011, 1000);
|
||||
maxResources.put(1580012, 2000);
|
||||
maxResources.put(1580013, 3000);
|
||||
maxResources.put(1580014, 1000);
|
||||
maxResources.put(1580015, 1000);
|
||||
maxResources.put(1580016, 1000);
|
||||
maxResources.put(1580017, 500);
|
||||
maxResources.put(1580018, 500);
|
||||
maxResources.put(1580019, 500);
|
||||
maxResources.put(1580020, 500);
|
||||
maxResources.put(1580021, 500);
|
||||
}
|
||||
|
||||
return maxResources;
|
||||
|
||||
@@ -247,6 +247,8 @@ public class ActionsBase {
|
||||
//TODO make this more efficient then testing strings
|
||||
if (this.stackType.equals("Stun") && bonus.getBool(ModType.ImmuneTo, SourceType.Stun))
|
||||
return true; //Currently stun immune. Skip stun
|
||||
else if (this.stackType.equals("Fear") && bonus.getBool(ModType.ImmuneTo, SourceType.Fear))
|
||||
return true; //Currently fear immune. Skip fear
|
||||
else if (this.stackType.equals("Snare") && bonus.getBool(ModType.ImmuneTo, SourceType.Snare))
|
||||
return true; //Currently snare immune. Skip snare
|
||||
else if (this.stackType.equals("Blindness") && bonus.getBool(ModType.ImmuneTo, SourceType.Blind))
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ .
|
||||
// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
|
||||
// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
|
||||
// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
|
||||
// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀
|
||||
// Magicbane Emulator Project © 2013 - 2022
|
||||
// www.magicbane.com
|
||||
|
||||
|
||||
package engine.powers.effectmodifiers;
|
||||
|
||||
import engine.Enum.GameObjectType;
|
||||
import engine.Enum.ModType;
|
||||
import engine.Enum.SourceType;
|
||||
import engine.jobs.FearWanderJob;
|
||||
import engine.job.JobContainer;
|
||||
import engine.job.JobScheduler;
|
||||
import engine.jobs.AbstractEffectJob;
|
||||
import engine.objects.*;
|
||||
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
|
||||
public class FearEffectModifier extends AbstractEffectModifier {
|
||||
|
||||
public FearEffectModifier(ResultSet rs) throws SQLException {
|
||||
super(rs);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
|
||||
// Optional: custom logic when fear is applied
|
||||
}
|
||||
|
||||
@Override
|
||||
public void applyBonus(AbstractCharacter ac, int trains) {
|
||||
PlayerBonuses bonus = ac.getBonuses();
|
||||
|
||||
bonus.setBool(this.modType, this.sourceType, true);
|
||||
ac.cancelOnFear();
|
||||
ac.setIsCasting(false);
|
||||
ac.stopMovement(ac.getLoc());
|
||||
|
||||
// Schedule the wander job if not already scheduled
|
||||
if (ac.getTimers().get("FearWander") == null) {
|
||||
JobContainer wanderJob = JobScheduler.getInstance().scheduleJob(
|
||||
new FearWanderJob(ac), 2000
|
||||
);
|
||||
|
||||
ac.getTimers().put("FearWander", wanderJob);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void applyBonus(Item item, int trains) {}
|
||||
@Override
|
||||
public void applyBonus(Building building, int trains) {}
|
||||
}
|
||||
@@ -33,16 +33,15 @@ public class MBServerStatics {
|
||||
// hit box
|
||||
// calcs
|
||||
public static final boolean PRINT_INCOMING_OPCODES = false; // print
|
||||
public static final int BANK_GOLD_LIMIT = 1000000000;
|
||||
public static final int BANK_GOLD_LIMIT = 25000000;
|
||||
// incoming
|
||||
// opcodes to
|
||||
// console
|
||||
public static final int PLAYER_GOLD_LIMIT = 500000000;
|
||||
public static final int PLAYER_GOLD_LIMIT = 10000000;
|
||||
// buildings, npcs
|
||||
/*
|
||||
* Login cache flags
|
||||
*/
|
||||
public static final int RESOURCE_STACK_LIMIT = 1000000000;
|
||||
public static final boolean SKIP_CACHE_LOGIN = false; // skip caching // login server
|
||||
public static final boolean SKIP_CACHE_LOGIN_PLAYER = false; // skip caching // on login
|
||||
public static final boolean SKIP_CACHE_LOGIN_ITEM = false; // skip caching
|
||||
|
||||
Reference in New Issue
Block a user