Rebase commit

This commit is contained in:
danielkenji83 2024-02-17 00:50:23 -03:00
parent 8e62c17a81
commit 5c401215cf
286 changed files with 897 additions and 208 deletions

View File

@ -90,6 +90,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Balance changes; Smoother entity progression consisting of larger variety in (effective) health pools, dps, entity flee_health alterations, and minor weight distribution changes for entity spawns.
- Made power of weapon tiers scale non-linearly.
- Sword Changes; Pommel Strike has been nerfed -> increased energy cost, increased _durations, and decreased poise damage. Heavy Sweep has been nerfed -> decreased poise damage and stun vulnerability damage. Pillar Thrust has been altered -> decreased maximum base damage with an increase in stun vulnerability damage.
- Weapons block are based on poise
- Wooden Shield recipe
### Removed
- Medium and large potions from all loot tables

View File

@ -351,8 +351,9 @@
abilities: [],
),
Tool(Shield): (
primary: Simple(None, "common.abilities.shield.tempbasic"),
secondary: Simple(None, "common.abilities.shield.block"),
guard: Some(Simple(None, "common.abilities.shield.basic_guard")),
primary: Simple(None, "common.abilities.shield.singlestrike"),
secondary: Simple(None, "common.abilities.shield.singlestrike"),
abilities: [],
),
Custom("Stone Golem"): (

View File

@ -2,7 +2,6 @@ BasicBlock(
buildup_duration: 0.25,
recover_duration: 0.25,
max_angle: 90.0,
block_strength: 0.5,
parry_window: (
buildup: false,
recover: false,

View File

@ -1,14 +1,14 @@
BasicBlock(
buildup_duration: 0.1,
recover_duration: 0.1,
buildup_duration: 0.45,
recover_duration: 0.2,
max_angle: 90.0,
block_strength: 0.8,
parry_window: (
buildup: true,
recover: false,
),
energy_cost: 0.0,
energy_regen: 0.0,
energy_cost: 5.0,
energy_regen: 5.0,
can_hold: true,
blocked_attacks: (
melee: true,

View File

@ -0,0 +1,32 @@
ComboMelee2(
strikes: [
(
melee_constructor: (
kind: Bash(
damage: 6,
poise: 5,
knockback: 0,
energy_regen: 5,
),
range: 1.5,
angle: 45.0,
damage_effect: Some(BuffsVulnerable(0.5, Parried)),
),
buildup_duration: 0.15,
swing_duration: 0.2,
hit_timing: 0.1,
recover_duration: 0.15,
ori_modifier: 0.1,
movement: (
buildup: Some(Forward(0.1)),
swing: None,
recover: None,
),
),
],
energy_cost_per_strike: 0,
meta: (
// // The ability will parry all blockable attacks in the buildup portion
capabilities: ("PARRIES"),
),
)

View File

@ -1,18 +0,0 @@
BasicMelee(
energy_cost: 0,
buildup_duration: 0.1,
swing_duration: 0.1,
hit_timing: 0.0,
recover_duration: 0.3,
melee_constructor: (
kind: Bash(
damage: 4.0,
poise: 0.0,
knockback: 0.0,
energy_regen: 0.0,
),
range: 3.0,
angle: 90.0,
),
ori_modifier: 1.0,
)

View File

@ -22,6 +22,6 @@ ComboMelee2(
energy_cost_per_strike: 5,
meta: (
// The ability will parry melee attacks in the buildup & swing portion
capabilities: ("PARRIES"),
capabilities: ("PARRIES_MELEE"),
),
)

View File

@ -22,6 +22,6 @@ ComboMelee2(
energy_cost_per_strike: 5,
meta: (
// The ability will parry melee attacks in the buildup & swing portion
capabilities: ("PARRIES"),
capabilities: ("PARRIES_MELEE"),
),
)

View File

@ -41,6 +41,6 @@ ComboMelee2(
auto_progress: true,
meta: (
// The ability will parry melee attacks in the buildup & swing portion
capabilities: ("PARRIES"),
capabilities: ("PARRIES_MELEE"),
),
)

View File

@ -2,7 +2,6 @@ BasicBlock(
buildup_duration: 0.4,
recover_duration: 0.2,
max_angle: 45.0,
block_strength: 0.75,
parry_window: (
buildup: true,
recover: false,

View File

@ -23,6 +23,6 @@ ComboMelee2(
energy_cost_per_strike: 5,
meta: (
// The ability will parry melee attacks in the buildup & swing portion
capabilities: ("PARRIES"),
capabilities: ("PARRIES_MELEE"),
),
)

View File

@ -22,6 +22,6 @@ ComboMelee2(
energy_cost_per_strike: 5,
meta: (
// The ability will parry melee attacks in the buildup & swing portion
capabilities: ("PARRIES"),
capabilities: ("PARRIES_MELEE"),
),
)

View File

@ -27,6 +27,6 @@ ComboMelee2(
energy_cost_per_strike: 5,
meta: (
// The ability will parry melee attacks in the buildup & swing portion
capabilities: ("PARRIES"),
capabilities: ("PARRIES_MELEE"),
),
)

View File

@ -705,6 +705,9 @@
Simple(
"common.items.weapons.shield.shield_1",
): "weapon-shield-wood-0",
Simple(
"common.items.weapons.shield.starter_shield",
): "weapon-shield-starter",
Simple(
"common.items.weapons.dagger.basic_0",
): "weapon-dagger-dagger_basic-0",

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 0.0,
),
)),
quality: Debug,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 999.9
),
)),
quality: Debug,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 0.0,
),
)),
quality: Debug,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 0.9,
),
hand_restriction: None,
weapon_name: HandednessDependent(

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.8,
buff_strength: 1.2,
block_strength: 0.6,
),
hand_restriction: None,
weapon_name: HandednessDependent(

View File

@ -12,6 +12,7 @@ ItemDef(
range: 0.9,
energy_efficiency: 0.9,
buff_strength: 1.2,
block_strength: 1.2,
),
hand_restriction: Some(Two),
weapon_name: Universal("Greataxe"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.8,
buff_strength: 1.4,
block_strength: 0.8,
),
hand_restriction: None,
weapon_name: HandednessDependent(

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.9,
buff_strength: 0.8,
block_strength: 1.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Labrys"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.1,
energy_efficiency: 1.3,
buff_strength: 1.0,
block_strength: 0.7,
),
hand_restriction: None,
weapon_name: HandednessDependent(

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.3,
energy_efficiency: 0.9,
buff_strength: 0.9,
block_strength: 1.1,
),
hand_restriction: Some(Two),
weapon_name: Universal("Poleaxe"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 0.9,
energy_efficiency: 0.9,
buff_strength: 0.9,
block_strength: 0.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Bow"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.8,
buff_strength: 1.5,
block_strength: 0.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Composite Bow"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.8,
buff_strength: 0.8,
block_strength: 0.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Greatbow"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.3,
energy_efficiency: 0.8,
buff_strength: 0.8,
block_strength: 0.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Longbow"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.5,
buff_strength: 0.8,
block_strength: 0.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Ornate Bow"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.8,
buff_strength: 0.8,
block_strength: 0.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Shortbow"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.8,
buff_strength: 0.8,
block_strength: 0.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Warbow"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.8,
buff_strength: 0.8,
block_strength: 1.3,
),
hand_restriction: Some(Two),
weapon_name: Universal("Greathammer"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.8,
buff_strength: 0.8,
block_strength: 1.1,
),
hand_restriction: Some(Two),
weapon_name: Universal("Greatmace"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 0.9,
energy_efficiency: 0.9,
buff_strength: 0.9,
block_strength: 1.0,
),
hand_restriction: None,
weapon_name: HandednessDependent(

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.3,
energy_efficiency: 0.8,
buff_strength: 0.8,
block_strength: 1.2,
),
hand_restriction: Some(Two),
weapon_name: Universal("Maul"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.5,
buff_strength: 0.8,
block_strength: 0.8,
),
hand_restriction: None,
weapon_name: HandednessDependent(

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.8,
buff_strength: 1.5,
block_strength: 0.9,
),
hand_restriction: None,
weapon_name: HandednessDependent(

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.8,
buff_strength: 0.8,
block_strength: 0.7,
),
hand_restriction: None,
weapon_name: HandednessDependent(

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.3,
energy_efficiency: 0.8,
buff_strength: 0.8,
block_strength: 0.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Arbor"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.8,
buff_strength: 0.8,
block_strength: 0.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Cane"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.8,
buff_strength: 1.5,
block_strength: 0.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Crook"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.8,
buff_strength: 0.8,
block_strength: 0.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Crozier"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.8,
buff_strength: 0.8,
block_strength: 0.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Grandsceptre"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.5,
buff_strength: 0.8,
block_strength: 0.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Ornate Sceptre"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 0.9,
energy_efficiency: 0.9,
buff_strength: 0.9,
block_strength: 0.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Sceptre"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.8,
buff_strength: 0.8,
block_strength: 0.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Brand"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.8,
buff_strength: 0.8,
block_strength: 0.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Grandstaff"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.3,
energy_efficiency: 0.8,
buff_strength: 0.8,
block_strength: 0.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Longpole"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.5,
buff_strength: 0.8,
block_strength: 0.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Ornate Staff"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.8,
buff_strength: 1.5,
block_strength: 0.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Pole"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.8,
buff_strength: 0.8,
block_strength: 0.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Rod"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 0.9,
energy_efficiency: 0.9,
buff_strength: 0.9,
block_strength: 0.0,
),
hand_restriction: Some(Two),
weapon_name: Universal("Staff"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.7,
buff_strength: 1.0,
block_strength: 1.3,
),
hand_restriction: Some(Two),
weapon_name: Universal("Greatsword"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.3,
buff_strength: 0.9,
block_strength: 0.7,
),
hand_restriction: None,
weapon_name: HandednessDependent(

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 1.0,
),
hand_restriction: None,
weapon_name: HandednessDependent(

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.5,
buff_strength: 0.8,
block_strength: 0.8,
),
hand_restriction: None,
weapon_name: HandednessDependent(

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.1,
buff_strength: 0.8,
block_strength: 1.1,
),
hand_restriction: None,
weapon_name: HandednessDependent(

View File

@ -12,6 +12,7 @@ ItemDef(
range: 0.9,
energy_efficiency: 0.8,
buff_strength: 1.4,
block_strength: 0.9,
),
hand_restriction: None,
weapon_name: HandednessDependent(

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.3,
energy_efficiency: 0.9,
buff_strength: 0.8,
block_strength: 1.2,
),
hand_restriction: Some(Two),
weapon_name: Universal("Zweihander"),

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.1,
energy_efficiency: 0.9,
buff_strength: 1.1,
block_strength: 1.2,
),
hand_restriction: Some(Two),
)

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.9,
buff_strength: 1.0,
block_strength: 1.0,
),
hand_restriction: None,
)

