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

weapon tweaks

Browse Source
This commit is contained in:
jshipsey 2022-01-30 01:10:13 -05:00
parent 4fbd3027a1
commit 7827797106
55 changed files with 76 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/entity/dungeon/tier-0/chieftain.ron
View File

@ -3,7 +3,7 @@
body: RandomWith("gnarling"),
alignment: Alignment(Enemy),
loadout: Extended(
hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.chieftain_staff")),
hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.chieftain")),
base_asset: Loadout("common.loadout.dungeon.tier-0.gnarling_chieftain"),
inventory: [],
),

2
assets/common/entity/dungeon/tier-0/logger.ron
View File

@ -3,7 +3,7 @@
body: RandomWith("gnarling"),
alignment: Alignment(Enemy),
loadout: Extended(
hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.axe")),
hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.logger")),
base_asset: Loadout("common.loadout.dungeon.tier-0.logger"),
inventory: [],
),

2
assets/common/entity/dungeon/tier-0/mugger.ron
View File

@ -3,7 +3,7 @@
body: RandomWith("gnarling"),
alignment: Alignment(Enemy),
loadout: Extended(
hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.dagger")),
hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.mugger")),
base_asset: Loadout("common.loadout.dungeon.tier-0.mugger"),
inventory: [],
),

2
assets/common/entity/dungeon/tier-0/stalker.ron
View File

@ -3,7 +3,7 @@
body: RandomWith("gnarling"),
alignment: Alignment(Enemy),
loadout: Extended(
hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.blowgun")),
hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.stalker")),
base_asset: Loadout("common.loadout.dungeon.tier-0.stalker"),
inventory: [],
),

6
assets/common/items/npc_weapons/biped_small/adlet/hunter.ron
View File

