Browse Source

adjust mines

lakebane-master
FatBoy-DOTC 8 months ago
parent
commit
d04cad0484
  1. 34
      src/engine/gameManager/SimulationManager.java
  2. 2
      src/engine/objects/Mob.java
  3. 2
      src/engine/workthreads/HourlyJobThread.java

34
src/engine/gameManager/SimulationManager.java

@ -19,8 +19,12 @@ import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDateTime;
import java.util.Collection; import java.util.Collection;
import static engine.workthreads.HourlyJobThread.mineWindowClose;
import static engine.workthreads.HourlyJobThread.mineWindowOpen;
/* /*
* This class contains all methods necessary to drive periodic * This class contains all methods necessary to drive periodic
* updates of the game simulation from the main _exec loop. * updates of the game simulation from the main _exec loop.
@ -128,7 +132,7 @@ public enum SimulationManager {
if ((_minePulseTime != 0) if ((_minePulseTime != 0)
&& (System.currentTimeMillis() > _minePulseTime)) && (System.currentTimeMillis() > _minePulseTime))
pulseMines(); pulseMines();
} catch (Exception e) { } catch (Exception e) {
Logger.error( Logger.error(
"Fatal error in Mine Pulse: DISABLED. Error Message : " "Fatal error in Mine Pulse: DISABLED. Error Message : "
+ e.getMessage()); + e.getMessage());
@ -228,14 +232,30 @@ public enum SimulationManager {
} }
private void pulseMines(){ private void pulseMines(){
Mine mine; for(Mine mine : Mine.getMines()) {
Collection<AbstractGameObject> mineList = DbManager.getList(Enum.GameObjectType.Mine); if (LocalDateTime.now().getHour() == 1) {
mine.wasClaimed = false;
mine.hasProduced = false;
}
int minute = 0;
if (mine.firstThirty == false)
minute = 30;
LocalDateTime openTime = LocalDateTime.now().withHour(mine.liveTime).withMinute(minute).withSecond(0);
LocalDateTime closeTime = openTime.plusMinutes(30);
if (!mine.isActive && LocalDateTime.now().isAfter(openTime) && LocalDateTime.now().isBefore(closeTime)) {
mine.setActive(true);
ChatManager.chatSystemChannel(mine.getZoneName() + "'s Mine is now Active!");
Logger.info(mine.getZoneName() + "'s Mine is now Active!");
continue;
}
if (mineList == null) { if (mine.isActive && (LocalDateTime.now().isAfter(closeTime) || LocalDateTime.now().isBefore(openTime))) {
Logger.info("Mine List null"); mineWindowClose(mine);
return; }
} }
_minePulseTime = System.currentTimeMillis() + CITY_PULSE; _minePulseTime = System.currentTimeMillis() + CITY_PULSE;
} }
} }

2
src/engine/objects/Mob.java

@ -1145,7 +1145,7 @@ public class Mob extends AbstractIntelligenceAgent {
public void calculateAtrDefenseDamage() { public void calculateAtrDefenseDamage() {
if (this.charItemManager == null || this.equip == null) { if (this.charItemManager == null || this.equip == null) {
Logger.error("Player " + currentID + " missing skills or equipment"); //Logger.error("Player " + currentID + " missing skills or equipment");
defaultAtrAndDamage(true); defaultAtrAndDamage(true);
defaultAtrAndDamage(false); defaultAtrAndDamage(false);
this.defenseRating = 0; this.defenseRating = 0;

2
src/engine/workthreads/HourlyJobThread.java

@ -218,7 +218,7 @@ public class HourlyJobThread implements Runnable {
//Logger.info("Hourly job is now running."); //Logger.info("Hourly job is now running.");
processMineWindow(); //processMineWindow();
// Reset time-gated access to WOO slider. // Reset time-gated access to WOO slider.
// *** Do this after the mines open/close! // *** Do this after the mines open/close!

Loading…
Cancel
Save