View File

@ -12,6 +12,7 @@ ItemDef(
range: 0.9,
energy_efficiency: 1.1,
buff_strength: 0.9,
block_strength: 0.8,
),
hand_restriction: Some(One),
)

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.2,
energy_efficiency: 0.9,
buff_strength: 1.1,
block_strength: 0.0,
),
hand_restriction: Some(Two),
)

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 0.0,
),
hand_restriction: Some(Two),
)

View File

@ -12,6 +12,7 @@ ItemDef(
range: 0.85,
energy_efficiency: 1.1,
buff_strength: 0.9,
block_strength: 0.0,
),
hand_restriction: Some(Two),
)

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.2,
energy_efficiency: 0.9,
buff_strength: 1.1,
block_strength: 1.2,
),
hand_restriction: Some(Two),
)

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 0.9,
buff_strength: 1.0,
block_strength: 1.0,
),
hand_restriction: None,
)

View File

@ -12,6 +12,7 @@ ItemDef(
range: 0.85,
energy_efficiency: 1.1,
buff_strength: 0.9,
block_strength: 0.8,
),
hand_restriction: Some(One),
)

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.2,
energy_efficiency: 0.9,
buff_strength: 1.1,
block_strength: 0.0,
),
hand_restriction: Some(Two),
)

View File

