Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed old tier-1 files

Browse Source
This commit is contained in:
Sam 2023-05-09 20:58:59 -04:00
parent aca38d0cf4
commit ca070f7ae8
7 changed files with 3 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
assets/common/entity/dungeon/tier-1/boss.ron
View File

@ -1,11 +0,0 @@
#![enable(implicit_some)]
(
name: Name("Yeti"),
body: RandomWith("yeti"),
alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.dungeon.tier-1.boss"),
inventory: (
loadout: FromBody,
),
meta: [],
)

16
assets/common/entity/dungeon/tier-1/hunter.ron
View File

@ -1,16 +0,0 @@
#![enable(implicit_some)]
(
name: Name("Adlet Hunter"),
body: RandomWith("adlet"),
alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.dungeon.tier-1.enemy"),
inventory: (
loadout: Inline((
inherit: Asset("common.loadout.dungeon.adlet.hunter"),
active_hands: InHands((Item("common.items.npc_weapons.biped_small.adlet.hunter"), None)),
)),
),
meta: [
SkillSetAsset("common.skillset.preset.rank1.fullskill"),
],
)

16
assets/common/entity/dungeon/tier-1/icepicker.ron
View File

@ -1,16 +0,0 @@
#![enable(implicit_some)]
(
name: Name("Adlet Icepicker"),
body: RandomWith("adlet"),
alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.dungeon.tier-1.enemy"),
inventory: (
loadout: Inline((
inherit: Asset("common.loadout.dungeon.adlet.icepicker"),
active_hands: InHands((Item("common.items.npc_weapons.biped_small.adlet.icepicker"), None)),
)),
),
meta: [
SkillSetAsset("common.skillset.preset.rank1.fullskill"),
],
)

11
assets/common/entity/dungeon/tier-1/rat.ron
View File

@ -1,11 +0,0 @@
#![enable(implicit_some)]
(
name: Name("Rat"),
body: RandomWith("rat"),
alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.creature.quad_small.generic"),
inventory: (
loadout: FromBody,
),
meta: [],
)

16
assets/common/entity/dungeon/tier-1/tracker.ron
View File

@ -1,16 +0,0 @@
#![enable(implicit_some)]
(
name: Name("Adlet Tracker"),
body: RandomWith("adlet"),
alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.dungeon.tier-1.enemy"),
inventory: (
loadout: Inline((
inherit: Asset("common.loadout.dungeon.adlet.tracker"),
active_hands: InHands((Item("common.items.npc_weapons.biped_small.adlet.tracker"), None)),
)),
),
meta: [
SkillSetAsset("common.skillset.preset.rank1.fullskill"),
],
)

6
world/src/layer/spot.rs
View File

