lew/rust-rl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

atomises item table into sub-tables, adds table rolls to vaults

Browse source
This commit is contained in:
Llywelwyn 2023-07-23 22:41:24 +01:00
parent 72bd7558fa
commit 1f6c04a526
6 changed files with 92 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/map_builders/mod.rs
View file

@ -304,6 +304,7 @@ pub fn random_builder(new_depth: i32, rng: &mut rltk::RandomNumberGenerator) ->
builder.start_with(BspInteriorBuilder::new());
builder.with(DoorPlacement::new());
builder.with(RoomBasedSpawner::new());
builder.with(PrefabBuilder::vaults());
builder.with(RoomBasedStairs::new());
builder.with(RoomBasedStartingPosition::new());
builder

36
src/map_builders/prefab_builder/mod.rs
View file

@ -1,4 +1,7 @@
use super::{BuilderMap, InitialMapBuilder, MetaMapBuilder, Position, TileType};
use super::{
spawner::equipment_table, spawner::food_table, spawner::potion_table, spawner::scroll_table, spawner::wand_table,
BuilderMap, InitialMapBuilder, MetaMapBuilder, Position, TileType,
};
use rltk::RandomNumberGenerator;
pub mod prefab_levels;
pub mod prefab_sections;
@ -60,15 +63,15 @@ impl PrefabBuilder {
fn build(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
match self.mode {
PrefabMode::RexLevel { template } => self.load_rex_map(&template, build_data),
PrefabMode::Constant { level } => self.load_ascii_map(&level, build_data),
PrefabMode::RexLevel { template } => self.load_rex_map(&template, rng, build_data),
PrefabMode::Constant { level } => self.load_ascii_map(&level, rng, build_data),
PrefabMode::Sectional { section } => self.apply_sectional(&section, rng, build_data),
PrefabMode::RoomVaults => self.apply_room_vaults(rng, build_data),
}
build_data.take_snapshot();
}
fn char_to_map(&mut self, ch: char, idx: usize, build_data: &mut BuilderMap) {
fn char_to_map(&mut self, ch: char, idx: usize, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
match ch {
' ' => build_data.map.tiles[idx] = TileType::Floor,
'#' => build_data.map.tiles[idx] = TileType::Wall,
@ -98,20 +101,20 @@ impl PrefabBuilder {
}
'%' => {
build_data.map.tiles[idx] = TileType::Floor;
build_data.spawn_list.push((idx, "rations".to_string()));
build_data.spawn_list.push((idx, food_table(build_data.map.depth).roll(rng)));
}
'!' => {
build_data.map.tiles[idx] = TileType::Floor;
build_data.spawn_list.push((idx, "health potion".to_string()));
build_data.spawn_list.push((idx, potion_table(build_data.map.depth).roll(rng)));
}
'/' => {
build_data.map.tiles[idx] = TileType::Floor;
build_data.spawn_list.push((idx, "magic missile wand".to_string()));
build_data.spawn_list.push((idx, wand_table(build_data.map.depth).roll(rng)));
// Placeholder for wand spawn
}
'?' => {
build_data.map.tiles[idx] = TileType::Floor;
build_data.spawn_list.push((idx, "fireball scroll".to_string()));
build_data.spawn_list.push((idx, scroll_table(build_data.map.depth).roll(rng)));
// Placeholder for scroll spawn
}
_ => {
@ -121,7 +124,7 @@ impl PrefabBuilder {
}
#[allow(dead_code)]
fn load_rex_map(&mut self, path: &str, build_data: &mut BuilderMap) {
fn load_rex_map(&mut self, path: &str, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
let xp_file = rltk::rex::XpFile::from_resource(path).unwrap();
for layer in &xp_file.layers {
@ -131,7 +134,7 @@ impl PrefabBuilder {
if x < build_data.map.width as usize && y < build_data.map.height as usize {
let idx = build_data.map.xy_idx(x as i32, y as i32);
// We're doing some nasty casting to make it easier to type things like '#' in the match
self.char_to_map(cell.ch as u8 as char, idx, build_data);
self.char_to_map(cell.ch as u8 as char, idx, rng, build_data);
}
}
}
@ -149,7 +152,12 @@ impl PrefabBuilder {
}
#[allow(dead_code)]
fn load_ascii_map(&mut self, level: &prefab_levels::PrefabLevel, build_data: &mut BuilderMap) {
fn load_ascii_map(
&mut self,
level: &prefab_levels::PrefabLevel,
rng: &mut RandomNumberGenerator,
build_data: &mut BuilderMap,
) {
let string_vec = PrefabBuilder::read_ascii_to_vec(level.template);
let mut i = 0;
@ -158,7 +166,7 @@ impl PrefabBuilder {
if tx < build_data.map.width as usize && ty < build_data.map.height as usize {
let idx = build_data.map.xy_idx(tx as i32, ty as i32);
if i < string_vec.len() {
self.char_to_map(string_vec[i], idx, build_data);
self.char_to_map(string_vec[i], idx, rng, build_data);
}
}
i += 1;
@ -228,7 +236,7 @@ impl PrefabBuilder {
{
let idx = build_data.map.xy_idx(tx as i32 + chunk_x, ty as i32 + chunk_y);
if i < string_vec.len() {
self.char_to_map(string_vec[i], idx, build_data);
self.char_to_map(string_vec[i], idx, rng, build_data);
}
}
i += 1;
@ -385,7 +393,7 @@ impl PrefabBuilder {
}
let idx = build_data.map.xy_idx(x_ + chunk_x, y_ + chunk_y);
if i < string_vec.len() {
self.char_to_map(string_vec[i], idx, build_data);
self.char_to_map(string_vec[i], idx, rng, build_data);
}
used_tiles.insert(idx);
i += 1;

12
src/random_table.rs
View file

@ -37,6 +37,18 @@ impl RandomTable {
return self;
}
/// Adds two RandomTables together
pub fn add_table(mut self, table: RandomTable) -> RandomTable {
// For every entry in the table being added, push to self.
for entry in table.entries {
self.entries.push(entry);
}
// Add the total weight of the added table to self.
self.total_weight += table.total_weight;
// Return
return self;
}
/// Rolls on an existing RandomTable
pub fn roll(&self, rng: &mut RandomNumberGenerator) -> String {
// If the table has no weight, return nothing.

41
src/spawner.rs
View file

@ -199,35 +199,46 @@ fn mob_table(map_depth: i32) -> RandomTable {
}
// 6 equipment : 10 potions : 10 scrolls : 2 cursed scrolls
fn item_table(_map_depth: i32) -> RandomTable {
fn item_table(map_depth: i32) -> RandomTable {
return RandomTable::new()
// Equipment
.add("dagger", 4)
.add("shortsword", 4)
.add("buckler", 4)
.add("shield", 2)
.add_table(equipment_table(map_depth))
// Potions
.add("weak health potion", 14)
.add("health potion", 6)
.add_table(potion_table(map_depth))
// Scrolls
.add_table(scroll_table(map_depth))
// Wands
.add_table(wand_table(map_depth));
}
pub fn equipment_table(_map_depth: i32) -> RandomTable {
return RandomTable::new().add("dagger", 4).add("shortsword", 2).add("buckler", 4).add("shield", 2);
}
pub fn potion_table(_map_depth: i32) -> RandomTable {
return RandomTable::new().add("weak health potion", 14).add("health potion", 6);
}
pub fn scroll_table(_map_depth: i32) -> RandomTable {
return RandomTable::new()
.add("fireball scroll", 2)
.add("cursed fireball scroll", 2)
.add("confusion scroll", 4)
.add("magic missile scroll", 10)
.add("magic map scroll", 4)
.add("cursed magic map scroll", 2)
// Wands
.add("magic missile wand", 1)
.add("fireball wand", 1)
.add("confusion wand", 1);
.add("cursed magic map scroll", 2);
}
fn food_table(_map_depth: i32) -> RandomTable {
pub fn wand_table(_map_depth: i32) -> RandomTable {
return RandomTable::new().add("magic missile wand", 1).add("fireball wand", 1).add("confusion wand", 1);
}
pub fn food_table(_map_depth: i32) -> RandomTable {
return RandomTable::new().add("rations", 1).add("apple", 1);
}
fn trap_table(_map_depth: i32) -> RandomTable {
return RandomTable::new().add("bear trap", 0).add("confusion trap", 1);
pub fn trap_table(_map_depth: i32) -> RandomTable {
return RandomTable::new().add("bear trap", 2).add("confusion trap", 1);
}
fn door(ecs: &mut World, x: i32, y: i32) {