@ -12,6 +12,7 @@ ItemDef(
range: 0.85,
energy_efficiency: 1.1,
buff_strength: 0.9,
block_strength: 0.0,
),
hand_restriction: Some(Two),
)

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 0.0,
),
hand_restriction: Some(Two),
)

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.2,
energy_efficiency: 0.9,
buff_strength: 1.1,
block_strength: 0.0,
),
hand_restriction: Some(Two),
)

View File

@ -12,6 +12,7 @@ ItemDef(
range: 0.85,
energy_efficiency: 1.1,
buff_strength: 0.9,
block_strength: 0.0,
),
hand_restriction: Some(Two),
)

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 1.0,
),
hand_restriction: Some(Two),
)

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.1,
energy_efficiency: 0.9,
buff_strength: 1.1,
block_strength: 1.2,
),
hand_restriction: Some(Two),
)

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 1.2,
),
hand_restriction: None,
)

View File

@ -12,6 +12,7 @@ ItemDef(
range: 0.9,
energy_efficiency: 1.1,
buff_strength: 0.9,
block_strength: 1.2,
),
hand_restriction: Some(One),
)

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 1.0,
),
)),
quality: Legendary,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 0.0,
),
)),
quality: Legendary,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 1.8,
),
)),
quality: Low,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 1.0,
),
)),
quality: Low,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 0.0,
),
)),
quality: Low,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 0.0,
),
)),
quality: Low,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 0.0,
),
)),
quality: Epic,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 1.0,
),
)),
quality: Epic,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 0.0,
),
)),
quality: Low,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 0.0,
),
)),
quality: Low,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 1.0,
),
)),
quality: Low,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 0.5,
),
)),
quality: Low,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 0.0,
),
)),
quality: Low,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 0.0,
),
)),
quality: Low,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 0.0,
),
)),
quality: Low,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 0.0,
),
)),
quality: Moderate,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 1.0,
),
)),
quality: Low,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 1.0,
),
)),
quality: Low,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 0.0,
),
)),
quality: Low,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 3.2,
),
)),
quality: Low,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 0.0,
),
)),
quality: Moderate,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 3.2,
),
)),
quality: Low,

View File

@ -12,6 +12,7 @@ ItemDef(
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
block_strength: 0.0,
),
)),
quality: Moderate,

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