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

Merge branch 'glider' into 'master'

Browse Source 
Adding new glider variants

See merge request veloren/veloren!1660
This commit is contained in:
Monty Marz 2020-12-24 02:54:18 +00:00
commit 6c778fa3d0
20 changed files with 146 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/common/items/crafting_ing/raptor_feather.ron Normal file
View File

@ -0,0 +1,8 @@
ItemDef(
name: "Raptor Feather",
description: "Large colorful feather from a raptor.",
kind: Ingredient(
kind: "RaptorFeather",
),
quality: Common,
)

10
assets/common/items/glider/glider_monarch.ron Normal file
View File

@ -0,0 +1,10 @@
ItemDef(
name: "Orange Monarch",
description: "The delicate wings flutter faintly.",
kind: Glider(
(
kind: "ButterflyMonarch",
),
),
quality: High,
)

10
assets/common/items/glider/glider_morpho.ron Normal file
View File

@ -0,0 +1,10 @@
ItemDef(
name: "Blue Morpho",
description: "The delicate wings flutter faintly.",
kind: Glider(
(
kind: "ButterflyMorpho",
),
),
quality: High,
)

10
assets/common/items/glider/glider_sandraptor.ron Normal file
View File

@ -0,0 +1,10 @@
ItemDef(
name: "Sand Raptor Wings",
description: "Take flight with the wings of a predator.",
kind: Glider(
(
kind: "SandRaptor",
),
),
quality: High,
)

10
assets/common/items/glider/glider_snowraptor.ron Normal file
View File

@ -0,0 +1,10 @@
ItemDef(
name: "Snow Raptor Wings",
description: "Take flight with the wings of a predator.",
kind: Glider(
(
kind: "SnowRaptor",
),
),
quality: High,
)

10
assets/common/items/glider/glider_woodraptor.ron Normal file
View File

@ -0,0 +1,10 @@
ItemDef(
name: "Wood Raptor Wings",
description: "Take flight with the wings of a predator.",
kind: Glider(
(
kind: "WoodRaptor",
),
),
quality: High,
)

2
assets/common/loot_tables/loot_table_boss_cultist-leader.ron
View File

@ -14,4 +14,4 @@
// misc
(1, "common.items.boss_drops.lantern"),
(0.1, "common.items.glider.glider_purp"),
]
]

12
assets/common/loot_tables/loot_table_cave_large.ron
View File

@ -1,11 +1,13 @@
[
// Misc
(0.25, "common.items.armor.neck.neck_1"),
(0.2, "common.items.crafting_ing.cloth_scraps"),
(0.2, "common.items.crafting_ing.cloth_scraps"),
(1.0, "common.items.crafting_ing.empty_vial"),
(0.1, "common.items.glider.glider_blue"),
(0.1, "common.items.glider.glider_blue"),
(0.1, "common.items.glider.glider_morpho"),
(0.1, "common.items.glider.glider_monarch"),
(0.05, "common.items.armor.ring.ring_gold_0"),
// swords
// swords
(0.07, "common.items.weapons.sword.greatsword_2h_fine-1"),
(0.07, "common.items.weapons.sword.greatsword_2h_fine-2"),
(0.08, "common.items.weapons.sword.long_2h_orn-0"),
@ -55,6 +57,6 @@
(0.05, "common.items.weapons.hammer.steel_hammer-5"),
// bows
(0.1, "common.items.weapons.bow.nature_ore_longbow-0"),
]
]

4
assets/common/loot_tables/loot_table_raptor.ron Normal file
View File

@ -0,0 +1,4 @@
[
(2, "common.items.crafting_ing.raptor_feather"),
(1, "common.items.crafting_ing.leather_scraps"),
]

5
assets/common/recipe_book.ron
View File

