Browse Source

test mechanics removed

lakebane-master
FatBoy-DOTC 10 months ago
parent
commit
e70b52d88c
  1. 3
      src/engine/InterestManagement/InterestManager.java
  2. 2
      src/engine/gameManager/BuildingManager.java
  3. 6
      src/engine/net/client/handlers/ObjectActionMsgHandler.java
  4. 3
      src/engine/net/client/handlers/UpgradeAssetMsgHandler.java
  5. 3
      src/engine/objects/Mob.java
  6. 3
      src/engine/objects/NPC.java

3
src/engine/InterestManagement/InterestManager.java

@ -533,9 +533,6 @@ public enum InterestManager implements Runnable { @@ -533,9 +533,6 @@ public enum InterestManager implements Runnable {
if(player.level < 10) {
player.setLevel((short) 10);
MobLoot ml = new MobLoot(player,ItemBase.getItemBase(980066),false);
ml.promoteToItem(player);
player.getCharItemManager().addGoldToInventory(50000, true);
}
player.isBoxed = false;
for(PlayerCharacter pc : SessionManager.getAllActivePlayers()){

2
src/engine/gameManager/BuildingManager.java

@ -258,7 +258,7 @@ public enum BuildingManager { @@ -258,7 +258,7 @@ public enum BuildingManager {
if (building == null)
return;
building.upgradeDateTime = LocalDateTime.now().plusMinutes(5);
if (building.getUpgradeDateTime() == null) {
Logger.error("Attempt to submit upgrade job for non-ranking building");
return;

6
src/engine/net/client/handlers/ObjectActionMsgHandler.java

@ -439,8 +439,10 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler { @@ -439,8 +439,10 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
// }
// break;
//}
LootManager.peddleFate(player,item);
int i = 0;
if(i != 0) {
LootManager.peddleFate(player, item);
}
break;
case 30: //water bucket

3
src/engine/net/client/handlers/UpgradeAssetMsgHandler.java

@ -119,8 +119,7 @@ public class UpgradeAssetMsgHandler extends AbstractClientMsgHandler { @@ -119,8 +119,7 @@ public class UpgradeAssetMsgHandler extends AbstractClientMsgHandler {
return true;
}
//dateToUpgrade = LocalDateTime.now().plusHours(buildingToRank.getBlueprint().getRankTime(nextRank));
dateToUpgrade = LocalDateTime.now().plusMinutes(5);
dateToUpgrade = LocalDateTime.now().plusHours(buildingToRank.getBlueprint().getRankTime(nextRank));
BuildingManager.setUpgradeDateTime(buildingToRank, dateToUpgrade, 0);

3
src/engine/objects/Mob.java

@ -1885,8 +1885,7 @@ public class Mob extends AbstractIntelligenceAgent { @@ -1885,8 +1885,7 @@ public class Mob extends AbstractIntelligenceAgent {
if (!building.transferGold(-rankCost, false))
return;
//DateTime dateToUpgrade = DateTime.now().plusHours(Mob.getUpgradeTime(this));
DateTime dateToUpgrade = DateTime.now().plusMinutes(5);
DateTime dateToUpgrade = DateTime.now().plusHours(Mob.getUpgradeTime(this));
Mob.setUpgradeDateTime(this, dateToUpgrade);
// Schedule upgrade job

3
src/engine/objects/NPC.java

@ -1325,8 +1325,7 @@ public class NPC extends AbstractCharacter { @@ -1325,8 +1325,7 @@ public class NPC extends AbstractCharacter {
if (!building.transferGold(-rankCost, false))
return;
//dateToUpgrade = DateTime.now().plusHours(this.getUpgradeTime());
dateToUpgrade = DateTime.now().plusMinutes(5);
dateToUpgrade = DateTime.now().plusHours(this.getUpgradeTime());
this.setUpgradeDateTime(dateToUpgrade);
// Schedule upgrade job

Loading…
Cancel
Save