From 92764542dfc6ebd6b7a8358ed031740c471de1be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Fri, 27 Jan 2017 00:52:45 +0100 Subject: [PATCH] Added submodule tscommon, shared with Succession --- .gitmodules | 3 +++ out/index.html | 2 +- src/GameUI.ts | 2 +- src/common | 1 + src/game/Attribute.spec.ts | 2 +- src/game/Attribute.ts | 2 +- src/game/AttributeCollection.spec.ts | 2 +- src/game/AttributeCollection.ts | 2 +- src/game/Battle.spec.ts | 2 +- src/game/Battle.ts | 2 +- src/game/BattleLog.spec.ts | 2 +- src/game/BattleLog.ts | 2 +- src/game/BattleOutcome.spec.ts | 2 +- src/game/BattleOutcome.ts | 2 +- src/game/EffectTemplate.spec.ts | 2 +- src/game/EffectTemplate.ts | 2 +- src/game/Equipment.spec.ts | 2 +- src/game/Equipment.ts | 2 +- src/game/Fleet.spec.ts | 2 +- src/game/Fleet.ts | 2 +- src/game/FleetGenerator.ts | 2 +- src/game/GameSession.spec.ts | 2 +- src/game/GameSession.ts | 2 +- src/game/LootGenerator.spec.ts | 2 +- src/game/LootGenerator.ts | 6 +++--- src/game/LootTemplate.spec.ts | 2 +- src/game/LootTemplate.ts | 2 +- src/game/NameGenerator.spec.ts | 2 +- src/game/NameGenerator.ts | 2 +- src/game/Player.ts | 2 +- src/game/RandomGenerator.ts | 2 +- src/game/Range.spec.ts | 2 +- src/game/Range.ts | 2 +- src/game/Serializable.ts | 2 +- src/game/Serializer.spec.ts | 2 +- src/game/Serializer.ts | 4 ++-- src/game/Ship.spec.ts | 2 +- src/game/Ship.ts | 2 +- src/game/ShipGenerator.spec.ts | 2 +- src/game/ShipGenerator.ts | 2 +- src/game/ShipModel.ts | 2 +- src/game/Slot.spec.ts | 2 +- src/game/Slot.ts | 2 +- src/game/Star.spec.ts | 2 +- src/game/Star.ts | 2 +- src/game/StarLink.spec.ts | 2 +- src/game/StarLink.ts | 2 +- src/game/StarLocation.spec.ts | 2 +- src/game/StarLocation.ts | 2 +- src/game/Target.spec.ts | 2 +- src/game/Target.ts | 2 +- src/game/TestTools.ts | 2 +- src/game/Tools.spec.ts | 2 +- src/game/Tools.ts | 2 +- src/game/Universe.spec.ts | 2 +- src/game/Universe.ts | 2 +- src/game/actions/BaseAction.spec.ts | 2 +- src/game/actions/BaseAction.ts | 2 +- src/game/actions/EndTurnAction.spec.ts | 2 +- src/game/actions/EndTurnAction.ts | 2 +- src/game/actions/FireWeaponAction.ts | 2 +- src/game/actions/MoveAction.spec.ts | 2 +- src/game/actions/MoveAction.ts | 2 +- src/game/ai/AbstractAI.ts | 2 +- src/game/ai/BullyAI.spec.ts | 2 +- src/game/ai/BullyAI.ts | 2 +- src/game/ai/Maneuver.ts | 2 +- src/game/ai/ManeuverSequence.ts | 2 +- src/game/effects/AttributeLimitEffect.ts | 2 +- src/game/effects/AttributeMaxEffect.ts | 2 +- src/game/effects/AttributeValueEffect.ts | 2 +- src/game/effects/BaseEffect.ts | 2 +- src/game/effects/DamageEffect.ts | 2 +- src/game/effects/StickyEffect.ts | 2 +- src/game/equipments/AbstractWeapon.spec.ts | 2 +- src/game/equipments/AbstractWeapon.ts | 2 +- src/game/equipments/BasicForceField.ts | 2 +- src/game/equipments/BasicPowerCore.ts | 2 +- src/game/equipments/ConventionalEngine.ts | 2 +- src/game/equipments/EnergyDepleter.spec.ts | 2 +- src/game/equipments/EnergyDepleter.ts | 2 +- src/game/equipments/GatlingGun.ts | 2 +- src/game/equipments/IronHull.ts | 2 +- src/game/equipments/SubMunitionMissile.spec.ts | 2 +- src/game/equipments/SubMunitionMissile.ts | 2 +- src/game/events/AttributeChangeEvent.ts | 2 +- src/game/events/BaseLogEvent.ts | 2 +- src/game/events/DamageEvent.ts | 2 +- src/game/events/DeathEvent.ts | 2 +- src/game/events/EffectAddedEvent.ts | 2 +- src/game/events/EffectDurationChangedEvent.ts | 2 +- src/game/events/EffectRemovedEvent.ts | 2 +- src/game/events/EndBattleEvent.ts | 2 +- src/game/events/FireEvent.ts | 2 +- src/game/events/MoveEvent.ts | 2 +- src/game/events/ShipChangeEvent.ts | 2 +- src/view/BaseView.ts | 2 +- src/view/Boot.ts | 2 +- src/view/MainMenu.ts | 2 +- src/view/Preload.ts | 2 +- src/view/Router.ts | 2 +- src/view/TestGame.ts | 2 +- src/view/battle/ActionBar.spec.ts | 2 +- src/view/battle/ActionBar.ts | 2 +- src/view/battle/ActionIcon.ts | 2 +- src/view/battle/ActionTooltip.ts | 2 +- src/view/battle/Arena.ts | 2 +- src/view/battle/ArenaShip.ts | 2 +- src/view/battle/BattleView.spec.ts | 2 +- src/view/battle/BattleView.ts | 2 +- src/view/battle/LogProcessor.ts | 2 +- src/view/battle/RangeHint.ts | 2 +- src/view/battle/ShipList.spec.ts | 2 +- src/view/battle/ShipList.ts | 2 +- src/view/battle/ShipListItem.ts | 2 +- src/view/battle/ShipTooltip.ts | 2 +- src/view/battle/Targetting.spec.ts | 2 +- src/view/battle/Targetting.ts | 2 +- src/view/battle/WeaponEffect.ts | 2 +- src/view/common/Animation.ts | 2 +- src/view/common/Audio.ts | 2 +- src/view/common/InputManager.ts | 2 +- src/view/common/Messages.ts | 2 +- src/view/common/Tools.spec.ts | 2 +- src/view/common/Tools.ts | 2 +- src/view/common/ValueBar.spec.ts | 2 +- src/view/common/ValueBar.ts | 2 +- src/view/map/StarSystemDisplay.ts | 2 +- src/view/map/UniverseMapView.ts | 2 +- 129 files changed, 134 insertions(+), 130 deletions(-) create mode 100644 .gitmodules create mode 160000 src/common diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..4180e55 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "src/common"] + path = src/common + url = https://code.thunderk.net/michael/tscommon.git diff --git a/out/index.html b/out/index.html index 1695051..d2dfdbf 100644 --- a/out/index.html +++ b/out/index.html @@ -31,7 +31,7 @@ diff --git a/src/GameUI.ts b/src/GameUI.ts index 13109eb..e10ddc3 100644 --- a/src/GameUI.ts +++ b/src/GameUI.ts @@ -4,7 +4,7 @@ if (typeof window != "undefined") { (window).describe = (window).describe || function () { }; } -module SpaceTac { +module TS.SpaceTac { // Router between game views export class GameUI extends Phaser.Game { // Current game session diff --git a/src/common b/src/common new file mode 160000 index 0000000..c79c6fa --- /dev/null +++ b/src/common @@ -0,0 +1 @@ +Subproject commit c79c6fa24da6b065163a45139722d368f0ca6d0f diff --git a/src/game/Attribute.spec.ts b/src/game/Attribute.spec.ts index a24e991..345d935 100644 --- a/src/game/Attribute.spec.ts +++ b/src/game/Attribute.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game { +module TS.SpaceTac.Game { describe("Attribute", function () { it("is initially not limited", function () { var attr = new Attribute(); diff --git a/src/game/Attribute.ts b/src/game/Attribute.ts index f0c3be7..287aee6 100644 --- a/src/game/Attribute.ts +++ b/src/game/Attribute.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Code to identify export enum AttributeCode { // Initiative level diff --git a/src/game/AttributeCollection.spec.ts b/src/game/AttributeCollection.spec.ts index dc1eb10..4f56c37 100644 --- a/src/game/AttributeCollection.spec.ts +++ b/src/game/AttributeCollection.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game { +module TS.SpaceTac.Game { describe("AttributeCollection", function () { it("sets and gets an attribute value", function () { var coll = new AttributeCollection(); diff --git a/src/game/AttributeCollection.ts b/src/game/AttributeCollection.ts index 8e31f3f..2021864 100644 --- a/src/game/AttributeCollection.ts +++ b/src/game/AttributeCollection.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Collection of several attributes export class AttributeCollection extends Serializable { // Attributes diff --git a/src/game/Battle.spec.ts b/src/game/Battle.spec.ts index b44b16d..0b5b011 100644 --- a/src/game/Battle.spec.ts +++ b/src/game/Battle.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game { +module TS.SpaceTac.Game { describe("Battle", function () { it("defines play order by initiative throws", function () { var fleet1 = new Fleet(null); diff --git a/src/game/Battle.ts b/src/game/Battle.ts index 7ce329d..4008d97 100644 --- a/src/game/Battle.ts +++ b/src/game/Battle.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // A turn-based battle between fleets export class Battle extends Serializable { // Flag indicating if the battle is ended diff --git a/src/game/BattleLog.spec.ts b/src/game/BattleLog.spec.ts index 79cb3fe..dd794e7 100644 --- a/src/game/BattleLog.spec.ts +++ b/src/game/BattleLog.spec.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Check a single game log event function checkEvent(got: BaseLogEvent, ship: Ship, code: string, target_ship: Ship = null, target_x: number = null, target_y: number = null): void { diff --git a/src/game/BattleLog.ts b/src/game/BattleLog.ts index c15c016..6ad222e 100644 --- a/src/game/BattleLog.ts +++ b/src/game/BattleLog.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Log of a battle // This keeps track of all events in a battle // It also allows to register a callback to receive these events diff --git a/src/game/BattleOutcome.spec.ts b/src/game/BattleOutcome.spec.ts index 385feb6..5c3d5f6 100644 --- a/src/game/BattleOutcome.spec.ts +++ b/src/game/BattleOutcome.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { describe("BattleOutcome", () => { it("generates loot from dead ships, for the winner to take", () => { var fleet1 = new Fleet(); diff --git a/src/game/BattleOutcome.ts b/src/game/BattleOutcome.ts index 3205984..429b2ac 100644 --- a/src/game/BattleOutcome.ts +++ b/src/game/BattleOutcome.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Result of an ended battle export class BattleOutcome extends Serializable { // Indicates if the battle is a draw (no winner) diff --git a/src/game/EffectTemplate.spec.ts b/src/game/EffectTemplate.spec.ts index dc05d4a..e344e19 100644 --- a/src/game/EffectTemplate.spec.ts +++ b/src/game/EffectTemplate.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { describe("EffectTemplate", () => { it("interpolates between weak and strong effects", () => { var base_effect = new AttributeMaxEffect(AttributeCode.Hull, 6); diff --git a/src/game/EffectTemplate.ts b/src/game/EffectTemplate.ts index ab59d3d..14a26bd 100644 --- a/src/game/EffectTemplate.ts +++ b/src/game/EffectTemplate.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game { +module TS.SpaceTac.Game { // Modifier for a value of a BaseEffect subclass export class EffectTemplateModifier { // Value name diff --git a/src/game/Equipment.spec.ts b/src/game/Equipment.spec.ts index a1cd239..2251646 100644 --- a/src/game/Equipment.spec.ts +++ b/src/game/Equipment.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { describe("Equipment", () => { it("checks capabilities requirements", function () { var equipment = new Equipment(); diff --git a/src/game/Equipment.ts b/src/game/Equipment.ts index 90312db..520325b 100644 --- a/src/game/Equipment.ts +++ b/src/game/Equipment.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Piece of equipment to attach in slots export class Equipment extends Serializable { // Actual slot this equipment is attached to diff --git a/src/game/Fleet.spec.ts b/src/game/Fleet.spec.ts index 94b31e5..7aad1c8 100644 --- a/src/game/Fleet.spec.ts +++ b/src/game/Fleet.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game { +module TS.SpaceTac.Game { describe("Fleet", function () { it("get average level", function () { var fleet = new Fleet(); diff --git a/src/game/Fleet.ts b/src/game/Fleet.ts index e1e8ee8..312939b 100644 --- a/src/game/Fleet.ts +++ b/src/game/Fleet.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // A fleet of ships export class Fleet extends Serializable { // Fleet owner diff --git a/src/game/FleetGenerator.ts b/src/game/FleetGenerator.ts index a6760e3..85427fc 100644 --- a/src/game/FleetGenerator.ts +++ b/src/game/FleetGenerator.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game { +module TS.SpaceTac.Game { // Generator of balanced ships to form a fleet export class FleetGenerator { // Random generator to use diff --git a/src/game/GameSession.spec.ts b/src/game/GameSession.spec.ts index aa7b385..2978c33 100644 --- a/src/game/GameSession.spec.ts +++ b/src/game/GameSession.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { function applyGameSteps(session: GameSession): void { var battle = session.getBattle(); battle.advanceToNextShip(); diff --git a/src/game/GameSession.ts b/src/game/GameSession.ts index 265c3f0..9fc2cfa 100644 --- a/src/game/GameSession.ts +++ b/src/game/GameSession.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // A game session, binding a universe and a player export class GameSession extends Serializable { // Game universe diff --git a/src/game/LootGenerator.spec.ts b/src/game/LootGenerator.spec.ts index 6100957..2d5bd1c 100644 --- a/src/game/LootGenerator.spec.ts +++ b/src/game/LootGenerator.spec.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { class TestTemplate extends LootTemplate { constructor() { super(SlotType.Shield, "Hexagrid Shield"); diff --git a/src/game/LootGenerator.ts b/src/game/LootGenerator.ts index 3a4a6ea..1fae2fa 100644 --- a/src/game/LootGenerator.ts +++ b/src/game/LootGenerator.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game { +module TS.SpaceTac.Game { // Equipment generator from loot templates export class LootGenerator { // List of available templates @@ -21,9 +21,9 @@ module SpaceTac.Game { // Fill the list of templates populate(): void { var templates: LootTemplate[] = []; - for (var template_name in SpaceTac.Game.Equipments) { + for (var template_name in TS.SpaceTac.Game.Equipments) { if (template_name) { - var template_class = SpaceTac.Game.Equipments[template_name]; + var template_class = TS.SpaceTac.Game.Equipments[template_name]; var template: LootTemplate = new template_class(); templates.push(template); } diff --git a/src/game/LootTemplate.spec.ts b/src/game/LootTemplate.spec.ts index 7fd8433..c1a4865 100644 --- a/src/game/LootTemplate.spec.ts +++ b/src/game/LootTemplate.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { describe("LootTemplate", () => { it("interpolates between weak and strong loot", () => { var template = new LootTemplate(SlotType.Weapon, "Bulletator"); diff --git a/src/game/LootTemplate.ts b/src/game/LootTemplate.ts index 4945a44..7594dd2 100644 --- a/src/game/LootTemplate.ts +++ b/src/game/LootTemplate.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Template used to generate a loot equipment export class LootTemplate extends Serializable { // Type of slot this equipment will fit in diff --git a/src/game/NameGenerator.spec.ts b/src/game/NameGenerator.spec.ts index 685d10b..1fdf9a1 100644 --- a/src/game/NameGenerator.spec.ts +++ b/src/game/NameGenerator.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { describe("NameGenerator", () => { it("generates unique names", () => { var random = new RandomGenerator(0.48, 0.9, 0.1); diff --git a/src/game/NameGenerator.ts b/src/game/NameGenerator.ts index 084d3bd..8d328bb 100644 --- a/src/game/NameGenerator.ts +++ b/src/game/NameGenerator.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game { +module TS.SpaceTac.Game { // A unique name generator export class NameGenerator { // List of available choices diff --git a/src/game/Player.ts b/src/game/Player.ts index e88da1a..c53c9b1 100644 --- a/src/game/Player.ts +++ b/src/game/Player.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // One player (human or IA) export class Player extends Serializable { // Universe in which we are playing diff --git a/src/game/RandomGenerator.ts b/src/game/RandomGenerator.ts index bbb6e4b..55a28db 100644 --- a/src/game/RandomGenerator.ts +++ b/src/game/RandomGenerator.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Random generator, used in all throws export class RandomGenerator extends Serializable { // Array of next values, empty for a correct generator diff --git a/src/game/Range.spec.ts b/src/game/Range.spec.ts index 30dd9e9..44965cf 100644 --- a/src/game/Range.spec.ts +++ b/src/game/Range.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { function checkProportional(range: Range, value1: number, value2: number) { expect(range.getProportional(value1)).toEqual(value2); expect(range.getReverseProportional(value2)).toEqual(value1); diff --git a/src/game/Range.ts b/src/game/Range.ts index f81d7dd..ba6fcfd 100644 --- a/src/game/Range.ts +++ b/src/game/Range.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Range of number values export class Range extends Serializable { // Minimal value diff --git a/src/game/Serializable.ts b/src/game/Serializable.ts index d932d66..6e8193e 100644 --- a/src/game/Serializable.ts +++ b/src/game/Serializable.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game { +module TS.SpaceTac.Game { // Base class for serializable objects export class Serializable { static _next_sid: number = 0; diff --git a/src/game/Serializer.spec.ts b/src/game/Serializer.spec.ts index 3514463..0a48d3b 100644 --- a/src/game/Serializer.spec.ts +++ b/src/game/Serializer.spec.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { export class SerializableTestObj3 extends Serializable { a: boolean; b: SerializableTestObj1; diff --git a/src/game/Serializer.ts b/src/game/Serializer.ts index c313082..137a27f 100644 --- a/src/game/Serializer.ts +++ b/src/game/Serializer.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game { +module TS.SpaceTac.Game { // Serializer to cascade through Serializable objects export class Serializer { // Mapping of IDs to objects @@ -29,7 +29,7 @@ module SpaceTac.Game { } return result; } else { - return this.collectSerializableClasses(SpaceTac.Game, "SpaceTac.Game"); + return this.collectSerializableClasses(TS.SpaceTac.Game, "SpaceTac.Game"); } } diff --git a/src/game/Ship.spec.ts b/src/game/Ship.spec.ts index d1ca4d7..3be4e37 100644 --- a/src/game/Ship.spec.ts +++ b/src/game/Ship.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { describe("Ship", function () { it("moves and computes facing angle", function () { var ship = new Ship(null, "Test"); diff --git a/src/game/Ship.ts b/src/game/Ship.ts index 1f8cd23..cc6c4c5 100644 --- a/src/game/Ship.ts +++ b/src/game/Ship.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // A single ship in a Fleet export class Ship extends Serializable { // Fleet this ship is a member of diff --git a/src/game/ShipGenerator.spec.ts b/src/game/ShipGenerator.spec.ts index 68efb95..6187efa 100644 --- a/src/game/ShipGenerator.spec.ts +++ b/src/game/ShipGenerator.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { describe("ShipGenerator", function () { it("can use ship model", function () { var gen = new ShipGenerator(); diff --git a/src/game/ShipGenerator.ts b/src/game/ShipGenerator.ts index 508850d..157fcd2 100644 --- a/src/game/ShipGenerator.ts +++ b/src/game/ShipGenerator.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game { +module TS.SpaceTac.Game { // Generator of random ship export class ShipGenerator { // Random number generator used diff --git a/src/game/ShipModel.ts b/src/game/ShipModel.ts index ba8aabb..a2d2280 100644 --- a/src/game/ShipModel.ts +++ b/src/game/ShipModel.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game { +module TS.SpaceTac.Game { // A model of ship // It defines the ship looks, and available slots for equipment export class ShipModel { diff --git a/src/game/Slot.spec.ts b/src/game/Slot.spec.ts index bf62c72..b548bfa 100644 --- a/src/game/Slot.spec.ts +++ b/src/game/Slot.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { describe("Slot", () => { it("checks equipment type", () => { var ship = new Ship(); diff --git a/src/game/Slot.ts b/src/game/Slot.ts index d30b769..aeca0c4 100644 --- a/src/game/Slot.ts +++ b/src/game/Slot.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Types of slots export enum SlotType { Armor, diff --git a/src/game/Star.spec.ts b/src/game/Star.spec.ts index 3d98771..841a7b4 100644 --- a/src/game/Star.spec.ts +++ b/src/game/Star.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { describe("Star", () => { it("lists links to other stars", () => { var universe = new Universe(); diff --git a/src/game/Star.ts b/src/game/Star.ts index 1dbe862..0ab628c 100644 --- a/src/game/Star.ts +++ b/src/game/Star.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // A star system export class Star extends Serializable { diff --git a/src/game/StarLink.spec.ts b/src/game/StarLink.spec.ts index e8701a6..17bfc8b 100644 --- a/src/game/StarLink.spec.ts +++ b/src/game/StarLink.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { describe("StarLink", () => { it("checks link intersection", () => { var star1 = new Star(null, 0, 0); diff --git a/src/game/StarLink.ts b/src/game/StarLink.ts index 070a333..6b5f414 100644 --- a/src/game/StarLink.ts +++ b/src/game/StarLink.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // An hyperspace link between two star systems export class StarLink extends Serializable { // Stars diff --git a/src/game/StarLocation.spec.ts b/src/game/StarLocation.spec.ts index 6ff3ca5..3f2bf71 100644 --- a/src/game/StarLocation.spec.ts +++ b/src/game/StarLocation.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { describe("StarLocation", () => { it("removes generated encounters that lose", function () { var location = new StarLocation(null, StarLocationType.PLANET, 0, 0); diff --git a/src/game/StarLocation.ts b/src/game/StarLocation.ts index 8c7d66a..8f07dcd 100644 --- a/src/game/StarLocation.ts +++ b/src/game/StarLocation.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { export enum StarLocationType { STAR, WARP, diff --git a/src/game/Target.spec.ts b/src/game/Target.spec.ts index d39a5b9..778b679 100644 --- a/src/game/Target.spec.ts +++ b/src/game/Target.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { describe("Target", () => { it("initializes from ship or location", () => { var target: Target; diff --git a/src/game/Target.ts b/src/game/Target.ts index 4bf07ce..ebe980b 100644 --- a/src/game/Target.ts +++ b/src/game/Target.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Find the nearest intersection between a line and a circle // Circle is supposed to be centered at (0,0) // Nearest intersection to (x1,y1) is returned diff --git a/src/game/TestTools.ts b/src/game/TestTools.ts index 1e4ac52..835ecf8 100644 --- a/src/game/TestTools.ts +++ b/src/game/TestTools.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game { +module TS.SpaceTac.Game { // unit testing utilities export class TestTools { diff --git a/src/game/Tools.spec.ts b/src/game/Tools.spec.ts index e1915cd..b1dcefc 100644 --- a/src/game/Tools.spec.ts +++ b/src/game/Tools.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { class TestObj { a: string; b: any; diff --git a/src/game/Tools.ts b/src/game/Tools.ts index d374f5c..28cda53 100644 --- a/src/game/Tools.ts +++ b/src/game/Tools.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game { +module TS.SpaceTac.Game { // Generic tools functions export class Tools { diff --git a/src/game/Universe.spec.ts b/src/game/Universe.spec.ts index 2c8eb0c..92bb0e8 100644 --- a/src/game/Universe.spec.ts +++ b/src/game/Universe.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { describe("Universe", () => { it("generates star systems", () => { var universe = new Universe(); diff --git a/src/game/Universe.ts b/src/game/Universe.ts index 8d08d28..0f242c4 100644 --- a/src/game/Universe.ts +++ b/src/game/Universe.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Main game universe export class Universe extends Serializable { // List of star systems diff --git a/src/game/actions/BaseAction.spec.ts b/src/game/actions/BaseAction.spec.ts index a82cdd8..d6b9caa 100644 --- a/src/game/actions/BaseAction.spec.ts +++ b/src/game/actions/BaseAction.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game { +module TS.SpaceTac.Game { describe("BaseAction", function () { it("check if equipment can be used with remaining AP", function () { var equipment = new Equipment(SlotType.Armor); diff --git a/src/game/actions/BaseAction.ts b/src/game/actions/BaseAction.ts index 1243d27..0bcf3c6 100644 --- a/src/game/actions/BaseAction.ts +++ b/src/game/actions/BaseAction.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Base class for action definitions export class BaseAction extends Serializable { // Identifier code for the type of action diff --git a/src/game/actions/EndTurnAction.spec.ts b/src/game/actions/EndTurnAction.spec.ts index 94a64d0..c0a5902 100644 --- a/src/game/actions/EndTurnAction.spec.ts +++ b/src/game/actions/EndTurnAction.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { describe("EndTurnAction", () => { it("can't be applied to non-playing ship", () => { var battle = Battle.newQuickRandom(); diff --git a/src/game/actions/EndTurnAction.ts b/src/game/actions/EndTurnAction.ts index 7b4ee59..828bdf3 100644 --- a/src/game/actions/EndTurnAction.ts +++ b/src/game/actions/EndTurnAction.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game { +module TS.SpaceTac.Game { // Action to end the ship's turn export class EndTurnAction extends BaseAction { constructor() { diff --git a/src/game/actions/FireWeaponAction.ts b/src/game/actions/FireWeaponAction.ts index 1c8ce0b..ba83d33 100644 --- a/src/game/actions/FireWeaponAction.ts +++ b/src/game/actions/FireWeaponAction.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Action to fire a weapon on another ship, or in space export class FireWeaponAction extends BaseAction { // Boolean set to true if the weapon can target space diff --git a/src/game/actions/MoveAction.spec.ts b/src/game/actions/MoveAction.spec.ts index a232493..cc0f7a8 100644 --- a/src/game/actions/MoveAction.spec.ts +++ b/src/game/actions/MoveAction.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game { +module TS.SpaceTac.Game { describe("MoveAction", function () { it("checks movement against remaining AP", function () { var ship = new Ship(); diff --git a/src/game/actions/MoveAction.ts b/src/game/actions/MoveAction.ts index 5c11b1a..0a80be8 100644 --- a/src/game/actions/MoveAction.ts +++ b/src/game/actions/MoveAction.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game { +module TS.SpaceTac.Game { // Action to move to a given location export class MoveAction extends BaseAction { diff --git a/src/game/ai/AbstractAI.ts b/src/game/ai/AbstractAI.ts index 40ecb5f..1a7ca1c 100644 --- a/src/game/ai/AbstractAI.ts +++ b/src/game/ai/AbstractAI.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game.AI { +module TS.SpaceTac.Game.AI { // Base class for all Artificial Intelligence interaction export class AbstractAI extends Serializable { // The fleet controlled by this AI diff --git a/src/game/ai/BullyAI.spec.ts b/src/game/ai/BullyAI.spec.ts index 2b9ed2c..011e658 100644 --- a/src/game/ai/BullyAI.spec.ts +++ b/src/game/ai/BullyAI.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.AI.Specs { +module TS.SpaceTac.Game.AI.Specs { describe("BullyAI", function () { it("lists enemies", function () { var battle = new Battle(); diff --git a/src/game/ai/BullyAI.ts b/src/game/ai/BullyAI.ts index 3b99d05..e8507db 100644 --- a/src/game/ai/BullyAI.ts +++ b/src/game/ai/BullyAI.ts @@ -1,5 +1,5 @@ /// -module SpaceTac.Game.AI { +module TS.SpaceTac.Game.AI { // Combination of a move action and a fire action export class BullyManeuver { // Move action to position the ship before firing diff --git a/src/game/ai/Maneuver.ts b/src/game/ai/Maneuver.ts index 2a7d630..e607934 100644 --- a/src/game/ai/Maneuver.ts +++ b/src/game/ai/Maneuver.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.AI { +module TS.SpaceTac.Game.AI { // Ship maneuver for an artifical intelligence // A maneuver is like a human player action, choosing an equipment and using it export class Maneuver { diff --git a/src/game/ai/ManeuverSequence.ts b/src/game/ai/ManeuverSequence.ts index 986a78a..67b5436 100644 --- a/src/game/ai/ManeuverSequence.ts +++ b/src/game/ai/ManeuverSequence.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.AI { +module TS.SpaceTac.Game.AI { // A chain of Maneuver to execute sequentially export class ManeuverSequence { // Concerned ship diff --git a/src/game/effects/AttributeLimitEffect.ts b/src/game/effects/AttributeLimitEffect.ts index 04f48ea..69c9644 100644 --- a/src/game/effects/AttributeLimitEffect.ts +++ b/src/game/effects/AttributeLimitEffect.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Hard limitation on attribute value // For example, this could be used to slow a target by limiting its action points export class AttributeLimitEffect extends BaseEffect { diff --git a/src/game/effects/AttributeMaxEffect.ts b/src/game/effects/AttributeMaxEffect.ts index 5c4d02f..a40f19b 100644 --- a/src/game/effects/AttributeMaxEffect.ts +++ b/src/game/effects/AttributeMaxEffect.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Effect on attribute maximum // Typically, these effects are summed up to define an attribute maximum export class AttributeMaxEffect extends BaseEffect { diff --git a/src/game/effects/AttributeValueEffect.ts b/src/game/effects/AttributeValueEffect.ts index 13df68f..e407d27 100644 --- a/src/game/effects/AttributeValueEffect.ts +++ b/src/game/effects/AttributeValueEffect.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Effect on attribute value // Typically, these effects are summed up to define an attribute value export class AttributeValueEffect extends BaseEffect { diff --git a/src/game/effects/BaseEffect.ts b/src/game/effects/BaseEffect.ts index ce908d9..50cda39 100644 --- a/src/game/effects/BaseEffect.ts +++ b/src/game/effects/BaseEffect.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Base class for effects of actions // Effects are typically one shot, but sticky effects can be used to apply effects over a period export class BaseEffect extends Serializable { diff --git a/src/game/effects/DamageEffect.ts b/src/game/effects/DamageEffect.ts index 619570d..cdae0e4 100644 --- a/src/game/effects/DamageEffect.ts +++ b/src/game/effects/DamageEffect.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Apply damage to a ship export class DamageEffect extends BaseEffect { // Base damage points diff --git a/src/game/effects/StickyEffect.ts b/src/game/effects/StickyEffect.ts index c8f5378..b486144 100644 --- a/src/game/effects/StickyEffect.ts +++ b/src/game/effects/StickyEffect.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { /** * Wrapper around another effect, to make it stick to a ship. * diff --git a/src/game/equipments/AbstractWeapon.spec.ts b/src/game/equipments/AbstractWeapon.spec.ts index 7a6872f..5f32bd1 100644 --- a/src/game/equipments/AbstractWeapon.spec.ts +++ b/src/game/equipments/AbstractWeapon.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { describe("AbstractWeapon", function () { it("has fire action, and damage effects on target", function () { var weapon = new Equipments.AbstractWeapon("Super Fire Weapon", 50, 60); diff --git a/src/game/equipments/AbstractWeapon.ts b/src/game/equipments/AbstractWeapon.ts index 7c10fad..039888c 100644 --- a/src/game/equipments/AbstractWeapon.ts +++ b/src/game/equipments/AbstractWeapon.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game.Equipments { +module TS.SpaceTac.Game.Equipments { // Base convenience class for weapons export class AbstractWeapon extends LootTemplate { // Boolean set to true if the weapon can target space diff --git a/src/game/equipments/BasicForceField.ts b/src/game/equipments/BasicForceField.ts index 69abbf2..6bec63e 100644 --- a/src/game/equipments/BasicForceField.ts +++ b/src/game/equipments/BasicForceField.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game.Equipments { +module TS.SpaceTac.Game.Equipments { export class BasicForceField extends LootTemplate { constructor() { super(SlotType.Shield, "Basic Force Field"); diff --git a/src/game/equipments/BasicPowerCore.ts b/src/game/equipments/BasicPowerCore.ts index c5d1838..ea4bbce 100644 --- a/src/game/equipments/BasicPowerCore.ts +++ b/src/game/equipments/BasicPowerCore.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game.Equipments { +module TS.SpaceTac.Game.Equipments { export class BasicPowerCore extends LootTemplate { constructor() { super(SlotType.Power, "Basic Power Core"); diff --git a/src/game/equipments/ConventionalEngine.ts b/src/game/equipments/ConventionalEngine.ts index 509444a..706e955 100644 --- a/src/game/equipments/ConventionalEngine.ts +++ b/src/game/equipments/ConventionalEngine.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game.Equipments { +module TS.SpaceTac.Game.Equipments { // Equipment: Conventional Engine export class ConventionalEngine extends LootTemplate { constructor() { diff --git a/src/game/equipments/EnergyDepleter.spec.ts b/src/game/equipments/EnergyDepleter.spec.ts index 6a5414e..ee24a31 100644 --- a/src/game/equipments/EnergyDepleter.spec.ts +++ b/src/game/equipments/EnergyDepleter.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { describe("EnergyDepleter", () => { it("limits target's AP", () => { var template = new Equipments.EnergyDepleter(); diff --git a/src/game/equipments/EnergyDepleter.ts b/src/game/equipments/EnergyDepleter.ts index a3e2b60..090ea8e 100644 --- a/src/game/equipments/EnergyDepleter.ts +++ b/src/game/equipments/EnergyDepleter.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game.Equipments { +module TS.SpaceTac.Game.Equipments { export class EnergyDepleter extends AbstractWeapon { constructor() { super("Energy Depleter"); diff --git a/src/game/equipments/GatlingGun.ts b/src/game/equipments/GatlingGun.ts index fb51222..30ff8a3 100644 --- a/src/game/equipments/GatlingGun.ts +++ b/src/game/equipments/GatlingGun.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game.Equipments { +module TS.SpaceTac.Game.Equipments { export class GatlingGun extends AbstractWeapon { constructor() { super("Gatling Gun", 50, 100); diff --git a/src/game/equipments/IronHull.ts b/src/game/equipments/IronHull.ts index f5fdd68..abc806a 100644 --- a/src/game/equipments/IronHull.ts +++ b/src/game/equipments/IronHull.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game.Equipments { +module TS.SpaceTac.Game.Equipments { export class IronHull extends LootTemplate { constructor() { super(SlotType.Armor, "IronHull"); diff --git a/src/game/equipments/SubMunitionMissile.spec.ts b/src/game/equipments/SubMunitionMissile.spec.ts index 49504cb..ce995a9 100644 --- a/src/game/equipments/SubMunitionMissile.spec.ts +++ b/src/game/equipments/SubMunitionMissile.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.Game.Specs { +module TS.SpaceTac.Game.Specs { describe("SubMunitionMissile", () => { it("hits several targets in circle", () => { var battle = TestTools.createBattle(1, 2); diff --git a/src/game/equipments/SubMunitionMissile.ts b/src/game/equipments/SubMunitionMissile.ts index 274bcd3..b216579 100644 --- a/src/game/equipments/SubMunitionMissile.ts +++ b/src/game/equipments/SubMunitionMissile.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game.Equipments { +module TS.SpaceTac.Game.Equipments { export class SubMunitionMissile extends AbstractWeapon { constructor() { super("SubMunition Missile", 30, 50); diff --git a/src/game/events/AttributeChangeEvent.ts b/src/game/events/AttributeChangeEvent.ts index 30a5108..80278b3 100644 --- a/src/game/events/AttributeChangeEvent.ts +++ b/src/game/events/AttributeChangeEvent.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Event logged when a ship moves export class AttributeChangeEvent extends BaseLogEvent { // Saved version of the attribute diff --git a/src/game/events/BaseLogEvent.ts b/src/game/events/BaseLogEvent.ts index eb08076..06eeb61 100644 --- a/src/game/events/BaseLogEvent.ts +++ b/src/game/events/BaseLogEvent.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Base class for a BattleLog event export class BaseLogEvent extends Serializable { // Code of the event (its type) diff --git a/src/game/events/DamageEvent.ts b/src/game/events/DamageEvent.ts index 832c475..2e4b3d1 100644 --- a/src/game/events/DamageEvent.ts +++ b/src/game/events/DamageEvent.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Event logged when a ship takes damage export class DamageEvent extends BaseLogEvent { // Damage to hull diff --git a/src/game/events/DeathEvent.ts b/src/game/events/DeathEvent.ts index 107683f..c08f75b 100644 --- a/src/game/events/DeathEvent.ts +++ b/src/game/events/DeathEvent.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Event logged when a ship is dead export class DeathEvent extends BaseLogEvent { constructor(ship: Ship) { diff --git a/src/game/events/EffectAddedEvent.ts b/src/game/events/EffectAddedEvent.ts index 9f1038f..be8d9ff 100644 --- a/src/game/events/EffectAddedEvent.ts +++ b/src/game/events/EffectAddedEvent.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Event logged when a sticky effect is added to a ship export class EffectAddedEvent extends BaseLogEvent { // Pointer to the effect diff --git a/src/game/events/EffectDurationChangedEvent.ts b/src/game/events/EffectDurationChangedEvent.ts index b40f7f1..a8e8b79 100644 --- a/src/game/events/EffectDurationChangedEvent.ts +++ b/src/game/events/EffectDurationChangedEvent.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Event logged when a sticky effect is added to a ship export class EffectDurationChangedEvent extends BaseLogEvent { // Pointer to the effect diff --git a/src/game/events/EffectRemovedEvent.ts b/src/game/events/EffectRemovedEvent.ts index f4a0220..915f8b5 100644 --- a/src/game/events/EffectRemovedEvent.ts +++ b/src/game/events/EffectRemovedEvent.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Event logged when a sticky effect is removed from a ship export class EffectRemovedEvent extends BaseLogEvent { // Pointer to the effect diff --git a/src/game/events/EndBattleEvent.ts b/src/game/events/EndBattleEvent.ts index f7b6f5e..98e2d81 100644 --- a/src/game/events/EndBattleEvent.ts +++ b/src/game/events/EndBattleEvent.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Event logged when the battle ended // This is always the last event of a battle log export class EndBattleEvent extends BaseLogEvent { diff --git a/src/game/events/FireEvent.ts b/src/game/events/FireEvent.ts index aff2096..081d92f 100644 --- a/src/game/events/FireEvent.ts +++ b/src/game/events/FireEvent.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Event logged when a weapon is used on a target export class FireEvent extends BaseLogEvent { // Weapon used diff --git a/src/game/events/MoveEvent.ts b/src/game/events/MoveEvent.ts index 0ee3176..71bcd70 100644 --- a/src/game/events/MoveEvent.ts +++ b/src/game/events/MoveEvent.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Event logged when a ship moves export class MoveEvent extends BaseLogEvent { // New facing angle, in radians diff --git a/src/game/events/ShipChangeEvent.ts b/src/game/events/ShipChangeEvent.ts index e3598aa..2950a4e 100644 --- a/src/game/events/ShipChangeEvent.ts +++ b/src/game/events/ShipChangeEvent.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.Game { +module TS.SpaceTac.Game { // Battle event, when a ship turn ended, and advanced to a new one export class ShipChangeEvent extends BaseLogEvent { constructor(ship: Ship, new_ship: Ship) { diff --git a/src/view/BaseView.ts b/src/view/BaseView.ts index 2f749c4..ef82563 100644 --- a/src/view/BaseView.ts +++ b/src/view/BaseView.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { // Base class for all game views export class BaseView extends Phaser.State { // Link to the root UI diff --git a/src/view/Boot.ts b/src/view/Boot.ts index afabb3e..5d0da2a 100644 --- a/src/view/Boot.ts +++ b/src/view/Boot.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { export class Boot extends Phaser.State { preload() { this.load.image("preload-background", "assets/images/preload/bar-background.png"); diff --git a/src/view/MainMenu.ts b/src/view/MainMenu.ts index dea317c..9c4e0de 100644 --- a/src/view/MainMenu.ts +++ b/src/view/MainMenu.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.View { +module TS.SpaceTac.View { export class MainMenu extends BaseView { group: Phaser.Group; button_new_game: Phaser.Button; diff --git a/src/view/Preload.ts b/src/view/Preload.ts index cceca04..103df46 100644 --- a/src/view/Preload.ts +++ b/src/view/Preload.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.View { +module TS.SpaceTac.View { export class Preload extends BaseView { private preloadBar: Phaser.Image; diff --git a/src/view/Router.ts b/src/view/Router.ts index 49eaa8f..6629441 100644 --- a/src/view/Router.ts +++ b/src/view/Router.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { // Router to other states export class Router extends Phaser.State { create() { diff --git a/src/view/TestGame.ts b/src/view/TestGame.ts index debdc86..c9e46f9 100644 --- a/src/view/TestGame.ts +++ b/src/view/TestGame.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.View.Specs { +module TS.SpaceTac.View.Specs { // Test game wrapper (use instead of jasmine 'it') export function ingame_it(desc: string, func: (game: Phaser.Game, state: Phaser.State) => void, state: Phaser.State = null, ...stateargs: any[]) { diff --git a/src/view/battle/ActionBar.spec.ts b/src/view/battle/ActionBar.spec.ts index bd3e627..b172fe9 100644 --- a/src/view/battle/ActionBar.spec.ts +++ b/src/view/battle/ActionBar.spec.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.View.Specs { +module TS.SpaceTac.View.Specs { describe("ActionBar", () => { inbattleview_it("lists available actions for selected ship", (battleview: BattleView) => { var bar = battleview.action_bar; diff --git a/src/view/battle/ActionBar.ts b/src/view/battle/ActionBar.ts index 4034e2b..995387f 100644 --- a/src/view/battle/ActionBar.ts +++ b/src/view/battle/ActionBar.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { // Bar with all available action icons displayed export class ActionBar extends Phaser.Group { // Link to the parent battleview diff --git a/src/view/battle/ActionIcon.ts b/src/view/battle/ActionIcon.ts index b312221..1b65e03 100644 --- a/src/view/battle/ActionIcon.ts +++ b/src/view/battle/ActionIcon.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { // Icon to activate a ship capability (move, fire...) export class ActionIcon extends Phaser.Button { // Link to the parent bar diff --git a/src/view/battle/ActionTooltip.ts b/src/view/battle/ActionTooltip.ts index 1646696..5366993 100644 --- a/src/view/battle/ActionTooltip.ts +++ b/src/view/battle/ActionTooltip.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { // Tooltip to display action information export class ActionTooltip extends Phaser.Sprite { icon: Phaser.Image | null; diff --git a/src/view/battle/Arena.ts b/src/view/battle/Arena.ts index e4318b4..dccff4e 100644 --- a/src/view/battle/Arena.ts +++ b/src/view/battle/Arena.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { // Graphical representation of a battle // This is the area in the BattleView that will display ships with their real positions export class Arena extends Phaser.Group { diff --git a/src/view/battle/ArenaShip.ts b/src/view/battle/ArenaShip.ts index bb7db19..de0a841 100644 --- a/src/view/battle/ArenaShip.ts +++ b/src/view/battle/ArenaShip.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { // Ship sprite in the arena (BattleView) export class ArenaShip extends Phaser.Group { // Link to displayed ship diff --git a/src/view/battle/BattleView.spec.ts b/src/view/battle/BattleView.spec.ts index 1001fdd..5442650 100644 --- a/src/view/battle/BattleView.spec.ts +++ b/src/view/battle/BattleView.spec.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.View.Specs { +module TS.SpaceTac.View.Specs { describe("BattleView", () => { inbattleview_it("forwards events in targetting mode", (battleview: BattleView) => { expect(battleview.targetting).toBeNull(); diff --git a/src/view/battle/BattleView.ts b/src/view/battle/BattleView.ts index c0fed51..a11af03 100644 --- a/src/view/battle/BattleView.ts +++ b/src/view/battle/BattleView.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.View { +module TS.SpaceTac.View { // Interactive view of a Battle export class BattleView extends BaseView { diff --git a/src/view/battle/LogProcessor.ts b/src/view/battle/LogProcessor.ts index e18a85a..1df6a6c 100644 --- a/src/view/battle/LogProcessor.ts +++ b/src/view/battle/LogProcessor.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { // Processor of battle log events // This will process incoming battle events, and update the battleview accordingly export class LogProcessor { diff --git a/src/view/battle/RangeHint.ts b/src/view/battle/RangeHint.ts index 1d418e2..4d7d807 100644 --- a/src/view/battle/RangeHint.ts +++ b/src/view/battle/RangeHint.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { // Graphical hints for movement and weapon range export class RangeHint extends Phaser.Group { // Link to the arena diff --git a/src/view/battle/ShipList.spec.ts b/src/view/battle/ShipList.spec.ts index 841742e..8a79d13 100644 --- a/src/view/battle/ShipList.spec.ts +++ b/src/view/battle/ShipList.spec.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.View.Specs { +module TS.SpaceTac.View.Specs { describe("ShipList", () => { inbattleview_it("handles play position of ships", (battleview: BattleView) => { var list = battleview.ship_list; diff --git a/src/view/battle/ShipList.ts b/src/view/battle/ShipList.ts index f824fd0..0cb3be8 100644 --- a/src/view/battle/ShipList.ts +++ b/src/view/battle/ShipList.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { // Bar with all playing ships, by play order export class ShipList extends Phaser.Image { // Link to the parent battleview diff --git a/src/view/battle/ShipListItem.ts b/src/view/battle/ShipListItem.ts index 814f89b..a842e29 100644 --- a/src/view/battle/ShipListItem.ts +++ b/src/view/battle/ShipListItem.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { // One item in a ship list (used in BattleView) export class ShipListItem extends Phaser.Button { // Reference to the ship game object diff --git a/src/view/battle/ShipTooltip.ts b/src/view/battle/ShipTooltip.ts index 9b45b18..0a6974c 100644 --- a/src/view/battle/ShipTooltip.ts +++ b/src/view/battle/ShipTooltip.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { // Tooltip to display ship information export class ShipTooltip extends Phaser.Sprite { battleview: BattleView; diff --git a/src/view/battle/Targetting.spec.ts b/src/view/battle/Targetting.spec.ts index dd301c5..6a888b1 100644 --- a/src/view/battle/Targetting.spec.ts +++ b/src/view/battle/Targetting.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.View.Specs { +module TS.SpaceTac.View.Specs { describe("Targetting", () => { it("broadcasts hovering and selection events", () => { var targetting = new Targetting(null); diff --git a/src/view/battle/Targetting.ts b/src/view/battle/Targetting.ts index ad5bd60..9bbcef6 100644 --- a/src/view/battle/Targetting.ts +++ b/src/view/battle/Targetting.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { // Targetting system // Allows to pick a target for an action export class Targetting { diff --git a/src/view/battle/WeaponEffect.ts b/src/view/battle/WeaponEffect.ts index d284a37..60321ca 100644 --- a/src/view/battle/WeaponEffect.ts +++ b/src/view/battle/WeaponEffect.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { // Particle that is rotated to always face its ongoing direction class BulletParticle extends Phaser.Particle { update(): void { diff --git a/src/view/common/Animation.ts b/src/view/common/Animation.ts index 3f667c9..7a35af2 100644 --- a/src/view/common/Animation.ts +++ b/src/view/common/Animation.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { // Utility functions for animation export class Animation { diff --git a/src/view/common/Audio.ts b/src/view/common/Audio.ts index 0833b79..183d0bb 100644 --- a/src/view/common/Audio.ts +++ b/src/view/common/Audio.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { // Utility functions for sounds export class Audio { diff --git a/src/view/common/InputManager.ts b/src/view/common/InputManager.ts index 6d073da..12209a9 100644 --- a/src/view/common/InputManager.ts +++ b/src/view/common/InputManager.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { // Manager for keyboard input / bindings // Action callbacks will receive the view as 'this' context export class InputManager { diff --git a/src/view/common/Messages.ts b/src/view/common/Messages.ts index af1b852..40d5820 100644 --- a/src/view/common/Messages.ts +++ b/src/view/common/Messages.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { // A single displayed message class Message extends Phaser.Group { text: Phaser.Text; diff --git a/src/view/common/Tools.spec.ts b/src/view/common/Tools.spec.ts index df59bc4..8bbccbd 100644 --- a/src/view/common/Tools.spec.ts +++ b/src/view/common/Tools.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.View.Specs { +module TS.SpaceTac.View.Specs { describe("Tools", () => { it("normalizes angles", function () { expect(Tools.normalizeAngle(0)).toEqual(0); diff --git a/src/view/common/Tools.ts b/src/view/common/Tools.ts index 9a4cd09..7cfbc6d 100644 --- a/src/view/common/Tools.ts +++ b/src/view/common/Tools.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { // Common UI tools functions export class Tools { diff --git a/src/view/common/ValueBar.spec.ts b/src/view/common/ValueBar.spec.ts index 5f421aa..d43df52 100644 --- a/src/view/common/ValueBar.spec.ts +++ b/src/view/common/ValueBar.spec.ts @@ -1,4 +1,4 @@ -module SpaceTac.View.Specs { +module TS.SpaceTac.View.Specs { describe("ValueBar", () => { ingame_it("computes proportional value", (game: Phaser.Game) => { var bar = ValueBar.newStandard(game, 0, 0); diff --git a/src/view/common/ValueBar.ts b/src/view/common/ValueBar.ts index 6e6602e..2ea1510 100644 --- a/src/view/common/ValueBar.ts +++ b/src/view/common/ValueBar.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { // Bar to display a value (like a progress bar) export class ValueBar extends Phaser.Sprite { // Vertical orientation diff --git a/src/view/map/StarSystemDisplay.ts b/src/view/map/StarSystemDisplay.ts index c47407f..fd9ee89 100644 --- a/src/view/map/StarSystemDisplay.ts +++ b/src/view/map/StarSystemDisplay.ts @@ -1,4 +1,4 @@ -module SpaceTac.View { +module TS.SpaceTac.View { // Group to display a star system export class StarSystemDisplay extends Phaser.Image { starsystem: Game.Star; diff --git a/src/view/map/UniverseMapView.ts b/src/view/map/UniverseMapView.ts index db7241f..8fe82e0 100644 --- a/src/view/map/UniverseMapView.ts +++ b/src/view/map/UniverseMapView.ts @@ -1,6 +1,6 @@ /// -module SpaceTac.View { +module TS.SpaceTac.View { // Interactive map of the universe export class UniverseMapView extends BaseView { // Displayed universe