Speed up hostile NPC animations if they are faster than player

* Refresh mouse tooltip & ranged attack path when NPC is killed by player

Author: Hitonoriol

README.md

@@ -2,16 +2,21 @@
 ### Open-world sandbox roguelike
 ### <a href="https://github.com/Hitonoriol/MadSand/releases/download/launcher/MadSandLauncher.jar">Download Launcher</a>
 ### <a href="https://github.com/Hitonoriol/MadSand/wiki">Wiki</a>
+<br>
 
-
-### Dependencies
+### How to build
+#### Game
+<pre>
+./gradlew desktop:dist
+</pre>
+--> desktop/build/libs/MadSand-\<VERSION\>.jar
+<br><br>
+#### Launcher/Auto-updater
 <pre>
-libgdx
-commons-lang
-jackson-annotations
-jackson-core
-jackson-databind
+./gradlew launcher:dist
 </pre>
+--> launcher/build/libs/MadSandLauncher-\<VERSION\>.jar
+<br><br>
 ### Screenshots
 ![screenshot](https://raw.githubusercontent.com/Hitonoriol/MadSand/master/screenshots/title%20screen.png)
 ![screenshot](https://raw.githubusercontent.com/Hitonoriol/MadSand/master/screenshots/big%20dungeon%20room.png)

build.gradle

@@ -1,7 +1,7 @@
 allprojects {
 	apply plugin: "eclipse"
 
-	version = 'v0.49.5a-rc3'
+	version = 'v0.49.5a-rc4'
 
 	ext {
 		appName = "MadSand"

core/src/hitonoriol/madsand/GameSaver.java

@@ -112,8 +112,8 @@ public static String readFile(String name) {
 		return readFile(name, false);
 	}
 
-	public static String getProdStationFile(int wx, int wy, int layer) {
-		return getCurSaveDir() + "productionstations" + getSectorString(wx, wy, layer)
+	public static String getItemFactoryFile(int wx, int wy, int layer) {
+		return getCurSaveDir() + "itemfactories" + getSectorString(wx, wy, layer)
 				+ MadSand.SAVE_EXT;
 	}
 
@@ -197,7 +197,6 @@ public static void loadErrMsg() {
 				"Couldn't to load this world. \n"
 						+ "Maybe it was saved in older/newer version of the game or some files are corrupted.\n"
 						+ "Check " + Resources.ERR_FILE + " for details.");
-		// MadSand.justStarted = false;
 	}
 
 	public static boolean verifyNextSector(int x, int y) {

core/src/hitonoriol/madsand/entities/Entity.java

@@ -13,8 +13,8 @@
 import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import hitonoriol.madsand.MadSand;
 import hitonoriol.madsand.Resources;
@@ -41,12 +41,7 @@ public abstract class Entity extends MapEntity {
 	@JsonIgnore
 	private Sprite upSpr, downSpr, leftSpr, rightSpr;
 
-	public static Comparator<Entity> speedComparator = new Comparator<Entity>() {
-		@Override
-		public int compare(Entity o1, Entity o2) {
-			return Double.compare(o2.getSpeed(), o1.getSpeed());
-		}
-	};
+	public static final Comparator<Entity> speedComparator = (e1, e2) -> Double.compare(e2.getSpeed(), e1.getSpeed());
 
 	@JsonIgnore
 	private Sprite sprite;
@@ -72,7 +67,8 @@ public int compare(Entity o1, Entity o2) {
 	@JsonIgnore
 	public float stepx = MadSand.TILESIZE;
 
-	boolean moving = false;
+	protected boolean moving = false, hasMoved = false;
+	protected boolean running = false;
 
 	public Entity(String name) {
 		stats = isPlayer() ? new PlayerStats() : new Stats();
@@ -142,8 +138,9 @@ public float getActDelay() {
 		return actDelay;
 	}
 
-	public void resetActDelay() {
+	public void prepareToAct() {
 		actDelay = 0;
+		hasMoved = false;
 	}
 
 	public boolean hasActDelay() {
@@ -442,6 +439,19 @@ public void calcMovementSpeed() {
 		movementSpeed = speed / 17f + (float) Math.pow(Math.sqrt(speed), 1.225f) * 1.075f;
 	}
 
+	public void speedUp(float by) {
+		movementSpeed *= by;
+		running = true;
+	}
+
+	public void stopRunning() {
+		if (!running)
+			return;
+
+		calcMovementSpeed();
+		running = false;
+	}
+
 	@JsonIgnore
 	public PairFloat getWorldPos() {
 		if (!isMoving())
@@ -461,12 +471,17 @@ else if (stats.look == Direction.UP)
 		return worldPos;
 	}
 
+	public boolean hasMoved() {
+		return hasMoved;
+	}
+
 	public boolean isMoving() {
 		return moving;
 	}
 
 	public void setMoving(boolean val) {
-		moving = val;
+		if (moving = val)
+			hasMoved = true;
 	}
 
 	public void queueMovement(Direction dir) {
@@ -485,6 +500,9 @@ protected void pollMovementQueue() {
 	public void stopMovement() {
 		moving = false;
 		stepx = stepy = MadSand.TILESIZE;
+		if (!hasQueuedMovement())
+			stopRunning();
+
 		pollMovementQueue();
 	}
 
@@ -520,7 +538,7 @@ public boolean move(Direction dir) {
 				++x;
 				globalPos.x += MadSand.TILESIZE;
 			}
-			moving = true;
+			setMoving(true);
 			return true;
 		}
 		return false;

core/src/hitonoriol/madsand/entities/Player.java

@@ -60,6 +60,7 @@
 import hitonoriol.madsand.gui.dialogs.WaitDialog;
 import hitonoriol.madsand.gui.widgets.ResourceProgressBar;
 import hitonoriol.madsand.input.Keyboard;
+import hitonoriol.madsand.input.Mouse;
 import hitonoriol.madsand.lua.Lua;
 import hitonoriol.madsand.map.FishingSpot;
 import hitonoriol.madsand.map.Loot;
@@ -84,7 +85,6 @@ public class Player extends Entity {
 	public PlayerStats stats; // Reference to the same Stats object as super.stats
 	float elapsedTime; // TODO: move to AnimationContainer
 	private float runSpeedCoef = 3.5f;
-	private boolean running = false;
 
 	private int targetedByNpcs = 0;
 	private Set<Integer> unlockedItems = new HashSet<>(); // set of items player obtained at least once
@@ -357,6 +357,7 @@ private void attack(AbstractNpc npc, int dmg) {
 		}
 
 		if (npc.stats.dead) {
+			Mouse.refreshTooltip();
 			MadSand.notice("You kill " + npc.stats.name + "! [+" + npc.rewardExp + " exp]");
 			addExp(npc.rewardExp);
 			reputation.change(npc.stats.faction, Reputation.KILL_PENALTY);
@@ -1178,21 +1179,14 @@ public boolean walk(Direction dir) {
 
 	@Override
 	public void stopMovement() {
-		if (!hasQueuedMovement()) {
+		if (!hasQueuedMovement())
 			Keyboard.resumeInput();
-			if (running) {
-				Utils.dbg("Stopped running");
-				running = false;
-				calcMovementSpeed();
-			}
-		}
 
 		super.stopMovement();
 	}
 
 	public void run(Path path) {
-		movementSpeed *= runSpeedCoef;
-		running = true;
+		speedUp(runSpeedCoef);
 		super.move(path);
 	}
 

core/src/hitonoriol/madsand/entities/npc/AbstractNpc.java

@@ -38,6 +38,7 @@ public abstract class AbstractNpc extends Entity {
 	public static int NULL_NPC = 0;
 	static double IDLE_MOVE_CHANCE = 15;
 	static float MAX_FOV_COEF = 1.5f;
+	public static final float HOSTILE_SPEEDUP = 1.35f;
 
 	public int id;
 	public long uid;
@@ -59,7 +60,9 @@ public abstract class AbstractNpc extends Entity {
 
 	public State state = State.Idle;
 
+	@JsonIgnore
 	Path path = new Path();
+	@JsonIgnore
 	Pair prevDestination = new Pair();
 	int pathIdx = 0;
 

core/src/hitonoriol/madsand/input/Mouse.java

@@ -128,12 +128,12 @@ public static void updCoords() {
 
 		cellInfo.set(wx, wy);
 		pointingAtObject = cellInfo.isCellOccupied();
-		highlightRangedTarget();
 		refreshTooltip();
 	}
 
 	public static void refreshTooltip() {
 		Gui.overlay.getTooltip().setText(cellInfo.getInfo());
+		highlightRangedTarget();
 	}
 
 	private static void refreshPathToCursor() {

core/src/hitonoriol/madsand/map/CellInfo.java

@@ -90,6 +90,7 @@ public MapObject getObject() {
 	}
 
 	public String getInfo() {
+		refresh();
 		infoBuilder.setLength(0);
 		infoBuilder.append("Looking at (" + x + ", " + y + ")").append(NEWLINE);
 

core/src/hitonoriol/madsand/map/Map.java

@@ -74,7 +74,7 @@ public class Map {
 	private HashMap<Pair, Loot> mapLoot;
 	private HashMap<Pair, Crop> mapCrops;
 	private HashMap<Pair, AbstractNpc> mapNpcs;
-	private ArrayList<Pair> mapProductionStations;
+	private ArrayList<Pair> mapItemFactories;
 
 	IndexedAStarPathFinder<Node> pathFinder;
 	Graph graph;
@@ -192,24 +192,24 @@ public void rollSize() {
 	}
 
 	@JsonIgnore
-	public HashMap<Pair, ItemProducer> getMapProductionStations() {
-		HashMap<Pair, ItemProducer> prodStations = new HashMap<>();
+	public HashMap<Pair, ItemProducer> getMapItemFactories() {
+		HashMap<Pair, ItemProducer> itemFactories = new HashMap<>();
 
-		for (Pair coords : mapProductionStations)
+		for (Pair coords : mapItemFactories)
 			getObject(coords).as(ItemFactory.class)
-					.ifPresent(itemfactory -> prodStations.put(coords, itemfactory.getItemProducer()));
+					.ifPresent(factory -> itemFactories.put(coords, factory.getItemProducer()));
 
-		return prodStations;
+		return itemFactories;
 	}
 
-	public void setMapProductionStations(HashMap<Pair, ItemProducer> productionStations) {
-		mapProductionStations.clear();
-		for (Entry<Pair, ItemProducer> entry : productionStations.entrySet()) {
+	public void setMapItemFactories(HashMap<Pair, ItemProducer> itemFactories) {
+		mapItemFactories.clear();
+		for (Entry<Pair, ItemProducer> entry : itemFactories.entrySet()) {
 			Pair coords = entry.getKey();
 			getObject(coords).as(ItemFactory.class)
 					.ifPresent(itemFactory -> {
 						itemFactory.setItemProducer(entry.getValue());
-						mapProductionStations.add(coords);
+						mapItemFactories.add(coords);
 					});
 
 		}
@@ -359,7 +359,7 @@ public Map purge() {
 		mapLoot = new HashMap<>();
 		mapNpcs = new HashMap<>();
 		mapCrops = new HashMap<>();
-		mapProductionStations = new ArrayList<>();
+		mapItemFactories = new ArrayList<>();
 
 		graph = new Graph();
 		nodeMap = new NodeMap(graph, xsz, ysz);
@@ -712,7 +712,7 @@ public boolean addObject(int x, int y, int id, boolean force) {
 			setObjectSize(x, y, id);
 
 			object.as(ItemFactory.class)
-					.ifPresent(itemFactory -> mapProductionStations.add(coords));
+					.ifPresent(itemFactory -> mapItemFactories.add(coords));
 
 			if (graph.getNodeCount() > 0) {
 				if (!object.nocollide) {
@@ -1076,7 +1076,7 @@ public boolean removeNpc(int x, int y) {
 	}
 
 	public void updateProductionStations() {
-		for (Pair coords : mapProductionStations)
+		for (Pair coords : mapItemFactories)
 			getObject(coords).as(ItemFactory.class)
 					.ifPresent(itemFactory -> itemFactory.getItemProducer().produce());
 

core/src/hitonoriol/madsand/world/World.java

@@ -4,6 +4,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.function.Consumer;
 
 import org.apache.commons.lang3.mutable.MutableFloat;
@@ -614,18 +615,13 @@ private void timeTick() {
 
 	private void forEachEntity(Consumer<Entity> action) {
 		Map loc = getCurLoc();
-		HashMap<Pair, AbstractNpc> npcs = loc.getNpcs();
-		ArrayList<Entity> queue = new ArrayList<Entity>();
+		List<Entity> queue = new ArrayList<Entity>();
 		Graph graph = loc.getPathfindingGraph();
 
 		graph.reIndex();
-		player.resetActDelay();
-		npcs.forEach((position, npc) -> {
-			npc.resetActDelay();
-			queue.add(npc);
-		});
+		queue.addAll(loc.getNpcs().values());
 		queue.add(player);
-
+		queue.forEach(entity -> entity.prepareToAct());
 		Collections.sort(queue, Entity.speedComparator);
 		queue.forEach(entity -> action.accept(entity));
 		graph.reIndex();
@@ -640,17 +636,24 @@ public void timeSubtick(float time) {
 		MutableFloat maxDelay = new MutableFloat(0);
 		MutableInt stopLevel = new MutableInt(0);
 		float totalTick = globalTick + time;
-		
+
 		forEachEntity(entity -> {
 			if (timeSkip && entity.distanceTo(player) > maxSimDst)
 				return;
 
-			float actDelay = cumulativeDelay.getValue() + entity.getAnimationDuration() + entity.getActDelay();
-			maxDelay.setValue(Math.max(maxDelay.getValue(), actDelay));
-
 			if (player.canSee(entity)) {
+				boolean hostile = entity != player && !((AbstractNpc) entity).isNeutral();
+				boolean actBeforePlayer = hostile && entity.getSpeed() >= player.getSpeed();
+
+				if (actBeforePlayer)
+					entity.speedUp(AbstractNpc.HOSTILE_SPEEDUP);
+
+				float actDelay = entity.getAnimationDuration() + entity.getActDelay();
+
 				if (entity != player) {
-					if (!((AbstractNpc) entity).isNeutral() && entity.getSpeed() >= player.getSpeed()) {
+					actDelay += cumulativeDelay.getValue();
+					if (actBeforePlayer) {
+						maxDelay.setValue(Math.max(maxDelay.getValue(), actDelay));
 						Keyboard.stopInput();
 						stopLevel.increment();
 						player.setActDelay(maxDelay.getValue());
@@ -677,7 +680,7 @@ public void timeSubtick(float time) {
 			if (timeSkip)
 				endTimeSkip();
 			Utils.dbg("[end of subtick #%f]", totalTick);
-		}, maxDelay.getValue());
+		}, maxDelay.getValue() + 0.01f);
 	}
 
 	public void updateLight() {