From 295049702f902c3c5195f23c19445194ea70de25 Mon Sep 17 00:00:00 2001 From: Brett Laptop Date: Fri, 3 Mar 2023 15:04:33 -0500 Subject: [PATCH] pushy --- .../src/ca/cosc3p91/a2/game/GameEngine.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Assignment 2/src/ca/cosc3p91/a2/game/GameEngine.java b/Assignment 2/src/ca/cosc3p91/a2/game/GameEngine.java index a323cb5..78e0603 100644 --- a/Assignment 2/src/ca/cosc3p91/a2/game/GameEngine.java +++ b/Assignment 2/src/ca/cosc3p91/a2/game/GameEngine.java @@ -12,6 +12,10 @@ import java.util.Scanner; public class GameEngine implements Runnable { + public static final double GOLD_FACTOR = 5; + public static final double IRON_FACTOR = 1; + public static final double WOOD_FACTOR = 0.1; + private Player player; boolean running = true; @@ -82,12 +86,16 @@ public class GameEngine implements Runnable { public Map generateMap() { Map initialMap = generateInitialMap(); - initialMap.build(new Tile(), new SaulGoodMine(1, new ResourceStage(50, 0, 0, new Time(), 0, 0, 25))); + initialMap.getTownHall().upgrade(VillageHallStages.villageStages[this.map.getTownHall().getLevel()]); return initialMap; } - public void getScore(Map map) { - + public int getScore(Map map) { + CasaDeNarino hall = map.getTownHall(); + int score = (int)(hall.getCurrentGold() * GOLD_FACTOR + hall.getCurrentIron() * IRON_FACTOR + hall.getCurrentWood() * WOOD_FACTOR); + score += map.contains.size(); + score += map.inhabitants.size(); + return score; } @Override