diff --git a/graphics/exported/equipment/fractalhull.png b/graphics/exported/equipment/fractalhull.png
new file mode 100644
index 0000000..6e023cf
Binary files /dev/null and b/graphics/exported/equipment/fractalhull.png differ
diff --git a/graphics/exported/equipment/gravitshield.png b/graphics/exported/equipment/gravitshield.png
new file mode 100644
index 0000000..68b259e
Binary files /dev/null and b/graphics/exported/equipment/gravitshield.png differ
diff --git a/graphics/exported/equipment/harcoatedhull.png b/graphics/exported/equipment/harcoatedhull.png
new file mode 100644
index 0000000..e068ffc
Binary files /dev/null and b/graphics/exported/equipment/harcoatedhull.png differ
diff --git a/graphics/exported/equipment/invertershield.png b/graphics/exported/equipment/invertershield.png
new file mode 100644
index 0000000..7256ca5
Binary files /dev/null and b/graphics/exported/equipment/invertershield.png differ
diff --git a/graphics/ui/actions.svg b/graphics/ui/actions.svg
index d8e39b6..b60bb71 100644
--- a/graphics/ui/actions.svg
+++ b/graphics/ui/actions.svg
@@ -16,12 +16,111 @@
version="1.1"
inkscape:version="0.92.1 r15371"
sodipodi:docname="actions.svg"
- inkscape:export-filename="/home/michael/workspace/perso/spacetac/out/assets/images/equipment/damageprotector.png"
+ inkscape:export-filename="/home/michael/workspace/perso/spacetac/graphics/exported/equipment/invertershield.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
- viewBox="0 0 256 256">
+ viewBox="0 0 256 256"
+ enable-background="new">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -627,6 +726,99 @@
stdDeviation="0.52701551"
id="feGaussianBlur5537" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ showguides="false"
+ inkscape:snap-others="true"
+ inkscape:snap-grids="false"
+ inkscape:snap-to-guides="true"
+ inkscape:object-paths="true">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ style="display:none">
+ style="opacity:0.32900002" />
SpaceTac - Loot Generator Samples
+
@@ -63,12 +66,17 @@
window.onload = function () {
var generator = new TS.SpaceTac.LootGenerator();
var result = document.getElementById("result");
+ var current_level = 1;
+ var current_name = "";
- function update(level) {
+ function update() {
result.innerHTML = "";
generator.templates.forEach(function (template) {
+ if (template.name != current_name) {
+ return;
+ }
TS.iterenum(TS.SpaceTac.EquipmentQuality, function (quality) {
- var loot = template.generate(level, quality);
+ var loot = template.generate(current_level, quality);
let title = document.createElement("h2");
title.textContent = loot.getFullName() + " (Price " + loot.price.toString() + ")";
@@ -81,10 +89,24 @@
});
}
- update(1);
+ TS.sortedBy(generator.templates, function (template) {
+ return template.name;
+ }).forEach(function (template) {
+ var opt = document.createElement('option');
+ opt.value = template.name;
+ opt.innerHTML = template.name;
+ document.getElementById("template").appendChild(opt);
+ });
+
document.getElementById("level").onchange = function () {
- update(this.value);
+ current_level = this.value;
+ update();
}
+ document.getElementById("template").onchange = function () {
+ current_name = this.value;
+ update();
+ }
+ update();
};
diff --git a/src/core/LootTemplate.ts b/src/core/LootTemplate.ts
index f9df747..76bfdbf 100644
--- a/src/core/LootTemplate.ts
+++ b/src/core/LootTemplate.ts
@@ -187,11 +187,11 @@ module TS.SpaceTac {
// Modifiers applied to "common" equipment to obtain a specific quality
protected quality_modifiers: QualityModifier[]
- constructor(slot: SlotType, name: string, description = "") {
+ constructor(slot: SlotType, name: string, description = "", price_base = 100, price_inflation = 200) {
this.slot = slot;
this.name = name;
this.description = description;
- this.price = istep(100, istep(200, irepeat(200)));
+ this.price = istep(price_base, istep(price_inflation, irepeat(price_inflation)));
this.base_modifiers = [];
this.quality_modifiers = [standardQualityModifier];
}
@@ -268,7 +268,7 @@ module TS.SpaceTac {
addAttributeEffect(attribute: keyof ShipAttributes, value: LeveledValue): void {
this.base_modifiers.push((equipment, level) => {
let resolved = resolveForLevel(value, level);
- if (resolved > 0) {
+ if (resolved != 0) {
equipment.effects.push(new AttributeEffect(attribute, resolved));
}
});
diff --git a/src/core/equipments/ForceField.spec.ts b/src/core/equipments/ForceField.spec.ts
deleted file mode 100644
index a6eaac0..0000000
--- a/src/core/equipments/ForceField.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-module TS.SpaceTac.Equipments {
- describe("ForceField", function () {
- it("generates equipment based on level", function () {
- let template = new ForceField();
-
- let equipment = template.generate(1);
- expect(equipment.requirements).toEqual({ "skill_photons": 1 });
- expect(equipment.effects).toEqual([new AttributeEffect("shield_capacity", 100)]);
-
- equipment = template.generate(2);
- expect(equipment.requirements).toEqual({ "skill_photons": 3 });
- expect(equipment.effects).toEqual([new AttributeEffect("shield_capacity", 140)]);
-
- equipment = template.generate(3);
- expect(equipment.requirements).toEqual({ "skill_photons": 5 });
- expect(equipment.effects).toEqual([new AttributeEffect("shield_capacity", 180)]);
-
- equipment = template.generate(10);
- expect(equipment.requirements).toEqual({ "skill_photons": 19 });
- expect(equipment.effects).toEqual([new AttributeEffect("shield_capacity", 460)]);
- });
- });
-}
diff --git a/src/core/equipments/ForceField.ts b/src/core/equipments/ForceField.ts
deleted file mode 100644
index f3abe36..0000000
--- a/src/core/equipments/ForceField.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-///