mindustry logic execution, map- and schematic- parsing and rendering
remove random
bendn 2023-07-31
parent f60d254 · commit bedc2a5
-rw-r--r--Cargo.toml2
-rw-r--r--assets/blocks/walls/scrap-wall-huge.png (renamed from assets/blocks/walls/scrap-wall-huge1.png)bin550 -> 550 bytes
-rw-r--r--assets/blocks/walls/scrap-wall-huge2.pngbin828 -> 0 bytes
-rw-r--r--assets/blocks/walls/scrap-wall-huge3.pngbin834 -> 0 bytes
-rw-r--r--assets/blocks/walls/scrap-wall-large1.pngbin544 -> 0 bytes
-rw-r--r--assets/blocks/walls/scrap-wall-large2.pngbin358 -> 0 bytes
-rw-r--r--assets/blocks/walls/scrap-wall-large3.pngbin571 -> 0 bytes
-rw-r--r--assets/blocks/walls/scrap-wall-large4.pngbin576 -> 0 bytes
-rw-r--r--assets/blocks/walls/scrap-wall.png (renamed from assets/blocks/walls/scrap-wall5.png)bin213 -> 213 bytes
-rw-r--r--assets/blocks/walls/scrap-wall1.pngbin267 -> 0 bytes
-rw-r--r--assets/blocks/walls/scrap-wall2.pngbin268 -> 0 bytes
-rw-r--r--assets/blocks/walls/scrap-wall3.pngbin270 -> 0 bytes
-rw-r--r--assets/blocks/walls/scrap-wall4.pngbin227 -> 0 bytes
-rw-r--r--src/block/walls.rs13
14 files changed, 0 insertions, 15 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 58e4f9c..5d0b724 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,8 +19,6 @@ strconv = "0.1"
# png feature not needed; only for binary. todo seperate bin
image = { version = "0.24", features = ["png"], default-features = false }
color-hex = "0.2"
-tinyrand = "0.5"
-tinyrand-std = "0.5"
thiserror = "1.0"
bobbin-bits = "0.1"
blurslice = { version = "0.1", optional = true }
diff --git a/assets/blocks/walls/scrap-wall-huge1.png b/assets/blocks/walls/scrap-wall-huge.png
index d5c5822..d5c5822 100644
--- a/assets/blocks/walls/scrap-wall-huge1.png
+++ b/assets/blocks/walls/scrap-wall-huge.png
Binary files differ
diff --git a/assets/blocks/walls/scrap-wall-huge2.png b/assets/blocks/walls/scrap-wall-huge2.png
deleted file mode 100644
index 777dfa2..0000000
--- a/assets/blocks/walls/scrap-wall-huge2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/walls/scrap-wall-huge3.png b/assets/blocks/walls/scrap-wall-huge3.png
deleted file mode 100644
index b04b4ee..0000000
--- a/assets/blocks/walls/scrap-wall-huge3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/walls/scrap-wall-large1.png b/assets/blocks/walls/scrap-wall-large1.png
deleted file mode 100644
index ae4de43..0000000
--- a/assets/blocks/walls/scrap-wall-large1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/walls/scrap-wall-large2.png b/assets/blocks/walls/scrap-wall-large2.png
deleted file mode 100644
index f755c40..0000000
--- a/assets/blocks/walls/scrap-wall-large2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/walls/scrap-wall-large3.png b/assets/blocks/walls/scrap-wall-large3.png
deleted file mode 100644
index a593446..0000000
--- a/assets/blocks/walls/scrap-wall-large3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/walls/scrap-wall-large4.png b/assets/blocks/walls/scrap-wall-large4.png
deleted file mode 100644
index c9f792d..0000000
--- a/assets/blocks/walls/scrap-wall-large4.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/walls/scrap-wall5.png b/assets/blocks/walls/scrap-wall.png
index 49ac797..49ac797 100644
--- a/assets/blocks/walls/scrap-wall5.png
+++ b/assets/blocks/walls/scrap-wall.png
Binary files differ
diff --git a/assets/blocks/walls/scrap-wall1.png b/assets/blocks/walls/scrap-wall1.png
deleted file mode 100644
index 3723064..0000000
--- a/assets/blocks/walls/scrap-wall1.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/walls/scrap-wall2.png b/assets/blocks/walls/scrap-wall2.png
deleted file mode 100644
index 9d94900..0000000
--- a/assets/blocks/walls/scrap-wall2.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/walls/scrap-wall3.png b/assets/blocks/walls/scrap-wall3.png
deleted file mode 100644
index 2add87b..0000000
--- a/assets/blocks/walls/scrap-wall3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/walls/scrap-wall4.png b/assets/blocks/walls/scrap-wall4.png
deleted file mode 100644
index 3219bc4..0000000
--- a/assets/blocks/walls/scrap-wall4.png
+++ /dev/null
Binary files differ
diff --git a/src/block/walls.rs b/src/block/walls.rs
index d0f437b..93eebe7 100644
--- a/src/block/walls.rs
+++ b/src/block/walls.rs
@@ -3,26 +3,13 @@ use crate::block::simple::*;
use crate::block::*;
use crate::data::dynamic::DynType;
use crate::data::renderer::{load, read_with};
-use tinyrand::RandRange;
-use tinyrand_std::thread_rand;
make_simple!(WallBlock, |_, name, _, _, _, s| {
- macro_rules! pick {
- ($name: literal => load $n: literal) => {{
- load(
- &format!("{}{}", $name, thread_rand().next_range(1usize..$n)),
- s,
- )
- }};
- }
match name {
"thruster" => {
const SFX: &[&str; 1] = &["-top"];
read_with("thruster", SFX, 4u32, s)
}
- "scrap-wall" => pick!("scrap-wall" => load 5),
- "scrap-wall-large" => pick!("scrap-wall-large" => load 3),
- "scrap-wall-huge" => pick!("scrap-wall-huge" => load 3),
_ => load(name, s),
}
});