v.1.2.6 - work with Halite 1.1.6 for spawn-collision

rooklift · Dec 10, 2018 · 6ca9ea0 · 6ca9ea0
1 parent 0428c47
commit 6ca9ea0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/fluorine_renderer.js b/fluorine_renderer.js
@@ -483,18 +483,21 @@ function make_renderer() {
 
 						let burned_en_route = 0;
 
-						if (final_state.x !== data.x || final_state.y !== data.y) {     // The ship moved before colliding.
-							let ground = renderer.production_list[n][final_state.x][final_state.y];     // Ship's source before moving.
-							if (final_state.is_inspired) {
-								burned_en_route = Math.floor(ground / renderer.game.GAME_CONSTANTS.INSPIRED_MOVE_COST_RATIO);
-							} else {
-								burned_en_route = Math.floor(ground / renderer.game.GAME_CONSTANTS.MOVE_COST_RATIO);
+						if (final_state !== undefined) {		// If undefined, it's a ship that crashed as it was created. Applies to Halite 1.1.6 onwards.
+
+							if (final_state.x !== data.x || final_state.y !== data.y) {     				// The ship moved before colliding.
+								let ground = renderer.production_list[n][final_state.x][final_state.y];     // Ship's source before moving.
+								if (final_state.is_inspired) {
+									burned_en_route = Math.floor(ground / renderer.game.GAME_CONSTANTS.INSPIRED_MOVE_COST_RATIO);
+								} else {
+									burned_en_route = Math.floor(ground / renderer.game.GAME_CONSTANTS.MOVE_COST_RATIO);
+								}
 							}
-						}
 
-						data.halite_losses[pid] += final_state.energy - burned_en_route;
+							data.halite_losses[pid] += final_state.energy - burned_en_route;
 
-						total_dropped += final_state.energy - burned_en_route;
+							total_dropped += final_state.energy - burned_en_route;
+						}
 					}
 
 					// Adjustment for collisions over a factory...

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Fluorine",
 	"description": "Replay viewer for Halite 3",
-	"version": "1.2.5",
+	"version": "1.2.6",
 	"author": "Fohristiwhirl",
 	"repository": {
 		"type": "git",