@ -1,8 +1,8 @@
ItemDef(
name: "Wooden Spear",
description: "Testing",
name: "Hunter Spear",
description: "",
kind: Tool((
kind: Axe,
kind: Spear,
hands: Two,
stats: Direct((
equip_time_secs: 0.0,

6
assets/common/items/npc_weapons/biped_small/adlet/icepicker.ron
View File

@ -1,8 +1,8 @@
ItemDef(
name: "Gnoll Staff",
description: "eekum bokum",
name: "Icepicker Axe",
description: "",
kind: Tool((
kind: Staff,
kind: Axe,
hands: Two,
stats: Direct((
equip_time_secs: 0.0,

6
assets/common/items/npc_weapons/biped_small/adlet/tracker.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Adlet Bow",
description: "Strips of leather are wrapped around the handle.",
name: "Tracker Bow",
description: "",
kind: Tool((
kind: Bow,
hands: Two,
@ -17,5 +17,5 @@ ItemDef(
)),
quality: Moderate,
tags: [],
ability_spec: None,
ability_spec: Some(Custom("Bow Simple")),
)

2
assets/common/items/npc_weapons/biped_small/gnarling/chieftain_staff.ron → assets/common/items/npc_weapons/biped_small/gnarling/chieftain.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Chieftain Staff",
description: "eekum bokum",
description: "",
kind: Tool((
kind: Staff,
hands: Two,

4
assets/common/items/npc_weapons/biped_small/gnarling/axe.ron → assets/common/items/npc_weapons/biped_small/gnarling/logger.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Gnarling Logger Axe",
description: "Testing",
name: "Logger Axe",
description: "",
kind: Tool((
kind: Axe,
hands: Two,

4
assets/common/items/npc_weapons/biped_small/gnarling/dagger.ron → assets/common/items/npc_weapons/biped_small/gnarling/mugger.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Gnarling Mugger Dagger",
description: "Testing",
name: "Mugger Dagger",
description: "",
kind: Tool((
kind: Dagger,
hands: Two,

4
assets/common/items/npc_weapons/biped_small/gnarling/blowgun.ron → assets/common/items/npc_weapons/biped_small/gnarling/stalker.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Gnarling Blowgun",
description: "testing123",
name: "Stalker Blowgun",
description: "",
kind: Tool((
kind: Blowgun,
hands: Two,

6
assets/common/items/npc_weapons/biped_small/haniwa/archer.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Adlet Bow",
description: "Strips of leather are wrapped around the handle.",
name: "Archer Bow",
description: "",
kind: Tool((
kind: Bow,
hands: Two,
@ -17,5 +17,5 @@ ItemDef(
)),
quality: Moderate,
tags: [],
ability_spec: None,
ability_spec: Some(Custom("Bow Simple")),
)

4
assets/common/items/npc_weapons/biped_small/haniwa/guard.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Wooden Spear",
description: "Testing",
name: "Guard Spear",
description: "",
kind: Tool((
kind: Spear,
hands: Two,

4
assets/common/items/npc_weapons/biped_small/haniwa/soldier.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Gnoll Staff",
description: "eekum bokum",
name: "Soldier Sword",
description: "",
kind: Tool((
kind: Dagger,
hands: Two,

4
assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Wooden Spear",
description: "Testing",
name: "Hoplite Spear",
description: "",
kind: Tool((
kind: Spear,
hands: Two,

6
assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Adlet Bow",
description: "Strips of leather are wrapped around the handle.",
name: "Marksman Bow",
description: "",
kind: Tool((
kind: Bow,
hands: Two,
@ -17,5 +17,5 @@ ItemDef(
)),
quality: Moderate,
tags: [],
ability_spec: None,
ability_spec: Some(Custom("Bow Simple")),
)

4
assets/common/items/npc_weapons/biped_small/myrmidon/strategian.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Gnoll Staff",
description: "eekum bokum",
name: "Strategian Axe",
description: "",
kind: Tool((
kind: Axe,
hands: Two,

6
assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Adlet Bow",
description: "Strips of leather are wrapped around the handle.",
name: "Sniper Bow",
description: "",
kind: Tool((
kind: Bow,
hands: Two,
@ -17,5 +17,5 @@ ItemDef(
)),
quality: Moderate,
tags: [],
ability_spec: None,
ability_spec: Some(Custom("Bow Simple")),
)

4
assets/common/items/npc_weapons/biped_small/sahagin/sorcerer.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Gnoll Staff",
description: "eekum bokum",
name: "Sorcerer Staff",
description: "",
kind: Tool((
kind: Staff,
hands: Two,

4
assets/common/items/npc_weapons/biped_small/sahagin/spearman.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Wooden Spear",
description: "Testing",
name: "Spearman Spear",
description: "",
kind: Tool((
kind: Spear,
hands: Two,

2
assets/voxygen/voxel/biped_small_armor_chest_manifest.ron
View File

@ -61,7 +61,7 @@
vox_spec: ("npc.haniwa.archer.chest", (-6.5, -4.0, -3.0)),
),
"HaniwaSoldier": (
vox_spec: ("npc.haniwa.solier.chest", (-6.5, -4.0, -3.0)),
vox_spec: ("npc.haniwa.soldier.chest", (-6.5, -4.0, -3.0)),
),
"MyrmidonHoplite": (
vox_spec: ("npc.myrmidon.hoplite.chest", (-5.5, -4.0, -3.0)),

38
assets/voxygen/voxel/biped_weapon_manifest.ron
View File

@ -1103,44 +1103,44 @@
color: None
),
//BIPEDSMALL
"common.items.npc_weapons.biped_small.gnarling.chieftain_staff": (
vox_spec: ("weapon.biped_small.staff.chieftain", (-0.5, -4.0, -4.0)),
"common.items.npc_weapons.biped_small.gnarling.chieftain": (
vox_spec: ("weapon.biped_small.staff.chieftain", (-1.5, -4.5, -4.0)),
color: None
),
"common.items.npc_weapons.biped_small.gnarling.blowgun": (
"common.items.npc_weapons.biped_small.gnarling.stalker": (
vox_spec: ("weapon.biped_small.blowgun.stalker", (-2.5, -2.5, -1.5)),
color: None
),
"common.items.npc_weapons.biped_small.gnarling.axe": (
"common.items.npc_weapons.biped_small.gnarling.logger": (
vox_spec: ("weapon.biped_small.axe.logger", (-0.5, -3.0, -4.0)),
color: None
),
"common.items.npc_weapons.biped_small.gnarling.dagger": (
vox_spec: ("weapon.biped_small.dagger.dagger", (-0.5, -4.5, -0.0)),
"common.items.npc_weapons.biped_small.gnarling.mugger": (
vox_spec: ("weapon.biped_small.dagger.mugger", (-0.5, -4.5, -1.0)),
color: None
),
"common.items.npc_weapons.biped_small.adlet.hunter": (
vox_spec: ("weapon.biped_small.spear.hunter", (-0.5, -3.0, -4.0)),
vox_spec: ("weapon.biped_small.spear.hunter", (-0.5, -2.0, -5.0)),
color: None
),
"common.items.npc_weapons.biped_small.adlet.icepicker": (
vox_spec: ("weapon.biped_small.axe.icepicker", (-0.5, -3.0, -4.0)),
vox_spec: ("weapon.biped_small.axe.icepicker", (-1.5, -6.5, -4.0)),
color: None
),
"common.items.npc_weapons.biped_small.adlet.tracker": (
vox_spec: ("weapon.biped_small.bow.tracker", (-0.5, -3.0, -4.0)),
vox_spec: ("weapon.biped_small.bow.tracker", (-0.5, -5.5, -9.5)),
color: None
),
"common.items.npc_weapons.biped_small.gnoll.rogue": (
vox_spec: ("weapon.biped_small.dagger.rogue", (-0.5, -4.0, -4.0)),
vox_spec: ("weapon.biped_small.dagger.rogue", (-0.5, -3.0, -1.0)),
color: None
),
"common.items.npc_weapons.biped_small.gnoll.trapper": (
vox_spec: ("weapon.biped_small.blowgun.trapper", (-0.5, -4.0, -4.0)),
vox_spec: ("weapon.biped_small.blowgun.trapper", (-1.5, -1.5, -1.5)),
color: None
),
"common.items.npc_weapons.biped_small.gnoll.shaman": (
vox_spec: ("weapon.biped_small.staff.shaman", (-0.5, -4.0, -4.0)),
vox_spec: ("weapon.biped_small.staff.shaman", (-2.5, -3.0, -4.0)),
color: None
),
"common.items.npc_weapons.biped_small.sahagin.sniper": (
@ -1152,31 +1152,31 @@
color: None
),
"common.items.npc_weapons.biped_small.sahagin.spearman": (
vox_spec: ("weapon.biped_small.spear.spearman", (-0.5, -3.0, -4.0)),
vox_spec: ("weapon.biped_small.spear.spearman", (-0.5, -3.0, -5.0)),
color: None
),
"common.items.npc_weapons.biped_small.haniwa.guard": (
vox_spec: ("weapon.biped_small.spear.guard", (-0.5, -4.5, -10.5)),
vox_spec: ("weapon.biped_small.spear.guard", (-0.5, -3.0, -5.0)),
color: None
),
"common.items.npc_weapons.biped_small.haniwa.soldier": (
vox_spec: ("weapon.biped_small.dagger.soldier", (-0.5, -4.0, -4.0)),
vox_spec: ("weapon.biped_small.dagger.soldier", (-0.5, -3.0, -2.0)),
color: None
),
"common.items.npc_weapons.biped_small.haniwa.archer": (
vox_spec: ("weapon.biped_small.bow.archer", (-0.5, -3.0, -4.0)),
vox_spec: ("weapon.biped_small.bow.archer", (-0.5, -4.5, -10.5)),
color: None
),
"common.items.npc_weapons.biped_small.myrmidon.hoplite": (
vox_spec: ("weapon.biped_small.spear.hoplite", (-0.5, -5.0, -10.5)),
vox_spec: ("weapon.biped_small.spear.hoplite", (-0.5, -2.0, -5.0)),
color: None
),
"common.items.npc_weapons.biped_small.myrmidon.marksman": (
vox_spec: ("weapon.biped_small.bow.marksman", (-0.5, -4.0, -4.0)),
vox_spec: ("weapon.biped_small.bow.marksman", (-0.5, -5.0, -10.5)),
color: None
),
"common.items.npc_weapons.biped_small.myrmidon.strategian": (
vox_spec: ("weapon.biped_small.axe.strategian", (-0.5, -2.0, -4.0)),
vox_spec: ("weapon.biped_small.axe.strategian", (-0.5, -6.0, -4.0)),
color: None
),
})

BIN
assets/voxygen/voxel/npc/adlet/male/bow/bow_movelater.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/adlet/male/bow/chest.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/adlet/male/bow/hand_r.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/adlet/male/bow/head.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/adlet/male/bow/pants.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/adlet/male/foot_r.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/adlet/male/spear/chest.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/adlet/male/spear/hand_r.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/adlet/male/spear/head.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/adlet/male/spear/pants.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/adlet/male/tail.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/haniwa/male/chest.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/haniwa/male/foot_r.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/haniwa/male/hand_r.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/haniwa/male/head.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/haniwa/male/pants.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/myrmidon/male/MyrmidonHoplite-5.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/myrmidon/male/chest.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/myrmidon/male/foot_r.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/myrmidon/male/hand_r.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/myrmidon/male/head.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/myrmidon/male/pants.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/myrmidon/male/tail.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/sahagin/male/chest.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/sahagin/male/foot_r.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/sahagin/male/hand_r.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/sahagin/male/head.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/sahagin/male/pants.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/sahagin/male/tail.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/sahagin/spearman/hand_r.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/biped_small/dagger/rogue.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/biped_small/staff/sahagin.vox (Stored with Git LFS)
View File

Binary file not shown.

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

@ -697,15 +697,9 @@ fn enemy_1(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInf
// TODO: give enemies health skills?
let entity = EntityInfo::at(tile_wcenter.map(|e| e as f32));
match dynamic_rng.gen_range(0..=4) {
<<<<<<< HEAD
0 => entity.with_asset_expect("common.entity.dungeon.tier-1.bow", dynamic_rng),
1 => entity.with_asset_expect("common.entity.dungeon.tier-1.staff", dynamic_rng),
_ => entity.with_asset_expect("common.entity.dungeon.tier-1.spear", dynamic_rng),
=======
0 => entity.with_asset_expect("common.entity.dungeon.tier-1.tracker"),
1 => entity.with_asset_expect("common.entity.dungeon.tier-1.icepicker"),
_ => entity.with_asset_expect("common.entity.dungeon.tier-1.hunter"),
>>>>>>> new mobs
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),
}
});
@ -719,15 +713,9 @@ fn enemy_2(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInf
// TODO: give enemies health skills?
let entity = EntityInfo::at(tile_wcenter.map(|e| e as f32));
match dynamic_rng.gen_range(0..=4) {
<<<<<<< HEAD
0 => entity.with_asset_expect("common.entity.dungeon.tier-2.bow", dynamic_rng),
1 => entity.with_asset_expect("common.entity.dungeon.tier-2.staff", dynamic_rng),
_ => entity.with_asset_expect("common.entity.dungeon.tier-2.spear", dynamic_rng),
=======
0 => entity.with_asset_expect("common.entity.dungeon.tier-2.sniper"),
1 => entity.with_asset_expect("common.entity.dungeon.tier-2.sorcerer"),
_ => entity.with_asset_expect("common.entity.dungeon.tier-2.spearman"),
>>>>>>> new mobs
0 => entity.with_asset_expect("common.entity.dungeon.tier-2.sniper", dynamic_rng),
1 => entity.with_asset_expect("common.entity.dungeon.tier-2.sorcerer", dynamic_rng),
_ => entity.with_asset_expect("common.entity.dungeon.tier-2.spearman", dynamic_rng),
}
});
@ -741,15 +729,9 @@ fn enemy_3(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInf
// TODO: give enemies health skills?
let entity = EntityInfo::at(tile_wcenter.map(|e| e as f32));
match dynamic_rng.gen_range(0..=4) {
<<<<<<< HEAD
0 => entity.with_asset_expect("common.entity.dungeon.tier-3.bow", dynamic_rng),
1 => entity.with_asset_expect("common.entity.dungeon.tier-3.staff", dynamic_rng),
_ => entity.with_asset_expect("common.entity.dungeon.tier-3.spear", dynamic_rng),
=======
0 => entity.with_asset_expect("common.entity.dungeon.tier-3.archer"),
1 => entity.with_asset_expect("common.entity.dungeon.tier-3.soldier"),
_ => entity.with_asset_expect("common.entity.dungeon.tier-3.guard"),
>>>>>>> new mobs
0 => entity.with_asset_expect("common.entity.dungeon.tier-3.archer", dynamic_rng),
1 => entity.with_asset_expect("common.entity.dungeon.tier-3.soldier", dynamic_rng),
_ => entity.with_asset_expect("common.entity.dungeon.tier-3.guard", dynamic_rng),
}
});
@ -763,15 +745,9 @@ fn enemy_4(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInf
// TODO: give enemies health skills?
let entity = EntityInfo::at(tile_wcenter.map(|e| e as f32));
match dynamic_rng.gen_range(0..=4) {
<<<<<<< HEAD
0 => entity.with_asset_expect("common.entity.dungeon.tier-4.bow", dynamic_rng),
1 => entity.with_asset_expect("common.entity.dungeon.tier-4.staff", dynamic_rng),
_ => entity.with_asset_expect("common.entity.dungeon.tier-4.spear", dynamic_rng),
=======
0 => entity.with_asset_expect("common.entity.dungeon.tier-4.marksman"),
1 => entity.with_asset_expect("common.entity.dungeon.tier-4.strategian"),
_ => entity.with_asset_expect("common.entity.dungeon.tier-4.hoplite"),
>>>>>>> new mobs
0 => entity.with_asset_expect("common.entity.dungeon.tier-4.marksman", dynamic_rng),
1 => entity.with_asset_expect("common.entity.dungeon.tier-4.strategian", dynamic_rng),
_ => entity.with_asset_expect("common.entity.dungeon.tier-4.hoplite", dynamic_rng),
}
});