address comments

This commit is contained in:
jshipsey 2021-02-25 01:27:55 -05:00
parent 17112926e7
commit 0a353576dc
11 changed files with 18 additions and 28 deletions

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 100,
base_damage: 300,
damage_increase: 0,
base_poise_damage: 0,
poise_damage_increase: 0,

Binary file not shown.

View File

@ -18,7 +18,7 @@ pub enum ToolKind {
Sword,
Axe,
Hammer,
HammerSimple,
HammerSimple, //simple tools utilized by small/large biped variants, to simplify movesets
SwordSimple,
StaffSimple,
BowSimple,

View File

@ -333,7 +333,7 @@ impl LoadoutBuilder {
"common.items.npc_armor.biped_small.adlet.tail.adlet",
)))
.build(),
Some(ToolKind::Spear) | Some(ToolKind::Staff) => LoadoutBuilder::new()
Some(ToolKind::Spear) | Some(ToolKind::StaffSimple) => LoadoutBuilder::new()
.active_item(active_item)
.head(Some(Item::new_from_asset_expect(
"common.items.npc_armor.biped_small.adlet.head.adlet_spear",
@ -378,7 +378,7 @@ impl LoadoutBuilder {
"common.items.npc_armor.biped_small.gnarling.tail.gnarling",
)))
.build(),
Some(ToolKind::Staff) => LoadoutBuilder::new()
Some(ToolKind::StaffSimple) => LoadoutBuilder::new()
.active_item(active_item)
.head(Some(Item::new_from_asset_expect(
"common.items.npc_armor.biped_small.gnarling.head.gnarling",

View File

@ -47,9 +47,9 @@ impl Animation for RunAnimation {
*rate = 1.0;
let lab = 0.65 * s_a.tempo; //.65
let speednorm = (speed / 12.0).powf(0.6); //.powf(0.4)
let speednormlow = (speed / 12.0).powf(4.0); //.powf(0.4)
let lab = 0.65 * s_a.tempo;
let speednorm = (speed / 12.0).powf(0.6);
let speednormlow = (speed / 12.0).powf(4.0);
let footvertl = (acc_vel * lab as f32 + PI * -0.2).sin() * speednorm;
let footvertr = (acc_vel * lab as f32 + PI * -1.2).sin() * speednorm;
@ -91,17 +91,17 @@ impl Animation for RunAnimation {
let shift4 = speedadjust - PI * 3.0 / 4.0 + speedadjust * PI / 2.0;
//FL
let foot1a = (acc_vel * lab as f32 * speedmult + 0.0 + canceler * 0.05 + shift1).sin(); //1.5
let foot1b = (acc_vel * lab as f32 * speedmult + 1.1 + canceler * 0.05 + shift1).sin(); //1.9
let foot1a = (acc_vel * lab as f32 * speedmult + 0.0 + canceler * 0.05 + shift1).sin();
let foot1b = (acc_vel * lab as f32 * speedmult + 1.1 + canceler * 0.05 + shift1).sin();
//FR
let foot2a = (acc_vel * lab as f32 * speedmult + shift2).sin(); //1.2
let foot2b = (acc_vel * lab as f32 * speedmult + 1.1 + shift2).sin(); //1.6
let foot2a = (acc_vel * lab as f32 * speedmult + shift2).sin();
let foot2b = (acc_vel * lab as f32 * speedmult + 1.1 + shift2).sin();
//BL
let foot3a = (acc_vel * lab as f32 * speedmult + shift3).sin(); //0.0
let foot3b = (acc_vel * lab as f32 * speedmult + 0.3 + shift3).sin(); //0.4
let foot3a = (acc_vel * lab as f32 * speedmult + shift3).sin();
let foot3b = (acc_vel * lab as f32 * speedmult + 0.3 + shift3).sin();
//BR
let foot4a = (acc_vel * lab as f32 * speedmult + 0.0 + canceler * 0.05 + shift4).sin(); //0.3
let foot4b = (acc_vel * lab as f32 * speedmult + 1.57 + canceler * 0.05 + shift4).sin(); //0.7
let foot4a = (acc_vel * lab as f32 * speedmult + 0.0 + canceler * 0.05 + shift4).sin();
let foot4b = (acc_vel * lab as f32 * speedmult + 1.57 + canceler * 0.05 + shift4).sin();
//
let slow = (acc_vel * lab as f32 * speedmult + PI).sin();

View File

@ -46,7 +46,6 @@ impl Animation for AlphaAnimation {
let mut next = (*skeleton).clone();
let speed = Vec2::<f32>::from(velocity).magnitude();
//let fastacc = (acc_vel * 2.0).sin();
let fast = (anim_time as f32 * 10.0).sin();
let fastalt = (anim_time as f32 * 10.0 + PI / 2.0).sin();

View File

@ -46,7 +46,6 @@ impl Animation for DashAnimation {
let mut next = (*skeleton).clone();
let speed = Vec2::<f32>::from(velocity).magnitude();
//let fastacc = (acc_vel * 2.0).sin();
let fast = (anim_time as f32 * 10.0).sin();
let fastalt = (anim_time as f32 * 10.0 + PI / 2.0).sin();

View File

@ -75,7 +75,6 @@ impl Animation for RunAnimation {
} else {
0.0
} * 1.3;
//println!("speednorm {} ",side);
let head_look = Vec2::new(
((global_time + anim_time) as f32 / 18.0)

View File

@ -66,8 +66,6 @@ impl Animation for LeapAnimation {
* Quaternion::rotation_y(0.0 + move2 * -0.1)
* Quaternion::rotation_z(move1 * -0.4 + move2 * -0.2 + move3 * 0.6);
//next.hand_l.position = Vec3::new(-12.0 + move3 * 10.0, 0.0, 0.0);
next.foot_l.position = Vec3::new(
-s_a.foot.0,
s_a.foot.1 + move3 * 13.0,

View File

@ -25,8 +25,8 @@ impl Animation for RunAnimation {
let mut next = (*skeleton).clone();
let speed = Vec2::<f32>::from(velocity).magnitude();
let lab = 0.45 * s_a.tempo; //.65
let speednorm = (speed / 7.0).powf(0.6); //.powf(0.4)
let lab = 0.45 * s_a.tempo;
let speednorm = (speed / 7.0).powf(0.6);
let foothoril = (((1.0)
/ (0.4 + (0.6) * ((acc_vel * 2.0 * lab as f32 + PI * 1.4).sin()).powi(2)))
.sqrt())

View File

@ -24,14 +24,12 @@ impl Animation for RunAnimation {
let mut next = (*skeleton).clone();
let speed = (Vec2::<f32>::from(velocity).magnitude()).min(24.0);
*rate = 1.0;
//let increasefreqtest = (((1.0/speed)*3.0).round()).min(5.0);
let lab = 0.72; //0.72
let lab = 0.72;
let amplitude = (speed / 24.0).powf(0.6);
let amplitude2 = (speed / 24.0).powf(0.6);
let amplitude3 = (speed / 24.0).powf(0.6);
let speedmult = s_a.tempo;
let canceler = (speed / 24.0).powf(0.6);
//println!("{} test", canceler);
let short = (((1.0)
/ (0.72