Address some comments

Eliminated extra stagger state

Responding to more comments

Move poise character state changes to character behavior system

Move poise out of JoinTuple/Data

Finish up comments (various fixes)
This commit is contained in:
jiminycrick 2021-01-26 19:05:13 -08:00
parent 46c8c744fa
commit a02444825d
452 changed files with 862 additions and 1125 deletions

View File

@ -3,7 +3,6 @@ ComboMelee(
(
stage: 1,
base_damage: 90,
max_damage: 110,
base_poise_damage: 0,
damage_increase: 10,
poise_damage_increase: 0,
@ -18,7 +17,6 @@ ComboMelee(
(
stage: 2,
base_damage: 130,
max_damage: 160,
base_poise_damage: 0,
damage_increase: 15,
poise_damage_increase: 0,

View File

@ -4,7 +4,6 @@ BasicRanged(
recover_duration: 300,
projectile: Arrow(
damage: 70.0,
poise_damage: 0,
knockback: 5.0,
energy_regen: 40,
),

View File

@ -3,8 +3,6 @@ ChargedRanged(
energy_drain: 300,
initial_damage: 10,
scaled_damage: 190,
initial_poise_damage: 0,
scaled_poise_damage: 0,
initial_knockback: 10.0,
scaled_knockback: 10.0,
speed: 1.0,

View File

@ -7,7 +7,6 @@ RepeaterRanged(
leap: Some(5.0),
projectile: Arrow(
damage: 40.0,
poise_damage: 0,
knockback: 5.0,
energy_regen: 0,
),

View File

@ -4,7 +4,6 @@ BasicRanged(
recover_duration: 350,
projectile: Fireball(
damage: 100.0,
poise_damage: 0,
radius: 5.0,
energy_regen: 50,
),

View File

@ -4,7 +4,6 @@ BasicRanged(
recover_duration: 350,
projectile: Fireball(
damage: 100.0,
poise_damage: 0,
radius: 5.0,
energy_regen: 0,
),

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Back("Admin"),
stats: (
protection: Invincible,
poise_protection: Invincible,
poise_resilience: Invincible,
),
)),
quality: Debug,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Back("Backpack0"),
stats: (
protection: Normal(0.0),
poise_protection: Normal(0.0),
poise_resilience: Normal(0.0),
),
)),
quality: High,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Back("DungPurp0"),
stats: (
protection: Normal(3.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Epic,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Back("Short2"),
stats: (
protection: Normal(0.2),
poise_protection: Normal(0.1),
poise_resilience: Normal(0.1),
),
)),
quality: Common,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Back("Short0"),
stats: (
protection: Normal(0.3),
poise_protection: Normal(0.5),
poise_resilience: Normal(0.5),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Back("Short1"),
stats: (
protection: Normal(0.1),
poise_protection: Normal(0.2),
poise_resilience: Normal(0.2),
),
)),
quality: Common,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Back("VeloriteMage0"),
stats: (
protection: Normal(2.8),
poise_protection: Normal(2.0),
poise_resilience: Normal(2.0),
),
)),
quality: High,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Back("Warlock"),
stats: (
protection: Normal(4.0),
poise_protection: Normal(3.0),
poise_resilience: Normal(3.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Back("Warlord"),
stats: (
protection: Normal(4.0),
poise_protection: Normal(5.0),
poise_resilience: Normal(5.0),
),
)),
quality: Moderate,

View File

@ -6,7 +6,7 @@ ItemDef(
kind: Bag("BluePouch"),
stats: (
protection: Normal(0.0),
poise_protection: Normal(0.0),
poise_resilience: Normal(0.0),
),
)
),

View File

@ -6,7 +6,7 @@ ItemDef(
kind: Bag("RedSmall"),
stats: (
protection: Normal(0.0),
poise_protection: Normal(0.0),
poise_resilience: Normal(0.0),
),
)
),

View File

@ -6,7 +6,7 @@ ItemDef(
kind: Bag("GreenMid"),
stats: (
protection: Normal(0.0),
poise_protection: Normal(0.0),
poise_resilience: Normal(0.0),
),
)
),

