Fix old bugs; Remove gitea workflow; Update
This commit is contained in:
parent
c7d87d0638
commit
55f020e600
@ -1,83 +0,0 @@
|
||||
name: Publish
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
pull_request:
|
||||
branches:
|
||||
- main
|
||||
env:
|
||||
REGISTRY: git.jeffa.io
|
||||
IMAGE_NAME: ${{ gitea.repository }}
|
||||
jobs:
|
||||
rust:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Set up Rust
|
||||
uses: actions-rs/toolchain@v1
|
||||
|
||||
- name: Run cargo clippy
|
||||
run: cargo clippy -- -D warnings
|
||||
|
||||
- name: Check for errors
|
||||
run: |
|
||||
if [ "$?" -ne 0 ]; then
|
||||
echo "Check failed"
|
||||
exit 1
|
||||
fi
|
||||
docker:
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: read
|
||||
packages: write
|
||||
# This is used to complete the identity challenge
|
||||
# with sigstore/fulcio when running outside of PRs.
|
||||
id-token: write
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
|
||||
# Set up BuildKit Docker container builder to be able to build
|
||||
# multi-platform images and export cache
|
||||
# https://github.com/docker/setup-buildx-action
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
|
||||
|
||||
# Login against a Docker registry except on PR
|
||||
# https://github.com/docker/login-action
|
||||
- name: Log into registry ${{ env.REGISTRY }}
|
||||
if: github.event_name != 'pull_request'
|
||||
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
|
||||
with:
|
||||
registry: ${{ env.REGISTRY }}
|
||||
username: ${{ gitea.actor }}
|
||||
password: ${{ secrets.TOKEN }}
|
||||
|
||||
# Extract metadata (tags, labels) for Docker
|
||||
# https://github.com/docker/metadata-action
|
||||
- name: Extract Docker metadata
|
||||
id: meta
|
||||
uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
|
||||
with:
|
||||
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
|
||||
|
||||
# Build and push Docker image with Buildx (don't push on PR)
|
||||
# https://github.com/docker/build-push-action
|
||||
- name: Build and push Docker image
|
||||
id: build-and-push
|
||||
uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
|
||||
with:
|
||||
context: .
|
||||
file: Containerfile
|
||||
push: ${{ gitea.event_name != 'pull_request' }}
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
cache-from: type=gha
|
||||
cache-to: type=gha,mode=max
|
545
Cargo.lock
generated
545
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -17,7 +17,8 @@ serde = { version = "1.0.203", features = ["derive"] }
|
||||
log = "0.4.22"
|
||||
env_logger = "0.11.3"
|
||||
vek = { version = "0.17.0", features = ["repr_simd"] }
|
||||
hashbrown = { version = "0.14.5", features = ["equivalent"] }
|
||||
hashbrown = { version = "0.15.1", features = ["equivalent"] }
|
||||
|
||||
[patch.crates-io]
|
||||
specs = { git = "https://github.com/amethyst/specs.git", rev = "4e2da1df29ee840baa9b936593c45592b7c9ae27" }
|
||||
hashbrown = { git = "https://github.com/rust-lang/hashbrown.git", rev = "458e44532a65cf850bde3c22bd5d30a1ce2ed6af"}
|
||||
|
@ -131,7 +131,7 @@
|
||||
pseudo_id: "common.abilities.sword.agile_flurry",
|
||||
abilities: [
|
||||
((stance: Sword(Agile), dual_wielding_same_kind: true), (Sword(AgileFlurry), "common.abilities.sword.agile_dual_flurry")),
|
||||
((stance: Sword(Agile)), (Sword(AgileFlurry), "common.abilities.sword.agile_flurry")),
|
||||
((), (Sword(AgileFlurry), "common.abilities.sword.agile_flurry")),
|
||||
],
|
||||
),
|
||||
Simple(Sword(DefensiveStalwartSword), "common.abilities.sword.defensive_stalwart_sword"),
|
||||
@ -923,18 +923,18 @@
|
||||
Simple(None, "common.abilities.custom.gigas_frost.whirlwind"),
|
||||
],
|
||||
),
|
||||
Custom("Boreal Bow"): (
|
||||
primary: Simple(None, "common.abilities.custom.boreal_warrior.bow.charged"),
|
||||
secondary: Simple(None, "common.abilities.custom.boreal_warrior.bow.repeater"),
|
||||
abilities: [
|
||||
Simple(None, "common.abilities.custom.boreal_warrior.bow.shotgun")
|
||||
],
|
||||
),
|
||||
Custom("Boreal Hammer"): (
|
||||
primary: Simple(None, "common.abilities.custom.boreal_warrior.hammer.singlestrike"),
|
||||
secondary: Simple(None, "common.abilities.custom.boreal_warrior.hammer.dash"),
|
||||
abilities: [
|
||||
Simple(None, "common.abilities.custom.boreal_warrior.hammer.leap")
|
||||
Simple(None, "common.abilities.custom.boreal_warrior.hammer.leap"),
|
||||
],
|
||||
),
|
||||
Custom("Boreal Bow"): (
|
||||
primary: Simple(None, "common.abilities.custom.boreal_warrior.bow.doublestrike"),
|
||||
secondary: Simple(None, "common.abilities.custom.boreal_warrior.bow.shotgun"),
|
||||
abilities: [
|
||||
Simple(None, "common.abilities.custom.boreal_warrior.bow.trap"),
|
||||
],
|
||||
),
|
||||
Custom("Tornado"): (
|
||||
@ -1031,7 +1031,12 @@
|
||||
primary: Simple(None, "common.abilities.music.kora"),
|
||||
secondary: Simple(None, "common.abilities.music.kora"),
|
||||
abilities: [],
|
||||
),
|
||||
),
|
||||
Custom("Banjo"): (
|
||||
primary: Simple(None, "common.abilities.music.banjo"),
|
||||
secondary: Simple(None, "common.abilities.music.banjo"),
|
||||
abilities: [],
|
||||
),
|
||||
Tool(Debug): (
|
||||
primary: Simple(None, "common.abilities.debug.forwardboost"),
|
||||
secondary: Simple(None, "common.abilities.debug.upboost"),
|
||||
|
@ -6,7 +6,7 @@ LeapMelee(
|
||||
recover_duration: 0.2,
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage: 25.0,
|
||||
damage: 19.0,
|
||||
poise: 40.0,
|
||||
knockback: 25.0,
|
||||
energy_regen: 0.0,
|
||||
@ -22,6 +22,6 @@ LeapMelee(
|
||||
))),
|
||||
),
|
||||
forward_leap_strength: 30.0,
|
||||
vertical_leap_strength: 15.0,
|
||||
vertical_leap_strength: 7.0,
|
||||
specifier: Some(LeapWhoosh),
|
||||
)
|
||||
|
@ -51,7 +51,7 @@ ComboMelee2(
|
||||
buildup_duration: 0.85,
|
||||
swing_duration: 0.35,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.4,
|
||||
recover_duration: 0.5,
|
||||
movement: (
|
||||
swing: Some(Forward(0.5)),
|
||||
),
|
||||
|
@ -1,7 +1,7 @@
|
||||
BasicMelee(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 0.4,
|
||||
swing_duration: 0.2,
|
||||
buildup_duration: 0.6,
|
||||
swing_duration: 0.3,
|
||||
hit_timing: 0.8,
|
||||
recover_duration: 0.4,
|
||||
melee_constructor: (
|
||||
|
@ -5,7 +5,7 @@ BasicRanged(
|
||||
projectile: (
|
||||
kind: Pointed,
|
||||
attack: Some((
|
||||
damage: 16,
|
||||
damage: 14,
|
||||
knockback: Some(1),
|
||||
energy: 0,
|
||||
buff: Some((
|
||||
|
@ -1,12 +1,12 @@
|
||||
LeapMelee(
|
||||
energy_cost: 0.0,
|
||||
buildup_duration: 0.6,
|
||||
buildup_duration: 0.8,
|
||||
movement_duration: 0.2,
|
||||
swing_duration: 0.1,
|
||||
recover_duration: 0.3,
|
||||
melee_constructor: (
|
||||
kind: Stab(
|
||||
damage: 20,
|
||||
damage: 11,
|
||||
poise: 20,
|
||||
knockback: 0,
|
||||
energy_regen: 0,
|
||||
|
@ -6,7 +6,7 @@ BasicMelee(
|
||||
recover_duration: 0.45,
|
||||
melee_constructor: (
|
||||
kind: Stab(
|
||||
damage: 12,
|
||||
damage: 8,
|
||||
poise: 10,
|
||||
knockback: 0,
|
||||
energy_regen: 0,
|
||||
|
@ -1,11 +1,11 @@
|
||||
BasicRanged(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 0.6,
|
||||
buildup_duration: 1.0,
|
||||
recover_duration: 0.4,
|
||||
projectile: (
|
||||
kind: Pointed,
|
||||
attack: Some((
|
||||
damage: 12,
|
||||
damage: 6,
|
||||
energy: 0,
|
||||
buff: Some((
|
||||
kind: Bleeding,
|
||||
|
@ -8,7 +8,7 @@ BasicRanged(
|
||||
duration: 10,
|
||||
),
|
||||
attack: Some((
|
||||
damage: 12,
|
||||
damage: 8,
|
||||
energy: 0,
|
||||
)),
|
||||
),
|
||||
|
@ -4,7 +4,7 @@ SelfBuff(
|
||||
recover_duration: 0.2,
|
||||
buff_kind: EnergyRegen,
|
||||
buff_strength: 0.1,
|
||||
buff_duration: Some(10.0),
|
||||
buff_duration: Some(15.0),
|
||||
combo_cost: 1,
|
||||
combo_scaling: Some(Linear),
|
||||
energy_cost: 0,
|
||||
|
@ -1,8 +1,8 @@
|
||||
BasicBlock(
|
||||
buildup_duration: 0.25,
|
||||
recover_duration: 0.2,
|
||||
recover_duration: 0.4,
|
||||
max_angle: 60.0,
|
||||
block_strength: 5.0,
|
||||
block_strength: 2.25,
|
||||
parry_window: (
|
||||
buildup: true,
|
||||
recover: false,
|
||||
|
@ -3,8 +3,8 @@ SelfBuff(
|
||||
cast_duration: 0.2,
|
||||
recover_duration: 0.1,
|
||||
buff_kind: Berserk,
|
||||
buff_strength: 0.5,
|
||||
buff_duration: Some(15.0),
|
||||
buff_strength: 0.3,
|
||||
buff_duration: Some(20.0),
|
||||
combo_cost: 10,
|
||||
energy_cost: 0,
|
||||
)
|
||||
|
@ -4,7 +4,7 @@ SelfBuff(
|
||||
recover_duration: 0.1,
|
||||
buff_kind: Bloodfeast,
|
||||
buff_strength: 0.1,
|
||||
buff_duration: Some(15.0),
|
||||
buff_duration: Some(20.0),
|
||||
energy_cost: 0,
|
||||
combo_cost: 10,
|
||||
)
|
||||
|
@ -8,14 +8,14 @@ ComboMelee2(
|
||||
knockback: 0,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 3.0,
|
||||
range: 4.0,
|
||||
angle: 360.0,
|
||||
multi_target: Some(Normal),
|
||||
),
|
||||
buildup_duration: 0.2,
|
||||
swing_duration: 0.2,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.3,
|
||||
recover_duration: 0.4,
|
||||
ori_modifier: 0.6,
|
||||
),
|
||||
],
|
||||
|
@ -4,8 +4,8 @@ FinisherMelee(
|
||||
swing_duration: 0.2,
|
||||
recover_duration: 0.4,
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 40,
|
||||
kind: Bash(
|
||||
damage: 45,
|
||||
poise: 100,
|
||||
knockback: 0,
|
||||
energy_regen: 0,
|
||||
|
@ -4,8 +4,8 @@ FinisherMelee(
|
||||
swing_duration: 0.3,
|
||||
recover_duration: 0.4,
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 40,
|
||||
kind: Bash(
|
||||
damage: 45,
|
||||
poise: 100,
|
||||
knockback: 0,
|
||||
energy_regen: 0,
|
||||
|
@ -18,9 +18,9 @@ ChargedMelee(
|
||||
range: 4.5,
|
||||
angle: 10.0,
|
||||
),
|
||||
charge_duration: 0.7,
|
||||
charge_duration: 0.6,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.2,
|
||||
recover_duration: 0.2,
|
||||
custom_combo: Some((additional: 4)),
|
||||
custom_combo: (base: Some(4)),
|
||||
)
|
||||
|
@ -3,7 +3,7 @@ SelfBuff(
|
||||
cast_duration: 1.0,
|
||||
recover_duration: 0.1,
|
||||
buff_kind: Defiance,
|
||||
buff_strength: 1.0,
|
||||
buff_strength: 0.65,
|
||||
buff_duration: Some(8.0),
|
||||
energy_cost: 20,
|
||||
enforced_limit: false,
|
||||
|
@ -9,12 +9,12 @@ RapidMelee(
|
||||
knockback: 0,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 6.0,
|
||||
range: 4.0,
|
||||
angle: 10.0,
|
||||
simultaneous_hits: 2,
|
||||
),
|
||||
energy_cost: 8,
|
||||
max_strikes: Some(5),
|
||||
max_strikes: Some(4),
|
||||
move_modifier: 0.35,
|
||||
ori_modifier: 0.25,
|
||||
)
|
||||
|
@ -5,7 +5,7 @@ FinisherMelee(
|
||||
recover_duration: 0.4,
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 60,
|
||||
damage: 70,
|
||||
poise: 20,
|
||||
knockback: 0,
|
||||
energy_regen: 0,
|
||||
|
@ -9,11 +9,11 @@ RapidMelee(
|
||||
knockback: 0,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 6.0,
|
||||
range: 5.0,
|
||||
angle: 10.0,
|
||||
),
|
||||
energy_cost: 4,
|
||||
max_strikes: Some(5),
|
||||
max_strikes: Some(4),
|
||||
move_modifier: 0.35,
|
||||
ori_modifier: 0.25,
|
||||
)
|
||||
|
@ -15,7 +15,7 @@ FinisherMelee(
|
||||
damage_effect: Some(Buff((
|
||||
kind: Crippled,
|
||||
dur_secs: 10.0,
|
||||
strength: Value(0.1),
|
||||
strength: Value(0.05),
|
||||
chance: 1.0,
|
||||
))),
|
||||
),
|
||||
|
@ -4,7 +4,7 @@ SelfBuff(
|
||||
recover_duration: 0.2,
|
||||
buff_kind: Fury,
|
||||
buff_strength: 1.0,
|
||||
buff_duration: Some(15.0),
|
||||
buff_duration: Some(20.0),
|
||||
energy_cost: 20,
|
||||
enforced_limit: false,
|
||||
)
|
||||
|
@ -5,7 +5,7 @@ FinisherMelee(
|
||||
recover_duration: 0.5,
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 10,
|
||||
damage: 8,
|
||||
poise: 5,
|
||||
knockback: 0,
|
||||
energy_regen: 0,
|
||||
@ -14,7 +14,7 @@ FinisherMelee(
|
||||
angle: 45.0,
|
||||
damage_effect: Some(Buff((
|
||||
kind: Bleeding,
|
||||
dur_secs: 5.0,
|
||||
dur_secs: 8.0,
|
||||
strength: DamageFraction(1.0),
|
||||
chance: 1.0,
|
||||
))),
|
||||
|
@ -5,7 +5,7 @@ FinisherMelee(
|
||||
recover_duration: 0.2,
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 60,
|
||||
damage: 70,
|
||||
poise: 20,
|
||||
knockback: 0,
|
||||
energy_regen: 0,
|
||||
|
@ -8,7 +8,7 @@ ComboMelee2(
|
||||
knockback: 10,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 2.5,
|
||||
range: 3.0,
|
||||
angle: 60.0,
|
||||
),
|
||||
buildup_duration: 0.1,
|
||||
@ -20,8 +20,11 @@ ComboMelee2(
|
||||
swing: Some(Forward(0.7)),
|
||||
),
|
||||
ori_modifier: 0.6,
|
||||
custom_combo: Some((additional: 4)),
|
||||
custom_combo: (
|
||||
base: Some(3),
|
||||
conditional: Some((3, TargetPoised)),
|
||||
),
|
||||
),
|
||||
],
|
||||
energy_cost_per_strike: 10,
|
||||
)
|
||||
)
|
||||
|
@ -5,7 +5,7 @@ FinisherMelee(
|
||||
recover_duration: 0.5,
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 10,
|
||||
damage: 8,
|
||||
poise: 5,
|
||||
knockback: 0,
|
||||
energy_regen: 0,
|
||||
@ -15,7 +15,7 @@ FinisherMelee(
|
||||
multi_target: Some(Normal),
|
||||
damage_effect: Some(Buff((
|
||||
kind: Bleeding,
|
||||
dur_secs: 5.0,
|
||||
dur_secs: 8.0,
|
||||
strength: DamageFraction(1.0),
|
||||
chance: 1.0,
|
||||
))),
|
||||
|
@ -11,13 +11,16 @@ ComboMelee2(
|
||||
range: 3.0,
|
||||
angle: 45.0,
|
||||
),
|
||||
buildup_duration: 0.25,
|
||||
buildup_duration: 0.2,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.3,
|
||||
recover_duration: 0.25,
|
||||
ori_modifier: 0.6,
|
||||
custom_combo: Some((additional: 4)),
|
||||
custom_combo: (
|
||||
base: Some(3),
|
||||
conditional: Some((3, TargetHasBuff(Bleeding))),
|
||||
),
|
||||
),
|
||||
],
|
||||
energy_cost_per_strike: 10,
|
||||
)
|
||||
)
|
||||
|
@ -3,18 +3,18 @@ ComboMelee2(
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage: 15,
|
||||
poise: 50,
|
||||
damage: 14,
|
||||
poise: 60,
|
||||
knockback: 0,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 3.0,
|
||||
angle: 45.0,
|
||||
),
|
||||
buildup_duration: 0.3,
|
||||
buildup_duration: 0.2,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.3,
|
||||
recover_duration: 0.25,
|
||||
ori_modifier: 0.6,
|
||||
),
|
||||
],
|
||||
|
@ -3,8 +3,8 @@ SelfBuff(
|
||||
cast_duration: 0.2,
|
||||
recover_duration: 0.1,
|
||||
buff_kind: Sunderer,
|
||||
buff_strength: 0.25,
|
||||
buff_duration: Some(15.0),
|
||||
buff_strength: 0.2,
|
||||
buff_duration: Some(20.0),
|
||||
combo_cost: 10,
|
||||
energy_cost: 0,
|
||||
)
|
||||
|
@ -3,7 +3,7 @@ ComboMelee2(
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 4,
|
||||
damage: 6,
|
||||
poise: 5,
|
||||
knockback: 0,
|
||||
energy_regen: 8,
|
||||
@ -20,7 +20,7 @@ ComboMelee2(
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 4,
|
||||
damage: 6,
|
||||
poise: 5,
|
||||
knockback: 0,
|
||||
energy_regen: 8,
|
||||
@ -37,7 +37,7 @@ ComboMelee2(
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 8,
|
||||
damage: 9,
|
||||
poise: 5,
|
||||
knockback: 0,
|
||||
energy_regen: 9,
|
||||
|
@ -17,12 +17,12 @@ ComboMelee2(
|
||||
chance: 0.1,
|
||||
))),
|
||||
),
|
||||
buildup_duration: 0.4,
|
||||
swing_duration: 0.08,
|
||||
buildup_duration: 0.45,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.5,
|
||||
movement: (
|
||||
swing: Some(Forward(2.5)),
|
||||
swing: Some(Forward(0.4)),
|
||||
),
|
||||
ori_modifier: 0.7,
|
||||
),
|
||||
@ -43,12 +43,12 @@ ComboMelee2(
|
||||
chance: 0.1,
|
||||
))),
|
||||
),
|
||||
buildup_duration: 0.7,
|
||||
swing_duration: 0.1,
|
||||
buildup_duration: 0.8,
|
||||
swing_duration: 0.15,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.7,
|
||||
recover_duration: 0.8,
|
||||
movement: (
|
||||
swing: Some(Forward(2.0)),
|
||||
swing: Some(Forward(0.2)),
|
||||
),
|
||||
ori_modifier: 0.7,
|
||||
),
|
||||
|
@ -17,10 +17,10 @@ ComboMelee2(
|
||||
chance: 0.6,
|
||||
))),
|
||||
),
|
||||
buildup_duration: 0.65,
|
||||
swing_duration: 0.15,
|
||||
buildup_duration: 0.80,
|
||||
swing_duration: 0.25,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.5,
|
||||
recover_duration: 1.85,
|
||||
movement: (
|
||||
swing: Some(Forward(1.0)),
|
||||
),
|
||||
|
@ -17,10 +17,10 @@ ComboMelee2(
|
||||
chance: 0.4,
|
||||
))),
|
||||
),
|
||||
buildup_duration: 0.55,
|
||||
buildup_duration: 0.65,
|
||||
swing_duration: 0.35,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.8,
|
||||
recover_duration: 1.4,
|
||||
movement: (
|
||||
swing: Some(Forward(0.1)),
|
||||
),
|
||||
|
@ -12,9 +12,9 @@ ComboMelee2(
|
||||
angle: 60.0,
|
||||
),
|
||||
buildup_duration: 0.5,
|
||||
swing_duration: 0.3,
|
||||
swing_duration: 0.35,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 1.0,
|
||||
recover_duration: 1.35,
|
||||
movement: (
|
||||
swing: Some(Forward(0.1)),
|
||||
),
|
||||
|
@ -3,7 +3,7 @@ ComboMelee2(
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage: 43,
|
||||
damage: 63,
|
||||
poise: 20,
|
||||
knockback: 5,
|
||||
energy_regen: 0,
|
||||
@ -11,10 +11,10 @@ ComboMelee2(
|
||||
range: 3.0,
|
||||
angle: 60.0,
|
||||
),
|
||||
buildup_duration: 0.7,
|
||||
swing_duration: 0.2,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
buildup_duration: 1.75,
|
||||
swing_duration: 0.45,
|
||||
hit_timing: 0.6,
|
||||
recover_duration: 1.2,
|
||||
movement: (
|
||||
swing: Some(Forward(0.1)),
|
||||
),
|
||||
|
@ -17,10 +17,10 @@ ComboMelee2(
|
||||
chance: 0.8,
|
||||
))),
|
||||
),
|
||||
buildup_duration: 0.6,
|
||||
swing_duration: 0.3,
|
||||
buildup_duration: 0.65,
|
||||
swing_duration: 0.35,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.8,
|
||||
recover_duration: 1.4,
|
||||
movement: (
|
||||
swing: Some(Forward(0.1)),
|
||||
),
|
||||
|
@ -11,10 +11,10 @@ ComboMelee2(
|
||||
range: 4.0,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.9,
|
||||
swing_duration: 0.5,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.4,
|
||||
buildup_duration: 0.25,
|
||||
swing_duration: 0.55,
|
||||
hit_timing: 0.6,
|
||||
recover_duration: 2.3,
|
||||
movement: (
|
||||
swing: Some(Forward(0.05)),
|
||||
),
|
||||
|
@ -1,9 +1,9 @@
|
||||
BasicBeam(
|
||||
buildup_duration: 1.8,
|
||||
buildup_duration: 1.0,
|
||||
recover_duration: 1.0,
|
||||
beam_duration: 1.15,
|
||||
damage: 64.0,
|
||||
tick_rate: 0.35,
|
||||
damage: 34.0,
|
||||
tick_rate: 1.35,
|
||||
range: 22.0,
|
||||
max_angle: 5.0,
|
||||
damage_effect: Some(Buff((
|
||||
|
@ -11,10 +11,10 @@ ComboMelee2(
|
||||
range: 2.8,
|
||||
angle: 90.0,
|
||||
),
|
||||
buildup_duration: 1.15,
|
||||
swing_duration: 0.25,
|
||||
buildup_duration: 1.45,
|
||||
swing_duration: 0.65,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.4,
|
||||
recover_duration: 2.85,
|
||||
movement: (
|
||||
swing: Some(Forward(0.25)),
|
||||
),
|
||||
@ -25,16 +25,16 @@ ComboMelee2(
|
||||
kind: Slash(
|
||||
damage: 39,
|
||||
poise: 18,
|
||||
knockback: 24,
|
||||
knockback: 12,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 3.2,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.55,
|
||||
swing_duration: 0.25,
|
||||
buildup_duration: 1.0,
|
||||
swing_duration: 0.45,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.8,
|
||||
recover_duration: 1.8,
|
||||
movement: (
|
||||
swing: Some(Forward(0.45)),
|
||||
),
|
||||
|
@ -11,7 +11,7 @@ ComboMelee2(
|
||||
range: 4.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.8,
|
||||
buildup_duration: 1.4,
|
||||
swing_duration: 0.25,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
@ -31,7 +31,7 @@ ComboMelee2(
|
||||
range: 3.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 1.2,
|
||||
buildup_duration: 1.4,
|
||||
swing_duration: 0.3,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
@ -51,8 +51,8 @@ ComboMelee2(
|
||||
range: 3.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.8,
|
||||
swing_duration: 0.35,
|
||||
buildup_duration: 1.45,
|
||||
swing_duration: 0.3,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
movement: (
|
||||
|
@ -1,36 +0,0 @@
|
||||
ChargedRanged(
|
||||
energy_cost: 0,
|
||||
energy_drain: 0,
|
||||
projectile: (
|
||||
kind: Pointed,
|
||||
attack: Some((
|
||||
damage: 2,
|
||||
energy: 2,
|
||||
buff: Some((
|
||||
kind: Bleeding,
|
||||
dur_secs: 10,
|
||||
strength: DamageFraction(0.1),
|
||||
chance: 0.1,
|
||||
)),
|
||||
)),
|
||||
scaled: Some((
|
||||
damage: 12,
|
||||
knockback: Some(12),
|
||||
energy: 14,
|
||||
)),
|
||||
),
|
||||
buildup_duration: 0.25,
|
||||
charge_duration: 1.0,
|
||||
recover_duration: 0.4,
|
||||
projectile_body: Object(Arrow),
|
||||
projectile_light: None,
|
||||
initial_projectile_speed: 50.0,
|
||||
scaled_projectile_speed: 200.0,
|
||||
damage_effect: Some(Buff((
|
||||
kind: Frozen,
|
||||
dur_secs: 2.0,
|
||||
strength: Value(0.3),
|
||||
chance: 1.0,
|
||||
))),
|
||||
move_speed: 0.6,
|
||||
)
|
@ -0,0 +1,45 @@
|
||||
ComboMelee2(
|
||||
strikes: [
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage: 52,
|
||||
poise: 0,
|
||||
knockback: 4,
|
||||
energy_regen: 35,
|
||||
),
|
||||
range: 5.5,
|
||||
angle: 50.0,
|
||||
),
|
||||
buildup_duration: 1.0,
|
||||
swing_duration: 0.2,
|
||||
hit_timing: 0.7,
|
||||
recover_duration: 1.2,
|
||||
movement: (
|
||||
swing: Some(Forward(0.5)),
|
||||
),
|
||||
ori_modifier: 0.6,
|
||||
),
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage: 63,
|
||||
poise: 0,
|
||||
knockback: 26,
|
||||
energy_regen: 35,
|
||||
),
|
||||
range: 5.5,
|
||||
angle: 15.0,
|
||||
),
|
||||
buildup_duration: 1.25,
|
||||
swing_duration: 0.25,
|
||||
hit_timing: 0.7,
|
||||
recover_duration: 1.5,
|
||||
movement: (
|
||||
swing: Some(Forward(0.65)),
|
||||
),
|
||||
ori_modifier: 0.6,
|
||||
),
|
||||
],
|
||||
energy_cost_per_strike: 0,
|
||||
)
|
@ -1,30 +0,0 @@
|
||||
RepeaterRanged(
|
||||
energy_cost: 6.0,
|
||||
buildup_duration: 0.2,
|
||||
shoot_duration: 0.3,
|
||||
recover_duration: 0.5,
|
||||
max_speed: 4.0,
|
||||
half_speed_at: 3,
|
||||
projectile: (
|
||||
kind: Pointed,
|
||||
attack: Some((
|
||||
damage: 5,
|
||||
energy: 0,
|
||||
buff: Some((
|
||||
kind: Bleeding,
|
||||
dur_secs: 10,
|
||||
strength: DamageFraction(0.1),
|
||||
chance: 0.1,
|
||||
)),
|
||||
)),
|
||||
),
|
||||
projectile_body: Object(Arrow),
|
||||
projectile_light: None,
|
||||
projectile_speed: 100.0,
|
||||
damage_effect: Some(Buff((
|
||||
kind: Frozen,
|
||||
dur_secs: 2.0,
|
||||
strength: Value(0.3),
|
||||
chance: 1.0,
|
||||
))),
|
||||
)
|
@ -1,12 +1,12 @@
|
||||
BasicRanged(
|
||||
energy_cost: 25.0,
|
||||
buildup_duration: 0.3,
|
||||
recover_duration: 0.3,
|
||||
energy_cost: 0.0,
|
||||
buildup_duration: 0.75,
|
||||
recover_duration: 1.4,
|
||||
projectile_spread: 0.05,
|
||||
projectile: (
|
||||
kind: Pointed,
|
||||
attack: Some((
|
||||
damage: 6,
|
||||
damage: 12,
|
||||
knockback: Some(5),
|
||||
energy: 0,
|
||||
buff: Some((
|
||||
@ -19,7 +19,7 @@ BasicRanged(
|
||||
),
|
||||
projectile_body: Object(Arrow),
|
||||
projectile_light: None,
|
||||
projectile_speed: 80.0,
|
||||
projectile_speed: 40.0,
|
||||
num_projectiles: Value(5),
|
||||
damage_effect: Some(Buff((
|
||||
kind: Frozen,
|
||||
|
27
assets/common/abilities/custom/boreal_warrior/bow/trap.ron
Normal file
27
assets/common/abilities/custom/boreal_warrior/bow/trap.ron
Normal file
@ -0,0 +1,27 @@
|
||||
BasicRanged(
|
||||
energy_cost: 20,
|
||||
buildup_duration: 0.75,
|
||||
recover_duration: 0.75,
|
||||
projectile: (
|
||||
kind: Hazard(
|
||||
is_sticky: true,
|
||||
duration: 80,
|
||||
),
|
||||
attack: Some((
|
||||
damage: 32,
|
||||
energy: 0,
|
||||
)),
|
||||
),
|
||||
projectile_body: Object(BorealTrap),
|
||||
projectile_light: None,
|
||||
projectile_speed: 20.0,
|
||||
num_projectiles: Value(3),
|
||||
projectile_spread: 1.0,
|
||||
move_efficiency: 0.8,
|
||||
damage_effect: Some(Buff((
|
||||
kind: Frozen,
|
||||
dur_secs: 10,
|
||||
strength: Value(0.3),
|
||||
chance: 1.0,
|
||||
))),
|
||||
)
|
@ -1,11 +1,11 @@
|
||||
DashMelee(
|
||||
energy_cost: 3.0,
|
||||
energy_cost: 0.0,
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage: 9.0,
|
||||
damage: 54.0,
|
||||
poise: 40.0,
|
||||
knockback: 16.0,
|
||||
energy_regen: 0.0,
|
||||
knockback: 25.0,
|
||||
energy_regen: 50.0,
|
||||
),
|
||||
scaled: Some((
|
||||
kind: Bash(
|
||||
@ -16,6 +16,7 @@ DashMelee(
|
||||
))),
|
||||
range: 5.0,
|
||||
angle: 45.0,
|
||||
attack_effect: Some((Poise(1000), TargetBlocking)),
|
||||
damage_effect: Some(Buff((
|
||||
kind: Frozen,
|
||||
dur_secs: 2.0,
|
||||
@ -25,7 +26,7 @@ DashMelee(
|
||||
),
|
||||
energy_drain: 0,
|
||||
forward_speed: 12.0,
|
||||
buildup_duration: 0.6,
|
||||
buildup_duration: 0.65,
|
||||
charge_duration: 0.2,
|
||||
swing_duration: 0.1,
|
||||
recover_duration: 0.9,
|
||||
|
@ -1,27 +1,27 @@
|
||||
LeapMelee(
|
||||
energy_cost: 35.0,
|
||||
buildup_duration: 0.1,
|
||||
energy_cost: 25.0,
|
||||
buildup_duration: 0.8,
|
||||
movement_duration: 0.6,
|
||||
swing_duration: 0.15,
|
||||
recover_duration: 0.2,
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage: 25.0,
|
||||
damage: 50.0,
|
||||
poise: 40.0,
|
||||
knockback: 25.0,
|
||||
energy_regen: 0.0,
|
||||
),
|
||||
range: 4.5,
|
||||
range: 7.5,
|
||||
angle: 360.0,
|
||||
multi_target: Some(Normal),
|
||||
damage_effect: Some(Buff((
|
||||
kind: Frozen,
|
||||
dur_secs: 2.0,
|
||||
dur_secs: 8.0,
|
||||
strength: Value(0.3),
|
||||
chance: 1.0,
|
||||
))),
|
||||
),
|
||||
forward_leap_strength: 20.0,
|
||||
forward_leap_strength: 60.0,
|
||||
vertical_leap_strength: 8.0,
|
||||
specifier: None,
|
||||
)
|
@ -3,12 +3,12 @@ ComboMelee2(
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage: 15,
|
||||
damage: 68,
|
||||
poise: 0,
|
||||
knockback: 3.5,
|
||||
energy_regen: 5,
|
||||
energy_regen: 35,
|
||||
),
|
||||
range: 4.5,
|
||||
range: 6.5,
|
||||
angle: 50.0,
|
||||
damage_effect: Some(Buff((
|
||||
kind: Frozen,
|
||||
@ -20,7 +20,10 @@ ComboMelee2(
|
||||
buildup_duration: 0.7,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.45,
|
||||
recover_duration: 1.6,
|
||||
movement: (
|
||||
swing: Some(Forward(1.0)),
|
||||
),
|
||||
ori_modifier: 1.0,
|
||||
),
|
||||
],
|
||||
|
@ -14,7 +14,7 @@ ComboMelee2(
|
||||
buildup_duration: 1.4,
|
||||
swing_duration: 0.35,
|
||||
hit_timing: 0.45,
|
||||
recover_duration: 0.5,
|
||||
recover_duration: 1.2,
|
||||
movement: (
|
||||
swing: Some(Forward(0.5)),
|
||||
),
|
||||
|
@ -3,7 +3,7 @@ BasicMelee(
|
||||
buildup_duration: 0.50,
|
||||
swing_duration: 0.6,
|
||||
hit_timing: 0.4,
|
||||
recover_duration: 0.85,
|
||||
recover_duration: 1.1,
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage:26.0,
|
||||
|
@ -11,8 +11,8 @@ ComboMelee2(
|
||||
range: 4.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.8,
|
||||
swing_duration: 0.1,
|
||||
buildup_duration: 1.4,
|
||||
swing_duration: 0.2,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
movement: (
|
||||
@ -31,7 +31,7 @@ ComboMelee2(
|
||||
range: 3.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 1.2,
|
||||
buildup_duration: 1.4,
|
||||
swing_duration: 0.3,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
@ -51,7 +51,7 @@ ComboMelee2(
|
||||
range: 3.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.8,
|
||||
buildup_duration: 1.45,
|
||||
swing_duration: 0.3,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
|
@ -1,9 +1,9 @@
|
||||
BasicMelee(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 1.6,
|
||||
swing_duration: 0.1,
|
||||
swing_duration: 0.35,
|
||||
hit_timing: 0.6,
|
||||
recover_duration: 1.0,
|
||||
recover_duration: 1.6,
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage: 30.0,
|
||||
|
@ -1,7 +1,7 @@
|
||||
BasicRanged(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 1.3,
|
||||
recover_duration: 0.3,
|
||||
recover_duration: 1.6,
|
||||
projectile: (
|
||||
kind: Explosive(
|
||||
radius: 6,
|
||||
@ -23,7 +23,7 @@ BasicRanged(
|
||||
),
|
||||
projectile_body: Object(SpitPoison),
|
||||
projectile_light: None,
|
||||
projectile_speed: 10.0,
|
||||
projectile_speed: 15.0,
|
||||
num_projectiles: Value(2),
|
||||
projectile_spread: 0.1,
|
||||
move_efficiency: 0.3,
|
||||
|
@ -1,19 +0,0 @@
|
||||
BasicSummon(
|
||||
buildup_duration: 0.2,
|
||||
cast_duration: 0.3,
|
||||
recover_duration: 4.0,
|
||||
summon_amount: 1,
|
||||
summon_distance: (4, 4),
|
||||
summon_info: (
|
||||
body: Golem((
|
||||
species: Mogwai,
|
||||
body_type: Male,
|
||||
)),
|
||||
scale: None,
|
||||
use_npc_name: true,
|
||||
has_health: true,
|
||||
loadout_config: None,
|
||||
skillset_config: Some(Rank3),
|
||||
),
|
||||
duration: None,
|
||||
)
|
@ -1,9 +0,0 @@
|
||||
SelfBuff(
|
||||
buildup_duration: 0.1,
|
||||
cast_duration: 0.1,
|
||||
recover_duration: 0.1,
|
||||
buff_kind: Burning,
|
||||
buff_strength: 2000.0,
|
||||
buff_duration: Some(60.0),
|
||||
energy_cost: 0,
|
||||
)
|
@ -37,10 +37,10 @@ ComboMelee2(
|
||||
chance: 1.0,
|
||||
))),
|
||||
),
|
||||
buildup_duration: 0.8,
|
||||
buildup_duration: 0.95,
|
||||
swing_duration: 0.8,
|
||||
hit_timing: 0.3,
|
||||
recover_duration: 1.2,
|
||||
recover_duration: 1.65,
|
||||
movement: (
|
||||
swing: Some(Forward(0.2)),
|
||||
),
|
||||
|
@ -43,7 +43,7 @@ ComboMelee2(
|
||||
chance: 0.15,
|
||||
))),
|
||||
),
|
||||
buildup_duration: 0.95,
|
||||
buildup_duration: 1.25,
|
||||
swing_duration: 0.15,
|
||||
hit_timing: 0.4,
|
||||
recover_duration: 1.3,
|
||||
|
@ -14,7 +14,7 @@ ComboMelee2(
|
||||
buildup_duration: 0.8,
|
||||
swing_duration: 0.27,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.5,
|
||||
recover_duration: 1.0,
|
||||
movement: (
|
||||
swing: Some(Forward(0.5)),
|
||||
),
|
||||
|
@ -1,5 +1,5 @@
|
||||
BasicBeam(
|
||||
buildup_duration: 0.5,
|
||||
buildup_duration: 1.0,
|
||||
recover_duration: 0.5,
|
||||
beam_duration: 1.0,
|
||||
damage: 10.0,
|
||||
|
@ -1,6 +1,6 @@
|
||||
BasicRanged(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 0.5,
|
||||
buildup_duration: 1.0,
|
||||
recover_duration: 1.5,
|
||||
projectile: (
|
||||
kind: Explosive(
|
||||
|
@ -13,7 +13,7 @@ ComboMelee2(
|
||||
),
|
||||
buildup_duration: 0.5,
|
||||
swing_duration: 0.4,
|
||||
hit_timing: 0.4,
|
||||
hit_timing: 0.6,
|
||||
recover_duration: 0.5,
|
||||
movement: (
|
||||
swing: Some(Forward(0.0)),
|
||||
|
@ -6,13 +6,13 @@ ComboMelee2(
|
||||
damage: 20,
|
||||
poise: 0,
|
||||
knockback: 5,
|
||||
energy_regen: 0,
|
||||
energy_regen: 10,
|
||||
),
|
||||
range: 4.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.8,
|
||||
swing_duration: 0.1,
|
||||
buildup_duration: 1.4,
|
||||
swing_duration: 0.2,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
movement: (
|
||||
@ -26,12 +26,12 @@ ComboMelee2(
|
||||
damage: 16,
|
||||
poise: 0,
|
||||
knockback: 5,
|
||||
energy_regen: 0,
|
||||
energy_regen: 10,
|
||||
),
|
||||
range: 3.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 1.2,
|
||||
buildup_duration: 1.4,
|
||||
swing_duration: 0.3,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
@ -46,13 +46,13 @@ ComboMelee2(
|
||||
damage: 26,
|
||||
poise: 0,
|
||||
knockback: 10,
|
||||
energy_regen: 0,
|
||||
energy_regen: 10,
|
||||
),
|
||||
range: 3.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.9,
|
||||
swing_duration: 0.2,
|
||||
buildup_duration: 1.45,
|
||||
swing_duration: 0.3,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
movement: (
|
||||
|
@ -17,7 +17,7 @@ ComboMelee2(
|
||||
chance: 1.0,
|
||||
))),
|
||||
),
|
||||
buildup_duration: 0.8,
|
||||
buildup_duration: 0.95,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.8,
|
||||
|
@ -11,7 +11,7 @@ ComboMelee2(
|
||||
range: 2.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.65,
|
||||
buildup_duration: 0.95,
|
||||
swing_duration: 0.3,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.4,
|
||||
@ -31,7 +31,7 @@ ComboMelee2(
|
||||
range: 2.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.9,
|
||||
buildup_duration: 1.0,
|
||||
swing_duration: 0.4,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.4,
|
||||
@ -48,10 +48,10 @@ ComboMelee2(
|
||||
range: 2.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.9,
|
||||
buildup_duration: 1.0,
|
||||
swing_duration: 0.4,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.4,
|
||||
recover_duration: 1.95,
|
||||
movement: (
|
||||
swing: Some(Forward(0.2)),
|
||||
),
|
||||
|
@ -11,8 +11,8 @@ ComboMelee2(
|
||||
range: 4.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.8,
|
||||
swing_duration: 0.1,
|
||||
buildup_duration: 1.4,
|
||||
swing_duration: 0.2,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
movement: (
|
||||
@ -31,8 +31,8 @@ ComboMelee2(
|
||||
range: 3.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 1.1,
|
||||
swing_duration: 0.4,
|
||||
buildup_duration: 1.4,
|
||||
swing_duration: 0.3,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
movement: (
|
||||
@ -51,8 +51,8 @@ ComboMelee2(
|
||||
range: 3.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.7,
|
||||
swing_duration: 0.4,
|
||||
buildup_duration: 1.45,
|
||||
swing_duration: 0.3,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
movement: (
|
||||
|
@ -6,19 +6,14 @@ BasicMelee(
|
||||
recover_duration: 0.6,
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage: 30,
|
||||
poise: 100,
|
||||
damage: 68,
|
||||
poise: 250,
|
||||
knockback: 0,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 8.0,
|
||||
angle: 100.0,
|
||||
damage_effect: Some(Buff((
|
||||
kind: Frozen,
|
||||
dur_secs: 5,
|
||||
strength: Value(0.7),
|
||||
chance: 1.0,
|
||||
))),
|
||||
attack_effect: Some((Poise(1000), TargetBlocking)),
|
||||
multi_target: Some(Normal),
|
||||
),
|
||||
ori_modifier: 0.8,
|
||||
|
@ -1,12 +1,12 @@
|
||||
BasicMelee(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 0.5,
|
||||
swing_duration: 0.1,
|
||||
buildup_duration: 0.75,
|
||||
swing_duration: 0.2,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.7,
|
||||
recover_duration: 1.7,
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 60.0,
|
||||
damage: 75.0,
|
||||
poise: 5.0,
|
||||
knockback: 5.0,
|
||||
energy_regen: 10.0,
|
||||
|
@ -2,8 +2,8 @@ BasicSummon(
|
||||
buildup_duration: 1.75,
|
||||
cast_duration: 1.5,
|
||||
recover_duration: 0.75,
|
||||
summon_amount: 12,
|
||||
summon_distance: (10, 15),
|
||||
summon_amount: 2,
|
||||
summon_distance: (5, 10),
|
||||
summon_info: (
|
||||
body: BipedSmall((
|
||||
species: Boreal,
|
||||
|
@ -1,5 +1,5 @@
|
||||
RapidMelee(
|
||||
buildup_duration: 1.1,
|
||||
buildup_duration: 2.475,
|
||||
swing_duration: 0.4,
|
||||
recover_duration: 0.6,
|
||||
melee_constructor: (
|
||||
|
@ -2,11 +2,11 @@ BasicMelee(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 0.4,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.5,
|
||||
hit_timing: 0.6,
|
||||
recover_duration: 0.8,
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 70.0,
|
||||
damage: 58.0,
|
||||
poise: 20.0,
|
||||
knockback: 5.0,
|
||||
energy_regen: 5.0,
|
||||
|
@ -1,10 +0,0 @@
|
||||
SpriteSummon(
|
||||
buildup_duration: 0.6,
|
||||
cast_duration: 0.4,
|
||||
recover_duration: 0.3,
|
||||
sprite: EnsnaringVines,
|
||||
del_timeout: None,
|
||||
summon_distance: (0, 25),
|
||||
sparseness: 0.67,
|
||||
angle: 360,
|
||||
)
|
@ -3,7 +3,7 @@ BasicMelee(
|
||||
buildup_duration: 1.0,
|
||||
swing_duration: 0.2,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 1.0,
|
||||
recover_duration: 1.6,
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage: 40,
|
||||
|
@ -11,10 +11,10 @@ ComboMelee2(
|
||||
range: 3.2,
|
||||
angle: 100.0,
|
||||
),
|
||||
buildup_duration: 0.7,
|
||||
swing_duration: 0.3,
|
||||
buildup_duration: 0.75,
|
||||
swing_duration: 0.35,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
recover_duration: 1.45,
|
||||
movement: (
|
||||
swing: Some(Forward(0.05)),
|
||||
),
|
||||
@ -31,10 +31,10 @@ ComboMelee2(
|
||||
range: 3.2,
|
||||
angle: 200.0,
|
||||
),
|
||||
buildup_duration: 0.5,
|
||||
swing_duration: 0.3,
|
||||
buildup_duration: 1.0,
|
||||
swing_duration: 0.45,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
recover_duration: 1.5,
|
||||
movement: (
|
||||
swing: Some(Forward(0.05)),
|
||||
),
|
||||
@ -51,8 +51,8 @@ ComboMelee2(
|
||||
range: 4.2,
|
||||
angle: 360.0,
|
||||
),
|
||||
buildup_duration: 1.3,
|
||||
swing_duration: 0.4,
|
||||
buildup_duration: 0.95,
|
||||
swing_duration: 0.45,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.8,
|
||||
movement: (
|
||||
|
@ -17,7 +17,7 @@ ComboMelee2(
|
||||
chance: 1.0,
|
||||
))),
|
||||
),
|
||||
buildup_duration: 1.2,
|
||||
buildup_duration: 0.8,
|
||||
swing_duration: 0.4,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.8,
|
||||
|
@ -11,10 +11,10 @@ ComboMelee2(
|
||||
range: 2.2,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.7,
|
||||
swing_duration: 0.3,
|
||||
buildup_duration: 1.2,
|
||||
swing_duration: 0.4,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
recover_duration: 0.8,
|
||||
movement: (
|
||||
swing: Some(Forward(0.15)),
|
||||
),
|
||||
@ -31,8 +31,8 @@ ComboMelee2(
|
||||
range: 2.2,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.5,
|
||||
swing_duration: 0.3,
|
||||
buildup_duration: 0.95,
|
||||
swing_duration: 0.35,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
movement: (
|
||||
|
@ -11,10 +11,10 @@ ComboMelee2(
|
||||
range: 5.5,
|
||||
angle: 60.0,
|
||||
),
|
||||
buildup_duration: 0.9,
|
||||
buildup_duration: 1.0,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.5,
|
||||
recover_duration: 1.35,
|
||||
ori_modifier: 0.7,
|
||||
),
|
||||
],
|
||||
|
@ -1,6 +1,6 @@
|
||||
BasicMelee(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 0.2,
|
||||
buildup_duration: 0.45,
|
||||
swing_duration: 0.3,
|
||||
recover_duration: 0.1,
|
||||
melee_constructor: (
|
||||
|
@ -11,10 +11,10 @@ ComboMelee2(
|
||||
range: 3.5,
|
||||
angle: 60.0,
|
||||
),
|
||||
buildup_duration: 0.25,
|
||||
buildup_duration: 0.32,
|
||||
swing_duration: 0.25,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.8,
|
||||
recover_duration: 1.9,
|
||||
movement: (
|
||||
swing: Some(Forward(0.15)),
|
||||
),
|
||||
|
@ -1,19 +0,0 @@
|
||||
BasicSummon(
|
||||
buildup_duration: 0.5,
|
||||
cast_duration: 1.0,
|
||||
recover_duration: 0.5,
|
||||
summon_amount: 2,
|
||||
summon_distance: (1, 1),
|
||||
summon_info: (
|
||||
body: BipedSmall((
|
||||
species: Husk,
|
||||
body_type: Male,
|
||||
)),
|
||||
use_npc_name: true,
|
||||
scale: None,
|
||||
has_health: true,
|
||||
loadout_config: Some(HuskSummon),
|
||||
skillset_config: Some(Rank5),
|
||||
),
|
||||
duration: None,
|
||||
)
|
@ -12,9 +12,9 @@ ComboMelee2(
|
||||
angle: 90.0,
|
||||
),
|
||||
buildup_duration: 0.5,
|
||||
swing_duration: 0.2,
|
||||
swing_duration: 0.35,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.5,
|
||||
recover_duration: 1.5,
|
||||
movement: (
|
||||
swing: Some(Forward(0.1)),
|
||||
),
|
||||
|
@ -11,8 +11,8 @@ ComboMelee2(
|
||||
range: 4.0,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.75,
|
||||
swing_duration: 0.45,
|
||||
buildup_duration: 0.5,
|
||||
swing_duration: 0.35,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.4,
|
||||
movement: (
|
||||
@ -31,7 +31,7 @@ ComboMelee2(
|
||||
range: 3.5,
|
||||
angle: 75.0,
|
||||
),
|
||||
buildup_duration: 0.35,
|
||||
buildup_duration: 1.2,
|
||||
swing_duration: 0.35,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.3,
|
||||
@ -51,10 +51,10 @@ ComboMelee2(
|
||||
range: 3.0,
|
||||
angle: 55.0,
|
||||
),
|
||||
buildup_duration: 0.55,
|
||||
swing_duration: 0.25,
|
||||
buildup_duration: 1.55,
|
||||
swing_duration: 0.35,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
recover_duration: 1.2,
|
||||
movement: (
|
||||
swing: Some(Forward(0.3)),
|
||||
),
|
||||
|
@ -20,7 +20,7 @@ ChargedMelee(
|
||||
multi_target: Some(Normal),
|
||||
),
|
||||
charge_duration: 1.7,
|
||||
swing_duration: 0.4,
|
||||
hit_timing: 0.5,
|
||||
swing_duration: 0.7,
|
||||
hit_timing: 0.85,
|
||||
recover_duration: 1.1,
|
||||
)
|
||||
|
@ -11,9 +11,9 @@ ComboMelee2(
|
||||
range: 2.7,
|
||||
angle: 60.0,
|
||||
),
|
||||
buildup_duration: 0.5,
|
||||
swing_duration: 0.3,
|
||||
hit_timing: 0.5,
|
||||
buildup_duration: 0.95,
|
||||
swing_duration: 0.35,
|
||||
hit_timing: 0.35,
|
||||
recover_duration: 0.8,
|
||||
movement: (
|
||||
swing: Some(Forward(0.1)),
|
||||
|
@ -11,9 +11,9 @@ ComboMelee2(
|
||||
range: 2.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.55,
|
||||
buildup_duration: 0.95,
|
||||
swing_duration: 0.35,
|
||||
hit_timing: 0.5,
|
||||
hit_timing: 0.35,
|
||||
recover_duration: 0.4,
|
||||
movement: (
|
||||
swing: Some(Forward(0.1)),
|
||||
@ -31,9 +31,9 @@ ComboMelee2(
|
||||
range: 2.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.8,
|
||||
buildup_duration: 1.0,
|
||||
swing_duration: 0.4,
|
||||
hit_timing: 0.5,
|
||||
hit_timing: 0.35,
|
||||
recover_duration: 0.4,
|
||||
movement: (
|
||||
swing: Some(Forward(0.2)),
|
||||
@ -51,10 +51,10 @@ ComboMelee2(
|
||||
range: 2.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.9,
|
||||
buildup_duration: 1.0,
|
||||
swing_duration: 0.4,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.4,
|
||||
hit_timing: 0.35,
|
||||
recover_duration: 1.95,
|
||||
movement: (
|
||||
swing: Some(Forward(0.1)),
|
||||
),
|
||||
|
@ -13,7 +13,7 @@ ComboMelee2(
|
||||
),
|
||||
buildup_duration: 0.85,
|
||||
swing_duration: 0.45,
|
||||
hit_timing: 0.5,
|
||||
hit_timing: 0.4,
|
||||
recover_duration: 0.6,
|
||||
movement: (
|
||||
swing: Some(Forward(0.1)),
|
||||
@ -33,8 +33,8 @@ ComboMelee2(
|
||||
),
|
||||
buildup_duration: 1.1,
|
||||
swing_duration: 0.35,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
hit_timing: 0.4,
|
||||
recover_duration: 1.45,
|
||||
movement: (
|
||||
swing: Some(Forward(0.1)),
|
||||
),
|
||||
|
@ -3,7 +3,7 @@ BasicMelee(
|
||||
buildup_duration: 0.7,
|
||||
swing_duration: 0.45,
|
||||
hit_timing: 0.4,
|
||||
recover_duration: 0.85,
|
||||
recover_duration: 1.55,
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage: 10.0,
|
||||
|
@ -11,9 +11,9 @@ ComboMelee2(
|
||||
range: 3.0,
|
||||
angle: 75.0,
|
||||
),
|
||||
buildup_duration: 1.2,
|
||||
swing_duration: 0.07,
|
||||
hit_timing: 0.5,
|
||||
buildup_duration: 1.1,
|
||||
swing_duration: 0.25,
|
||||
hit_timing: 0.4,
|
||||
recover_duration: 0.3,
|
||||
movement: (
|
||||
swing: Some(Forward(0.15)),
|
||||
@ -31,10 +31,10 @@ ComboMelee2(
|
||||
range: 3.0,
|
||||
angle: 75.0,
|
||||
),
|
||||
buildup_duration: 0.5,
|
||||
swing_duration: 0.07,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
buildup_duration: 1.0,
|
||||
swing_duration: 0.25,
|
||||
hit_timing: 0.4,
|
||||
recover_duration: 1.6,
|
||||
movement: (
|
||||
swing: Some(Forward(0.15)),
|
||||
),
|
||||
|
@ -11,8 +11,8 @@ ComboMelee2(
|
||||
range: 4.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.8,
|
||||
swing_duration: 0.1,
|
||||
buildup_duration: 1.4,
|
||||
swing_duration: 0.2,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
movement: (
|
||||
@ -31,8 +31,8 @@ ComboMelee2(
|
||||
range: 3.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 1.1,
|
||||
swing_duration: 0.4,
|
||||
buildup_duration: 1.4,
|
||||
swing_duration: 0.3,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
movement: (
|
||||
@ -51,7 +51,7 @@ ComboMelee2(
|
||||
range: 3.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.8,
|
||||
buildup_duration: 1.45,
|
||||
swing_duration: 0.3,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
|
@ -17,12 +17,12 @@ ComboMelee2(
|
||||
chance: 0.1,
|
||||
))),
|
||||
),
|
||||
buildup_duration: 0.4,
|
||||
swing_duration: 0.08,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.5,
|
||||
buildup_duration: 0.7,
|
||||
swing_duration: 0.3,
|
||||
hit_timing: 0.4,
|
||||
recover_duration: 0.3,
|
||||
movement: (
|
||||
swing: Some(Forward(2.5)),
|
||||
swing: Some(Forward(0.8)),
|
||||
),
|
||||
ori_modifier: 0.7,
|
||||
),
|
||||
@ -43,12 +43,12 @@ ComboMelee2(
|
||||
chance: 0.1,
|
||||
))),
|
||||
),
|
||||
buildup_duration: 0.7,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.7,
|
||||
buildup_duration: 0.8,
|
||||
swing_duration: 0.15,
|
||||
hit_timing: 0.4,
|
||||
recover_duration: 1.3,
|
||||
movement: (
|
||||
swing: Some(Forward(2.0)),
|
||||
swing: Some(Forward(0.2)),
|
||||
),
|
||||
ori_modifier: 0.7,
|
||||
),
|
||||
|
@ -31,8 +31,8 @@ ComboMelee2(
|
||||
range: 5.0,
|
||||
angle: 45.0,
|
||||
),
|
||||
buildup_duration: 0.6,
|
||||
swing_duration: 0.2,
|
||||
buildup_duration: 1.4,
|
||||
swing_duration: 0.25,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.4,
|
||||
movement: (
|
||||
@ -51,10 +51,10 @@ ComboMelee2(
|
||||
range: 5.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.7,
|
||||
buildup_duration: 2.15,
|
||||
swing_duration: 0.25,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 1.1,
|
||||
recover_duration: 1.45,
|
||||
movement: (
|
||||
swing: Some(Forward(0.1)),
|
||||
),
|
||||
|
@ -11,10 +11,10 @@ ComboMelee2(
|
||||
range: 3.0,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.7,
|
||||
swing_duration: 0.4,
|
||||
buildup_duration: 0.9,
|
||||
swing_duration: 0.15,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.2,
|
||||
recover_duration: 0.3,
|
||||
movement: (
|
||||
swing: Some(Forward(0.2)),
|
||||
),
|
||||
@ -31,8 +31,8 @@ ComboMelee2(
|
||||
range: 3.0,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.35,
|
||||
swing_duration: 0.3,
|
||||
buildup_duration: 1.4,
|
||||
swing_duration: 0.25,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.4,
|
||||
movement: (
|
||||
@ -51,10 +51,10 @@ ComboMelee2(
|
||||
range: 3.0,
|
||||
angle: 15.0,
|
||||
),
|
||||
buildup_duration: 0.95,
|
||||
buildup_duration: 2.15,
|
||||
swing_duration: 0.25,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 1.3,
|
||||
recover_duration: 0.2,
|
||||
movement: (
|
||||
swing: Some(Forward(0.1)),
|
||||
),
|
||||
|
@ -1,9 +1,9 @@
|
||||
BasicMelee(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 0.45,
|
||||
swing_duration: 0.1,
|
||||
buildup_duration: 0.65,
|
||||
swing_duration: 0.3,
|
||||
hit_timing: 0.3,
|
||||
recover_duration: 1.2,
|
||||
recover_duration: 1.5,
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage: 12.5,
|
||||
|
@ -1,9 +1,9 @@
|
||||
BasicMelee(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 0.5,
|
||||
swing_duration: 0.1,
|
||||
buildup_duration: 0.9,
|
||||
swing_duration: 0.25,
|
||||
hit_timing: 0.4,
|
||||
recover_duration: 0.5,
|
||||
recover_duration: 1.2,
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 40.0,
|
||||
|
@ -3,7 +3,7 @@ LeapMelee(
|
||||
buildup_duration: 1.5,
|
||||
movement_duration: 0.6,
|
||||
swing_duration: 0.15,
|
||||
recover_duration: 0.2,
|
||||
recover_duration: 1.0,
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage: 25.0,
|
||||
|
@ -11,8 +11,8 @@ ComboMelee2(
|
||||
range: 4.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.8,
|
||||
swing_duration: 0.1,
|
||||
buildup_duration: 1.4,
|
||||
swing_duration: 0.2,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
movement: (
|
||||
@ -31,7 +31,7 @@ ComboMelee2(
|
||||
range: 3.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 1.2,
|
||||
buildup_duration: 1.4,
|
||||
swing_duration: 0.3,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
@ -51,7 +51,7 @@ ComboMelee2(
|
||||
range: 3.5,
|
||||
angle: 30.0,
|
||||
),
|
||||
buildup_duration: 0.9,
|
||||
buildup_duration: 1.45,
|
||||
swing_duration: 0.3,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
|
@ -1,7 +1,7 @@
|
||||
BasicRanged(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 0.5,
|
||||
recover_duration: 1.4,
|
||||
buildup_duration: 0.6,
|
||||
recover_duration: 1.8,
|
||||
projectile: (
|
||||
kind: Explosive(
|
||||
radius: 5,
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user