@ -633,9 +633,9 @@ pub fn apply_spots_to(canvas: &mut Canvas, _dynamic_rng: &mut impl Rng) {
base_structures: Some("spots_general.igloo"),
entity_radius: 2.0,
entities: &[
(3..5, "common.entity.dungeon.tier-1.hunter"),
(3..5, "common.entity.dungeon.tier-1.icepicker"),
(2..3, "common.entity.dungeon.tier-1.tracker"),
(3..5, "common.entity.dungeon.adlet.hunter"),
(3..5, "common.entity.dungeon.adlet.icepicker"),
(2..3, "common.entity.dungeon.adlet.tracker"),
],
},
Spot::PirateHideout => SpotConfig {

40
world/src/site2/plot/dungeon.rs
View File

@ -227,7 +227,6 @@ impl Room {
// Toss mobs in the center of the room
if tile_pos == enemy_spawn_tile && wpos2d == tile_wcenter.xy() {
let entities = match self.difficulty {
1 => enemy_1(dynamic_rng, tile_wcenter),
2 => enemy_2(dynamic_rng, tile_wcenter),
3 => enemy_3(dynamic_rng, tile_wcenter),
4 => enemy_4(dynamic_rng, tile_wcenter),
@ -285,7 +284,6 @@ impl Room {
if tile_pos == miniboss_spawn_tile && tile_wcenter.xy() == wpos2d {
let entities = match self.difficulty {
1 => mini_boss_1(dynamic_rng, tile_wcenter),
2 => mini_boss_2(dynamic_rng, tile_wcenter),
3 => mini_boss_3(dynamic_rng, tile_wcenter),
4 => mini_boss_4(dynamic_rng, tile_wcenter),
@ -318,7 +316,6 @@ impl Room {
if tile_pos == boss_spawn_tile && wpos2d == tile_wcenter.xy() {
let entities = match self.difficulty {
1 => boss_1(dynamic_rng, tile_wcenter),
2 => boss_2(dynamic_rng, tile_wcenter),
3 => boss_3(dynamic_rng, tile_wcenter),
4 => boss_4(dynamic_rng, tile_wcenter),
@ -669,22 +666,6 @@ impl Floor {
}
}
fn enemy_1(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInfo> {
let number = dynamic_rng.gen_range(2..=4);
let mut entities = Vec::new();
entities.resize_with(number, || {
// TODO: give enemies health skills?
let entity = EntityInfo::at(tile_wcenter.map(|e| e as f32));
match dynamic_rng.gen_range(0..=4) {
0 => entity.with_asset_expect("common.entity.dungeon.tier-1.tracker", dynamic_rng),
1 => entity.with_asset_expect("common.entity.dungeon.tier-1.icepicker", dynamic_rng),
_ => entity.with_asset_expect("common.entity.dungeon.tier-1.hunter", dynamic_rng),
}
});
entities
}
fn enemy_2(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInfo> {
let number = dynamic_rng.gen_range(2..=4);
let mut entities = Vec::new();
@ -768,13 +749,6 @@ fn turret_5(dynamic_rng: &mut impl Rng, pos: Vec3<f32>) -> EntityInfo {
EntityInfo::at(pos).with_asset_expect("common.entity.dungeon.tier-5.turret", dynamic_rng)
}
fn boss_1(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInfo> {
vec![
EntityInfo::at(tile_wcenter.map(|e| e as f32))
.with_asset_expect("common.entity.dungeon.tier-1.boss", dynamic_rng),
]
}
fn boss_2(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInfo> {
vec![
EntityInfo::at(tile_wcenter.map(|e| e as f32))
@ -812,15 +786,6 @@ fn boss_fallback(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<Ent
]
}
fn mini_boss_1(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInfo> {
let mut entities = Vec::new();
entities.resize_with(8, || {
EntityInfo::at(tile_wcenter.map(|e| e as f32))
.with_asset_expect("common.entity.dungeon.tier-1.rat", dynamic_rng)
});
entities
}
fn mini_boss_2(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInfo> {
let mut entities = Vec::new();
entities.resize_with(6, || {
@ -1208,8 +1173,6 @@ impl Floor {
Box::new(move |pos| RandomField::new(seed).chance(pos, loot_density * 0.5)),
));
let chest_sprite_fill = Fill::Block(Block::air(match difficulty {
0 => SpriteKind::DungeonChest0,
1 => SpriteKind::DungeonChest1,
2 => SpriteKind::DungeonChest2,
3 => SpriteKind::DungeonChest3,
4 => SpriteKind::DungeonChest4,
@ -1429,7 +1392,6 @@ mod tests {
fn test_creating_bosses() {
let mut dynamic_rng = thread_rng();
let tile_wcenter = Vec3::new(0, 0, 0);
boss_1(&mut dynamic_rng, tile_wcenter);
boss_2(&mut dynamic_rng, tile_wcenter);
boss_3(&mut dynamic_rng, tile_wcenter);
boss_4(&mut dynamic_rng, tile_wcenter);
@ -1442,7 +1404,6 @@ mod tests {
fn test_creating_enemies() {
let mut dynamic_rng = thread_rng();
let random_position = Vec3::new(0, 0, 0);
enemy_1(&mut dynamic_rng, random_position);
enemy_2(&mut dynamic_rng, random_position);
enemy_3(&mut dynamic_rng, random_position);
enemy_4(&mut dynamic_rng, random_position);
@ -1455,7 +1416,6 @@ mod tests {
fn test_creating_minibosses() {
let mut dynamic_rng = thread_rng();
let tile_wcenter = Vec3::new(0, 0, 0);
mini_boss_1(&mut dynamic_rng, tile_wcenter);
mini_boss_2(&mut dynamic_rng, tile_wcenter);
mini_boss_3(&mut dynamic_rng, tile_wcenter);
mini_boss_4(&mut dynamic_rng, tile_wcenter);