View File

@ -6,7 +6,7 @@ ItemDef(
kind: Bag("PurpleSkull"),
stats: (
protection: Normal(0.0),
poise_protection: Normal(0.0),
poise_resilience: Normal(0.0),
),
)
),

View File

@ -6,7 +6,7 @@ ItemDef(
kind: Bag("LeatherLarge"),
stats: (
protection: Normal(0.0),
poise_protection: Normal(0.0),
poise_resilience: Normal(0.0),
),
)
),

View File

@ -6,7 +6,7 @@ ItemDef(
kind: Bag("RedFace"),
stats: (
protection: Normal(0.0),
poise_protection: Normal(0.0),
poise_resilience: Normal(0.0),
),
)
),

View File

@ -6,7 +6,7 @@ ItemDef(
kind: Bag("BlueFace"),
stats: (
protection: Normal(0.0),
poise_protection: Normal(0.0),
poise_resilience: Normal(0.0),
),
)
),

View File

@ -6,7 +6,7 @@ ItemDef(
kind: Bag("RedLarge"),
stats: (
protection: Normal(0.0),
poise_protection: Normal(0.0),
poise_resilience: Normal(0.0),
),
)
),

View File

@ -6,7 +6,7 @@ ItemDef(
kind: Bag("LeatherSmall"),
stats: (
protection: Normal(0.0),
poise_protection: Normal(0.0),
poise_resilience: Normal(0.0),
),
)
),

View File

@ -6,7 +6,7 @@ ItemDef(
kind: Bag("RedTiny"),
stats: (
protection: Normal(0.0),
poise_protection: Normal(0.0),
poise_resilience: Normal(0.0),
),
)
),

View File

@ -6,7 +6,7 @@ ItemDef(
kind: Bag("GreenLarge"),
stats: (
protection: Normal(0.0),
poise_protection: Normal(0.0),
poise_resilience: Normal(0.0),
),
)
),

View File

