Update jasmine definition

TODO

@@ -2,7 +2,9 @@
 * Character sheet: add initial character creation
 * Character sheet: disable interaction during battle (except for loot screen)
 * Character sheet: improve eye-catching for shop and loot section
-* Character sheet: highlight allowed destinations during drag-and-drop
+* Character sheet: highlight allowed destinations during drag-and-drop, with text hints
+* Character sheet: when transferring to another ship, if the item can't be equipped (unmatched requirements), the transfer is cancelled instead of trying cargo
+* Character sheet: effective skill is sometimes not updated when upgrading base skill
 * Add permanent effects to ship models to ease balancing
 * Find incentives to move from starting position
 * Fix targetting not resetting when using action shortcuts

bower.json

@@ -6,11 +6,11 @@
     "Michael Lemaire"
   ],
   "license": "MIT",
-  "homepage": "",
+  "homepage": "https://thunderk.net/spacetac/",
   "private": true,
   "dependencies": {
     "phaser": "2.6.2",
     "jasmine-core": "jasmine#^2.5.2",
     "deep-diff": "0.3.0"
   }
-}
+}

src/core/MoveFireSimulator.spec.ts

@@ -34,7 +34,7 @@ module TS.SpaceTac.Specs {
             expect(result.can_fire).toBe(true, 'can_fire');
             expect(result.total_fire_ap).toBe(3, 'total_fire_ap');
 
-            expect(result.parts).toEqual([
+            expect(<any[]>result.parts).toEqual([
                 { action: jasmine.objectContaining({ code: "fire-equipment" }), target: new Target(ship.arena_x + 5, ship.arena_y, null), ap: 3, possible: true }
             ]);
         });
@@ -48,7 +48,7 @@ module TS.SpaceTac.Specs {
             expect(result.can_fire).toBe(false, 'can_fire');
             expect(result.total_fire_ap).toBe(3, 'total_fire_ap');
 
-            expect(result.parts).toEqual([
+            expect(<any[]>result.parts).toEqual([
                 { action: jasmine.objectContaining({ code: "fire-equipment" }), target: new Target(ship.arena_x + 5, ship.arena_y, null), ap: 3, possible: false }
             ]);
         });
@@ -65,7 +65,7 @@ module TS.SpaceTac.Specs {
             expect(result.can_fire).toBe(true, 'can_fire');
             expect(result.total_fire_ap).toBe(3, 'total_fire_ap');
 
-            expect(result.parts).toEqual([
+            expect(<any[]>result.parts).toEqual([
                 { action: jasmine.objectContaining({ code: "move" }), target: new Target(ship.arena_x + 5, ship.arena_y, null), ap: 1, possible: true },
                 { action: jasmine.objectContaining({ code: "fire-equipment" }), target: new Target(ship.arena_x + 15, ship.arena_y, null), ap: 3, possible: true }
             ]);
@@ -83,7 +83,7 @@ module TS.SpaceTac.Specs {
             expect(result.can_fire).toBe(false, 'can_fire');
             expect(result.total_fire_ap).toBe(2, 'total_fire_ap');
 
-            expect(result.parts).toEqual([
+            expect(<any[]>result.parts).toEqual([
                 { action: jasmine.objectContaining({ code: "move" }), target: new Target(ship.arena_x + 10, ship.arena_y, null), ap: 2, possible: true },
                 { action: jasmine.objectContaining({ code: "fire-equipment" }), target: new Target(ship.arena_x + 18, ship.arena_y, null), ap: 2, possible: false }
             ]);

src/core/Player.spec.ts

@@ -41,11 +41,8 @@ module TS.SpaceTac {
             let player = new Player();
             let star = new Star();
             let loc1 = new StarLocation(star);
-            loc1.encounter_gen = true;
-            loc1.encounter = null;
+            loc1.clearEncounter();
             let loc2 = new StarLocation(star);
-            loc2.encounter_gen = false;
-            loc2.encounter = null;
             loc2.encounter_random = new SkewedRandomGenerator([0], true);
 
             player.fleet.setLocation(loc1);
@@ -67,7 +64,7 @@ module TS.SpaceTac {
             expect(player.getBattle()).not.toBeNull();
             expect(player.fleet.location).toBe(loc2);
             expect(player.hasVisitedLocation(loc2)).toBe(true);
-            expect(nn(player.getBattle()).fleets[1]).toBe(enemy);
+            expect(nn(player.getBattle()).fleets[1]).toBe(nn(enemy));
         });
     });
 }

src/ui/battle/BattleView.spec.ts

@@ -16,10 +16,10 @@ module TS.SpaceTac.UI.Specs {
             var result = nn(battleview.enterTargettingMode());
 
             expect(battleview.targetting).toBeTruthy();
-            expect(result).toBe(battleview.targetting);
+            expect(result).toBe(nn(battleview.targetting));
 
             // Collect targetting events
-            var hovered: Target[] = [];
+            var hovered: (Target | null)[] = [];
             var clicked: Target[] = [];
             result.targetHovered.add((target: Target) => {
                 hovered.push(target);

src/ui/character/CharacterEquipment.spec.ts

@@ -80,7 +80,7 @@ module TS.SpaceTac.UI.Specs {
             equipment.events.onDragStop.dispatch();
             expect(equipment.container).toBe(container2);
             expect(equipment.x).toBe(100);
-            expect(container1.inside).toBe(null);
+            expect(container1.inside).toBeNull();
             expect(container2.inside).toBe(equipment);
             expect(refresh).toHaveBeenCalledTimes(1);
 

typings.json

@@ -2,7 +2,7 @@
   "name": "spacetac",
   "dependencies": {},
   "globalDependencies": {
-    "jasmine": "registry:dt/jasmine#2.5.0+20161003201800",
+    "jasmine": "registry:dt/jasmine#2.5.2+20170317130948",
     "phaser": "github:thunderk/phaser/typescript/typings.json#v2.6.2a"
   }
 }