From 90da075bb57b53c9982d31a6df74fd754deec80e Mon Sep 17 00:00:00 2001 From: Alex Henry Date: Thu, 21 Sep 2017 00:17:41 -0300 Subject: [PATCH] Tuning down spontaneous feature generation to once every 2 weeks. The world was getting very crowded after 1 year, now with Districts and all. --- .../controller/generator/feature/FeatureGenerator.java | 1 + javelin/view/screen/WorldScreen.java | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/javelin/controller/generator/feature/FeatureGenerator.java b/javelin/controller/generator/feature/FeatureGenerator.java index df54dab33..36134739d 100644 --- a/javelin/controller/generator/feature/FeatureGenerator.java +++ b/javelin/controller/generator/feature/FeatureGenerator.java @@ -162,6 +162,7 @@ GenerationData register(Class class1, * If false will limit spawning to only a starting * set of actors. true is supposed to be used while * the game is progressing to support the full feature set. + * @see GenerationData#starting */ public void spawn(float chance, boolean generatingworld) { if (countplaces() >= World.scenario.startingfeatures diff --git a/javelin/view/screen/WorldScreen.java b/javelin/view/screen/WorldScreen.java index f22c6bba2..a7abce485 100644 --- a/javelin/view/screen/WorldScreen.java +++ b/javelin/view/screen/WorldScreen.java @@ -231,15 +231,12 @@ static public void setVisible(int x, int y) { */ public void endturn() { Squad act = Javelin.act(); - // if (act != null && act.work != null) { - // act.build(); - // } long time = act.hourselapsed; final int day = new Double(Math.ceil(time / 24.0)).intValue(); List squads = World.getall(Squad.class); while (day > WorldScreen.lastday || squads.isEmpty()) { Season.change(day); - FeatureGenerator.SINGLETON.spawn(1 / 7f, false); + FeatureGenerator.SINGLETON.spawn(1 / 14f, false); for (Actor p : World.getactors()) { if (!(p instanceof Incursion)) { p.turn(time, this); @@ -382,8 +379,7 @@ static public ArrayList showstatusinformation() { vital += " "; } hps.add(vital + " Level " - + Math.round(Math.floor( - CrCalculator.calculatecr(c.source))) + + Math.round(Math.floor(CrCalculator.calculatecr(c.source))) + " " + c.gethumanxp()); } return hps;