diff --git a/Cargo.lock b/Cargo.lock index 63646bc..639f1f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1677,6 +1677,12 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "mint" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" + [[package]] name = "mio" version = "1.0.2" @@ -3131,6 +3137,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86dce3b89992dbfee9b6f46d8a98a4a5ecf79f93f3b077fad3cc2759ebe92214" dependencies = [ "approx", + "mint", "num-integer", "num-traits", "rustc_version", @@ -3140,7 +3147,7 @@ dependencies = [ [[package]] name = "veloren-client" version = "0.16.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61" dependencies = [ "authc", "byteorder", @@ -3166,7 +3173,7 @@ dependencies = [ [[package]] name = "veloren-client-i18n" version = "0.13.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61" dependencies = [ "deunicode", "fluent", @@ -3184,7 +3191,7 @@ dependencies = [ [[package]] name = "veloren-common" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61" dependencies = [ "approx", "bitflags 2.6.0", @@ -3224,7 +3231,7 @@ dependencies = [ [[package]] name = "veloren-common-assets" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61" dependencies = [ "assets_manager", "dot_vox", @@ -3239,7 +3246,7 @@ dependencies = [ [[package]] name = "veloren-common-base" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61" dependencies = [ "directories-next", "tracing", @@ -3248,7 +3255,7 @@ dependencies = [ [[package]] name = "veloren-common-ecs" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61" dependencies = [ "specs", "tracing", @@ -3258,7 +3265,7 @@ dependencies = [ [[package]] name = "veloren-common-i18n" version = "0.1.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61" dependencies = [ "hashbrown 0.14.5", "rand", @@ -3268,7 +3275,7 @@ dependencies = [ [[package]] name = "veloren-common-net" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61" dependencies = [ "bincode", "flate2", @@ -3286,7 +3293,7 @@ dependencies = [ [[package]] name = "veloren-common-state" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61" dependencies = [ "async-trait", "bytes", @@ -3308,7 +3315,7 @@ dependencies = [ [[package]] name = "veloren-common-systems" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61" dependencies = [ "itertools", "ordered-float", @@ -3326,7 +3333,7 @@ dependencies = [ [[package]] name = "veloren-network" version = "0.3.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61" dependencies = [ "async-channel", "async-trait", @@ -3351,7 +3358,7 @@ dependencies = [ [[package]] name = "veloren-network-protocol" version = "0.6.1" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61" dependencies = [ "async-trait", "bitflags 2.6.0", @@ -3365,7 +3372,7 @@ dependencies = [ [[package]] name = "veloren-world" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61" dependencies = [ "arr_macro", "bincode", diff --git a/assets/common/abilities/ability_set_manifest.ron b/assets/common/abilities/ability_set_manifest.ron index 4bfed6c..6c2e41a 100644 --- a/assets/common/abilities/ability_set_manifest.ron +++ b/assets/common/abilities/ability_set_manifest.ron @@ -277,6 +277,11 @@ secondary: Simple(None, "common.abilities.custom.bushly.dash"), abilities: [], ), + Custom("Cactid"): ( + primary: Simple(None, "common.abilities.custom.cactid.singlestrike"), + secondary: Simple(None, "common.abilities.custom.cactid.dash"), + abilities: [], + ), Custom("Irrwurz"): ( primary: Simple(None, "common.abilities.custom.irrwurz.singlestrike"), secondary: Simple(None, "common.abilities.custom.irrwurz.magicball"), @@ -695,7 +700,8 @@ Simple(None, "common.abilities.custom.mindflayer.dimensionaldoor"), Simple(None, "common.abilities.custom.mindflayer.necroticsphere"), Simple(None, "common.abilities.custom.mindflayer.summonminions"), - Simple(None, "common.abilities.custom.mindflayer.summonextraminions"), + Simple(None, "common.abilities.custom.mindflayer.necroticsphere_blast"), + Simple(None, "common.abilities.custom.mindflayer.necroticsphere_multiblast"), ], ), Custom("Flamekeeper"): ( @@ -1233,4 +1239,39 @@ secondary: Simple(None, "common.abilities.vampire.executioner.doublestrike"), abilities: [], ), + Custom("Goblin Thug"): ( + primary: Simple(None, "common.abilities.custom.goblin_thug.doublestrike"), + secondary: Simple(None, "common.abilities.custom.goblin_thug.doublestrike"), + abilities: [], + ), + Custom("Goblin Chucker"): ( + primary: Simple(None, "common.abilities.custom.goblin_chucker.throw"), + secondary: Simple(None, "common.abilities.custom.goblin_chucker.throw"), + abilities: [], + ), + Custom("Goblin Ruffian"): ( + primary: Simple(None, "common.abilities.custom.goblin_ruffian.stab"), + secondary: Simple(None, "common.abilities.custom.goblin_ruffian.stab"), + abilities: [], + ), + Custom("Green Legoom"): ( + primary: Simple(None, "common.abilities.custom.green_legoom.doublestrike"), + secondary: Simple(None, "common.abilities.custom.green_legoom.doublestrike"), + abilities: [], + ), + Custom("Ochre Legoom"): ( + primary: Simple(None, "common.abilities.custom.ochre_legoom.dash"), + secondary: Simple(None, "common.abilities.custom.ochre_legoom.dash"), + abilities: [], + ), + Custom("Purple Legoom"): ( + primary: Simple(None, "common.abilities.custom.purple_legoom.doublestrike"), + secondary: Simple(None, "common.abilities.custom.purple_legoom.doublestrike"), + abilities: [], + ), + Custom("Red Legoom"): ( + primary: Simple(None, "common.abilities.custom.red_legoom.doublestrike"), + secondary: Simple(None, "common.abilities.custom.red_legoom.doublestrike"), + abilities: [], + ), }) diff --git a/assets/common/abilities/custom/arthropods/blackwidow/ensnaringwebs.ron b/assets/common/abilities/custom/arthropods/blackwidow/ensnaringwebs.ron index da4f882..3a5b9e1 100644 --- a/assets/common/abilities/custom/arthropods/blackwidow/ensnaringwebs.ron +++ b/assets/common/abilities/custom/arthropods/blackwidow/ensnaringwebs.ron @@ -3,7 +3,7 @@ SpriteSummon( cast_duration: 0.4, recover_duration: 0.3, sprite: EnsnaringWeb, - del_timeout: None, + del_timeout: Some((20, 4)), summon_distance: (0, 10), sparseness: 0.76, angle: 360, diff --git a/assets/common/abilities/custom/arthropods/tarantula/ensnaringwebs.ron b/assets/common/abilities/custom/arthropods/tarantula/ensnaringwebs.ron index f873461..f05691c 100644 --- a/assets/common/abilities/custom/arthropods/tarantula/ensnaringwebs.ron +++ b/assets/common/abilities/custom/arthropods/tarantula/ensnaringwebs.ron @@ -3,7 +3,7 @@ SpriteSummon( cast_duration: 0.4, recover_duration: 0.3, sprite: EnsnaringWeb, - del_timeout: None, + del_timeout: Some((10, 2)), summon_distance: (0, 9), sparseness: 0.8, angle: 360, diff --git a/assets/common/abilities/custom/cactid/dash.ron b/assets/common/abilities/custom/cactid/dash.ron new file mode 100644 index 0000000..d629575 --- /dev/null +++ b/assets/common/abilities/custom/cactid/dash.ron @@ -0,0 +1,28 @@ +DashMelee( + energy_cost: 0, + melee_constructor: ( + kind: Slash( + damage: 12.0, + poise: 8.0, + knockback: 4.0, + energy_regen: 0.0, + ), + scaled: Some(( + kind: Slash( + damage: 9.0, + poise: 20.0, + knockback: 6.0, + energy_regen: 0.0, + ))), + range: 4, + angle: 45.0, + ), + energy_drain: 0, + forward_speed: 8, + buildup_duration: 1.0, + charge_duration: 2.0, + swing_duration: 0.1, + recover_duration: 2.0, + ori_modifier: 0.1, + auto_charge: false, +) diff --git a/assets/common/abilities/custom/cactid/singlestrike.ron b/assets/common/abilities/custom/cactid/singlestrike.ron new file mode 100644 index 0000000..da2e788 --- /dev/null +++ b/assets/common/abilities/custom/cactid/singlestrike.ron @@ -0,0 +1,26 @@ +ComboMelee2( + strikes: [ + ( + melee_constructor: ( + kind: Slash( + damage: 8.0, + poise: 4, + knockback: 2, + energy_regen: 0, + ), + range: 3.0, + angle: 150.0, + ), + buildup_duration: 0.9, + swing_duration: 0.7, + hit_timing: 0.5, + recover_duration: 0.8, + movement: ( + swing: None, + ), + ori_modifier: 0.6, + ), + ], + energy_cost_per_strike: 0, + auto_progress: true, +) diff --git a/assets/common/abilities/custom/cloudwyvern/triplestrike.ron b/assets/common/abilities/custom/cloudwyvern/triplestrike.ron index 9559250..cdd63dd 100644 --- a/assets/common/abilities/custom/cloudwyvern/triplestrike.ron +++ b/assets/common/abilities/custom/cloudwyvern/triplestrike.ron @@ -16,7 +16,7 @@ ComboMelee2( hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(0.5)), + swing: Some(Forward(0.1)), ), ori_modifier: 0.7, ), @@ -36,7 +36,7 @@ ComboMelee2( hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(0.5)), + swing: Some(Forward(0.1)), ), ori_modifier: 0.7, ), @@ -56,11 +56,11 @@ ComboMelee2( hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(0.5)), + swing: Some(Forward(0.2)), ), ori_modifier: 0.7, ), ], energy_cost_per_strike: 0, auto_progress: true, -) \ No newline at end of file +) diff --git a/assets/common/abilities/custom/flamewyvern/triplestrike.ron b/assets/common/abilities/custom/flamewyvern/triplestrike.ron index 7f17b1e..906e8a2 100644 --- a/assets/common/abilities/custom/flamewyvern/triplestrike.ron +++ b/assets/common/abilities/custom/flamewyvern/triplestrike.ron @@ -16,7 +16,7 @@ ComboMelee2( hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(0.5)), + swing: Some(Forward(0.1)), ), ori_modifier: 0.7, ), @@ -36,7 +36,7 @@ ComboMelee2( hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(0.5)), + swing: Some(Forward(0.1)), ), ori_modifier: 0.7, ), @@ -56,11 +56,11 @@ ComboMelee2( hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(0.5)), + swing: Some(Forward(0.2)), ), ori_modifier: 0.7, ), ], energy_cost_per_strike: 0, auto_progress: true, -) \ No newline at end of file +) diff --git a/assets/common/abilities/custom/frostwyvern/triplestrike.ron b/assets/common/abilities/custom/frostwyvern/triplestrike.ron index d9f1c6d..a066171 100644 --- a/assets/common/abilities/custom/frostwyvern/triplestrike.ron +++ b/assets/common/abilities/custom/frostwyvern/triplestrike.ron @@ -16,7 +16,7 @@ ComboMelee2( hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(0.5)), + swing: Some(Forward(0.1)), ), ori_modifier: 0.7, ), @@ -36,7 +36,7 @@ ComboMelee2( hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(0.5)), + swing: Some(Forward(0.1)), ), ori_modifier: 0.7, ), @@ -56,11 +56,11 @@ ComboMelee2( hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(0.5)), + swing: Some(Forward(0.2)), ), ori_modifier: 0.7, ), ], energy_cost_per_strike: 0, auto_progress: true, -) \ No newline at end of file +) diff --git a/assets/common/abilities/custom/goblin_chucker/throw.ron b/assets/common/abilities/custom/goblin_chucker/throw.ron new file mode 100644 index 0000000..caba1d6 --- /dev/null +++ b/assets/common/abilities/custom/goblin_chucker/throw.ron @@ -0,0 +1,18 @@ +BasicRanged( + energy_cost: 0, + buildup_duration: 0.75, + recover_duration: 0.75, + projectile: ( + kind: Blunt, + attack: Some(( + damage: 4, + energy: 0, + )), + ), + projectile_body: Object(Pebble), + projectile_light: None, + projectile_speed: 18.0, + num_projectiles: Value(2), + projectile_spread: 0.2, + move_efficiency: 0.3, +) diff --git a/assets/common/abilities/custom/goblin_ruffian/stab.ron b/assets/common/abilities/custom/goblin_ruffian/stab.ron new file mode 100644 index 0000000..0771ef4 --- /dev/null +++ b/assets/common/abilities/custom/goblin_ruffian/stab.ron @@ -0,0 +1,18 @@ +BasicMelee( + energy_cost: 0, + buildup_duration: 0.2, + swing_duration: 0.05, + hit_timing: 0.4, + recover_duration: 0.375, + melee_constructor: ( + kind: Stab( + damage: 5, + poise: 2, + knockback: 0, + energy_regen: 0, + ), + range: 3, + angle: 15, + ), + ori_modifier: 1.0, +) diff --git a/assets/common/abilities/custom/goblin_thug/doublestrike.ron b/assets/common/abilities/custom/goblin_thug/doublestrike.ron new file mode 100644 index 0000000..da5ac85 --- /dev/null +++ b/assets/common/abilities/custom/goblin_thug/doublestrike.ron @@ -0,0 +1,45 @@ +ComboMelee2( + strikes: [ + ( + melee_constructor: ( + kind: Bash( + damage: 4, + poise: 1, + knockback: 0, + energy_regen: 0, + ), + range: 3.5, + angle: 50.0, + ), + buildup_duration: 0.6, + swing_duration: 0.25, + hit_timing: 0.5, + recover_duration: 0.25, + movement: ( + swing: Some(Forward(0.5)), + ), + ori_modifier: 0.65, + ), + ( + melee_constructor: ( + kind: Bash( + damage: 6, + poise: 1, + knockback: 0, + energy_regen: 0, + ), + range: 4.0, + angle: 30.0, + ), + buildup_duration: 1, + swing_duration: 0.4, + hit_timing: 0.5, + recover_duration: 1.2, + movement: ( + swing: Some(Forward(0.5)), + ), + ori_modifier: 0.65, + ), + ], + energy_cost_per_strike: 0, +) diff --git a/assets/common/abilities/custom/green_legoom/doublestrike.ron b/assets/common/abilities/custom/green_legoom/doublestrike.ron new file mode 100644 index 0000000..7f7ed18 --- /dev/null +++ b/assets/common/abilities/custom/green_legoom/doublestrike.ron @@ -0,0 +1,45 @@ +ComboMelee2( + strikes: [ + ( + melee_constructor: ( + kind: Bash( + damage: 5, + poise: 2, + knockback: 0, + energy_regen: 0, + ), + range: 3.5, + angle: 50.0, + ), + buildup_duration: 0.6, + swing_duration: 0.25, + hit_timing: 0.5, + recover_duration: 0.25, + movement: ( + swing: Some(Forward(0.5)), + ), + ori_modifier: 0.65, + ), + ( + melee_constructor: ( + kind: Bash( + damage: 8, + poise: 3, + knockback: 0, + energy_regen: 0, + ), + range: 4.0, + angle: 30.0, + ), + buildup_duration: 1, + swing_duration: 0.4, + hit_timing: 0.5, + recover_duration: 1.2, + movement: ( + swing: Some(Forward(0.5)), + ), + ori_modifier: 0.65, + ), + ], + energy_cost_per_strike: 0, +) diff --git a/assets/common/abilities/custom/harvester/ensnaringvines_dense.ron b/assets/common/abilities/custom/harvester/ensnaringvines_dense.ron index 6c008eb..af65b6c 100644 --- a/assets/common/abilities/custom/harvester/ensnaringvines_dense.ron +++ b/assets/common/abilities/custom/harvester/ensnaringvines_dense.ron @@ -3,7 +3,7 @@ SpriteSummon( cast_duration: 0.6, recover_duration: 0.5, sprite: EnsnaringVines, - del_timeout: None, + del_timeout: Some((60, 10)), summon_distance: (0, 25), sparseness: 0.6, angle: 360, diff --git a/assets/common/abilities/custom/harvester/ensnaringvines_sparse.ron b/assets/common/abilities/custom/harvester/ensnaringvines_sparse.ron index 0cf61ff..d0d580a 100644 --- a/assets/common/abilities/custom/harvester/ensnaringvines_sparse.ron +++ b/assets/common/abilities/custom/harvester/ensnaringvines_sparse.ron @@ -3,7 +3,7 @@ SpriteSummon( cast_duration: 0.4, recover_duration: 0.3, sprite: EnsnaringVines, - del_timeout: None, + del_timeout: Some((60, 10)), summon_distance: (0, 30), sparseness: 0.8, angle: 360, diff --git a/assets/common/abilities/custom/hydra/multi_bite.ron b/assets/common/abilities/custom/hydra/multi_bite.ron index 018987e..9112490 100644 --- a/assets/common/abilities/custom/hydra/multi_bite.ron +++ b/assets/common/abilities/custom/hydra/multi_bite.ron @@ -16,7 +16,7 @@ ComboMelee2( hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(0.15)), + swing: Some(Forward(0.05)), ), ori_modifier: 0.65, ), @@ -36,7 +36,7 @@ ComboMelee2( hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(0.1)), + swing: Some(Forward(0.05)), ), ori_modifier: 0.65, ), @@ -56,7 +56,7 @@ ComboMelee2( hit_timing: 0.5, recover_duration: 0.8, movement: ( - swing: Some(Forward(0.5)), + swing: Some(Forward(0.1)), ), ori_modifier: 0.65, ), diff --git a/assets/common/abilities/custom/karkatha/riposte.ron b/assets/common/abilities/custom/karkatha/riposte.ron index 7226244..4705c59 100644 --- a/assets/common/abilities/custom/karkatha/riposte.ron +++ b/assets/common/abilities/custom/karkatha/riposte.ron @@ -3,6 +3,7 @@ RiposteMelee( buildup_duration: 0.3, swing_duration: 0.9, recover_duration: 0.3, + whiffed_recover_duration: 0.6, block_strength: 50.0, melee_constructor: ( kind: Slash( diff --git a/assets/common/abilities/custom/mindflayer/cursedflames.ron b/assets/common/abilities/custom/mindflayer/cursedflames.ron index 37ef3a2..6d2e13d 100644 --- a/assets/common/abilities/custom/mindflayer/cursedflames.ron +++ b/assets/common/abilities/custom/mindflayer/cursedflames.ron @@ -14,6 +14,6 @@ BasicBeam( ))), energy_regen: 0, energy_drain: 45, - ori_rate: 0.45, + ori_rate: 0.3, specifier: Cultist, ) diff --git a/assets/common/abilities/custom/mindflayer/necroticsphere_blast.ron b/assets/common/abilities/custom/mindflayer/necroticsphere_blast.ron new file mode 100644 index 0000000..c15d0ed --- /dev/null +++ b/assets/common/abilities/custom/mindflayer/necroticsphere_blast.ron @@ -0,0 +1,22 @@ +BasicRanged( + energy_cost: 0, + buildup_duration: 0.3, + recover_duration: 0.8, + projectile: ( + kind: Explosive( + radius: 20, + min_falloff: 0.2, + reagent: Some(Purple), + ), + attack: Some(( + damage: 25, + energy: 20, + )), + ), + projectile_body: Object(FireworkPurple), + projectile_speed: 0.0, + num_projectiles: Value(1), + projectile_spread: 0.0, + move_efficiency: 0.3, +) + diff --git a/assets/common/abilities/custom/mindflayer/necroticsphere_multiblast.ron b/assets/common/abilities/custom/mindflayer/necroticsphere_multiblast.ron new file mode 100644 index 0000000..6b61d14 --- /dev/null +++ b/assets/common/abilities/custom/mindflayer/necroticsphere_multiblast.ron @@ -0,0 +1,22 @@ +BasicRanged( + energy_cost: 0, + buildup_duration: 6.0, + recover_duration: 0.5, + projectile: ( + kind: Explosive( + radius: 10, + min_falloff: 0.2, + reagent: Some(Purple), + ), + attack: Some(( + damage: 30, + energy: 40, + )), + ), + projectile_body: Object(FireworkPurple), + projectile_speed: 10.0, + num_projectiles: Value(6), + projectile_spread: 0.5, + move_efficiency: 0.3, +) + diff --git a/assets/common/abilities/custom/mindflayer/necroticvortex.ron b/assets/common/abilities/custom/mindflayer/necroticvortex.ron index f147745..ddee124 100644 --- a/assets/common/abilities/custom/mindflayer/necroticvortex.ron +++ b/assets/common/abilities/custom/mindflayer/necroticvortex.ron @@ -1,15 +1,15 @@ RapidMelee( - buildup_duration: 1.0, - swing_duration: 0.45, - recover_duration: 1.0, + buildup_duration: 0.5, + swing_duration: 0.8, + recover_duration: 0.1, melee_constructor: ( kind: NecroticVortex( damage: 20, - pull: 6.5, - lifesteal: 3.0, + pull: 12.0, + lifesteal: 8.0, energy_regen: 30, ), - range: 17.0, + range: 25.0, angle: 360.0, multi_target: Some(Normal), ), diff --git a/assets/common/abilities/custom/ochre_legoom/dash.ron b/assets/common/abilities/custom/ochre_legoom/dash.ron new file mode 100644 index 0000000..1c1256d --- /dev/null +++ b/assets/common/abilities/custom/ochre_legoom/dash.ron @@ -0,0 +1,28 @@ +DashMelee( + energy_cost: 0.0, + melee_constructor: ( + kind: Stab( + damage: 5.0, + poise: 3.0, + knockback: 2.0, + energy_regen: 0.0, + ), + scaled: Some(( + kind: Stab( + damage: 5.0, + poise: 3.0, + knockback: 2.0, + energy_regen: 0.0, + ))), + range: 5.0, + angle: 45.0, + ), + energy_drain: 0, + forward_speed: 5.0, + buildup_duration: 1.2, + charge_duration: 0.4, + swing_duration: 0.1, + recover_duration: 1.2, + ori_modifier: 0.3, + auto_charge: false, +) diff --git a/assets/common/abilities/custom/purple_legoom/doublestrike.ron b/assets/common/abilities/custom/purple_legoom/doublestrike.ron new file mode 100644 index 0000000..c8f07bb --- /dev/null +++ b/assets/common/abilities/custom/purple_legoom/doublestrike.ron @@ -0,0 +1,45 @@ +ComboMelee2( + strikes: [ + ( + melee_constructor: ( + kind: Stab( + damage: 5, + poise: 2, + knockback: 0, + energy_regen: 0, + ), + range: 3.5, + angle: 50.0, + ), + buildup_duration: 0.6, + swing_duration: 0.25, + hit_timing: 0.5, + recover_duration: 0.25, + movement: ( + swing: Some(Forward(0.5)), + ), + ori_modifier: 0.65, + ), + ( + melee_constructor: ( + kind: Stab( + damage: 8, + poise: 3, + knockback: 0, + energy_regen: 0, + ), + range: 4.0, + angle: 30.0, + ), + buildup_duration: 1, + swing_duration: 0.4, + hit_timing: 0.5, + recover_duration: 1.2, + movement: ( + swing: Some(Forward(0.5)), + ), + ori_modifier: 0.65, + ), + ], + energy_cost_per_strike: 0, +) diff --git a/assets/common/abilities/custom/red_legoom/doublestrike.ron b/assets/common/abilities/custom/red_legoom/doublestrike.ron new file mode 100644 index 0000000..7f7ed18 --- /dev/null +++ b/assets/common/abilities/custom/red_legoom/doublestrike.ron @@ -0,0 +1,45 @@ +ComboMelee2( + strikes: [ + ( + melee_constructor: ( + kind: Bash( + damage: 5, + poise: 2, + knockback: 0, + energy_regen: 0, + ), + range: 3.5, + angle: 50.0, + ), + buildup_duration: 0.6, + swing_duration: 0.25, + hit_timing: 0.5, + recover_duration: 0.25, + movement: ( + swing: Some(Forward(0.5)), + ), + ori_modifier: 0.65, + ), + ( + melee_constructor: ( + kind: Bash( + damage: 8, + poise: 3, + knockback: 0, + energy_regen: 0, + ), + range: 4.0, + angle: 30.0, + ), + buildup_duration: 1, + swing_duration: 0.4, + hit_timing: 0.5, + recover_duration: 1.2, + movement: ( + swing: Some(Forward(0.5)), + ), + ori_modifier: 0.65, + ), + ], + energy_cost_per_strike: 0, +) diff --git a/assets/common/abilities/custom/seawyvern/triplestrike.ron b/assets/common/abilities/custom/seawyvern/triplestrike.ron index e12d430..1e77749 100644 --- a/assets/common/abilities/custom/seawyvern/triplestrike.ron +++ b/assets/common/abilities/custom/seawyvern/triplestrike.ron @@ -16,7 +16,7 @@ ComboMelee2( hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(0.5)), + swing: Some(Forward(0.1)), ), ori_modifier: 0.7, ), @@ -36,7 +36,7 @@ ComboMelee2( hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(0.5)), + swing: Some(Forward(0.1)), ), ori_modifier: 0.7, ), @@ -56,11 +56,11 @@ ComboMelee2( hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(0.5)), + swing: Some(Forward(0.2)), ), ori_modifier: 0.7, ), ], energy_cost_per_strike: 0, auto_progress: true, -) \ No newline at end of file +) diff --git a/assets/common/abilities/custom/wealdwyvern/triplestrike.ron b/assets/common/abilities/custom/wealdwyvern/triplestrike.ron index 609970e..a85791e 100644 --- a/assets/common/abilities/custom/wealdwyvern/triplestrike.ron +++ b/assets/common/abilities/custom/wealdwyvern/triplestrike.ron @@ -16,7 +16,7 @@ ComboMelee2( hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(0.5)), + swing: Some(Forward(0.1)), ), ori_modifier: 0.7, ), @@ -36,7 +36,7 @@ ComboMelee2( hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(0.5)), + swing: Some(Forward(0.1)), ), ori_modifier: 0.7, ), @@ -56,11 +56,11 @@ ComboMelee2( hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(0.5)), + swing: Some(Forward(0.2)), ), ori_modifier: 0.7, ), ], energy_cost_per_strike: 0, auto_progress: true, -) \ No newline at end of file +) diff --git a/assets/common/abilities/hammer/dual_iron_tempest.ron b/assets/common/abilities/hammer/dual_iron_tempest.ron index 0531531..e92d845 100644 --- a/assets/common/abilities/hammer/dual_iron_tempest.ron +++ b/assets/common/abilities/hammer/dual_iron_tempest.ron @@ -11,6 +11,7 @@ RapidMelee( ), range: 4.0, angle: 360.0, + multi_target: Some(Normal), simultaneous_hits: 2, ), energy_cost: 3, diff --git a/assets/common/abilities/hammer/iron_tempest.ron b/assets/common/abilities/hammer/iron_tempest.ron index 97d74ab..54e3f80 100644 --- a/assets/common/abilities/hammer/iron_tempest.ron +++ b/assets/common/abilities/hammer/iron_tempest.ron @@ -11,6 +11,7 @@ RapidMelee( ), range: 4.0, angle: 360.0, + multi_target: Some(Normal), ), energy_cost: 3, max_strikes: Some(8), diff --git a/assets/common/abilities/hammer/retaliate.ron b/assets/common/abilities/hammer/retaliate.ron index 8a06ff6..872fe9c 100644 --- a/assets/common/abilities/hammer/retaliate.ron +++ b/assets/common/abilities/hammer/retaliate.ron @@ -3,6 +3,7 @@ RiposteMelee( buildup_duration: 0.4, swing_duration: 0.1, recover_duration: 0.2, + whiffed_recover_duration: 0.6, block_strength: 5.0, melee_constructor: ( kind: Bash( diff --git a/assets/common/abilities/haniwa/soldier/riposte.ron b/assets/common/abilities/haniwa/soldier/riposte.ron index 61919de..178d4b7 100644 --- a/assets/common/abilities/haniwa/soldier/riposte.ron +++ b/assets/common/abilities/haniwa/soldier/riposte.ron @@ -3,6 +3,7 @@ RiposteMelee( buildup_duration: 0.7, swing_duration: 0.3, recover_duration: 0.2, + whiffed_recover_duration: 0.4, block_strength: 5.0, melee_constructor: ( kind: Slash( @@ -14,4 +15,4 @@ RiposteMelee( range: 4.0, angle: 60.0, ), -) \ No newline at end of file +) diff --git a/assets/common/abilities/sword/defensive_riposte.ron b/assets/common/abilities/sword/defensive_riposte.ron index 4c655cd..82958ab 100644 --- a/assets/common/abilities/sword/defensive_riposte.ron +++ b/assets/common/abilities/sword/defensive_riposte.ron @@ -3,6 +3,7 @@ RiposteMelee( buildup_duration: 0.4, swing_duration: 0.1, recover_duration: 0.2, + whiffed_recover_duration: 0.6, block_strength: 5.0, melee_constructor: ( kind: Slash( diff --git a/assets/common/entity/calendar/halloween/aggressive/bloodservant.ron b/assets/common/entity/calendar/halloween/aggressive/bloodservant.ron new file mode 100644 index 0000000..df5849d --- /dev/null +++ b/assets/common/entity/calendar/halloween/aggressive/bloodservant.ron @@ -0,0 +1,18 @@ +#![enable(implicit_some)] +( + name: Name("Bloodservant"), + body: RandomWith("bloodservant"), + alignment: Alignment(Enemy), + loot: LootTable("common.loot_tables.calendar.halloween.halloween_bloodservant"), + inventory: ( + loadout: Inline(( + active_hands: InHands((Item("common.items.npc_weapons.biped_small.vampire.bloodservant_axe"), None)), + inherit: Asset("common.loadout.dungeon.vampire.bloodservant"), + + )), ), + agent: ( + idle_wander_factor: 0.0, + aggro_range_multiplier: 2.0, + ), + meta: [], +) diff --git a/assets/common/entity/calendar/halloween/wild/halloween_strigoi.ron b/assets/common/entity/calendar/halloween/wild/halloween_strigoi.ron new file mode 100644 index 0000000..ef0c99b --- /dev/null +++ b/assets/common/entity/calendar/halloween/wild/halloween_strigoi.ron @@ -0,0 +1,11 @@ +#![enable(implicit_some)] +( + name: Name("Strigoi"), + body: RandomWith("strigoi"), + alignment: Alignment(Wild), + loot: LootTable("common.loot_tables.calendar.halloween.halloween_strigoi"), + inventory: ( + loadout: FromBody, + ), + meta: [], +) diff --git a/assets/common/entity/wild/aggressive/cactid.ron b/assets/common/entity/wild/aggressive/cactid.ron new file mode 100644 index 0000000..35147ff --- /dev/null +++ b/assets/common/entity/wild/aggressive/cactid.ron @@ -0,0 +1,12 @@ +#![enable(implicit_some)] +( + name: Name("Cactid"), + body: RandomWith("cactid"), + alignment: Alignment(Enemy), + loot: LootTable("common.loot_tables.creature.biped_small.cactid"), + inventory: ( + loadout: Inline(( + inherit: Asset("common.loadout.world.cactid.cactid"), + )), ), + meta: [], +) diff --git a/assets/common/entity/wild/aggressive/goblin_chucker.ron b/assets/common/entity/wild/aggressive/goblin_chucker.ron new file mode 100644 index 0000000..0f68cee --- /dev/null +++ b/assets/common/entity/wild/aggressive/goblin_chucker.ron @@ -0,0 +1,12 @@ +#![enable(implicit_some)] +( + name: Name("Goblin Chucker"), + body: RandomWith("goblin_chucker"), + alignment: Alignment(Enemy), + loot: LootTable("common.loot_tables.creature.biped_small.goblin"), + inventory: ( + loadout: Inline(( + inherit: Asset("common.loadout.world.goblin.goblin_chucker"), + )), ), + meta: [], +) diff --git a/assets/common/entity/wild/aggressive/goblin_ruffian.ron b/assets/common/entity/wild/aggressive/goblin_ruffian.ron new file mode 100644 index 0000000..1992642 --- /dev/null +++ b/assets/common/entity/wild/aggressive/goblin_ruffian.ron @@ -0,0 +1,12 @@ +#![enable(implicit_some)] +( + name: Name("Goblin Ruffian"), + body: RandomWith("goblin_ruffian"), + alignment: Alignment(Enemy), + loot: LootTable("common.loot_tables.creature.biped_small.goblin"), + inventory: ( + loadout: Inline(( + inherit: Asset("common.loadout.world.goblin.goblin_ruffian"), + )), ), + meta: [], +) diff --git a/assets/common/entity/wild/aggressive/goblin_thug.ron b/assets/common/entity/wild/aggressive/goblin_thug.ron new file mode 100644 index 0000000..a809037 --- /dev/null +++ b/assets/common/entity/wild/aggressive/goblin_thug.ron @@ -0,0 +1,12 @@ +#![enable(implicit_some)] +( + name: Name("Goblin Thug"), + body: RandomWith("goblin_thug"), + alignment: Alignment(Enemy), + loot: LootTable("common.loot_tables.creature.biped_small.goblin"), + inventory: ( + loadout: Inline(( + inherit: Asset("common.loadout.world.goblin.goblin_thug"), + )), ), + meta: [], +) diff --git a/assets/common/entity/wild/aggressive/green_legoom.ron b/assets/common/entity/wild/aggressive/green_legoom.ron new file mode 100644 index 0000000..cb195c7 --- /dev/null +++ b/assets/common/entity/wild/aggressive/green_legoom.ron @@ -0,0 +1,12 @@ +#![enable(implicit_some)] +( + name: Name("Green Legoom"), + body: RandomWith("green_legoom"), + alignment: Alignment(Enemy), + loot: LootTable("common.loot_tables.creature.biped_small.legoom"), + inventory: ( + loadout: Inline(( + inherit: Asset("common.loadout.world.legoom.green_legoom"), + )), ), + meta: [], +) diff --git a/assets/common/entity/wild/aggressive/ochre_legoom.ron b/assets/common/entity/wild/aggressive/ochre_legoom.ron new file mode 100644 index 0000000..d9f3913 --- /dev/null +++ b/assets/common/entity/wild/aggressive/ochre_legoom.ron @@ -0,0 +1,12 @@ +#![enable(implicit_some)] +( + name: Name("Ochre Legoom"), + body: RandomWith("ochre_legoom"), + alignment: Alignment(Enemy), + loot: LootTable("common.loot_tables.creature.biped_small.legoom"), + inventory: ( + loadout: Inline(( + inherit: Asset("common.loadout.world.legoom.ochre_legoom"), + )), ), + meta: [], +) \ No newline at end of file diff --git a/assets/common/entity/wild/aggressive/purple_legoom.ron b/assets/common/entity/wild/aggressive/purple_legoom.ron new file mode 100644 index 0000000..169901f --- /dev/null +++ b/assets/common/entity/wild/aggressive/purple_legoom.ron @@ -0,0 +1,12 @@ +#![enable(implicit_some)] +( + name: Name("Purple Legoom"), + body: RandomWith("purple_legoom"), + alignment: Alignment(Enemy), + loot: LootTable("common.loot_tables.creature.biped_small.legoom"), + inventory: ( + loadout: Inline(( + inherit: Asset("common.loadout.world.legoom.purple_legoom"), + )), ), + meta: [], +) \ No newline at end of file diff --git a/assets/common/entity/wild/aggressive/red_legoom.ron b/assets/common/entity/wild/aggressive/red_legoom.ron new file mode 100644 index 0000000..294507a --- /dev/null +++ b/assets/common/entity/wild/aggressive/red_legoom.ron @@ -0,0 +1,12 @@ +#![enable(implicit_some)] +( + name: Name("Red Legoom"), + body: RandomWith("red_legoom"), + alignment: Alignment(Enemy), + loot: LootTable("common.loot_tables.creature.biped_small.legoom"), + inventory: ( + loadout: Inline(( + inherit: Asset("common.loadout.world.legoom.red_legoom"), + )), ), + meta: [], +) \ No newline at end of file diff --git a/assets/common/item_i18n_manifest.ron b/assets/common/item_i18n_manifest.ron index 6eb05b1..f2f9d1d 100644 --- a/assets/common/item_i18n_manifest.ron +++ b/assets/common/item_i18n_manifest.ron @@ -324,6 +324,21 @@ Simple( "common.items.npc_armor.biped_small.bushly.hand.bushly", ): "common-items-npc_armor-biped_small-bushly-hand-bushly", + Simple( + "common.items.npc_armor.biped_small.cactid.head.cactid", + ): "common-items-npc_armor-biped_small-cactid-head-cactid", + Simple( + "common.items.npc_armor.biped_small.cactid.foot.cactid", + ): "common-items-npc_armor-biped_small-cactid-foot-cactid", + Simple( + "common.items.npc_armor.biped_small.cactid.pants.cactid", + ): "common-items-npc_armor-biped_small-cactid-pants-cactid", + Simple( + "common.items.npc_armor.biped_small.cactid.chest.cactid", + ): "common-items-npc_armor-biped_small-cactid-chest-cactid", + Simple( + "common.items.npc_armor.biped_small.cactid.hand.cactid", + ): "common-items-npc_armor-biped_small-cactid-hand-cactid", Simple( "common.items.npc_armor.biped_small.treasure_egg.chest.treasure_egg", ): "common-items-npc_armor-biped_small-treasure_egg-chest-treasure_egg", @@ -591,6 +606,111 @@ Simple( "common.items.npc_armor.biped_small.harlequin.pants.harlequin", ): "common-items-npc_armor-biped_small-harlequin-pants-harlequin", + Simple( + "common.items.npc_armor.biped_small.goblin_thug.chest.goblin_thug", + ): "common-items-npc_armor-biped_small-goblin_thug-chest-goblin_thug", + Simple( + "common.items.npc_armor.biped_small.goblin_thug.foot.goblin_thug", + ): "common-items-npc_armor-biped_small-goblin_thug-foot-goblin_thug", + Simple( + "common.items.npc_armor.biped_small.goblin_thug.hand.goblin_thug", + ): "common-items-npc_armor-biped_small-goblin_thug-hand-goblin_thug", + Simple( + "common.items.npc_armor.biped_small.goblin_thug.head.goblin_thug", + ): "common-items-npc_armor-biped_small-goblin_thug-head-goblin_thug", + Simple( + "common.items.npc_armor.biped_small.goblin_thug.pants.goblin_thug", + ): "common-items-npc_armor-biped_small-goblin_thug-pants-goblin_thug", + Simple( + "common.items.npc_armor.biped_small.goblin_chucker.chest.goblin_chucker", + ): "common-items-npc_armor-biped_small-goblin_chucker-chest-goblin_chucker", + Simple( + "common.items.npc_armor.biped_small.goblin_chucker.foot.goblin_chucker", + ): "common-items-npc_armor-biped_small-goblin_chucker-foot-goblin_chucker", + Simple( + "common.items.npc_armor.biped_small.goblin_chucker.hand.goblin_chucker", + ): "common-items-npc_armor-biped_small-goblin_chucker-hand-goblin_chucker", + Simple( + "common.items.npc_armor.biped_small.goblin_chucker.head.goblin_chucker", + ): "common-items-npc_armor-biped_small-goblin_chucker-head-goblin_chucker", + Simple( + "common.items.npc_armor.biped_small.goblin_chucker.pants.goblin_chucker", + ): "common-items-npc_armor-biped_small-goblin_chucker-pants-goblin_chucker", + Simple( + "common.items.npc_armor.biped_small.goblin_ruffian.chest.goblin_ruffian", + ): "common-items-npc_armor-biped_small-goblin_ruffian-chest-goblin_ruffian", + Simple( + "common.items.npc_armor.biped_small.goblin_ruffian.foot.goblin_ruffian", + ): "common-items-npc_armor-biped_small-goblin_ruffian-foot-goblin_ruffian", + Simple( + "common.items.npc_armor.biped_small.goblin_ruffian.hand.goblin_ruffian", + ): "common-items-npc_armor-biped_small-goblin_ruffian-hand-goblin_ruffian", + Simple( + "common.items.npc_armor.biped_small.goblin_ruffian.head.goblin_ruffian", + ): "common-items-npc_armor-biped_small-goblin_ruffian-head-goblin_ruffian", + Simple( + "common.items.npc_armor.biped_small.goblin_ruffian.pants.goblin_ruffian", + ): "common-items-npc_armor-biped_small-goblin_ruffian-pants-goblin_ruffian", + Simple( + "common.items.npc_armor.biped_small.green_legoom.chest.green_legoom", + ): "common-items-npc_armor-biped_small-green_legoom-chest-green_legoom", + Simple( + "common.items.npc_armor.biped_small.green_legoom.foot.green_legoom", + ): "common-items-npc_armor-biped_small-green_legoom-foot-green_legoom", + Simple( + "common.items.npc_armor.biped_small.green_legoom.hand.green_legoom", + ): "common-items-npc_armor-biped_small-green_legoom-hand-green_legoom", + Simple( + "common.items.npc_armor.biped_small.green_legoom.head.green_legoom", + ): "common-items-npc_armor-biped_small-green_legoom-head-green_legoom", + Simple( + "common.items.npc_armor.biped_small.green_legoom.pants.green_legoom", + ): "common-items-npc_armor-biped_small-green_legoom-pants-green_legoom", + Simple( + "common.items.npc_armor.biped_small.ochre_legoom.chest.ochre_legoom", + ): "common-items-npc_armor-biped_small-ochre_legoom-chest-ochre_legoom", + Simple( + "common.items.npc_armor.biped_small.ochre_legoom.foot.ochre_legoom", + ): "common-items-npc_armor-biped_small-ochre_legoom-foot-ochre_legoom", + Simple( + "common.items.npc_armor.biped_small.ochre_legoom.hand.ochre_legoom", + ): "common-items-npc_armor-biped_small-ochre_legoom-hand-ochre_legoom", + Simple( + "common.items.npc_armor.biped_small.ochre_legoom.head.ochre_legoom", + ): "common-items-npc_armor-biped_small-ochre_legoom-head-ochre_legoom", + Simple( + "common.items.npc_armor.biped_small.ochre_legoom.pants.ochre_legoom", + ): "common-items-npc_armor-biped_small-ochre_legoom-pants-ochre_legoom", + Simple( + "common.items.npc_armor.biped_small.purple_legoom.chest.purple_legoom", + ): "common-items-npc_armor-biped_small-purple_legoom-chest-purple_legoom", + Simple( + "common.items.npc_armor.biped_small.purple_legoom.foot.purple_legoom", + ): "common-items-npc_armor-biped_small-purple_legoom-foot-purple_legoom", + Simple( + "common.items.npc_armor.biped_small.purple_legoom.hand.purple_legoom", + ): "common-items-npc_armor-biped_small-purple_legoom-hand-purple_legoom", + Simple( + "common.items.npc_armor.biped_small.purple_legoom.head.purple_legoom", + ): "common-items-npc_armor-biped_small-purple_legoom-head-purple_legoom", + Simple( + "common.items.npc_armor.biped_small.purple_legoom.pants.purple_legoom", + ): "common-items-npc_armor-biped_small-purple_legoom-pants-purple_legoom", + Simple( + "common.items.npc_armor.biped_small.red_legoom.chest.red_legoom", + ): "common-items-npc_armor-biped_small-red_legoom-chest-red_legoom", + Simple( + "common.items.npc_armor.biped_small.red_legoom.foot.red_legoom", + ): "common-items-npc_armor-biped_small-red_legoom-foot-red_legoom", + Simple( + "common.items.npc_armor.biped_small.red_legoom.hand.red_legoom", + ): "common-items-npc_armor-biped_small-red_legoom-hand-red_legoom", + Simple( + "common.items.npc_armor.biped_small.red_legoom.head.red_legoom", + ): "common-items-npc_armor-biped_small-red_legoom-head-red_legoom", + Simple( + "common.items.npc_armor.biped_small.red_legoom.pants.red_legoom", + ): "common-items-npc_armor-biped_small-red_legoom-pants-red_legoom", Simple( "common.items.npc_armor.crustacean.karkatha", ): "common-items-npc_armor-crustacean-karkatha", @@ -1203,6 +1323,9 @@ Simple( "common.items.armor.misc.head.cat_capuche", ): "armor-misc-head-cat_capuche", + Simple( + "common.items.armor.misc.head.scarlet_spectacles", + ): "armor-misc-head-scarlet_spectacles", Simple( "common.items.armor.misc.pants.hunting", ): "armor-misc-pants-grayscale", @@ -2505,6 +2628,27 @@ Simple( "common.items.npc_weapons.biped_small.vampire.bloodmoon_heiress_sword", ): "common-items-npc_weapons-biped_small-vampire-bloodmoon_heiress_sword", + Simple( + "common.items.npc_weapons.unique.goblin_thug_club", + ): "common-items-npc_weapons-unique-goblin_thug_club", + Simple( + "common.items.npc_weapons.unique.goblin_chucker", + ): "common-items-npc_weapons-unique-goblin_chucker", + Simple( + "common.items.npc_weapons.unique.goblin_ruffian_knife", + ): "common-items-npc_weapons-unique-goblin_ruffian_knife", + Simple( + "common.items.npc_weapons.unique.green_legoom_rake", + ): "common-items-npc_weapons-unique-green_legoom_rake", + Simple( + "common.items.npc_weapons.unique.ochre_legoom_spade", + ): "common-items-npc_weapons-unique-ochre_legoom_spade", + Simple( + "common.items.npc_weapons.unique.purple_legoom_pitchfork", + ): "common-items-npc_weapons-unique-purple_legoom_pitchfork", + Simple( + "common.items.npc_weapons.unique.red_legoom_hoe", + ): "common-items-npc_weapons-unique-red_legoom_hoe", Simple( "common.items.npc_weapons.bow.bipedlarge-velorite", ): "common-items-npc_weapons-bow-bipedlarge-velorite", @@ -2580,6 +2724,9 @@ Simple( "common.items.npc_weapons.unique.bushly", ): "common-items-npc_weapons-unique-bushly", + Simple( + "common.items.npc_weapons.unique.cactid", + ): "common-items-npc_weapons-unique-cactid", Simple( "common.items.npc_weapons.unique.cardinal", ): "common-items-npc_weapons-unique-cardinal", diff --git a/assets/common/items/armor/brinestone/crown.ron b/assets/common/items/armor/brinestone/crown.ron index 8e79f6a..fd1d9ee 100644 --- a/assets/common/items/armor/brinestone/crown.ron +++ b/assets/common/items/armor/brinestone/crown.ron @@ -4,10 +4,11 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - protection: Some(Normal(8.0)), - poise_resilience: Some(Normal(4.0)), - energy_reward: Some(0.15), - precision_power: Some(-0.05), + protection: Some(Normal(9.0)), + poise_resilience: Some(Normal(3.0)), + energy_max: Some(7.0), + energy_reward: Some(0.07), + precision_power: Some(-0.02), )), )), quality: Legendary, diff --git a/assets/common/items/armor/cultist/bandana.ron b/assets/common/items/armor/cultist/bandana.ron index 0d6dfc3..259d307 100644 --- a/assets/common/items/armor/cultist/bandana.ron +++ b/assets/common/items/armor/cultist/bandana.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - protection: Some(Normal(6.0)), - poise_resilience: Some(Normal(1.0)), - energy_max: Some(2.0), - energy_reward: Some(0.025), - precision_power: Some(0.008), + protection: Some(Normal(8.0)), + poise_resilience: Some(Normal(2.0)), + energy_max: Some(3.0), + energy_reward: Some(0.04), + precision_power: Some(0.025), stealth: Some(0.04), )), )), diff --git a/assets/common/items/armor/cultist/necklace.ron b/assets/common/items/armor/cultist/necklace.ron index 6985ee4..24419a0 100644 --- a/assets/common/items/armor/cultist/necklace.ron +++ b/assets/common/items/armor/cultist/necklace.ron @@ -4,9 +4,9 @@ ItemDef( kind: Armor(( kind: Neck, stats: Direct(( - protection: Some(Normal(2.0)), - energy_max: Some(4.5), - energy_reward: Some(0.0275), + protection: Some(Normal(1.0)), + energy_max: Some(3.0), + energy_reward: Some(0.03), precision_power: Some(0.015), )), )), diff --git a/assets/common/items/armor/cultist/ring.ron b/assets/common/items/armor/cultist/ring.ron index c73c750..54a80e4 100644 --- a/assets/common/items/armor/cultist/ring.ron +++ b/assets/common/items/armor/cultist/ring.ron @@ -5,8 +5,8 @@ ItemDef( kind: Ring, stats: Direct(( protection: Some(Normal(0.5)), - energy_max: Some(2.5), - energy_reward: Some(0.0125), + energy_max: Some(2.0), + energy_reward: Some(0.02), precision_power: Some(0.01), )), )), diff --git a/assets/common/items/armor/golemite/helmet.ron b/assets/common/items/armor/golemite/helmet.ron index cfbae47..f9119f5 100644 --- a/assets/common/items/armor/golemite/helmet.ron +++ b/assets/common/items/armor/golemite/helmet.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - protection: Some(Normal(14.0)), - poise_resilience: Some(Normal(5.6)), - energy_max: Some(10.0), - energy_reward: Some(-0.08), + protection: Some(Normal(13.0)), + poise_resilience: Some(Normal(4.5)), + energy_max: Some(6.0), + energy_reward: Some(-0.06), )), )), quality: Legendary, diff --git a/assets/common/items/armor/mail/orichalcum/head.ron b/assets/common/items/armor/mail/orichalcum/head.ron index 9cfe315..b7bf2d6 100644 --- a/assets/common/items/armor/mail/orichalcum/head.ron +++ b/assets/common/items/armor/mail/orichalcum/head.ron @@ -4,7 +4,7 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - protection: Some(Normal(18.0)), + protection: Some(Normal(15.0)), poise_resilience: Some(Normal(6.0)), )), )), diff --git a/assets/common/items/armor/merchant/turban.ron b/assets/common/items/armor/merchant/turban.ron index e14e495..85b8f9c 100644 --- a/assets/common/items/armor/merchant/turban.ron +++ b/assets/common/items/armor/merchant/turban.ron @@ -5,9 +5,8 @@ ItemDef( kind: Head, stats: Direct(( protection: Some(Normal(5.0)), - poise_resilience: Some(Normal(1.5)), energy_max: Some(12.0), - energy_reward: Some(0.07), + energy_reward: Some(0.08), )), )), quality: Epic, diff --git a/assets/common/items/armor/misc/head/bamboo_twig.ron b/assets/common/items/armor/misc/head/bamboo_twig.ron index 0c0d307..b66512b 100644 --- a/assets/common/items/armor/misc/head/bamboo_twig.ron +++ b/assets/common/items/armor/misc/head/bamboo_twig.ron @@ -4,7 +4,7 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - energy_reward: Some(0.033), + energy_reward: Some(0.1), )), )), quality: Common, diff --git a/assets/common/items/armor/misc/head/bandana/red.ron b/assets/common/items/armor/misc/head/bandana/red.ron index b5c9b64..5ff2857 100644 --- a/assets/common/items/armor/misc/head/bandana/red.ron +++ b/assets/common/items/armor/misc/head/bandana/red.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - precision_power: Some(0.006), - stealth: Some(0.14), + precision_power: Some(0.05), + stealth: Some(0.12), )), )), quality: Common, diff --git a/assets/common/items/armor/misc/head/bandana/thief.ron b/assets/common/items/armor/misc/head/bandana/thief.ron index 044be2c..5599b66 100644 --- a/assets/common/items/armor/misc/head/bandana/thief.ron +++ b/assets/common/items/armor/misc/head/bandana/thief.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - precision_power: Some(0.0045), - stealth: Some(0.18), + precision_power: Some(0.04), + stealth: Some(0.15), )), )), quality: Common, diff --git a/assets/common/items/armor/misc/head/bear_bonnet.ron b/assets/common/items/armor/misc/head/bear_bonnet.ron index ec681bb..38bdb65 100644 --- a/assets/common/items/armor/misc/head/bear_bonnet.ron +++ b/assets/common/items/armor/misc/head/bear_bonnet.ron @@ -5,8 +5,8 @@ ItemDef( kind: Head, stats: Direct(( protection: Some(Normal(12.0)), - precision_power: Some(0.0095), - stealth: Some(0.21), + precision_power: Some(0.02), + stealth: Some(0.15), )), )), quality: Epic, diff --git a/assets/common/items/armor/misc/head/boreal_warhelm.ron b/assets/common/items/armor/misc/head/boreal_warhelm.ron index 33e85d3..b3401ed 100644 --- a/assets/common/items/armor/misc/head/boreal_warhelm.ron +++ b/assets/common/items/armor/misc/head/boreal_warhelm.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - protection: Some(Normal(9.82)), - poise_resilience: Some(Normal(5.5)), - energy_max: Some(-6.5), - precision_power: Some(0.065), + protection: Some(Normal(10.0)), + poise_resilience: Some(Normal(4.0)), + energy_max: Some(-5.0), + precision_power: Some(0.05), stealth: Some(0.05), )), )), diff --git a/assets/common/items/armor/misc/head/cat_capuche.ron b/assets/common/items/armor/misc/head/cat_capuche.ron index 1e0cf9a..ce25e5e 100644 --- a/assets/common/items/armor/misc/head/cat_capuche.ron +++ b/assets/common/items/armor/misc/head/cat_capuche.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - energy_max: Some(4.0), - energy_reward: Some(0.04), + energy_max: Some(5.0), + energy_reward: Some(0.05), )), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/head/crown.ron b/assets/common/items/armor/misc/head/crown.ron index fba533b..75d93a2 100644 --- a/assets/common/items/armor/misc/head/crown.ron +++ b/assets/common/items/armor/misc/head/crown.ron @@ -4,10 +4,9 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - protection: Some(Normal(9.0)), - poise_resilience: Some(Normal(2.0)), - energy_max: Some(5.0), - precision_power: Some(0.006), + protection: Some(Normal(10.0)), + poise_resilience: Some(Normal(3.0)), + energy_max: Some(7.0), )), )), quality: Epic, diff --git a/assets/common/items/armor/misc/head/facegourd.ron b/assets/common/items/armor/misc/head/facegourd.ron index 3dc34fb..8f18f36 100644 --- a/assets/common/items/armor/misc/head/facegourd.ron +++ b/assets/common/items/armor/misc/head/facegourd.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - energy_max: Some(4.0), - energy_reward: Some(0.04), + energy_max: Some(5.0), + energy_reward: Some(0.05), )), )), quality: Common, diff --git a/assets/common/items/armor/misc/head/gnarling_mask.ron b/assets/common/items/armor/misc/head/gnarling_mask.ron index 00b89d2..90301b7 100644 --- a/assets/common/items/armor/misc/head/gnarling_mask.ron +++ b/assets/common/items/armor/misc/head/gnarling_mask.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(3.0)), poise_resilience: Some(Normal(1.0)), - energy_max: Some(6.0), + energy_max: Some(12.0), )), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/head/hare_hat.ron b/assets/common/items/armor/misc/head/hare_hat.ron index 720df34..5540ce0 100644 --- a/assets/common/items/armor/misc/head/hare_hat.ron +++ b/assets/common/items/armor/misc/head/hare_hat.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - energy_max: Some(4.0), - energy_reward: Some(0.04), + energy_max: Some(5.0), + energy_reward: Some(0.05), )), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/head/hog_hood.ron b/assets/common/items/armor/misc/head/hog_hood.ron index f979971..a80e64d 100644 --- a/assets/common/items/armor/misc/head/hog_hood.ron +++ b/assets/common/items/armor/misc/head/hog_hood.ron @@ -4,9 +4,9 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - protection: Some(Normal(3.0)), - precision_power: Some(0.0095), - stealth: Some(0.21), + protection: Some(Normal(5.0)), + precision_power: Some(0.04), + stealth: Some(0.15), )), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/head/hood.ron b/assets/common/items/armor/misc/head/hood.ron index 625bc55..9984c77 100644 --- a/assets/common/items/armor/misc/head/hood.ron +++ b/assets/common/items/armor/misc/head/hood.ron @@ -4,9 +4,9 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - protection: Some(Normal(2.5)), - precision_power: Some(0.016), - stealth: Some(0.22), + protection: Some(Normal(4.0)), + precision_power: Some(0.05), + stealth: Some(0.15), )), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/head/hood_dark.ron b/assets/common/items/armor/misc/head/hood_dark.ron index 97be6cf..1bce391 100644 --- a/assets/common/items/armor/misc/head/hood_dark.ron +++ b/assets/common/items/armor/misc/head/hood_dark.ron @@ -4,9 +4,9 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - protection: Some(Normal(4.5)), - poise_resilience: Some(Normal(1.0)), - stealth: Some(0.2), + protection: Some(Normal(6.0)), + poise_resilience: Some(Normal(2.0)), + stealth: Some(0.15), )), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/head/howl_cowl.ron b/assets/common/items/armor/misc/head/howl_cowl.ron index 94fbf23..993f039 100644 --- a/assets/common/items/armor/misc/head/howl_cowl.ron +++ b/assets/common/items/armor/misc/head/howl_cowl.ron @@ -4,9 +4,9 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - protection: Some(Normal(4.0)), - precision_power: Some(0.065), - stealth: Some(0.21), + protection: Some(Normal(5.0)), + precision_power: Some(0.08), + stealth: Some(0.15), )), )), quality: Epic, diff --git a/assets/common/items/armor/misc/head/mitre.ron b/assets/common/items/armor/misc/head/mitre.ron index 05d9e2f..ad26c3b 100644 --- a/assets/common/items/armor/misc/head/mitre.ron +++ b/assets/common/items/armor/misc/head/mitre.ron @@ -5,9 +5,8 @@ ItemDef( kind: Head, stats: Direct(( protection: Some(Normal(2.0)), - poise_resilience: Some(Normal(0.5)), - energy_max: Some(7.0), - energy_reward: Some(0.06), + energy_max: Some(12.0), + energy_reward: Some(0.09), )), )), quality: High, diff --git a/assets/common/items/armor/misc/head/scarlet_spectacles.ron b/assets/common/items/armor/misc/head/scarlet_spectacles.ron index e36fe96..4db0f23 100644 --- a/assets/common/items/armor/misc/head/scarlet_spectacles.ron +++ b/assets/common/items/armor/misc/head/scarlet_spectacles.ron @@ -1,11 +1,11 @@ ItemDef( - legacy_name: "Vampire glasses", + legacy_name: "Scarlet Spectacles", legacy_description: "Perfect for pulling pranks on your fellow adventurers by pretending to be a devilish creature of the night! We are not liable for any resulting damage, injuries, or angry mobs.", kind: Armor(( kind: Head, stats: Direct(( precision_power: Some(0.08), - energy_max: Some(-2.0), + energy_max: Some(4.0), energy_reward: Some(-0.04), )), )), diff --git a/assets/common/items/armor/misc/head/spikeguard.ron b/assets/common/items/armor/misc/head/spikeguard.ron index eb615ac..8166730 100644 --- a/assets/common/items/armor/misc/head/spikeguard.ron +++ b/assets/common/items/armor/misc/head/spikeguard.ron @@ -4,9 +4,9 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - protection: Some(Normal(7.0)), - poise_resilience: Some(Normal(3.0)), - precision_power: Some(0.036), + protection: Some(Normal(9.0)), + poise_resilience: Some(Normal(4.0)), + precision_power: Some(0.04), )), )), quality: High, diff --git a/assets/common/items/armor/misc/head/straw.ron b/assets/common/items/armor/misc/head/straw.ron index 936fad0..5fbd18a 100644 --- a/assets/common/items/armor/misc/head/straw.ron +++ b/assets/common/items/armor/misc/head/straw.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - energy_max: Some(3.0), - energy_reward: Some(0.02), + energy_max: Some(7.0), + energy_reward: Some(0.04), )), )), quality: Common, diff --git a/assets/common/items/armor/misc/head/wanderers_hat.ron b/assets/common/items/armor/misc/head/wanderers_hat.ron index c9a7d18..80ff99c 100644 --- a/assets/common/items/armor/misc/head/wanderers_hat.ron +++ b/assets/common/items/armor/misc/head/wanderers_hat.ron @@ -4,7 +4,8 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - precision_power: Some(0.016), + energy_reward: Some(0.06), + precision_power: Some(0.06), stealth: Some(0.1), )), )), diff --git a/assets/common/items/armor/misc/head/winged_coronet.ron b/assets/common/items/armor/misc/head/winged_coronet.ron index a78a8c2..bccb4b4 100644 --- a/assets/common/items/armor/misc/head/winged_coronet.ron +++ b/assets/common/items/armor/misc/head/winged_coronet.ron @@ -5,10 +5,9 @@ ItemDef( kind: Head, stats: Direct(( protection: Some(Normal(2.0)), - energy_max: Some(4.5), - energy_reward: Some(0.04), - precision_power: Some(0.006), - stealth: Some(0.17), + energy_max: Some(10.0), + energy_reward: Some(0.09), + stealth: Some(0.1), )), )), quality: High, diff --git a/assets/common/items/armor/misc/neck/abyssal_gorget.ron b/assets/common/items/armor/misc/neck/abyssal_gorget.ron index b7e2235..49a6c50 100644 --- a/assets/common/items/armor/misc/neck/abyssal_gorget.ron +++ b/assets/common/items/armor/misc/neck/abyssal_gorget.ron @@ -5,7 +5,8 @@ ItemDef( kind: Neck, stats: Direct(( protection: Some(Normal(6.0)), - poise_resilience: Some(Normal(4.0)), + poise_resilience: Some(Normal(4.5)), + energy_max: Some(-4.5), )), )), quality: Legendary, diff --git a/assets/common/items/armor/misc/neck/ankh_of_life.ron b/assets/common/items/armor/misc/neck/ankh_of_life.ron index 006db1d..7a8691f 100644 --- a/assets/common/items/armor/misc/neck/ankh_of_life.ron +++ b/assets/common/items/armor/misc/neck/ankh_of_life.ron @@ -5,8 +5,9 @@ ItemDef( kind: Neck, stats: Direct(( protection: Some(Normal(2.0)), - energy_max: Some(15.0), - energy_reward: Some(0.1), + energy_max: Some(10.0), + energy_reward: Some(0.05), + precision_power: Some(-0.075), )), )), quality: Legendary, diff --git a/assets/common/items/armor/misc/neck/carcanet_of_wrath.ron b/assets/common/items/armor/misc/neck/carcanet_of_wrath.ron index 65cc47f..eddccdd 100644 --- a/assets/common/items/armor/misc/neck/carcanet_of_wrath.ron +++ b/assets/common/items/armor/misc/neck/carcanet_of_wrath.ron @@ -5,7 +5,9 @@ ItemDef( kind: Neck, stats: Direct(( protection: Some(Normal(2.0)), - precision_power: Some(0.1), + energy_max: Some(5.0), + energy_reward: Some(-0.09375), + precision_power: Some(0.08), )), )), quality: Legendary, diff --git a/assets/common/items/armor/misc/neck/diamond.ron b/assets/common/items/armor/misc/neck/diamond.ron index 27cac92..c761d24 100644 --- a/assets/common/items/armor/misc/neck/diamond.ron +++ b/assets/common/items/armor/misc/neck/diamond.ron @@ -5,8 +5,8 @@ ItemDef( kind: Neck, stats: Direct(( protection: Some(Normal(1.0)), - energy_reward: Some(-0.0375), - precision_power: Some(0.075), + energy_reward: Some(-0.0563), + precision_power: Some(0.09), )), )), quality: Epic, diff --git a/assets/common/items/armor/misc/neck/emerald.ron b/assets/common/items/armor/misc/neck/emerald.ron index 715ffd6..bbfa61f 100644 --- a/assets/common/items/armor/misc/neck/emerald.ron +++ b/assets/common/items/armor/misc/neck/emerald.ron @@ -5,8 +5,8 @@ ItemDef( kind: Neck, stats: Direct(( protection: Some(Normal(1.0)), - energy_max: Some(15.0), - energy_reward: Some(-0.15), + energy_max: Some(11.25), + energy_reward: Some(-0.0563), )), )), quality: High, diff --git a/assets/common/items/armor/misc/neck/fang.ron b/assets/common/items/armor/misc/neck/fang.ron index 5610b53..7ec9af8 100644 --- a/assets/common/items/armor/misc/neck/fang.ron +++ b/assets/common/items/armor/misc/neck/fang.ron @@ -5,8 +5,8 @@ ItemDef( kind: Neck, stats: Direct(( protection: Some(Normal(1.0)), - precision_power: Some(0.07), - energy_max: Some(-3.5), + precision_power: Some(0.06), + energy_max: Some(-3.75), )), )), quality: High, diff --git a/assets/common/items/armor/misc/neck/gem_of_resilience.ron b/assets/common/items/armor/misc/neck/gem_of_resilience.ron index 8203275..2a86814 100644 --- a/assets/common/items/armor/misc/neck/gem_of_resilience.ron +++ b/assets/common/items/armor/misc/neck/gem_of_resilience.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Neck, stats: Direct(( - protection: Some(Normal(2.0)), - poise_resilience: Some(Normal(1.0)), + protection: Some(Normal(3.0)), + poise_resilience: Some(Normal(2.0)), )), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/neck/gold.ron b/assets/common/items/armor/misc/neck/gold.ron index 4c647c6..403daa6 100644 --- a/assets/common/items/armor/misc/neck/gold.ron +++ b/assets/common/items/armor/misc/neck/gold.ron @@ -5,7 +5,7 @@ ItemDef( kind: Armor(( kind: Neck, stats: Direct(( - protection: Some(Normal(1.5)), + protection: Some(Normal(2.0)), )), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/neck/haniwa_talisman.ron b/assets/common/items/armor/misc/neck/haniwa_talisman.ron index 0906c6a..120cd30 100644 --- a/assets/common/items/armor/misc/neck/haniwa_talisman.ron +++ b/assets/common/items/armor/misc/neck/haniwa_talisman.ron @@ -4,9 +4,8 @@ ItemDef( kind: Armor(( kind: Neck, stats: Direct(( - protection: Some(Normal(3.0)), - poise_resilience: Some(Normal(2.0)), - energy_max: Some(-5.0), + protection: Some(Normal(4.0)), + poise_resilience: Some(Normal(3.0)), )), )), quality: High, diff --git a/assets/common/items/armor/misc/neck/honeycomb_pendant.ron b/assets/common/items/armor/misc/neck/honeycomb_pendant.ron index 41bb2b9..3447f3a 100644 --- a/assets/common/items/armor/misc/neck/honeycomb_pendant.ron +++ b/assets/common/items/armor/misc/neck/honeycomb_pendant.ron @@ -5,9 +5,9 @@ ItemDef( kind: Neck, stats: Direct(( protection: Some(Normal(1.0)), - energy_max: Some(8.0), - energy_reward: Some(0.04), - precision_power: Some(-0.06), + energy_max: Some(5.0), + energy_reward: Some(0.025), + precision_power: Some(-0.03), )), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/neck/pendant_of_protection.ron b/assets/common/items/armor/misc/neck/pendant_of_protection.ron index bce7b5f..d1e60ba 100644 --- a/assets/common/items/armor/misc/neck/pendant_of_protection.ron +++ b/assets/common/items/armor/misc/neck/pendant_of_protection.ron @@ -4,7 +4,8 @@ ItemDef( kind: Armor(( kind: Neck, stats: Direct(( - protection: Some(Normal(1.5)), + protection: Some(Normal(2.0)), + poise_resilience: Some(Normal(1.0)), )), )), quality: Common, diff --git a/assets/common/items/armor/misc/neck/sapphire.ron b/assets/common/items/armor/misc/neck/sapphire.ron index 1bb7fdc..9884783 100644 --- a/assets/common/items/armor/misc/neck/sapphire.ron +++ b/assets/common/items/armor/misc/neck/sapphire.ron @@ -5,8 +5,8 @@ ItemDef( kind: Neck, stats: Direct(( protection: Some(Normal(1.0)), - energy_reward: Some(-0.0225), - precision_power: Some(0.0225), + energy_reward: Some(-0.0375), + precision_power: Some(0.06), )), )), quality: High, diff --git a/assets/common/items/armor/misc/neck/scratched.ron b/assets/common/items/armor/misc/neck/scratched.ron index e7f19ed..0b3219c 100644 --- a/assets/common/items/armor/misc/neck/scratched.ron +++ b/assets/common/items/armor/misc/neck/scratched.ron @@ -4,7 +4,7 @@ ItemDef( kind: Armor(( kind: Neck, stats: Direct(( - protection: Some(Normal(0.5)), + protection: Some(Normal(1.0)), )), )), quality: Low, diff --git a/assets/common/items/armor/misc/neck/shell.ron b/assets/common/items/armor/misc/neck/shell.ron index a24c291..6af2042 100644 --- a/assets/common/items/armor/misc/neck/shell.ron +++ b/assets/common/items/armor/misc/neck/shell.ron @@ -4,8 +4,9 @@ ItemDef( kind: Armor(( kind: Neck, stats: Direct(( - protection: Some(Normal(2.0)), - poise_resilience: Some(Normal(1.0)), + protection: Some(Normal(1.0)), + energy_max: Some(7.5), + precision_power: Some(-0.03), )), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/neck/topaz.ron b/assets/common/items/armor/misc/neck/topaz.ron index 9e8b4e3..cf842bd 100644 --- a/assets/common/items/armor/misc/neck/topaz.ron +++ b/assets/common/items/armor/misc/neck/topaz.ron @@ -4,9 +4,9 @@ ItemDef( kind: Armor(( kind: Neck, stats: Direct(( - protection: Some(Normal(0.5)), - energy_max: Some(9.0), - energy_reward: Some(-0.09), + protection: Some(Normal(1.0)), + energy_max: Some(7.5), + energy_reward: Some(-0.0375), )), )), quality: Common, diff --git a/assets/common/items/armor/misc/ring/abyssal_ring.ron b/assets/common/items/armor/misc/ring/abyssal_ring.ron index 57b10b1..ee02a54 100644 --- a/assets/common/items/armor/misc/ring/abyssal_ring.ron +++ b/assets/common/items/armor/misc/ring/abyssal_ring.ron @@ -4,8 +4,9 @@ ItemDef( kind: Armor(( kind: Ring, stats: Direct(( - protection: Some(Normal(2.0)), - poise_resilience: Some(Normal(1.5)), + protection: Some(Normal(4.0)), + poise_resilience: Some(Normal(3.0)), + energy_max: Some(-3.0), )), )), quality: Legendary, diff --git a/assets/common/items/armor/misc/ring/diamond.ron b/assets/common/items/armor/misc/ring/diamond.ron index e13f2c4..8756a44 100644 --- a/assets/common/items/armor/misc/ring/diamond.ron +++ b/assets/common/items/armor/misc/ring/diamond.ron @@ -5,8 +5,8 @@ ItemDef( kind: Ring, stats: Direct(( protection: Some(Normal(0.5)), - energy_reward: Some(-0.025), - precision_power: Some(0.04), + energy_reward: Some(-0.0375), + precision_power: Some(0.06), )), )), quality: Epic, diff --git a/assets/common/items/armor/misc/ring/emerald.ron b/assets/common/items/armor/misc/ring/emerald.ron index 8a11c76..aefeb01 100644 --- a/assets/common/items/armor/misc/ring/emerald.ron +++ b/assets/common/items/armor/misc/ring/emerald.ron @@ -5,8 +5,8 @@ ItemDef( kind: Ring, stats: Direct(( protection: Some(Normal(0.5)), - energy_max: Some(10.0), - energy_reward: Some(-0.1), + energy_max: Some(7.5), + energy_reward: Some(-0.0375), )), )), quality: High, diff --git a/assets/common/items/armor/misc/ring/sapphire.ron b/assets/common/items/armor/misc/ring/sapphire.ron index 5ef30da..65444e4 100644 --- a/assets/common/items/armor/misc/ring/sapphire.ron +++ b/assets/common/items/armor/misc/ring/sapphire.ron @@ -5,8 +5,8 @@ ItemDef( kind: Ring, stats: Direct(( protection: Some(Normal(0.5)), - energy_reward: Some(-0.015), - precision_power: Some(0.015), + energy_reward: Some(-0.025), + precision_power: Some(0.04), )), )), quality: High, diff --git a/assets/common/items/armor/misc/ring/scratched.ron b/assets/common/items/armor/misc/ring/scratched.ron index cfe52e6..efb683a 100644 --- a/assets/common/items/armor/misc/ring/scratched.ron +++ b/assets/common/items/armor/misc/ring/scratched.ron @@ -4,7 +4,7 @@ ItemDef( kind: Armor(( kind: Ring, stats: Direct(( - protection: Some(Normal(0.25)), + protection: Some(Normal(0.5)), )), )), quality: Low, diff --git a/assets/common/items/armor/misc/ring/topaz.ron b/assets/common/items/armor/misc/ring/topaz.ron index 1460786..2d5b00b 100644 --- a/assets/common/items/armor/misc/ring/topaz.ron +++ b/assets/common/items/armor/misc/ring/topaz.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(0.5)), energy_max: Some(5.0), - energy_reward: Some(-0.05), + energy_reward: Some(-0.025), )), )), quality: Common, diff --git a/assets/common/items/armor/pirate/hat.ron b/assets/common/items/armor/pirate/hat.ron index 7b2df2a..7bb6289 100644 --- a/assets/common/items/armor/pirate/hat.ron +++ b/assets/common/items/armor/pirate/hat.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - protection: Some(Normal(2.5)), - energy_reward: Some(0.025), + protection: Some(Normal(4.0)), + energy_reward: Some(0.03), precision_power: Some(0.08), )), )), diff --git a/assets/common/items/armor/witch/hat.ron b/assets/common/items/armor/witch/hat.ron index 7c8fd81..7a75aba 100644 --- a/assets/common/items/armor/witch/hat.ron +++ b/assets/common/items/armor/witch/hat.ron @@ -5,9 +5,8 @@ ItemDef( kind: Head, stats: Direct(( protection: Some(Normal(2.0)), - poise_resilience: Some(Normal(1.5)), - energy_max: Some(8.0), - energy_reward: Some(0.084), + energy_max: Some(10.0), + energy_reward: Some(0.12), )), )), quality: Epic, diff --git a/assets/common/items/npc_armor/biped_small/bushly/hand/bushly.ron b/assets/common/items/npc_armor/biped_small/bushly/hand/bushly.ron index 038df48..bfe9eca 100644 --- a/assets/common/items/npc_armor/biped_small/bushly/hand/bushly.ron +++ b/assets/common/items/npc_armor/biped_small/bushly/hand/bushly.ron @@ -1,6 +1,6 @@ ItemDef( - legacy_name: "Mandragora", - legacy_description: "Ceremonial attire used by members.", + legacy_name: "Bushly", + legacy_description: "Plant Creature", kind: Armor(( kind: Hand, stats: Direct(( diff --git a/assets/common/items/npc_armor/biped_small/cactid/chest/cactid.ron b/assets/common/items/npc_armor/biped_small/cactid/chest/cactid.ron new file mode 100644 index 0000000..eee36ee --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/cactid/chest/cactid.ron @@ -0,0 +1,16 @@ +ItemDef( + legacy_name: "Cactid", + legacy_description: "Cactid Chest", + kind: Armor(( + kind: Chest, + stats: Direct(( + protection: Some(Normal(4.0)), + poise_resilience: Some(Normal(4.0)), + energy_max: Some(3.4), + energy_reward: Some(0.81), + precision_power: Some(0.075), + )), + )), + quality: Low, + tags: [], +) diff --git a/assets/common/items/npc_armor/biped_small/cactid/foot/cactid.ron b/assets/common/items/npc_armor/biped_small/cactid/foot/cactid.ron new file mode 100644 index 0000000..bb0b9d5 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/cactid/foot/cactid.ron @@ -0,0 +1,16 @@ +ItemDef( + legacy_name: "Cactid", + legacy_description: "Cactid Foot", + kind: Armor(( + kind: Foot, + stats: Direct(( + protection: Some(Normal(1.0)), + poise_resilience: Some(Normal(4.0)), + energy_max: Some(3.4), + energy_reward: Some(0.81), + precision_power: Some(0.075), + )), + )), + quality: Low, + tags: [], +) diff --git a/assets/common/items/npc_armor/biped_small/cactid/hand/cactid.ron b/assets/common/items/npc_armor/biped_small/cactid/hand/cactid.ron new file mode 100644 index 0000000..13dcb87 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/cactid/hand/cactid.ron @@ -0,0 +1,16 @@ +ItemDef( + legacy_name: "Cactid", + legacy_description: "Cactid Hand", + kind: Armor(( + kind: Hand, + stats: Direct(( + protection: Some(Normal(1.0)), + poise_resilience: Some(Normal(4.0)), + energy_max: Some(3.4), + energy_reward: Some(0.81), + precision_power: Some(0.075), + )), + )), + quality: Low, + tags: [], +) diff --git a/assets/common/items/npc_armor/biped_small/cactid/head/cactid.ron b/assets/common/items/npc_armor/biped_small/cactid/head/cactid.ron new file mode 100644 index 0000000..d985a18 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/cactid/head/cactid.ron @@ -0,0 +1,16 @@ +ItemDef( + legacy_name: "Cactid", + legacy_description: "Cactid Head", + kind: Armor(( + kind: Head, + stats: Direct(( + protection: Some(Normal(5.0)), + poise_resilience: Some(Normal(8.0)), + energy_max: Some(3.4), + energy_reward: Some(0.81), + precision_power: Some(0.075), + )), + )), + quality: Low, + tags: [], +) diff --git a/assets/common/items/npc_armor/biped_small/cactid/pants/cactid.ron b/assets/common/items/npc_armor/biped_small/cactid/pants/cactid.ron new file mode 100644 index 0000000..f90be66 --- /dev/null +++ b/assets/common/items/npc_armor/biped_small/cactid/pants/cactid.ron @@ -0,0 +1,16 @@ +ItemDef( + legacy_name: "Cactid", + legacy_description: "Cactid Pants", + kind: Armor(( + kind: Pants, + stats: Direct(( + protection: Some(Normal(2.0)), + poise_resilience: Some(Normal(4.0)), + energy_max: Some(3.4), + energy_reward: Some(0.81), + precision_power: Some(0.075), + )), + )), + quality: Low, + tags: [], +) diff --git a/assets/common/items/npc_weapons/unique/cactid.ron b/assets/common/items/npc_weapons/unique/cactid.ron new file mode 100644 index 0000000..a01a12c --- /dev/null +++ b/assets/common/items/npc_weapons/unique/cactid.ron @@ -0,0 +1,20 @@ +ItemDef( + legacy_name: "Cactid", + legacy_description: "Cactid.", + kind: Tool(( + kind: Natural, + hands: Two, + stats: ( + equip_time_secs: 0.01, + power: 1.0, + effect_power: 1.0, + speed: 1.0, + range: 1.0, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + )), + quality: Low, + tags: [], + ability_spec: Some(Custom("Cactid")), +) diff --git a/assets/common/items/weapons/axe/malachite_axe-0.ron b/assets/common/items/weapons/axe/malachite_axe-0.ron index 8af2624..3dcb7a8 100644 --- a/assets/common/items/weapons/axe/malachite_axe-0.ron +++ b/assets/common/items/weapons/axe/malachite_axe-0.ron @@ -6,11 +6,11 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.5, - power: 1.45, - effect_power: 1.3, - speed: 0.8, + power: 2.175, + effect_power: 1.2, + speed: 0.7, range: 1.0, - energy_efficiency: 1.3, + energy_efficiency: 0.8, buff_strength: 1.2, ), )), diff --git a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron index 646807c..860817b 100644 --- a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron +++ b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron @@ -6,12 +6,12 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.5, - power: 1.45, - effect_power: 1.0, - speed: 0.65, + power: 2.175, + effect_power: 1.2, + speed: 0.7, range: 1.0, - energy_efficiency: 1.0, - buff_strength: 1.0, + energy_efficiency: 0.8, + buff_strength: 1.2, ), )), quality: Epic, diff --git a/assets/common/items/weapons/sword/cultist.ron b/assets/common/items/weapons/sword/cultist.ron index 8ccfa6e..db08d36 100644 --- a/assets/common/items/weapons/sword/cultist.ron +++ b/assets/common/items/weapons/sword/cultist.ron @@ -6,11 +6,11 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.5, - power: 1.45, - effect_power: 0.7, - speed: 0.8, + power: 2.175, + effect_power: 1.2, + speed: 0.7, range: 1.0, - energy_efficiency: 1.3, + energy_efficiency: 0.8, buff_strength: 1.2, ), )), diff --git a/assets/common/loadout/world/cactid/cactid.ron b/assets/common/loadout/world/cactid/cactid.ron new file mode 100644 index 0000000..967818f --- /dev/null +++ b/assets/common/loadout/world/cactid/cactid.ron @@ -0,0 +1,9 @@ +#![enable(implicit_some)] +( + head: Item("common.items.npc_armor.biped_small.cactid.head.cactid"), + chest: Item("common.items.npc_armor.biped_small.cactid.chest.cactid"), + gloves: Item("common.items.npc_armor.biped_small.cactid.hand.cactid"), + legs: Item("common.items.npc_armor.biped_small.cactid.pants.cactid"), + feet: Item("common.items.npc_armor.biped_small.cactid.foot.cactid"), + active_hands: InHands((Item("common.items.npc_weapons.unique.cactid"), None)), +) diff --git a/assets/common/loadout/world/goblin/goblin_chucker.ron b/assets/common/loadout/world/goblin/goblin_chucker.ron new file mode 100644 index 0000000..66c79d5 --- /dev/null +++ b/assets/common/loadout/world/goblin/goblin_chucker.ron @@ -0,0 +1,9 @@ +#![enable(implicit_some)] +( + head: Item("common.items.npc_armor.biped_small.goblin_chucker.head.goblin_chucker"), + chest: Item("common.items.npc_armor.biped_small.goblin_chucker.chest.goblin_chucker"), + gloves: Item("common.items.npc_armor.biped_small.goblin_chucker.hand.goblin_chucker"), + legs: Item("common.items.npc_armor.biped_small.goblin_chucker.pants.goblin_chucker"), + feet: Item("common.items.npc_armor.biped_small.goblin_chucker.foot.goblin_chucker"), + active_hands: InHands((Item("common.items.npc_weapons.unique.goblin_chucker"), None)), +) diff --git a/assets/common/loadout/world/goblin/goblin_ruffian.ron b/assets/common/loadout/world/goblin/goblin_ruffian.ron new file mode 100644 index 0000000..abaa19c --- /dev/null +++ b/assets/common/loadout/world/goblin/goblin_ruffian.ron @@ -0,0 +1,9 @@ +#![enable(implicit_some)] +( + head: Item("common.items.npc_armor.biped_small.goblin_ruffian.head.goblin_ruffian"), + chest: Item("common.items.npc_armor.biped_small.goblin_ruffian.chest.goblin_ruffian"), + gloves: Item("common.items.npc_armor.biped_small.goblin_ruffian.hand.goblin_ruffian"), + legs: Item("common.items.npc_armor.biped_small.goblin_ruffian.pants.goblin_ruffian"), + feet: Item("common.items.npc_armor.biped_small.goblin_ruffian.foot.goblin_ruffian"), + active_hands: InHands((Item("common.items.npc_weapons.unique.goblin_ruffian_knife"), None)), +) diff --git a/assets/common/loadout/world/goblin/goblin_thug.ron b/assets/common/loadout/world/goblin/goblin_thug.ron new file mode 100644 index 0000000..48c91d1 --- /dev/null +++ b/assets/common/loadout/world/goblin/goblin_thug.ron @@ -0,0 +1,9 @@ +#![enable(implicit_some)] +( + head: Item("common.items.npc_armor.biped_small.goblin_thug.head.goblin_thug"), + chest: Item("common.items.npc_armor.biped_small.goblin_thug.chest.goblin_thug"), + gloves: Item("common.items.npc_armor.biped_small.goblin_thug.hand.goblin_thug"), + legs: Item("common.items.npc_armor.biped_small.goblin_thug.pants.goblin_thug"), + feet: Item("common.items.npc_armor.biped_small.goblin_thug.foot.goblin_thug"), + active_hands: InHands((Item("common.items.npc_weapons.unique.goblin_thug_club"), None)), +) diff --git a/assets/common/loadout/world/legoom/green_legoom.ron b/assets/common/loadout/world/legoom/green_legoom.ron new file mode 100644 index 0000000..8c5bf45 --- /dev/null +++ b/assets/common/loadout/world/legoom/green_legoom.ron @@ -0,0 +1,9 @@ +#![enable(implicit_some)] +( + head: Item("common.items.npc_armor.biped_small.green_legoom.head.green_legoom"), + chest: Item("common.items.npc_armor.biped_small.green_legoom.chest.green_legoom"), + gloves: Item("common.items.npc_armor.biped_small.green_legoom.hand.green_legoom"), + legs: Item("common.items.npc_armor.biped_small.green_legoom.pants.green_legoom"), + feet: Item("common.items.npc_armor.biped_small.green_legoom.foot.green_legoom"), + active_hands: InHands((Item("common.items.npc_weapons.unique.green_legoom_rake"), None)), +) diff --git a/assets/common/loadout/world/legoom/ochre_legoom.ron b/assets/common/loadout/world/legoom/ochre_legoom.ron new file mode 100644 index 0000000..11465ca --- /dev/null +++ b/assets/common/loadout/world/legoom/ochre_legoom.ron @@ -0,0 +1,9 @@ +#![enable(implicit_some)] +( + head: Item("common.items.npc_armor.biped_small.ochre_legoom.head.ochre_legoom"), + chest: Item("common.items.npc_armor.biped_small.ochre_legoom.chest.ochre_legoom"), + gloves: Item("common.items.npc_armor.biped_small.ochre_legoom.hand.ochre_legoom"), + legs: Item("common.items.npc_armor.biped_small.ochre_legoom.pants.ochre_legoom"), + feet: Item("common.items.npc_armor.biped_small.ochre_legoom.foot.ochre_legoom"), + active_hands: InHands((Item("common.items.npc_weapons.unique.ochre_legoom_spade"), None)), +) diff --git a/assets/common/loadout/world/legoom/purple_legoom.ron b/assets/common/loadout/world/legoom/purple_legoom.ron new file mode 100644 index 0000000..f350461 --- /dev/null +++ b/assets/common/loadout/world/legoom/purple_legoom.ron @@ -0,0 +1,9 @@ +#![enable(implicit_some)] +( + head: Item("common.items.npc_armor.biped_small.purple_legoom.head.purple_legoom"), + chest: Item("common.items.npc_armor.biped_small.purple_legoom.chest.purple_legoom"), + gloves: Item("common.items.npc_armor.biped_small.purple_legoom.hand.purple_legoom"), + legs: Item("common.items.npc_armor.biped_small.purple_legoom.pants.purple_legoom"), + feet: Item("common.items.npc_armor.biped_small.purple_legoom.foot.purple_legoom"), + active_hands: InHands((Item("common.items.npc_weapons.unique.purple_legoom_pitchfork"), None)), +) diff --git a/assets/common/loadout/world/legoom/red_legoom.ron b/assets/common/loadout/world/legoom/red_legoom.ron new file mode 100644 index 0000000..29f6a82 --- /dev/null +++ b/assets/common/loadout/world/legoom/red_legoom.ron @@ -0,0 +1,9 @@ +#![enable(implicit_some)] +( + head: Item("common.items.npc_armor.biped_small.red_legoom.head.red_legoom"), + chest: Item("common.items.npc_armor.biped_small.red_legoom.chest.red_legoom"), + gloves: Item("common.items.npc_armor.biped_small.red_legoom.hand.red_legoom"), + legs: Item("common.items.npc_armor.biped_small.red_legoom.pants.red_legoom"), + feet: Item("common.items.npc_armor.biped_small.red_legoom.foot.red_legoom"), + active_hands: InHands((Item("common.items.npc_weapons.unique.red_legoom_hoe"), None)), +) diff --git a/assets/common/loot_tables/calendar/halloween/halloween_bloodservant.ron b/assets/common/loot_tables/calendar/halloween/halloween_bloodservant.ron new file mode 100644 index 0000000..20c38cd --- /dev/null +++ b/assets/common/loot_tables/calendar/halloween/halloween_bloodservant.ron @@ -0,0 +1,5 @@ +[ + (7.0, Item("common.items.food.honeycorn")), + (2.5, Item("common.items.food.pumpkin_spice_brew")), + (0.5, Item("common.items.armor.misc.head.scarlet_spectacles")), +] diff --git a/assets/common/loot_tables/calendar/halloween/halloween_strigoi.ron b/assets/common/loot_tables/calendar/halloween/halloween_strigoi.ron new file mode 100644 index 0000000..940ade6 --- /dev/null +++ b/assets/common/loot_tables/calendar/halloween/halloween_strigoi.ron @@ -0,0 +1,5 @@ +[ + (4.0, MultiDrop(Item("common.items.food.pumpkin_spice_brew"), 1, 2)), + (5.0, MultiDrop(Item("common.items.food.honeycorn"), 1, 2)), + (1.0, Item("common.items.armor.misc.head.facegourd")), +] diff --git a/assets/common/loot_tables/creature/biped_small/cactid.ron b/assets/common/loot_tables/creature/biped_small/cactid.ron new file mode 100644 index 0000000..4f84096 --- /dev/null +++ b/assets/common/loot_tables/creature/biped_small/cactid.ron @@ -0,0 +1,10 @@ +[ + (1, All([ + MultiDrop(Item("common.items.crafting_ing.cactus"), 1, 2), + Lottery([ + (2.0, MultiDrop(Item("common.items.flowers.plant_fiber"), 1, 2)), + (1.0, Item("common.items.crafting_ing.sentient_seed")), + ]), + ], + )), +] diff --git a/assets/common/loot_tables/creature/biped_small/goblin.ron b/assets/common/loot_tables/creature/biped_small/goblin.ron new file mode 100644 index 0000000..8ea261b --- /dev/null +++ b/assets/common/loot_tables/creature/biped_small/goblin.ron @@ -0,0 +1,5 @@ +[ + (2.0, MultiDrop(Item("common.items.crafting_ing.stones"), 1, 2)), + (1.0, Item("common.items.food.meat.beast_small_raw")), + (1.0, Item("common.items.crafting_ing.hide.animal_hide")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/biped_small/legoom.ron b/assets/common/loot_tables/creature/biped_small/legoom.ron new file mode 100644 index 0000000..9ff68d9 --- /dev/null +++ b/assets/common/loot_tables/creature/biped_small/legoom.ron @@ -0,0 +1,8 @@ +[ + (2.0, MultiDrop(Item("common.items.flowers.plant_fiber"), 1, 2)), + (2.0, MultiDrop(Item("common.items.flowers.wild_flax"), 1, 2)), + (2.0, MultiDrop(Item("common.items.crafting_ing.twigs"), 1, 2)), + (1.0, Item("common.items.food.carrot")), + (1.0, Item("common.items.food.lettuce")), + (1.0, Item("common.items.food.tomato")), +] diff --git a/assets/common/material_stats_manifest.ron b/assets/common/material_stats_manifest.ron index f45c20b..ef28bf7 100644 --- a/assets/common/material_stats_manifest.ron +++ b/assets/common/material_stats_manifest.ron @@ -115,96 +115,96 @@ armor_stats: { // Metals "Bronze": ( - protection: Some(Normal(60.0)), - poise_resilience: Some(Normal(10.0)), + protection: Some(Normal(45.0)), + poise_resilience: Some(Normal(27.0)), ), "Iron": ( - protection: Some(Normal(84.0)), - poise_resilience: Some(Normal(20.0)), + protection: Some(Normal(75.0)), + poise_resilience: Some(Normal(36.0)), ), "Steel": ( - protection: Some(Normal(108.0)), - poise_resilience: Some(Normal(30.0)), + protection: Some(Normal(99.0)), + poise_resilience: Some(Normal(43.2)), ), "Cobalt": ( - protection: Some(Normal(132.0)), - poise_resilience: Some(Normal(40.0)), + protection: Some(Normal(117.0)), + poise_resilience: Some(Normal(48.6)), ), "Bloodsteel": ( - protection: Some(Normal(156.0)), - poise_resilience: Some(Normal(50.0)), + protection: Some(Normal(129.0)), + poise_resilience: Some(Normal(52.8)), ), "Orichalcum": ( - protection: Some(Normal(162.0)), + protection: Some(Normal(135.0)), poise_resilience: Some(Normal(54.0)), ), // Hides "Rawhide": ( - protection: Some(Normal(20.0)), - precision_power: Some(0.4), - stealth: Some(0.5), + protection: Some(Normal(18.0)), + precision_power: Some(0.36), + stealth: Some(0.675), ), "Leather": ( - protection: Some(Normal(28.0)), + protection: Some(Normal(30.0)), precision_power: Some(0.48), - stealth: Some(0.7), - ), - "Scale": ( - protection: Some(Normal(36.0)), - precision_power: Some(0.56), stealth: Some(0.9), ), + "Scale": ( + protection: Some(Normal(39.6)), + precision_power: Some(0.576), + stealth: Some(1.08), + ), "Carapace": ( - protection: Some(Normal(44.0)), - precision_power: Some(0.64), - stealth: Some(1.1), + protection: Some(Normal(46.8)), + precision_power: Some(0.648), + stealth: Some(1.215), ), "Plate": ( - protection: Some(Normal(52.0)), - precision_power: Some(0.72), - stealth: Some(1.3), + protection: Some(Normal(51.6)), + precision_power: Some(0.696), + stealth: Some(1.305), ), "Dragonscale": ( - protection: Some(Normal(60.0)), - precision_power: Some(0.8), - stealth: Some(1.5), + protection: Some(Normal(54.0)), + precision_power: Some(0.72), + stealth: Some(1.35), ), // Cloths "Linen": ( - protection: Some(Normal(15.0)), - energy_max: Some(16.7), - energy_reward: Some(0.167), - stealth: Some(0.167), + protection: Some(Normal(12.0)), + energy_max: Some(45.0), + energy_reward: Some(0.45), + stealth: Some(0.45), ), "Wool": ( protection: Some(Normal(20.0)), - energy_max: Some(33.3), - energy_reward: Some(0.333), - stealth: Some(0.333), + energy_max: Some(60.0), + energy_reward: Some(0.6), + stealth: Some(0.6), ), "Silk": ( - protection: Some(Normal(25.0)), - energy_max: Some(50.0), - energy_reward: Some(0.5), - stealth: Some(0.5), + protection: Some(Normal(26.4)), + energy_max: Some(72.0), + energy_reward: Some(0.72), + stealth: Some(0.72), ), "Lifecloth": ( - protection: Some(Normal(30.0)), - energy_max: Some(66.7), - energy_reward: Some(0.667), - stealth: Some(0.667), + protection: Some(Normal(31.2)), + energy_max: Some(81.0), + energy_reward: Some(0.81), + stealth: Some(0.81), ), "Moonweave": ( - protection: Some(Normal(35.0)), - energy_max: Some(83.3), - energy_reward: Some(0.833), - stealth: Some(0.833), + protection: Some(Normal(34.4)), + energy_max: Some(87.0), + energy_reward: Some(0.87), + stealth: Some(0.87), ), "Sunsilk": ( - protection: Some(Normal(40.0)), - energy_max: Some(100.0), - energy_reward: Some(1.0), - stealth: Some(1.0), + protection: Some(Normal(36.0)), + energy_max: Some(90.0), + energy_reward: Some(0.9), + stealth: Some(0.9), ), // Misc Sets "Alchemist": ( @@ -245,15 +245,15 @@ protection: Some(Normal(5.0)), ), "Cultist": ( - protection: Some(Normal(100.0)), - poise_resilience: Some(Normal(20.0)), - energy_max: Some(30.0), - energy_reward: Some(0.4), - precision_power: Some(0.25), - stealth: Some(0.4), + protection: Some(Normal(72.0)), + poise_resilience: Some(Normal(18.0)), + energy_max: Some(27.0), + energy_reward: Some(0.36), + precision_power: Some(0.225), + stealth: Some(0.36), ), "Ferocious": ( - protection: Some(Normal(180.0)), + protection: Some(Normal(135.0)), ), "Leather Plate": ( protection: Some(Normal(120.0)), @@ -306,18 +306,18 @@ precision_power: Some(0.8), ), "Boreal": ( - protection: Some(Normal(88.0)), - poise_resilience: Some(Normal(49.5)), - energy_max: Some(-58.5), - precision_power: Some(0.585), + protection: Some(Normal(90.0)), + poise_resilience: Some(Normal(36.0)), + energy_max: Some(-45.0), + precision_power: Some(0.45), stealth: Some(0.45), ), "Brinestone": ( - protection: Some(Normal(122.0)), - poise_resilience: Some(Normal(29.5)), + protection: Some(Normal(81.0)), + poise_resilience: Some(Normal(27.0)), energy_max: Some(63.0), energy_reward: Some(0.63), - precision_power: Some(-0.20), + precision_power: Some(-0.18), ), "Miner": ( protection: Some(Normal(120.0)), @@ -327,10 +327,10 @@ precision_power: Some(0.5), ), "Golemite": ( - protection: Some(Normal(138.0)), - poise_resilience: Some(Normal(41.0)), - energy_max: Some(60.0), - energy_reward: Some(-0.6), - ) + protection: Some(Normal(117.0)), + poise_resilience: Some(Normal(40.5)), + energy_max: Some(54.0), + energy_reward: Some(-0.54), + ), }, ) diff --git a/assets/common/npc_names.ron b/assets/common/npc_names.ron index 4a818ed..cd065ee 100644 --- a/assets/common/npc_names.ron +++ b/assets/common/npc_names.ron @@ -1265,6 +1265,34 @@ keyword: "harlequin", generic: "Harlequin" ), + goblin_thug: ( + keyword: "goblin_thug", + generic: "Goblin Thug", + ), + goblin_chucker: ( + keyword: "goblin_chucker", + generic: "Goblin Chucker", + ), + goblin_ruffian: ( + keyword: "goblin_ruffian", + generic: "Goblin Ruffian", + ), + green_legoom: ( + keyword: "green_legoom", + generic: "Green Legoom", + ), + ochre_legoom: ( + keyword: "ochre_legoom", + generic: "Ochre Legoom", + ), + purple_legoom: ( + keyword: "purple_legoom", + generic: "Purple Legoom", + ), + red_legoom: ( + keyword: "red_legoom", + generic: "Red Legoom", + ), ) ), fish_small: ( diff --git a/assets/voxygen/i18n/en/command.ftl b/assets/voxygen/i18n/en/command.ftl index 59b6bad..c9c4ee0 100644 --- a/assets/voxygen/i18n/en/command.ftl +++ b/assets/voxygen/i18n/en/command.ftl @@ -16,6 +16,7 @@ command-body-desc = Change your body to different species command-buff-desc = Cast a buff on player command-build-desc = Toggles build mode on and off command-ban-desc = Ban a player with a given username, for a given duration (if provided). Pass true for overwrite to alter an existing ban. +command-ban-ip-desc = Ban a player with a given username, for a given duration (if provided). Unlike the normal ban this also additionally bans the IP-address associated with this user. Pass true for overwrite to alter an existing ban. command-battlemode-desc = Set your battle mode to: + pvp (player vs player) + pve (player vs environment). @@ -96,7 +97,8 @@ command-rtsim_info-desc = Display information about an rtsim NPC command-rtsim_npc-desc = List rtsim NPCs that fit a given query (e.g: simulated,merchant) in order of distance command-rtsim_purge-desc = Purge rtsim data on next startup command-rtsim_tp-desc = Teleport to an rtsim npc -command-unban-desc = Remove the ban for the given username +command-unban-desc = Remove the ban for the given username. If there is an linked IP ban it will be removed as well. +command-unban-ip-desc = Remove just the IP ban for the given username. command-version-desc = Prints server version command-waypoint-desc = Set your waypoint to your current position command-weather_zone-desc = Create a weather zone @@ -227,6 +229,7 @@ command-adminify-role-upgraded = Role for player { $player } upgraded to { $role command-adminify-removed-role = Role removed from player { $player }: { $role } command-ban-added = Added { $player } to the banlist with reason: { $reason } command-ban-already-added = { $player } is already on the banlist +command-ban-ip-added = Added { $username } to the regular banlist and IP banlist with reason: { $reason } command-faction-join = Please join a faction with /join_faction command-group-join = Please create a group first command-group_invite-invited-to-group = Invited { $player } to the group. @@ -240,6 +243,7 @@ command-sudo-no-permission-for-non-players = You don't have permission to sudo n command-time_scale-current = The current time scale is { $scale }. command-time_scale-changed = Set time scale to { $scale }. command-unban-successful = { $player } was successfully unbanned. +command-unban-ip-successful = The IP banned via user "{ $player }" was successfully unbanned (this user will remain banned) command-unban-already-unbanned = { $player } was already unbanned. command-version-current = Server is running { $hash }[{ $date }] command-whitelist-added = Added to whitelist: { $username } @@ -259,6 +263,13 @@ command-death_effect-unknown = Unknown death effect { $effect }. command-spot-spot_not_found = Didn't find any spots of that kind in this world. command-spot-world_feature = The `worldgen` feature has to be enabled to run this command. command-cannot-send-message-hidden = Cannot send messages as a hidden spectator. +command-destroyed-tethers = All tethers destroyed! You are now free +command-destroyed-no-tethers = You're not connected to any tethers +command-dismounted = Dismounted +command-no-dismount = You're not riding or being ridden +command-client-has-no-socketaddr = Cannot get socker addr (connected via mpsc connection) for { $target } +command-parse-duration-error = Could not parse duration: { $error } +command-ip-ban-require-online = { $error }. IP ban needs the target player to be online. # Unreachable/untestable but added for consistency @@ -268,7 +279,4 @@ command-kit-inventory-unavailable = Could not get inventory command-inventory-cant-fit-item = Can't fit item to inventory # Emitted by /disconnect_all when you don't exist (?) command-you-dont-exist = You do not exist, so you cannot use this command -command-destroyed-tethers = All tethers destroyed! You are now free -command-destroyed-no-tethers = You're not connected to any tethers -command-dismounted = Dismounted -command-no-dismount = You're not riding or being ridden +command-entity-has-no-client = Player has no client client component: { $target } diff --git a/assets/voxygen/i18n/en/item/armor/npc.ftl b/assets/voxygen/i18n/en/item/armor/npc.ftl index 604741c..ec4fc52 100644 --- a/assets/voxygen/i18n/en/item/armor/npc.ftl +++ b/assets/voxygen/i18n/en/item/armor/npc.ftl @@ -310,8 +310,23 @@ common-items-npc_armor-biped_small-bushly-pants-bushly = Bushly common-items-npc_armor-biped_small-bushly-chest-bushly = Bushly .desc = Plant Creature. -common-items-npc_armor-biped_small-bushly-hand-bushly = Mandragora - .desc = Ceremonial attire used by members. +common-items-npc_armor-biped_small-bushly-hand-bushly = Bushly + .desc = Plant Creature. + +common-items-npc_armor-biped_small-cactid-head-cactid = Cactid + .desc = Plant Creature. + +common-items-npc_armor-biped_small-cactid-foot-cactid = Cactid + .desc = Plant Creature. + +common-items-npc_armor-biped_small-cactid-pants-cactid = Cactid + .desc = Plant Creature. + +common-items-npc_armor-biped_small-cactid-chest-cactid = Cactid + .desc = Plant Creature. + +common-items-npc_armor-biped_small-cactid-hand-cactid = Cactid + .desc = Plant Creature. common-items-npc_armor-biped_small-treasure_egg-chest-treasure_egg = Treasure Egg Chest .desc = Treasure Egg Chest diff --git a/assets/voxygen/i18n/en/item/weapon/npc.ftl b/assets/voxygen/i18n/en/item/weapon/npc.ftl index fad467e..f319310 100644 --- a/assets/voxygen/i18n/en/item/weapon/npc.ftl +++ b/assets/voxygen/i18n/en/item/weapon/npc.ftl @@ -171,6 +171,9 @@ common-items-npc_weapons-unique-birdmediumbasic = Bird Medium Basic common-items-npc_weapons-unique-bushly = Starter Grace .desc = Fret not, newbies shant cry. + +common-items-npc_weapons-unique-cactid = Cactid + .desc = Cactid. common-items-npc_weapons-unique-cardinal = Caduceus .desc = The snakes seem to be alive