Skip to content

Commit caa21ce

Browse files
committed
feat: add demo2 to launcher
1 parent 300e63f commit caa21ce

File tree

17 files changed

+11967
-7
lines changed

17 files changed

+11967
-7
lines changed

assets/demo2_deployment.json

Lines changed: 5506 additions & 0 deletions
Large diffs are not rendered by default.

assets/demo2_deployment2.json

Lines changed: 5506 additions & 0 deletions
Large diffs are not rendered by default.

oc_launcher/src/main.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ impl eframe::App for Launcher {
7474
ui.horizontal(|ui|{
7575
let texture: &egui::TextureHandle = self.map1_preview.get_or_insert_with(|| {
7676
ui.ctx().load_texture(
77-
"Demo1Preview.png",
78-
load_image_from_path(Path::new("resources/maps/Demo1/Demo1Preview.png")).unwrap(),
77+
"Demo2Preview.png",
78+
load_image_from_path(Path::new("resources/maps/Demo2/Demo2Preview.png")).unwrap(),
7979
Default::default()
8080
)
8181
});
@@ -103,18 +103,18 @@ impl eframe::App for Launcher {
103103
impl Launcher {
104104
fn launch_attack_from_west(&self) -> Result<()> {
105105
self.launch(
106-
"Demo1",
107-
"assets/demo1_deployment.json",
106+
"Demo2",
107+
"assets/demo2_deployment.json",
108108
vec!["W", "NW", "SW"],
109109
vec!["ALL"],
110110
)?;
111111
Ok(())
112112
}
113113
fn launch_attack_from_north_est(&self) -> Result<()> {
114114
self.launch(
115-
"Demo1",
116-
"assets/demo1_deployment2.json",
117-
vec!["N", "NE", "E"],
115+
"Demo2",
116+
"assets/demo2_deployment2.json",
117+
vec!["S", "SE", "E"],
118118
vec!["ALL"],
119119
)?;
120120
Ok(())

resources/maps/Demo2/CREDITS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Original background, Creative Commons (BY) : https://rpgmapshare.com/piwigo/gallery/picture.php?/8327/category/55
2+
Trees, Creative Commons (BY): https://rpgmapshare.com/piwigo/gallery/index.php?/category/22
3+
House1, Creative Commons (BY) : https://rpgmapshare.com/piwigo/gallery/index.php?/category/19
4+
Tree stump : https://www.kindpng.com/imgv/wThwhx_tree-wellness-alpharetta-ga-top-tree-stump-png/
5+
Wood : https://rpgmapshare.com/piwigo/gallery/index.php
6+
Rock & Stones : https://rpgmapshare.com/piwigo/gallery/index.php?/category/23

resources/maps/Demo2/Demo2.png

7.32 MB
Loading

resources/maps/Demo2/Demo2.tmx

Lines changed: 859 additions & 0 deletions
Large diffs are not rendered by default.
7.74 MB
Loading

resources/maps/Demo2/Demo2__HD.png

65.2 MB
Loading

resources/maps/Demo2/interiors.png

192 KB
Loading
1.38 MB
Loading

0 commit comments

Comments
 (0)