diff --git a/firebase.json b/firebase.json
index 4969892..7b215fe 100644
--- a/firebase.json
+++ b/firebase.json
@@ -6,10 +6,22 @@
"**/.*",
"**/node_modules/**"
],
- "redirects": [{
- "source": "/benchmark2",
- "destination": "/benchmark2.html",
- "type": 301
- }]
+ "redirects": [
+ {
+ "source": "/benchmark1",
+ "destination": "/ShatteredSwordGameDesignDocument.html",
+ "type": 301
+ },
+ {
+ "source": "/benchmark2",
+ "destination": "/benchmark2.html",
+ "type": 301
+ },
+ {
+ "source": "/benchmark3",
+ "destination": "/banchmark3.html",
+ "type": 301
+ }
+ ]
}
}
\ No newline at end of file
diff --git a/public/benchmark2.html b/public/benchmark2.html
index c47fc9e..21432f6 100644
--- a/public/benchmark2.html
+++ b/public/benchmark2.html
@@ -1,8 +1,9 @@
-
+
-
- Game
+
+
+ Benchmark 2
@@ -68,6 +69,6 @@
-
+
\ No newline at end of file
diff --git a/public/benchmark3.html b/public/benchmark3.html
new file mode 100644
index 0000000..e2940cf
--- /dev/null
+++ b/public/benchmark3.html
@@ -0,0 +1,74 @@
+
+
+
+
+
+ Benchmark 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/bundle.js b/public/bundle2.js
similarity index 99%
rename from public/bundle.js
rename to public/bundle2.js
index 7efb914..7681f03 100644
--- a/public/bundle.js
+++ b/public/bundle2.js
@@ -11491,11 +11491,11 @@ class WeaponTemplateRegistry extends Registry_1.default {
const rm = ResourceManager_1.default.getInstance();
//TODO -
// Load sprites for each weapon
- //rm.image("something", "shattered_sword_assets/sprites/something.png");
- rm.image("knife", "shattered_sword_assets/sprites/knife.png");
+ //rm.image("something", "shattered_sword_assets2/sprites/something.png");
+ rm.image("knife", "shattered_sword_assets2/sprites/knife.png");
// Load spritesheets
- //rm.spritesheet("weapon anim", "shattered_sword_assets/spritesheets/weapon anim.json");
- rm.spritesheet("slice", "shattered_sword_assets/spritesheets/slice.json");
+ //rm.spritesheet("weapon anim", "shattered_sword_assets2/spritesheets/weapon anim.json");
+ rm.spritesheet("slice", "shattered_sword_assets2/spritesheets/slice.json");
// Register default types
//this.registerItem("itemtype", itemTypefile);
this.registerItem("slice", Slice_1.default);
@@ -11553,15 +11553,15 @@ class GameLevel extends Scene_1.default {
//can load player sprite here
//can load enemy sprite here
// Load the scene info
- this.load.object("weaponData", "shattered_sword_assets/data/weaponData.json");
+ this.load.object("weaponData", "shattered_sword_assets2/data/weaponData.json");
// Load in the enemy info
- //this.load.object("enemyData", "shattered_sword_assets/data/enemy.json");
+ //this.load.object("enemyData", "shattered_sword_assets2/data/enemy.json");
// Load in item info
- //this.load.object("itemData", "shattered_sword_assets/data/items.json");
- this.load.image("knife", "shattered_sword_assets/sprites/knife.png");
- this.load.spritesheet("slice", "shattered_sword_assets/spritesheets/slice.json");
- this.load.image("inventorySlot", "shattered_sword_assets/sprites/inventory.png");
- this.load.spritesheet("test_dummy", "shattered_sword_assets/spritesheets/test_dummy.json");
+ //this.load.object("itemData", "shattered_sword_assets2/data/items.json");
+ this.load.image("knife", "shattered_sword_assets2/sprites/knife.png");
+ this.load.spritesheet("slice", "shattered_sword_assets2/spritesheets/slice.json");
+ this.load.image("inventorySlot", "shattered_sword_assets2/sprites/inventory.png");
+ this.load.spritesheet("test_dummy", "shattered_sword_assets2/spritesheets/test_dummy.json");
}
startScene() {
// Do the game level standard initializations
@@ -11978,7 +11978,7 @@ const Levels_1 = require("./Levels");
class MainMenu extends Scene_1.default {
loadScene() {
// Load the menu song
- //this.load.audio("menu", "shattered_sword_assets/music/menu.mp3");
+ //this.load.audio("menu", "shattered_sword_assets2/music/menu.mp3");
}
//TODO
startScene() {
@@ -11990,7 +11990,7 @@ class MainMenu extends Scene_1.default {
// console.log(this.save.getLevel());
// this.save.setLevel(10);
// console.log(this.save.getLevel());
- // this.rmg = new RandomMapGenerator("shattered_sword_assets/jsons/forest_template.json", 114514);
+ // this.rmg = new RandomMapGenerator("shattered_sword_assets2/jsons/forest_template.json", 114514);
// this.rmg.getMap();
// Scene has started, so start playing music
//this.emitter.fireEvent(GameEventType.PLAY_SOUND, {key: "menu", loop: true, holdReference: true});
@@ -12295,7 +12295,7 @@ class SceneWithStory extends Scene_1.default {
let event = this.receiver.getNextEvent();
// Testing code
if (event.type === "loadStory" && this.currentMode === Mode.GAME_MODE) {
- this.storyLoader("shattered_sword_assets/jsons/story.json");
+ this.storyLoader("shattered_sword_assets2/jsons/story.json");
}
}
// Testing code
@@ -12316,15 +12316,15 @@ class Tutorial extends GameLevel_1.default {
loadScene() {
super.loadScene();
// Load resources
- // this.load.tilemap("forest1", "shattered_sword_assets/tilemaps/Tutorial.json");
+ // this.load.tilemap("forest1", "shattered_sword_assets2/tilemaps/Tutorial.json");
// let map = localStorage.getItem("map");
this.randomSeed = Math.floor(Math.random() * 10000000000);
- let rmg = new RandomMapGenerator_1.default("shattered_sword_assets/jsons/forest_template.json", this.randomSeed);
+ let rmg = new RandomMapGenerator_1.default("shattered_sword_assets2/jsons/forest_template.json", this.randomSeed);
this.map = rmg.getMap();
this.load.tilemapFromObject("forest1", this.map);
- this.load.spritesheet("player", "shattered_sword_assets/spritesheets/Hiro.json");
+ this.load.spritesheet("player", "shattered_sword_assets2/spritesheets/Hiro.json");
// TODO - change when done testing
- this.load.spritesheet("slice", "shattered_sword_assets/spritesheets/slice.json");
+ this.load.spritesheet("slice", "shattered_sword_assets2/spritesheets/slice.json");
//load music here
}
startScene() {
diff --git a/public/index.html b/public/index.html
index 9b6b645..06b0a41 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,89 +1,17 @@
-
+
- Welcome to Firebase Hosting
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Shattered Sword
-
-
Welcome
-
Firebase Hosting Setup Complete
-
You're seeing this because you've successfully setup Firebase Hosting. Now it's time to go build something extraordinary!
-
Open Hosting Documentation
-
- Firebase SDK Loading…
+ Benchmarks:
-
+
diff --git a/public/shattered_sword_assets/data/weaponData.json b/public/shattered_sword_assets2/data/weaponData.json
similarity index 100%
rename from public/shattered_sword_assets/data/weaponData.json
rename to public/shattered_sword_assets2/data/weaponData.json
diff --git a/public/shattered_sword_assets/fonts/PixelSimple.ttf b/public/shattered_sword_assets2/fonts/PixelSimple.ttf
similarity index 100%
rename from public/shattered_sword_assets/fonts/PixelSimple.ttf
rename to public/shattered_sword_assets2/fonts/PixelSimple.ttf
diff --git a/public/shattered_sword_assets/images/Logo.png b/public/shattered_sword_assets2/images/Logo.png
similarity index 100%
rename from public/shattered_sword_assets/images/Logo.png
rename to public/shattered_sword_assets2/images/Logo.png
diff --git a/public/shattered_sword_assets/images/story1.png b/public/shattered_sword_assets2/images/story1.png
similarity index 100%
rename from public/shattered_sword_assets/images/story1.png
rename to public/shattered_sword_assets2/images/story1.png
diff --git a/public/shattered_sword_assets/images/story2.png b/public/shattered_sword_assets2/images/story2.png
similarity index 100%
rename from public/shattered_sword_assets/images/story2.png
rename to public/shattered_sword_assets2/images/story2.png
diff --git a/public/shattered_sword_assets/images/story3.png b/public/shattered_sword_assets2/images/story3.png
similarity index 100%
rename from public/shattered_sword_assets/images/story3.png
rename to public/shattered_sword_assets2/images/story3.png
diff --git a/public/shattered_sword_assets/images/story4.png b/public/shattered_sword_assets2/images/story4.png
similarity index 100%
rename from public/shattered_sword_assets/images/story4.png
rename to public/shattered_sword_assets2/images/story4.png
diff --git a/public/shattered_sword_assets/jsons/forest_template.json b/public/shattered_sword_assets2/jsons/forest_template.json
similarity index 100%
rename from public/shattered_sword_assets/jsons/forest_template.json
rename to public/shattered_sword_assets2/jsons/forest_template.json
diff --git a/public/shattered_sword_assets/jsons/sampleconfig.json b/public/shattered_sword_assets2/jsons/sampleconfig.json
similarity index 100%
rename from public/shattered_sword_assets/jsons/sampleconfig.json
rename to public/shattered_sword_assets2/jsons/sampleconfig.json
diff --git a/public/shattered_sword_assets/jsons/samplesave.json b/public/shattered_sword_assets2/jsons/samplesave.json
similarity index 100%
rename from public/shattered_sword_assets/jsons/samplesave.json
rename to public/shattered_sword_assets2/jsons/samplesave.json
diff --git a/public/shattered_sword_assets/jsons/samplestory.json b/public/shattered_sword_assets2/jsons/samplestory.json
similarity index 100%
rename from public/shattered_sword_assets/jsons/samplestory.json
rename to public/shattered_sword_assets2/jsons/samplestory.json
diff --git a/public/shattered_sword_assets/jsons/story.json b/public/shattered_sword_assets2/jsons/story.json
similarity index 100%
rename from public/shattered_sword_assets/jsons/story.json
rename to public/shattered_sword_assets2/jsons/story.json
diff --git a/public/shattered_sword_assets/sounds/test.mp3 b/public/shattered_sword_assets2/sounds/test.mp3
similarity index 100%
rename from public/shattered_sword_assets/sounds/test.mp3
rename to public/shattered_sword_assets2/sounds/test.mp3
diff --git a/public/shattered_sword_assets/sprites/inventory.png b/public/shattered_sword_assets2/sprites/inventory.png
similarity index 100%
rename from public/shattered_sword_assets/sprites/inventory.png
rename to public/shattered_sword_assets2/sprites/inventory.png
diff --git a/public/shattered_sword_assets/sprites/knife.png b/public/shattered_sword_assets2/sprites/knife.png
similarity index 100%
rename from public/shattered_sword_assets/sprites/knife.png
rename to public/shattered_sword_assets2/sprites/knife.png
diff --git a/public/shattered_sword_assets/spritesheets/Hiro.json b/public/shattered_sword_assets2/spritesheets/Hiro.json
similarity index 100%
rename from public/shattered_sword_assets/spritesheets/Hiro.json
rename to public/shattered_sword_assets2/spritesheets/Hiro.json
diff --git a/public/shattered_sword_assets/spritesheets/Hiro.png b/public/shattered_sword_assets2/spritesheets/Hiro.png
similarity index 100%
rename from public/shattered_sword_assets/spritesheets/Hiro.png
rename to public/shattered_sword_assets2/spritesheets/Hiro.png
diff --git a/public/shattered_sword_assets/spritesheets/Hiro1.json b/public/shattered_sword_assets2/spritesheets/Hiro1.json
similarity index 100%
rename from public/shattered_sword_assets/spritesheets/Hiro1.json
rename to public/shattered_sword_assets2/spritesheets/Hiro1.json
diff --git a/public/shattered_sword_assets/spritesheets/Hiro1.png b/public/shattered_sword_assets2/spritesheets/Hiro1.png
similarity index 100%
rename from public/shattered_sword_assets/spritesheets/Hiro1.png
rename to public/shattered_sword_assets2/spritesheets/Hiro1.png
diff --git a/public/shattered_sword_assets/spritesheets/Snake.json b/public/shattered_sword_assets2/spritesheets/Snake.json
similarity index 100%
rename from public/shattered_sword_assets/spritesheets/Snake.json
rename to public/shattered_sword_assets2/spritesheets/Snake.json
diff --git a/public/shattered_sword_assets/spritesheets/Snake.png b/public/shattered_sword_assets2/spritesheets/Snake.png
similarity index 100%
rename from public/shattered_sword_assets/spritesheets/Snake.png
rename to public/shattered_sword_assets2/spritesheets/Snake.png
diff --git a/public/shattered_sword_assets/spritesheets/Tiger.json b/public/shattered_sword_assets2/spritesheets/Tiger.json
similarity index 100%
rename from public/shattered_sword_assets/spritesheets/Tiger.json
rename to public/shattered_sword_assets2/spritesheets/Tiger.json
diff --git a/public/shattered_sword_assets/spritesheets/Tiger.png b/public/shattered_sword_assets2/spritesheets/Tiger.png
similarity index 100%
rename from public/shattered_sword_assets/spritesheets/Tiger.png
rename to public/shattered_sword_assets2/spritesheets/Tiger.png
diff --git a/public/shattered_sword_assets/spritesheets/slice.json b/public/shattered_sword_assets2/spritesheets/slice.json
similarity index 100%
rename from public/shattered_sword_assets/spritesheets/slice.json
rename to public/shattered_sword_assets2/spritesheets/slice.json
diff --git a/public/shattered_sword_assets/spritesheets/slice.png b/public/shattered_sword_assets2/spritesheets/slice.png
similarity index 100%
rename from public/shattered_sword_assets/spritesheets/slice.png
rename to public/shattered_sword_assets2/spritesheets/slice.png
diff --git a/public/shattered_sword_assets/spritesheets/test_dummy.json b/public/shattered_sword_assets2/spritesheets/test_dummy.json
similarity index 100%
rename from public/shattered_sword_assets/spritesheets/test_dummy.json
rename to public/shattered_sword_assets2/spritesheets/test_dummy.json
diff --git a/public/shattered_sword_assets/spritesheets/test_dummy.png b/public/shattered_sword_assets2/spritesheets/test_dummy.png
similarity index 100%
rename from public/shattered_sword_assets/spritesheets/test_dummy.png
rename to public/shattered_sword_assets2/spritesheets/test_dummy.png
diff --git a/public/shattered_sword_assets/tilemaps/Tutorial.json b/public/shattered_sword_assets2/tilemaps/Tutorial.json
similarity index 100%
rename from public/shattered_sword_assets/tilemaps/Tutorial.json
rename to public/shattered_sword_assets2/tilemaps/Tutorial.json
diff --git a/public/shattered_sword_assets/tilemaps/bamboo_forest.tsx b/public/shattered_sword_assets2/tilemaps/bamboo_forest.tsx
similarity index 100%
rename from public/shattered_sword_assets/tilemaps/bamboo_forest.tsx
rename to public/shattered_sword_assets2/tilemaps/bamboo_forest.tsx
diff --git a/public/shattered_sword_assets/tilemaps/forest1.json b/public/shattered_sword_assets2/tilemaps/forest1.json
similarity index 100%
rename from public/shattered_sword_assets/tilemaps/forest1.json
rename to public/shattered_sword_assets2/tilemaps/forest1.json
diff --git a/public/shattered_sword_assets/tilemaps/forest1.png b/public/shattered_sword_assets2/tilemaps/forest1.png
similarity index 100%
rename from public/shattered_sword_assets/tilemaps/forest1.png
rename to public/shattered_sword_assets2/tilemaps/forest1.png
diff --git a/public/shattered_sword_assets/tilemaps/forest_tileset.png b/public/shattered_sword_assets2/tilemaps/forest_tileset.png
similarity index 100%
rename from public/shattered_sword_assets/tilemaps/forest_tileset.png
rename to public/shattered_sword_assets2/tilemaps/forest_tileset.png