Skip to content

Commit

Permalink
yin_yang orbs shooting
Browse files Browse the repository at this point in the history
  • Loading branch information
@o2sh
o2sh committed Feb 25, 2021
1 parent c0c700c commit 293bea7
Show file tree
Hide file tree
Showing 13 changed files with 572 additions and 18 deletions.
172 changes: 172 additions & 0 deletions assets/gfx/medium_orbs.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
{
"meta": {
"image": "medium_orbs.png",
"size": {
"w": 128,
"h": 64
},
"scale": "1"
},
"frames": {
"medium_orb0.png": {
"frame": {
"x": 0,
"y": 0,
"w": 32,
"h": 32
},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 32
},
"sourceSize": {
"w": 32,
"h": 32
}
},
"medium_orb1.png": {
"frame": {
"x": 32,
"y": 0,
"w": 32,
"h": 32
},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 32
},
"sourceSize": {
"w": 32,
"h": 32
}
},
"medium_orb2.png": {
"frame": {
"x": 64,
"y": 0,
"w": 32,
"h": 32
},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 32
},
"sourceSize": {
"w": 32,
"h": 32
}
},
"medium_orb3.png": {
"frame": {
"x": 96,
"y": 0,
"w": 32,
"h": 32
},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 32
},
"sourceSize": {
"w": 32,
"h": 32
}
},
"medium_orb4.png": {
"frame": {
"x": 0,
"y": 32,
"w": 32,
"h": 32
},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 32
},
"sourceSize": {
"w": 32,
"h": 32
}
},
"medium_orb5.png": {
"frame": {
"x": 32,
"y": 32,
"w": 32,
"h": 32
},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 32
},
"sourceSize": {
"w": 32,
"h": 32
}
},
"medium_orb6.png": {
"frame": {
"x": 64,
"y": 32,
"w": 32,
"h": 32
},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 32
},
"sourceSize": {
"w": 32,
"h": 32
}
},
"medium_orb7.png": {
"frame": {
"x": 96,
"y": 32,
"w": 32,
"h": 32
},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 32
},
"sourceSize": {
"w": 32,
"h": 32
}
}
}
}
Binary file added assets/gfx/medium_orbs.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions common/src/game/player_data.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ pub struct PlayerData<'a> {
pub bullet: &'a str,
pub special: &'a str,
pub big_orb: &'a str,
pub med_orb: &'a str,
pub yin_yang_orb: &'a str,
pub neutral_face: &'a str,
pub attack_face: &'a str,
Expand All @@ -19,6 +20,7 @@ impl<'a> PlayerData<'a> {
bullet: "spell0",
special: "special0",
big_orb: "big_orb0",
med_orb: "medium_orb7",
yin_yang_orb: "fighter_orb0",
neutral_face: "a_reimu0",
attack_face: "a_reimu1",
Expand All @@ -44,6 +46,7 @@ impl<'a> PlayerData<'a> {
bullet: "spell4",
special: "special1",
big_orb: "big_orb1",
med_orb: "medium_orb3",
yin_yang_orb: "fighter_orb1",
neutral_face: "a_marisa0",
attack_face: "a_marisa1",
Expand Down
172 changes: 172 additions & 0 deletions docs/assets/gfx/medium_orbs.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
{
"meta": {
"image": "medium_orbs.png",
"size": {
"w": 128,
"h": 64
},
"scale": "1"
},
"frames": {
"medium_orb0.png": {
"frame": {
"x": 0,
"y": 0,
"w": 32,
"h": 32
},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 32
},
"sourceSize": {
"w": 32,
"h": 32
}
},
"medium_orb1.png": {
"frame": {
"x": 32,
"y": 0,
"w": 32,
"h": 32
},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 32
},
"sourceSize": {
"w": 32,
"h": 32
}
},
"medium_orb2.png": {
"frame": {
"x": 64,
"y": 0,
"w": 32,
"h": 32
},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 32
},
"sourceSize": {
"w": 32,
"h": 32
}
},
"medium_orb3.png": {
"frame": {
"x": 96,
"y": 0,
"w": 32,
"h": 32
},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 32
},
"sourceSize": {
"w": 32,
"h": 32
}
},
"medium_orb4.png": {
"frame": {
"x": 0,
"y": 32,
"w": 32,
"h": 32
},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 32
},
"sourceSize": {
"w": 32,
"h": 32
}
},
"medium_orb5.png": {
"frame": {
"x": 32,
"y": 32,
"w": 32,
"h": 32
},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 32
},
"sourceSize": {
"w": 32,
"h": 32
}
},
"medium_orb6.png": {
"frame": {
"x": 64,
"y": 32,
"w": 32,
"h": 32
},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 32
},
"sourceSize": {
"w": 32,
"h": 32
}
},
"medium_orb7.png": {
"frame": {
"x": 96,
"y": 32,
"w": 32,
"h": 32
},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 32
},
"sourceSize": {
"w": 32,
"h": 32
}
}
}
}
Binary file added docs/assets/gfx/medium_orbs.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file renamed docs/5290cea3447ef0e20914.module.wasm → docs/bdcd3a1b6520f3bf967a.module.wasm
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/bootstrap.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@
/******/ promises.push(installedWasmModuleData);
/******/ else {
/******/ var importObject = wasmImportObjects[wasmModuleId]();
/******/ var req = fetch(__webpack_require__.p + "" + {"./pkg/index_bg.wasm":"5290cea3447ef0e20914"}[wasmModuleId] + ".module.wasm");
/******/ var req = fetch(__webpack_require__.p + "" + {"./pkg/index_bg.wasm":"bdcd3a1b6520f3bf967a"}[wasmModuleId] + ".module.wasm");
/******/ var promise;
/******/ if(importObject instanceof Promise && typeof WebAssembly.compileStreaming === 'function') {
/******/ promise = Promise.all([WebAssembly.compileStreaming(req), importObject]).then(function(items) {
Expand Down
2 changes: 2 additions & 0 deletions ecs/src/app/ecs_app.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ impl<R: Renderer, A: Audio, T: Timer> App<R> for EcsApp<A, T> {
"special.png",
"big_orbs.png",
"fighter_orbs.png",
"medium_orbs.png",
],
);
renderer.load_sprite_sheet("assets/gfx/marisa.json");
Expand All @@ -94,6 +95,7 @@ impl<R: Renderer, A: Audio, T: Timer> App<R> for EcsApp<A, T> {
renderer.load_sprite_sheet("assets/gfx/special.json");
renderer.load_sprite_sheet("assets/gfx/big_orbs.json");
renderer.load_sprite_sheet("assets/gfx/fighter_orbs.json");
renderer.load_sprite_sheet("assets/gfx/medium_orbs.json");

self.audio.load_musics("assets/bgm", &["stage01.ogg", "menu.ogg"]).expect("");
}
Expand Down
Loading

0 comments on commit 293bea7

Please sign in to comment.