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

Addresses more naming schemes and typos.

Browse Source
This commit is contained in:
Cody 2019-05-30 23:01:52 -04:00
parent b9377b5c33
commit 6c76667356
No known key found for this signature in database
GPG Key ID: 4953DADF9B6AD3C8
6 changed files with 101 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
common/src/comp/actor.rs
View File

@ -92,6 +92,7 @@ pub enum PigHead {
pub enum PigChest {
Default,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum PigLegL {
Default,
@ -103,7 +104,7 @@ pub enum PigLegR {
}
/////
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum WolfUpperHead {
pub enum WolfHeadUpper {
Default,
}
@ -113,7 +114,7 @@ pub enum WolfJaw {
}
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum WolfLowerHead {
pub enum WolfHeadLower {
Default,
}
@ -126,30 +127,34 @@ pub enum WolfTail {
pub enum WolfTorsoBack {
Default,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum WolfTorsoMid {
Default,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum WolfEars {
Default,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum WolfLFFoot {
Default,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum WolfRFFoot {
Default,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum WolfLBFoot {
pub enum WolfFootLF {
Default,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum WolfRBFoot {
pub enum WolfFootRF {
Default,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum WolfFootLB {
Default,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum WolfFootRB {
Default,
}
@ -276,33 +281,33 @@ const ALL_QMRACES: [Race; 6] = [
Race::Undead,
];
const ALL_QMBODY_TYPES: [BodyType; 3] = [BodyType::Female, BodyType::Male, BodyType::Unspecified];
const ALL_QMWOLF_UPPERHEADS: [WolfUpperHead; 1] = [WolfUpperHead::Default];
const ALL_QMWOLF_HEADS_UPPER: [WolfHeadUpper; 1] = [WolfHeadUpper::Default];
const ALL_QMWOLF_JAWS: [WolfJaw; 1] = [WolfJaw::Default];
const ALL_QMWOLF_LOWERHEADS: [WolfLowerHead; 1] = [WolfLowerHead::Default];
const ALL_QMWOLF_HEADS_LOWER: [WolfHeadLower; 1] = [WolfHeadLower::Default];
const ALL_QMWOLF_TAILS: [WolfTail; 1] = [WolfTail::Default];
const ALL_QMWOLF_TORSOBACKS: [WolfTorsoBack; 1] = [WolfTorsoBack::Default];
const ALL_QMWOLF_TORSOMIDS: [WolfTorsoMid; 1] = [WolfTorsoMid::Default];
const ALL_QMWOLF_TORSOS_BACK: [WolfTorsoBack; 1] = [WolfTorsoBack::Default];
const ALL_QMWOLF_TORSOS_MID: [WolfTorsoMid; 1] = [WolfTorsoMid::Default];
const ALL_QMWOLF_EARS: [WolfEars; 1] = [WolfEars::Default];
const ALL_QMWOLF_LFFEET: [WolfLFFoot; 1] = [WolfLFFoot::Default];
const ALL_QMWOLF_RFFEET: [WolfRFFoot; 1] = [WolfRFFoot::Default];
const ALL_QMWOLF_LBFEET: [WolfLBFoot; 1] = [WolfLBFoot::Default];
const ALL_QMWOLF_RBFEET: [WolfRBFoot; 1] = [WolfRBFoot::Default];
const ALL_QMWOLF_FEET_LF: [WolfFootLF; 1] = [WolfFootLF::Default];
const ALL_QMWOLF_FEET_RF: [WolfFootRF; 1] = [WolfFootRF::Default];
const ALL_QMWOLF_FEET_LB: [WolfFootLB; 1] = [WolfFootLB::Default];
const ALL_QMWOLF_FEET_RB: [WolfFootRB; 1] = [WolfFootRB::Default];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub struct QuadrupedMediumBody {
pub race: Race,
pub body_type: BodyType,
pub wolf_upperhead: WolfUpperHead,
pub wolf_head_upper: WolfHeadUpper,
pub wolf_jaw: WolfJaw,
pub wolf_lowerhead: WolfLowerHead,
pub wolf_head_lower: WolfHeadLower,
pub wolf_tail: WolfTail,
pub wolf_torsoback: WolfTorsoBack,
pub wolf_torsomid: WolfTorsoMid,
pub wolf_torso_back: WolfTorsoBack,
pub wolf_torso_mid: WolfTorsoMid,
pub wolf_ears: WolfEars,
pub wolf_lffoot: WolfLFFoot,
pub wolf_rffoot: WolfRFFoot,
pub wolf_lbfoot: WolfLBFoot,
pub wolf_rbfoot: WolfRBFoot,
pub wolf_foot_lf: WolfFootLF,
pub wolf_foot_rf: WolfFootRF,
pub wolf_foot_lb: WolfFootLB,
pub wolf_foot_rb: WolfFootRB,
}
impl QuadrupedMediumBody {
@ -310,17 +315,17 @@ impl QuadrupedMediumBody {
Self {
race: *thread_rng().choose(&ALL_QMRACES).unwrap(),
body_type: *thread_rng().choose(&ALL_QMBODY_TYPES).unwrap(),
wolf_upperhead: *thread_rng().choose(&ALL_QMWOLF_UPPERHEADS).unwrap(),
wolf_head_upper: *thread_rng().choose(&ALL_QMWOLF_HEADS_UPPER).unwrap(),
wolf_jaw: *thread_rng().choose(&ALL_QMWOLF_JAWS).unwrap(),
wolf_lowerhead: *thread_rng().choose(&ALL_QMWOLF_LOWERHEADS).unwrap(),
wolf_head_lower: *thread_rng().choose(&ALL_QMWOLF_HEADS_LOWER).unwrap(),
wolf_tail: *thread_rng().choose(&ALL_QMWOLF_TAILS).unwrap(),
wolf_torsoback: *thread_rng().choose(&ALL_QMWOLF_TORSOBACKS).unwrap(),
wolf_torsomid: *thread_rng().choose(&ALL_QMWOLF_TORSOMIDS).unwrap(),
wolf_torso_back: *thread_rng().choose(&ALL_QMWOLF_TORSOS_BACK).unwrap(),
wolf_torso_mid: *thread_rng().choose(&ALL_QMWOLF_TORSOS_MID).unwrap(),
wolf_ears: *thread_rng().choose(&ALL_QMWOLF_EARS).unwrap(),
wolf_lffoot: *thread_rng().choose(&ALL_QMWOLF_LFFEET).unwrap(),
wolf_rffoot: *thread_rng().choose(&ALL_QMWOLF_RFFEET).unwrap(),
wolf_lbfoot: *thread_rng().choose(&ALL_QMWOLF_LBFEET).unwrap(),
wolf_rbfoot: *thread_rng().choose(&ALL_QMWOLF_RBFEET).unwrap(),
wolf_foot_lf: *thread_rng().choose(&ALL_QMWOLF_FEET_LF).unwrap(),
wolf_foot_rf: *thread_rng().choose(&ALL_QMWOLF_FEET_RF).unwrap(),
wolf_foot_lb: *thread_rng().choose(&ALL_QMWOLF_FEET_LB).unwrap(),
wolf_foot_rb: *thread_rng().choose(&ALL_QMWOLF_FEET_RB).unwrap(),
}
}
}

4
common/src/inventory/item.rs
View File

@ -3,10 +3,10 @@ use specs::{Component, VecStorage};
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum Armor {
//TODO: Don't make armor be a bodypart. Wearing enemy's head is funny but also creepy thing to do.
//TODO: Don't make armor be a body part. Wearing enemy's head is funny but also creepy thing to do.
Helmet(actor::Head),
Shoulders(actor::Shoulder),
Chestplate(actor::Chest),
ChestPlate(actor::Chest),
Belt(actor::Belt),
Gloves(actor::Hand),
Pants(actor::Pants),

11
server/src/cmd.rs
View File

@ -85,13 +85,13 @@ lazy_static! {
"pig",
"{}",
"/pig : Spawn a test pig NPC",
handle_petpig
handle_pet_pig
),
ChatCommand::new(
"wolf",
"{}",
"/wolf : Spawn a test wolf NPC",
handle_petwolf
handle_pet_wolf
),
ChatCommand::new(
"enemy",
@ -218,7 +218,7 @@ fn handle_tp(server: &mut Server, entity: EcsEntity, args: String, action: &Chat
}
}
fn handle_petpig(server: &mut Server, entity: EcsEntity, args: String, action: &ChatCommand) {
fn handle_pet_pig(server: &mut Server, entity: EcsEntity, args: String, action: &ChatCommand) {
match server
.state
.read_component_cloned::<comp::phys::Pos>(entity)
@ -245,7 +245,8 @@ fn handle_petpig(server: &mut Server, entity: EcsEntity, args: String, action: &
.notify(entity, ServerMsg::Chat("You have no position!".to_owned())),
}
}
fn handle_petwolf(server: &mut Server, entity: EcsEntity, args: String, action: &ChatCommand) {
fn handle_pet_wolf(server: &mut Server, entity: EcsEntity, args: String, action: &ChatCommand) {
match server
.state
.read_component_cloned::<comp::phys::Pos>(entity)
@ -272,6 +273,7 @@ fn handle_petwolf(server: &mut Server, entity: EcsEntity, args: String, action:
.notify(entity, ServerMsg::Chat("You have no position!".to_owned())),
}
}
fn handle_enemy(server: &mut Server, entity: EcsEntity, args: String, action: &ChatCommand) {
match server
.state
@ -296,6 +298,7 @@ fn handle_enemy(server: &mut Server, entity: EcsEntity, args: String, action: &C
.notify(entity, ServerMsg::Chat("You have no position!".to_owned())),
}
}
fn handle_help(server: &mut Server, entity: EcsEntity, _args: String, _action: &ChatCommand) {
for cmd in CHAT_COMMANDS.iter() {
server

2
voxygen/src/main.rs
View File

@ -121,7 +121,7 @@ fn main() {
}
};
let msg = format!(
"A critical error has occured and Voxygen has been forced to \
"A critical error has occurred and Voxygen has been forced to \
terminate in an unusual manner. Details about the error can be \
found below.\n\
\n\

10
voxygen/src/menu/main/ui.rs
View File

@ -308,10 +308,10 @@ impl MainMenuUi {
.w_h(400.0, 400.0)
.set(self.ids.servers_frame, ui_widgets);
let netsettings = &global_state.settings.networking;
let net_settings = &global_state.settings.networking;
// TODO: Draw scroll bar or remove it.
let (mut items, scrollbar) = List::flow_down(netsettings.servers.len())
let (mut items, scrollbar) = List::flow_down(net_settings.servers.len())
.top_left_with_margins_on(self.ids.servers_frame, 0.0, 5.0)
.w_h(400.0, 300.0)
.scrollbar_next_to()
@ -321,12 +321,12 @@ impl MainMenuUi {
while let Some(item) = items.next(ui_widgets) {
let mut text = "".to_string();
if &netsettings.servers[item.i] == &self.server_address {
if &net_settings.servers[item.i] == &self.server_address {
text.push_str("* ")
} else {
text.push_str(" ")
}
text.push_str(&netsettings.servers[item.i]);
text.push_str(&net_settings.servers[item.i]);
if item
.set(
@ -344,7 +344,7 @@ impl MainMenuUi {
.was_clicked()
{
// TODO: Set as current server address
self.server_address = netsettings.servers[item.i].clone();
self.server_address = net_settings.servers[item.i].clone();
}
}

79
voxygen/src/scene/figure.rs
View File

@ -18,8 +18,8 @@ use common::{
self,
actor::{
Belt, Chest, Draw, Foot, Hand, Head, Pants, PigChest, PigHead, PigLegL, PigLegR,
Shoulder, Weapon, WolfEars, WolfJaw, WolfLBFoot, WolfLFFoot, WolfLowerHead, WolfRBFoot,
WolfRFFoot, WolfTail, WolfTorsoBack, WolfTorsoMid, WolfUpperHead,
Shoulder, Weapon, WolfEars, WolfFootLB, WolfFootLF, WolfFootRB, WolfFootRF,
WolfHeadLower, WolfHeadUpper, WolfJaw, WolfTail, WolfTorsoBack, WolfTorsoMid,
},
Body, HumanoidBody, QuadrupedBody, QuadrupedMediumBody,
},
@ -100,17 +100,17 @@ impl FigureModelCache {
None,
],
Body::QuadrupedMedium(body) => [
Some(Self::load_wolf_upperhead(body.wolf_upperhead)),
Some(Self::load_wolf_head_upper(body.wolf_head_upper)),
Some(Self::load_wolf_jaw(body.wolf_jaw)),
Some(Self::load_wolf_lowerhead(body.wolf_lowerhead)),
Some(Self::load_wolf_head_lower(body.wolf_head_lower)),
Some(Self::load_wolf_tail(body.wolf_tail)),
Some(Self::load_wolf_torsoback(body.wolf_torsoback)),
Some(Self::load_wolf_torsomid(body.wolf_torsomid)),
Some(Self::load_wolf_torso_back(body.wolf_torso_back)),
Some(Self::load_wolf_torso_mid(body.wolf_torso_mid)),
Some(Self::load_wolf_ears(body.wolf_ears)),
Some(Self::load_wolf_lffoot(body.wolf_lffoot)),
Some(Self::load_wolf_rffoot(body.wolf_rffoot)),
Some(Self::load_wolf_lbfoot(body.wolf_lbfoot)),
Some(Self::load_wolf_rbfoot(body.wolf_rbfoot)),
Some(Self::load_wolf_foot_lf(body.wolf_foot_lf)),
Some(Self::load_wolf_foot_rf(body.wolf_foot_rf)),
Some(Self::load_wolf_foot_lb(body.wolf_foot_lb)),
Some(Self::load_wolf_foot_rb(body.wolf_foot_rb)),
None,
None,
None,
@ -286,6 +286,7 @@ impl FigureModelCache {
Vec3::new(-1.5, -6.5, -4.5),
)
}
fn load_right_equip(hand: Hand) -> Mesh<FigurePipeline> {
Self::load_mesh(
match hand {
@ -331,9 +332,9 @@ impl FigureModelCache {
)
}
fn load_pig_leg_lb(pigleg_l: PigLegL) -> Mesh<FigurePipeline> {
fn load_pig_leg_lb(pig_leg_l: PigLegL) -> Mesh<FigurePipeline> {
Self::load_mesh(
match pigleg_l {
match pig_leg_l {
PigLegL::Default => "npc/pig_purple/pigleg_l.vox",
},
Vec3::new(0.0, -1.0, -1.5),
@ -349,14 +350,15 @@ impl FigureModelCache {
)
}
//////
fn load_wolf_upperhead(wolf_upperhead: WolfUpperHead) -> Mesh<FigurePipeline> {
fn load_wolf_head_upper(wolf_upper_head: WolfHeadUpper) -> Mesh<FigurePipeline> {
Self::load_mesh(
match wolf_upperhead {
WolfUpperHead::Default => "npc/wolf/wolf_upper_head.vox",
match wolf_upper_head {
WolfHeadUpper::Default => "npc/wolf/wolf_upper_head.vox",
},
Vec3::new(-7.0, -6.0, -5.5),
)
}
fn load_wolf_jaw(wolf_jaw: WolfJaw) -> Mesh<FigurePipeline> {
Self::load_mesh(
match wolf_jaw {
@ -365,14 +367,16 @@ impl FigureModelCache {
Vec3::new(-3.0, -3.0, -2.5),
)
}
fn load_wolf_lowerhead(wolf_lowerhead: WolfLowerHead) -> Mesh<FigurePipeline> {
fn load_wolf_head_lower(wolf_head_lower: WolfHeadLower) -> Mesh<FigurePipeline> {
Self::load_mesh(
match wolf_lowerhead {
WolfLowerHead::Default => "npc/wolf/wolf_lower_head.vox",
match wolf_head_lower {
WolfHeadLower::Default => "npc/wolf/wolf_lower_head.vox",
},
Vec3::new(-7.0, -6.0, -5.5),
)
}
fn load_wolf_tail(wolf_tail: WolfTail) -> Mesh<FigurePipeline> {
Self::load_mesh(
match wolf_tail {
@ -381,22 +385,25 @@ impl FigureModelCache {
Vec3::new(-2.0, -12.0, -5.0),
)
}
fn load_wolf_torsoback(wolf_torsoback: WolfTorsoBack) -> Mesh<FigurePipeline> {
fn load_wolf_torso_back(wolf_torso_back: WolfTorsoBack) -> Mesh<FigurePipeline> {
Self::load_mesh(
match wolf_torsoback {
match wolf_torso_back {
WolfTorsoBack::Default => "npc/wolf/wolf_torso_back.vox",
},
Vec3::new(-7.0, -6.0, -6.0),
)
}
fn load_wolf_torsomid(wolf_torsomid: WolfTorsoMid) -> Mesh<FigurePipeline> {
fn load_wolf_torso_mid(wolf_torso_mid: WolfTorsoMid) -> Mesh<FigurePipeline> {
Self::load_mesh(
match wolf_torsomid {
match wolf_torso_mid {
WolfTorsoMid::Default => "npc/wolf/wolf_torso_mid.vox",
},
Vec3::new(-8.0, -5.5, -6.0),
)
}
fn load_wolf_ears(wolf_ears: WolfEars) -> Mesh<FigurePipeline> {
Self::load_mesh(
match wolf_ears {
@ -405,34 +412,38 @@ impl FigureModelCache {
Vec3::new(-4.0, -1.0, -1.0),
)
}
fn load_wolf_lffoot(wolf_lffoot: WolfLFFoot) -> Mesh<FigurePipeline> {
fn load_wolf_foot_lf(wolf_foot_lf: WolfFootLF) -> Mesh<FigurePipeline> {
Self::load_mesh(
match wolf_lffoot {
WolfLFFoot::Default => "npc/wolf/wolf_lf_foot.vox",
match wolf_foot_lf {
WolfFootLF::Default => "npc/wolf/wolf_lf_foot.vox",
},
Vec3::new(-2.5, -4.0, -2.5),
)
}
fn load_wolf_rffoot(wolf_rffoot: WolfRFFoot) -> Mesh<FigurePipeline> {
fn load_wolf_foot_rf(wolf_foot_rf: WolfFootRF) -> Mesh<FigurePipeline> {
Self::load_mesh(
match wolf_rffoot {
WolfRFFoot::Default => "npc/wolf/wolf_rf_foot.vox",
match wolf_foot_rf {
WolfFootRF::Default => "npc/wolf/wolf_rf_foot.vox",
},
Vec3::new(-2.5, -4.0, -2.5),
)
}
fn load_wolf_lbfoot(wolf_lbfoot: WolfLBFoot) -> Mesh<FigurePipeline> {
fn load_wolf_foot_lb(wolf_foot_lb: WolfFootLB) -> Mesh<FigurePipeline> {
Self::load_mesh(
match wolf_lbfoot {
WolfLBFoot::Default => "npc/wolf/wolf_lb_foot.vox",
match wolf_foot_lb {
WolfFootLB::Default => "npc/wolf/wolf_lb_foot.vox",
},
Vec3::new(-2.5, -4.0, -2.5),
)
}
fn load_wolf_rbfoot(wolf_rbfoot: WolfRBFoot) -> Mesh<FigurePipeline> {
fn load_wolf_foot_rb(wolf_foot_rb: WolfFootRB) -> Mesh<FigurePipeline> {
Self::load_mesh(
match wolf_rbfoot {
WolfRBFoot::Default => "npc/wolf/wolf_rb_foot.vox",
match wolf_foot_rb {
WolfFootRB::Default => "npc/wolf/wolf_rb_foot.vox",
},
Vec3::new(-2.5, -4.0, -2.5),
)