@ -22,7 +22,10 @@
"mushroom_stick": (("common.items.food.mushroom_stick", 1),[("common.items.crafting_ing.twigs", 2), ("common.items.food.mushroom", 3)]),
"sunflower_icetea": (("common.items.food.sunflower_icetea", 4),[("common.items.crafting_ing.empty_vial", 1), ("common.items.crafting_ing.icy_fang", 1),("common.items.flowers.sunflower", 4), ("common.items.crafting_ing.honey", 1)]),
// Gliders
"Leaves Glider": (("common.items.glider.glider_leaves", 1),[("common.items.crafting_ing.twigs", 5), ("common.items.crafting_ing.leather_scraps", 5), ("common.items.crafting_ing.cloth_scraps", 5), ("common.items.crafting_ing.shiny_gem", 1), ("common.items.crafting_tools.craftsman_hammer", 0),("common.items.crafting_tools.sewing_set", 0)]),
"Leaves Glider": (("common.items.glider.glider_leaves", 1),[("common.items.crafting_ing.twigs", 5), ("common.items.crafting_ing.leather_scraps", 5), ("common.items.crafting_ing.cloth_scraps", 5), ("common.items.crafting_ing.shiny_gem", 1), ("common.items.crafting_tools.craftsman_hammer", 0),("common.items.crafting_tools.sewing_set", 0)]),
"Sand Raptor Wings": (("common.items.glider.glider_sandraptor", 1),[("common.items.crafting_ing.raptor_feather", 6), ("common.items.crafting_ing.twigs", 5), ("common.items.crafting_ing.leather_scraps", 5), ("common.items.crafting_ing.cloth_scraps", 5), ("common.items.crafting_ing.shiny_gem", 1), ("common.items.crafting_tools.craftsman_hammer", 0),("common.items.crafting_tools.sewing_set", 0)]),
"Snow Raptor Wings": (("common.items.glider.glider_snowraptor", 1),[("common.items.crafting_ing.raptor_feather", 6), ("common.items.crafting_ing.twigs", 5), ("common.items.crafting_ing.leather_scraps", 5), ("common.items.crafting_ing.cloth_scraps", 5), ("common.items.crafting_ing.icy_fang", 1), ("common.items.crafting_ing.shiny_gem", 1), ("common.items.crafting_tools.craftsman_hammer", 0),("common.items.crafting_tools.sewing_set", 0)]),
"Wood Raptor Wings": (("common.items.glider.glider_woodraptor", 1),[("common.items.crafting_ing.raptor_feather", 6), ("common.items.crafting_ing.twigs", 15), ("common.items.crafting_ing.leather_scraps", 5), ("common.items.crafting_ing.cloth_scraps", 5), ("common.items.crafting_ing.shiny_gem", 1), ("common.items.crafting_tools.craftsman_hammer", 0),("common.items.crafting_tools.sewing_set", 0)]),
// Weapons
"velorite_sceptre": (("common.items.weapons.sceptre.sceptre_velorite_0", 1),[("common.items.crafting_ing.twigs", 20), ("common.items.ore.veloritefrag", 10), ("common.items.crafting_ing.shiny_gem", 4), ("common.items.crafting_tools.craftsman_hammer", 0)]),
// Enhanced starting weapons

BIN
assets/voxygen/element/icons/item_raptor_feather.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

23
assets/voxygen/item_image_manifest.ron
View File