@ -6,7 +6,7 @@ ItemDef(
kind: Bag("RedMed"),
stats: (
protection: Normal(0.0),
poise_protection: Normal(0.0),
poise_resilience: Normal(0.0),
),
)
),

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Belt("Assassin"),
stats: (
protection: Normal(2.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Belt("Bonerattler"),
stats: (
protection: Normal(3.0),
poise_protection: Normal(5.0),
poise_resilience: Normal(5.0),
),
)),
quality: High,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Belt("ClothBlue0"),
stats: (
protection: Normal(1.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Common,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Belt("ClothGreen0"),
stats: (
protection: Normal(1.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Common,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Belt("ClothPurple0"),
stats: (
protection: Normal(1.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Common,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Belt("Cultist"),
stats: (
protection: Normal(6.0),
poise_protection: Normal(5.0),
poise_resilience: Normal(5.0),
),
)),
quality: Epic,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Belt("Druid"),
stats: (
protection: Normal(2.0),
poise_protection: Normal(2.0),
poise_resilience: Normal(2.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Belt("Leather0"),
stats: (
protection: Normal(1.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Common,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Belt("Leather2"),
stats: (
protection: Normal(1.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Common,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Belt("Leather2"),
stats: (
protection: Normal(1.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Belt("Plate0"),
stats: (
protection: Normal(3.0),
poise_protection: Normal(4.0),
poise_resilience: Normal(4.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Belt("Steel0"),
stats: (
protection: Normal(4.0),
poise_protection: Normal(8.0),
poise_resilience: Normal(8.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Belt("Tarasque"),
stats: (
protection: Normal(3.0),
poise_protection: Normal(5.0),
poise_resilience: Normal(5.0),
),
)),
quality: High,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Belt("Twig"),
stats: (
protection: Normal(2.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Belt("Twigsflowers"),
stats: (
protection: Normal(2.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Belt("Twigsleaves"),
stats: (
protection: Normal(2.0),
poise_protection: Normal(3.0),
poise_resilience: Normal(3.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Belt("VeloriteMage0"),
stats: (
protection: Normal(5.8),
poise_protection: Normal(5.0),
poise_resilience: Normal(5.0),
),
)),
quality: High,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Belt("Warlock"),
stats: (
protection: Normal(8.0),
poise_protection: Normal(7.0),
poise_resilience: Normal(7.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Belt("Warlord"),
stats: (
protection: Normal(8.0),
poise_protection: Normal(5.0),
poise_resilience: Normal(5.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("Assassin"),
stats: (
protection: Normal(15.0),
poise_protection: Normal(10.0),
poise_resilience: Normal(10.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("Bonerattler"),
stats: (
protection: Normal(25.0),
poise_protection: Normal(35.0),
poise_resilience: Normal(35.0),
),
)),
quality: High,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("ClothBlue0"),
stats: (
protection: Normal(1.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Common,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("ClothGreen0"),
stats: (
protection: Normal(1.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Common,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("ClothPurple0"),
stats: (
protection: Normal(1.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Common,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("VeloriteMage0"),
stats: (
protection: Normal(30.0),
poise_protection: Normal(15.0),
poise_resilience: Normal(15.0),
),
)),
quality: Epic,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("CultistPurple"),
stats: (
protection: Normal(30.0),
poise_protection: Normal(15.0),
poise_resilience: Normal(15.0),
),
)),
quality: Epic,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("Druid"),
stats: (
protection: Normal(6.0),
poise_protection: Normal(4.0),
poise_resilience: Normal(4.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("Leather0"),
stats: (
protection: Normal(10.0),
poise_protection: Normal(7.0),
poise_resilience: Normal(7.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("Leather2"),
stats: (
protection: Normal(10.0),
poise_protection: Normal(8.0),
poise_resilience: Normal(8.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("Leather2"),
stats: (
protection: Normal(8.0),
poise_protection: Normal(3.0),
poise_resilience: Normal(3.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("PlateGreen0"),
stats: (
protection: Normal(20.0),
poise_protection: Normal(18.0),
poise_resilience: Normal(18.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("Rugged0"),
stats: (
protection: Normal(1.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Low,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("Steel0"),
stats: (
protection: Normal(25.0),
poise_protection: Normal(40.0),
poise_resilience: Normal(40.0),
),
)),
quality: High,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("Tarasque"),
stats: (
protection: Normal(25.0),
poise_protection: Normal(30.0),
poise_resilience: Normal(30.0),
),
)),
quality: High,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("Twig"),
stats: (
protection: Normal(15.0),
poise_protection: Normal(10.0),
poise_resilience: Normal(10.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("Twigsflowers"),
stats: (
protection: Normal(15.0),
poise_protection: Normal(8.0),
poise_resilience: Normal(8.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("Twigsleaves"),
stats: (
protection: Normal(15.0),
poise_protection: Normal(10.0),
poise_resilience: Normal(10.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("VeloriteMage0"),
stats: (
protection: Normal(28.0),
poise_protection: Normal(20.0),
poise_resilience: Normal(20.0),
),
)),
quality: High,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("Warlock"),
stats: (
protection: Normal(40.0),
poise_protection: Normal(29.0),
poise_resilience: Normal(29.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("Warlord"),
stats: (
protection: Normal(40.0),
poise_protection: Normal(29.0),
poise_resilience: Normal(29.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("WorkerGreen0"),
stats: (
protection: Normal(1.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Low,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("WorkerGreen1"),
stats: (
protection: Normal(1.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Low,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("WorkerOrange0"),
stats: (
protection: Normal(1.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Low,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("WorkerOrange1"),
stats: (
protection: Normal(1.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Low,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("WorkerPurple0"),
stats: (
protection: Normal(1.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Low,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("WorkerPurple1"),
stats: (
protection: Normal(1.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Low,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("WorkerRed0"),
stats: (
protection: Normal(1.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Low,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("WorkerRed1"),
stats: (
protection: Normal(1.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Low,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("WorkerYellow0"),
stats: (
protection: Normal(1.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Low,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest("WorkerYellow1"),
stats: (
protection: Normal(1.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Low,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Foot("Assassin"),
stats: (
protection: Normal(4.0),
poise_protection: Normal(2.0),
poise_resilience: Normal(2.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Foot("Bonerattler"),
stats: (
protection: Normal(5.0),
poise_protection: Normal(10.0),
poise_resilience: Normal(10.0),
),
)),
quality: High,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Foot("ClothBlue0"),
stats: (
protection: Normal(0.0),
poise_protection: Normal(0.0),
poise_resilience: Normal(0.0),
),
)),
quality: Common,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Foot("ClothGreen0"),
stats: (
protection: Normal(0.0),
poise_protection: Normal(0.0),
poise_resilience: Normal(0.0),
),
)),
quality: Common,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Foot("ClothPurple0"),
stats: (
protection: Normal(0.0),
poise_protection: Normal(0.0),
poise_resilience: Normal(0.0),
),
)),
quality: Common,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Foot("Cultist"),
stats: (
protection: Normal(6.0),
poise_protection: Normal(3.0),
poise_resilience: Normal(3.0),
),
)),
quality: Epic,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Foot("Druid"),
stats: (
protection: Normal(1.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Foot("JackalopeSlips"),
stats: (
protection: Normal(0.0),
poise_protection: Normal(10.0),
poise_resilience: Normal(10.0),
),
)),
quality: High,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Foot("Leather0"),
stats: (
protection: Normal(2.0),
poise_protection: Normal(2.0),
poise_resilience: Normal(2.0),
),
)),
quality: Common,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Foot("Leather2"),
stats: (
protection: Normal(2.0),
poise_protection: Normal(3.0),
poise_resilience: Normal(3.0),
),
)),
quality: Common,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Foot("Leather2"),
stats: (
protection: Normal(2.0),
poise_protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Foot("Plate0"),
stats: (
protection: Normal(4.0),
poise_protection: Normal(8.0),
poise_resilience: Normal(8.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Foot("Sandal0"),
stats: (
protection: Normal(0.0),
poise_protection: Normal(0.0),
poise_resilience: Normal(0.0),
),
)),
quality: Low,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Foot("Steel0"),
stats: (
protection: Normal(5.0),
poise_protection: Normal(10.0),
poise_resilience: Normal(10.0),
),
)),
quality: High,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Foot("Tarasque"),
stats: (
protection: Normal(5.0),
poise_protection: Normal(9.0),
poise_resilience: Normal(9.0),
),
)),
quality: High,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Foot("Twig"),
stats: (
protection: Normal(3.0),
poise_protection: Normal(2.0),
poise_resilience: Normal(2.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Foot("Twigsflowers"),
stats: (
protection: Normal(3.0),
poise_protection: Normal(2.0),
poise_resilience: Normal(2.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Foot("Twigsleaves"),
stats: (
protection: Normal(3.0),
poise_protection: Normal(2.0),
poise_resilience: Normal(2.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Foot("VeloriteMage0"),
stats: (
protection: Normal(5.9),
poise_protection: Normal(5.0),
poise_resilience: Normal(5.0),
),
)),
quality: High,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Foot("Warlock"),
stats: (
protection: Normal(8.0),
poise_protection: Normal(5.0),
poise_resilience: Normal(5.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Foot("Warlord"),
stats: (
protection: Normal(8.0),
poise_protection: Normal(6.0),
poise_resilience: Normal(6.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Hand("Assassin"),
stats: (
protection: Normal(6.0),
poise_protection: Normal(3.0),
poise_resilience: Normal(3.0),
),
)),
quality: Moderate,

View File

@ -5,7 +5,7 @@ ItemDef(
kind: Hand("Bonerattler"),
stats: (
protection: Normal(10.0),
poise_protection: Normal(12.0),
poise_resilience: Normal(12.0),
),
)),
quality: High,

Some files were not shown because too many files have changed in this diff Show More