@ -1434,6 +1434,9 @@
Ingredient("IcyShard"): Png(
"element.icons.item_ice_shard",
),
Ingredient("RaptorFeather"): Png(
"element.icons.item_raptor_feather",
),
Ingredient("Twigs"): VoxTrans(
"voxel.sprite.twigs.twigs-0",
(0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
@ -1466,6 +1469,26 @@
"voxel.glider.glider_blue",
(6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
),
Glider("ButterflyMorpho"): VoxTrans(
"voxel.glider.glider_butterfly1",
(6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
),
Glider("ButterflyMonarch"): VoxTrans(
"voxel.glider.glider_butterfly2",
(6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
),
Glider("SandRaptor"): VoxTrans(
"voxel.glider.glider_sandraptor",
(6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
),
Glider("SnowRaptor"): VoxTrans(
"voxel.glider.glider_snowraptor",
(6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
),
Glider("WoodRaptor"): VoxTrans(
"voxel.glider.glider_woodraptor",
(6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
),
Glider("Purple0"): VoxTrans(
"voxel.glider.glider_cultists",
(5.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,

BIN
assets/voxygen/voxel/glider/glider_butterfly1.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/glider/glider_butterfly2.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/glider/glider_sandraptor.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/glider/glider_snowraptor.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/glider/glider_woodraptor.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

20
assets/voxygen/voxel/humanoid_glider_manifest.ron
View File

@ -11,6 +11,26 @@
"Blue0": (
vox_spec: ("glider.glider_blue", (-26.0, -26.0, -5.0)),
color: None
),
"ButterflyMorpho": (
vox_spec: ("glider.glider_butterfly1", (-26.0, -25.0, -5.0)),
color: None
),
"ButterflyMonarch": (
vox_spec: ("glider.glider_butterfly2", (-26.0, -25.0, -5.0)),
color: None
),
"SandRaptor": (
vox_spec: ("glider.glider_sandraptor", (-26.0, -25.0, -5.0)),
color: None
),
"SnowRaptor": (
vox_spec: ("glider.glider_snowraptor", (-26.0, -25.0, -5.0)),
color: None
),
"WoodRaptor": (
vox_spec: ("glider.glider_woodraptor", (-26.0, -25.0, -5.0)),
color: None
),
"Purple0": (
vox_spec: ("glider.glider_cultists", (-26.0, -16.0, -5.0)),

12
server/src/events/entity_manipulation.rs
View File

@ -1,6 +1,6 @@
use crate::{
client::Client,
comp::{biped_large, quadruped_medium, quadruped_small, PhysicsState},
comp::{biped_large, quadruped_medium, quadruped_small, theropod, PhysicsState},
rtsim::RtSim,
Server, SpawnPoint, StateExt,
};
@ -338,8 +338,14 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
7 => "common.loot_tables.loot_table_weapon_rare",
_ => "common.loot_tables.loot_table",
},
Some(common::comp::Body::Theropod(_)) => {
"common.loot_tables.loot_table_animal_parts"
Some(common::comp::Body::Theropod(theropod)) => match theropod.species {
theropod::Species::Sandraptor
| theropod::Species::Snowraptor
| theropod::Species::Woodraptor => match rng.gen_range(0, 3) {
0 => "common.loot_tables.loot_table_raptor",
_ => "common.loot_tables.loot_table_animal_parts",
},
_ => "common.loot_tables.loot_table_animal_parts",
},
Some(common::comp::Body::Dragon(_)) => "common.loot_tables.loot_table_weapon_rare",
Some(common::comp::Body::QuadrupedLow(_)) => match rng.gen_range(0, 3) {

2
voxygen/src/hud/crafting.rs
View File

@ -183,6 +183,7 @@ impl<'a> Widget for Crafting<'a> {
.set(ids.align_rec, ui);
Rectangle::fill_with([274.0, 340.0], color::TRANSPARENT)
.top_right_with_margins_on(ids.window, 74.0, 5.0)
.scroll_kids_vertically()
.set(ids.align_ing, ui);
let client = &self.client;
// First available recipes, then unavailable ones
@ -231,6 +232,7 @@ impl<'a> Widget for Crafting<'a> {
.label_font_id(self.fonts.cyri.conrod_id)
.image_color(can_perform.then_some(TEXT_COLOR).unwrap_or(TEXT_GRAY_COLOR))
.mid_bottom_with_margin_on(ids.align_ing, -31.0)
.parent(ids.window_frame)
.set(ids.btn_craft, ui)
.was_clicked()
{