Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into sharp/small-fixes

Browse Source
This commit is contained in:
Joshua Yanovski 2020-07-27 13:16:27 +02:00
commit 7d56ba31b4
372 changed files with 9371 additions and 5339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.gitlab/CI/build.gitlab-ci.yml
View File

@ -1,8 +1,11 @@
unittests: unittests:
extends: .recompile-branch extends: .recompile-branch
stage: build stage: build
variables:
GIT_DEPTH: 9999999999999
script: script:
- ln -s /dockercache/cache-all target - ln -s /dockercache/cache-all target
- cargo test --package veloren-voxygen --lib test_all_localizations -- --nocapture --ignored
- cargo test - cargo test
retry: retry:
max: 2 max: 2
@ -17,16 +20,6 @@ benchmarks:
retry: retry:
max: 2 max: 2
localization-status:
extends: .recompile-branch
stage: build
variables:
GIT_DEPTH: 0
allow_failure: true
script:
- ln -s /dockercache/cache-all target
- cargo test test_all_localizations -- --nocapture --ignored
# Coverage is needed on master for the README.md badge to work # Coverage is needed on master for the README.md badge to work
coverage: coverage:
extends: .recompile extends: .recompile
@ -110,4 +103,4 @@ opt-windows:
opt-macos: opt-macos:
extends: extends:
- .tmacos - .tmacos
- .optional-release - .optional-release

2
.gitlab/CI/release.yml
View File

@ -1,6 +1,6 @@
# allow_failure: true makes these pipelines manual and "non-blocking" which changed with except -> rule syntax # allow_failure: true makes these pipelines manual and "non-blocking" which changed with except -> rule syntax
.optional-release: .optional-release:
stage: build stage: check
tags: tags:
- veloren-docker - veloren-docker
rules: rules:

6
CHANGELOG.md
View File

@ -42,6 +42,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Training dummy items - Training dummy items
- Added spin attack for axe - Added spin attack for axe
- Creature specific stats - Creature specific stats
- Minimap compass
- Initial crafting system implementation
- Protection stat to armor that reduces incoming damage
- Loading-Screen tips
### Changed ### Changed
@ -68,6 +72,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Animals are more effective in combat - Animals are more effective in combat
- Pathfinding is much smoother and pets are cleverer - Pathfinding is much smoother and pets are cleverer
- Animals run/turn at different speeds - Animals run/turn at different speeds
- Updated windowing library (winit 0.19 -> 0.22)
- Bow M2 is now a charged attack that scales the longer it's held
### Removed ### Removed

407
Cargo.lock generated
View File

@ -63,6 +63,12 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "000444226fcff248f2bc4c7625be32c63caccfecc2723a2b9f78a7487a49c407" checksum = "000444226fcff248f2bc4c7625be32c63caccfecc2723a2b9f78a7487a49c407"
[[package]]
name = "android_log-sys"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8052e2d8aabbb8d556d6abbcce2a22b9590996c5f849b9c7ce4544a2e3b984e"
[[package]] [[package]]
name = "ansi_term" name = "ansi_term"
version = "0.11.0" version = "0.11.0"
@ -108,6 +114,18 @@ dependencies = [
"syn 1.0.33", "syn 1.0.33",
] ]
[[package]]
name = "arraygen"
version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc755b23c19211c270ef000fa7ce871377825e6cc7d1bfd0311076f22c5e6ba1"
dependencies = [
"proc-macro-error",
"proc-macro2 1.0.18",
"quote 1.0.7",
"syn 1.0.33",
]
[[package]] [[package]]
name = "arrayref" name = "arrayref"
version = "0.3.6" version = "0.3.6"
@ -416,6 +434,17 @@ dependencies = [
"winapi 0.3.8", "winapi 0.3.8",
] ]
[[package]]
name = "calloop"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7aa2097be53a00de9e8fc349fea6d76221f398f5c4fa550d420669906962d160"
dependencies = [
"mio",
"mio-extras",
"nix 0.14.1",
]
[[package]] [[package]]
name = "cast" name = "cast"
version = "0.2.3" version = "0.2.3"
@ -451,11 +480,10 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
[[package]] [[package]]
name = "cgl" name = "cgl"
version = "0.2.3" version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55e7ec0b74fe5897894cbc207092c577e87c52f8a59e8ca8d97ef37551f60a49" checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff"
dependencies = [ dependencies = [
"gleam",
"libc", "libc",
] ]
@ -518,14 +546,14 @@ dependencies = [
[[package]] [[package]]
name = "cocoa" name = "cocoa"
version = "0.18.5" version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1706996401131526e36b3b49f0c4d912639ce110996f3ca144d78946727bce54" checksum = "f29f7768b2d1be17b96158e3285951d366b40211320fb30826a76cb7a0da6400"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"block", "block",
"core-foundation", "core-foundation 0.6.4",
"core-graphics", "core-graphics 0.17.3",
"foreign-types", "foreign-types",
"libc", "libc",
"objc", "objc",
@ -533,14 +561,14 @@ dependencies = [
[[package]] [[package]]
name = "cocoa" name = "cocoa"
version = "0.19.1" version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f29f7768b2d1be17b96158e3285951d366b40211320fb30826a76cb7a0da6400" checksum = "0c49e86fc36d5704151f5996b7b3795385f50ce09e3be0f47a0cfde869681cf8"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"block", "block",
"core-foundation", "core-foundation 0.7.0",
"core-graphics", "core-graphics 0.19.2",
"foreign-types", "foreign-types",
"libc", "libc",
"objc", "objc",
@ -549,7 +577,7 @@ dependencies = [
[[package]] [[package]]
name = "conrod_core" name = "conrod_core"
version = "0.63.0" version = "0.63.0"
source = "git+https://gitlab.com/veloren/conrod.git?branch=pre-winit-20#46b374edc9537300e5278905ebd14dff45cfd927" source = "git+https://gitlab.com/veloren/conrod.git#1ab6eccf94b16a8977a3274b31d4dbfef9cf9a30"
dependencies = [ dependencies = [
"conrod_derive", "conrod_derive",
"copypasta", "copypasta",
@ -564,7 +592,7 @@ dependencies = [
[[package]] [[package]]
name = "conrod_derive" name = "conrod_derive"
version = "0.63.0" version = "0.63.0"
source = "git+https://gitlab.com/veloren/conrod.git?branch=pre-winit-20#46b374edc9537300e5278905ebd14dff45cfd927" source = "git+https://gitlab.com/veloren/conrod.git#1ab6eccf94b16a8977a3274b31d4dbfef9cf9a30"
dependencies = [ dependencies = [
"proc-macro2 0.4.30", "proc-macro2 0.4.30",
"quote 0.6.13", "quote 0.6.13",
@ -574,7 +602,7 @@ dependencies = [
[[package]] [[package]]
name = "conrod_winit" name = "conrod_winit"
version = "0.63.0" version = "0.63.0"
source = "git+https://gitlab.com/veloren/conrod.git?branch=pre-winit-20#46b374edc9537300e5278905ebd14dff45cfd927" source = "git+https://gitlab.com/veloren/conrod.git#1ab6eccf94b16a8977a3274b31d4dbfef9cf9a30"
[[package]] [[package]]
name = "const-random" name = "const-random"
@ -651,7 +679,7 @@ dependencies = [
"objc-foundation", "objc-foundation",
"objc_id", "objc_id",
"smithay-clipboard", "smithay-clipboard",
"wayland-client 0.23.6", "wayland-client",
"x11-clipboard", "x11-clipboard",
] ]
@ -661,7 +689,17 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
dependencies = [ dependencies = [
"core-foundation-sys", "core-foundation-sys 0.6.2",
"libc",
]
[[package]]
name = "core-foundation"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
dependencies = [
"core-foundation-sys 0.7.0",
"libc", "libc",
] ]
@ -671,6 +709,12 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
[[package]]
name = "core-foundation-sys"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
[[package]] [[package]]
name = "core-graphics" name = "core-graphics"
version = "0.17.3" version = "0.17.3"
@ -678,11 +722,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56790968ab1c8a1202a102e6de05fc6e1ec87da99e4e93e9a7d13efbfc1e95a9" checksum = "56790968ab1c8a1202a102e6de05fc6e1ec87da99e4e93e9a7d13efbfc1e95a9"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"core-foundation", "core-foundation 0.6.4",
"foreign-types", "foreign-types",
"libc", "libc",
] ]
[[package]]
name = "core-graphics"
version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923"
dependencies = [
"bitflags",
"core-foundation 0.7.0",
"foreign-types",
"libc",
]
[[package]]
name = "core-video-sys"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828"
dependencies = [
"cfg-if",
"core-foundation-sys 0.7.0",
"core-graphics 0.19.2",
"libc",
"objc",
]
[[package]] [[package]]
name = "coreaudio-rs" name = "coreaudio-rs"
version = "0.9.1" version = "0.9.1"
@ -709,7 +778,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b55d55d69f403f62a95bd3c04b431e0aedf5120c70f15d07a8edd234443dd59" checksum = "6b55d55d69f403f62a95bd3c04b431e0aedf5120c70f15d07a8edd234443dd59"
dependencies = [ dependencies = [
"alsa-sys", "alsa-sys",
"core-foundation-sys", "core-foundation-sys 0.6.2",
"coreaudio-rs", "coreaudio-rs",
"lazy_static", "lazy_static",
"libc", "libc",
@ -980,6 +1049,17 @@ dependencies = [
"byteorder 1.3.4", "byteorder 1.3.4",
] ]
[[package]]
name = "derivative"
version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb582b60359da160a9477ee80f15c8d784c477e69c217ef2cdd4169c24ea380f"
dependencies = [
"proc-macro2 1.0.18",
"quote 1.0.7",
"syn 1.0.33",
]
[[package]] [[package]]
name = "deunicode" name = "deunicode"
version = "1.1.1" version = "1.1.1"
@ -1051,6 +1131,12 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04e93ca78226c51902d7aa8c12c988338aadd9e85ed9c6be8aaac39192ff3605" checksum = "04e93ca78226c51902d7aa8c12c988338aadd9e85ed9c6be8aaac39192ff3605"
[[package]]
name = "dispatch"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
[[package]] [[package]]
name = "dlib" name = "dlib"
version = "0.4.2" version = "0.4.2"
@ -1494,17 +1580,6 @@ dependencies = [
"gl_generator 0.14.0", "gl_generator 0.14.0",
] ]
[[package]]
name = "gfx_window_glutin"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "310ff66f08b5a55854b18fea2f48bdbb75c94458207ba574c9723be78e97a646"
dependencies = [
"gfx_core",
"gfx_device_gl",
"glutin",
]
[[package]] [[package]]
name = "gilrs" name = "gilrs"
version = "0.7.4" version = "0.7.4"
@ -1526,7 +1601,7 @@ version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43c758daf46af26d6872fe55507e3b2339779a160a06ad7a9b2a082f221209cd" checksum = "43c758daf46af26d6872fe55507e3b2339779a160a06ad7a9b2a082f221209cd"
dependencies = [ dependencies = [
"core-foundation", "core-foundation 0.6.4",
"io-kit-sys", "io-kit-sys",
"libc", "libc",
"libudev-sys", "libudev-sys",
@ -1610,15 +1685,6 @@ dependencies = [
"xml-rs", "xml-rs",
] ]
[[package]]
name = "gleam"
version = "0.6.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cae10d7c99d0e77b4766e850a60898a17c1abaf01075531f1066f03dc7dc5fc5"
dependencies = [
"gl_generator 0.13.1",
]
[[package]] [[package]]
name = "glib" name = "glib"
version = "0.5.0" version = "0.5.0"
@ -1661,15 +1727,15 @@ dependencies = [
[[package]] [[package]]
name = "glutin" name = "glutin"
version = "0.21.2" version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5371b35b309dace06be1b81b5f6adb1c9de578b7dbe1e74bf7e4ef762cf6febd" checksum = "9a9666c8fd9afd008f6559e2468c35e11aad1d110d525bb3b354e4138ec0e20f"
dependencies = [ dependencies = [
"android_glue", "android_glue",
"cgl", "cgl",
"cocoa 0.18.5", "cocoa 0.20.2",
"core-foundation", "core-foundation 0.7.0",
"core-graphics", "core-graphics 0.19.2",
"glutin_egl_sys", "glutin_egl_sys",
"glutin_emscripten_sys", "glutin_emscripten_sys",
"glutin_gles2_sys", "glutin_gles2_sys",
@ -1677,10 +1743,11 @@ dependencies = [
"glutin_wgl_sys", "glutin_wgl_sys",
"lazy_static", "lazy_static",
"libloading 0.5.2", "libloading 0.5.2",
"log",
"objc", "objc",
"osmesa-sys", "osmesa-sys",
"parking_lot 0.9.0", "parking_lot 0.10.2",
"wayland-client 0.21.13", "wayland-client",
"winapi 0.3.8", "winapi 0.3.8",
"winit", "winit",
] ]
@ -2047,7 +2114,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f21dcc74995dd4cd090b147e79789f8d65959cbfb5f0b118002db869ea3bd0a0" checksum = "f21dcc74995dd4cd090b147e79789f8d65959cbfb5f0b118002db869ea3bd0a0"
dependencies = [ dependencies = [
"core-foundation-sys", "core-foundation-sys 0.6.2",
"mach", "mach",
] ]
@ -2075,6 +2142,12 @@ version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
[[package]]
name = "jni-sys"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
[[package]] [[package]]
name = "jobserver" name = "jobserver"
version = "0.1.21" version = "0.1.21"
@ -2447,6 +2520,37 @@ dependencies = [
"winapi 0.3.8", "winapi 0.3.8",
] ]
[[package]]
name = "ndk"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95a356cafe20aee088789830bfea3a61336e84ded9e545e00d3869ce95dcb80c"
dependencies = [
"jni-sys",
"ndk-sys",
"num_enum",
]
[[package]]
name = "ndk-glue"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d1730ee2e3de41c3321160a6da815f008c4006d71b095880ea50e17cf52332b8"
dependencies = [
"android_log-sys",
"lazy_static",
"libc",
"log",
"ndk",
"ndk-sys",
]
[[package]]
name = "ndk-sys"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b2820aca934aba5ed91c79acc72b6a44048ceacc5d36c035ed4e051f12d887d"
[[package]] [[package]]
name = "net2" name = "net2"
version = "0.2.34" version = "0.2.34"
@ -2637,6 +2741,28 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "num_enum"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4"
dependencies = [
"derivative",
"num_enum_derive",
]
[[package]]
name = "num_enum_derive"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffa5a33ddddfee04c0283a7653987d634e880347e96b5b2ed64de07efb59db9d"
dependencies = [
"proc-macro-crate",
"proc-macro2 1.0.18",
"quote 1.0.7",
"syn 1.0.33",
]
[[package]] [[package]]
name = "objc" name = "objc"
version = "0.2.7" version = "0.2.7"
@ -2681,6 +2807,17 @@ dependencies = [
"byteorder 1.3.4", "byteorder 1.3.4",
] ]
[[package]]
name = "old_school_gfx_glutin_ext"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0557cea37cc48d238c938ded2873a6cc772704ee1eb01e832b43c2dd99624bc"
dependencies = [
"gfx_core",
"gfx_device_gl",
"glutin",
]
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.4.0" version = "1.4.0"
@ -2967,6 +3104,41 @@ dependencies = [
"log", "log",
] ]
[[package]]
name = "proc-macro-crate"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
dependencies = [
"toml",
]
[[package]]
name = "proc-macro-error"
version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7"
dependencies = [
"proc-macro-error-attr",
"proc-macro2 1.0.18",
"quote 1.0.7",
"syn 1.0.33",
"version_check 0.9.2",
]
[[package]]
name = "proc-macro-error-attr"
version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de"
dependencies = [
"proc-macro2 1.0.18",
"quote 1.0.7",
"syn 1.0.33",
"syn-mid",
"version_check 0.9.2",
]
[[package]] [[package]]
name = "proc-macro-hack" name = "proc-macro-hack"
version = "0.5.16" version = "0.5.16"
@ -3655,23 +3827,6 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4"
[[package]]
name = "smithay-client-toolkit"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ccb8c57049b2a34d2cc2b203fa785020ba0129d31920ef0d317430adaf748fa"
dependencies = [
"andrew",
"bitflags",
"dlib",
"lazy_static",
"memmap",
"nix 0.14.1",
"wayland-client 0.21.13",
"wayland-commons 0.21.13",
"wayland-protocols 0.21.13",
]
[[package]] [[package]]
name = "smithay-client-toolkit" name = "smithay-client-toolkit"
version = "0.6.6" version = "0.6.6"
@ -3684,8 +3839,8 @@ dependencies = [
"lazy_static", "lazy_static",
"memmap", "memmap",
"nix 0.14.1", "nix 0.14.1",
"wayland-client 0.23.6", "wayland-client",
"wayland-protocols 0.23.6", "wayland-protocols",
] ]
[[package]] [[package]]
@ -3695,7 +3850,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "917e8ec7f535cd1a6cbf749c8866c24d67c548a80ac48c8e88a182eab5c07bd1" checksum = "917e8ec7f535cd1a6cbf749c8866c24d67c548a80ac48c8e88a182eab5c07bd1"
dependencies = [ dependencies = [
"nix 0.14.1", "nix 0.14.1",
"smithay-client-toolkit 0.6.6", "smithay-client-toolkit",
] ]
[[package]] [[package]]
@ -3849,6 +4004,17 @@ dependencies = [
"unicode-xid 0.2.0", "unicode-xid 0.2.0",
] ]
[[package]]
name = "syn-mid"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a"
dependencies = [
"proc-macro2 1.0.18",
"quote 1.0.7",
"syn 1.0.33",
]
[[package]] [[package]]
name = "synstructure" name = "synstructure"
version = "0.12.4" version = "0.12.4"
@ -4407,6 +4573,7 @@ dependencies = [
name = "veloren-common" name = "veloren-common"
version = "0.6.0" version = "0.6.0"
dependencies = [ dependencies = [
"arraygen",
"authc", "authc",
"criterion", "criterion",
"crossbeam", "crossbeam",
@ -4490,14 +4657,13 @@ dependencies = [
"crossbeam", "crossbeam",
"deunicode", "deunicode",
"directories-next", "directories-next",
"dispatch", "dispatch 0.1.4",
"dot_vox", "dot_vox",
"euc", "euc",
"failure", "failure",
"gfx", "gfx",
"gfx_device_gl", "gfx_device_gl",
"gfx_gl", "gfx_gl",
"gfx_window_glutin",
"gilrs", "gilrs",
"git2", "git2",
"glsl-include", "glsl-include",
@ -4507,6 +4673,7 @@ dependencies = [
"image", "image",
"msgbox", "msgbox",
"num 0.2.1", "num 0.2.1",
"old_school_gfx_glutin_ext",
"rand 0.7.3", "rand 0.7.3",
"rodio", "rodio",
"ron", "ron",
@ -4693,21 +4860,6 @@ version = "0.2.63"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9ba19973a58daf4db6f352eda73dc0e289493cd29fb2632eb172085b6521acd" checksum = "c9ba19973a58daf4db6f352eda73dc0e289493cd29fb2632eb172085b6521acd"
[[package]]
name = "wayland-client"
version = "0.21.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49963e5f9eeaf637bfcd1b9f0701c99fd5cd05225eb51035550d4272806f2713"
dependencies = [
"bitflags",
"downcast-rs",
"libc",
"nix 0.14.1",
"wayland-commons 0.21.13",
"wayland-scanner 0.21.13",
"wayland-sys 0.21.13",
]
[[package]] [[package]]
name = "wayland-client" name = "wayland-client"
version = "0.23.6" version = "0.23.6"
@ -4715,22 +4867,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af1080ebe0efabcf12aef2132152f616038f2d7dcbbccf7b2d8c5270fe14bcda" checksum = "af1080ebe0efabcf12aef2132152f616038f2d7dcbbccf7b2d8c5270fe14bcda"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"calloop",
"downcast-rs", "downcast-rs",
"libc", "libc",
"mio",
"nix 0.14.1", "nix 0.14.1",
"wayland-commons 0.23.6", "wayland-commons",
"wayland-scanner 0.23.6", "wayland-scanner",
"wayland-sys 0.23.6", "wayland-sys",
]
[[package]]
name = "wayland-commons"
version = "0.21.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40c08896768b667e1df195d88a62a53a2d1351a1ed96188be79c196b35bb32ec"
dependencies = [
"nix 0.14.1",
"wayland-sys 0.21.13",
] ]
[[package]] [[package]]
@ -4740,20 +4884,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb66b0d1a27c39bbce712b6372131c6e25149f03ffb0cd017cf8f7de8d66dbdb" checksum = "bb66b0d1a27c39bbce712b6372131c6e25149f03ffb0cd017cf8f7de8d66dbdb"
dependencies = [ dependencies = [
"nix 0.14.1", "nix 0.14.1",
"wayland-sys 0.23.6", "wayland-sys",
]
[[package]]
name = "wayland-protocols"
version = "0.21.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4afde2ea2a428eee6d7d2c8584fdbe8b82eee8b6c353e129a434cd6e07f42145"
dependencies = [
"bitflags",
"wayland-client 0.21.13",
"wayland-commons 0.21.13",
"wayland-scanner 0.21.13",
"wayland-sys 0.21.13",
] ]
[[package]] [[package]]
@ -4763,20 +4894,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6cc286643656742777d55dc8e70d144fa4699e426ca8e9d4ef454f4bf15ffcf9" checksum = "6cc286643656742777d55dc8e70d144fa4699e426ca8e9d4ef454f4bf15ffcf9"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"wayland-client 0.23.6", "wayland-client",
"wayland-commons 0.23.6", "wayland-commons",
"wayland-scanner 0.23.6", "wayland-scanner",
]
[[package]]
name = "wayland-scanner"
version = "0.21.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf3828c568714507315ee425a9529edc4a4aa9901409e373e9e0027e7622b79e"
dependencies = [
"proc-macro2 0.4.30",
"quote 0.6.13",
"xml-rs",
] ]
[[package]] [[package]]
@ -4790,16 +4910,6 @@ dependencies = [
"xml-rs", "xml-rs",
] ]
[[package]]
name = "wayland-sys"
version = "0.21.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "520ab0fd578017a0ee2206623ba9ef4afe5e8f23ca7b42f6acfba2f4e66b1628"
dependencies = [
"dlib",
"lazy_static",
]
[[package]] [[package]]
name = "wayland-sys" name = "wayland-sys"
version = "0.23.6" version = "0.23.6"
@ -4884,26 +4994,31 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]] [[package]]
name = "winit" name = "winit"
version = "0.19.5" version = "0.22.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/Imberflur/winit.git?branch=macos-test#e98133adf2abbfc4368f6c069d0beb2b8b688b42"
checksum = "1e96eb4bb472fa43e718e8fa4aef82f86cd9deac9483a1e1529230babdb394a8"
dependencies = [ dependencies = [
"android_glue",
"backtrace",
"bitflags", "bitflags",
"cocoa 0.18.5", "cocoa 0.20.2",
"core-foundation", "core-foundation 0.7.0",
"core-graphics", "core-graphics 0.19.2",
"core-video-sys",
"dispatch 0.2.0",
"instant",
"lazy_static", "lazy_static",
"libc", "libc",
"log", "log",
"mio",
"mio-extras",
"ndk",
"ndk-glue",
"ndk-sys",
"objc", "objc",
"parking_lot 0.9.0", "parking_lot 0.10.2",
"percent-encoding 2.1.0", "percent-encoding 2.1.0",
"raw-window-handle", "raw-window-handle",
"serde", "serde",
"smithay-client-toolkit 0.4.6", "smithay-client-toolkit",
"wayland-client 0.21.13", "wayland-client",
"winapi 0.3.8", "winapi 0.3.8",
"x11-dl", "x11-dl",
] ]

4
Cargo.toml
View File

@ -72,3 +72,7 @@ debug = false
[profile.releasedebuginfo] [profile.releasedebuginfo]
inherits = 'release' inherits = 'release'
debug = 1 debug = 1
# cpal conflict fix isn't released yet
[patch.crates-io]
winit = { git = "https://github.com/Imberflur/winit.git", branch = "macos-test" }

10
assets/common/items/armor/back/admin.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Admin's Cape", name: "Admin's Cape",
description: "Back\n\nArmor: 0\n\nWith great power comes\ngreat responsibility.\n\n<Right-Click to use>", description: "With great power comes\ngreat responsibility.",
kind: Armor( kind: Armor(
kind: Back(Admin), (
stats: (20), kind: Back(Admin),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

12
assets/common/items/armor/back/dungeon_purple-0.ron Normal file
View File

@ -0,0 +1,12 @@
Item(
name: "Purple Cultist Cape",
description: "Smells like dark magic and candles.",
kind: Armor(
(
kind: Back(DungPurp0),
stats: (
protection: Normal(3.0),
),
)
),
)

10
assets/common/items/armor/back/short_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Short leather Cape", name: "Short leather Cape",
description: "Back\n\nArmor: 0\n\n<Right-Click to use>", description: "Probably made of the finest leather.",
kind: Armor( kind: Armor(
kind: Back(Short0), (
stats: (20), kind: Back(Short0),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/belt/assassin.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Assassin Belt", name: "Assassin Belt",
description: "Belt\n\nArmor: 0\n\nOnly the best for a member of the creed.\n\n<Right-Click to use>", description: "Only the best for a member of the creed.",
kind: Armor( kind: Armor(
kind: Belt(Assassin), (
stats: (20), kind: Belt(Assassin),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/belt/cloth_blue_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Blue Linen Belt", name: "Blue Linen Belt",
description: "Belt\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>", description: "Soft and warm",
kind: Armor( kind: Armor(
kind: Belt(ClothBlue0), (
stats: (20), kind: Belt(ClothBlue0),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/belt/cloth_green_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Green Linen Belt", name: "Green Linen Belt",
description: "Belt\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>", description: "Soft and warm.",
kind: Armor( kind: Armor(
kind: Belt(ClothGreen0), (
stats: (20), kind: Belt(ClothGreen0),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/belt/cloth_purple_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Purple Linen Belt", name: "Purple Linen Belt",
description: "Belt\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>", description: "Soft and warm.",
kind: Armor( kind: Armor(
kind: Belt(ClothPurple0), (
stats: (20), kind: Belt(ClothPurple0),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/belt/cultist_belt.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Cultist Belt", name: "Cultist Belt",
description: "Belt\n\nArmor: 0\n\n<Right-Click to use>", description: "Ceremonial attire used by members.",
kind: Armor( kind: Armor(
kind: Belt(Cultist), (
stats: (20), kind: Belt(Cultist),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/belt/druid.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Druid's Belt", name: "Druid's Belt",
description: "Twisted vines to keep everything secure.\n\n<Right-Click to use>", description: "Twisted vines to keep everything secure.",
kind: Armor( kind: Armor(
kind: Belt(Druid), (
stats: (20), kind: Belt(Druid),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/belt/leather_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Swift Belt", name: "Swift Belt",
description: "Belt\n\nArmor: 0\n\nSwift like the wind.\n\n<Right-Click to use>", description: "Swift like the wind.",
kind: Armor( kind: Armor(
kind: Belt(Leather0), (
stats: (20), kind: Belt(Leather0),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

8
assets/common/items/armor/belt/leather_2.ron
View File

@ -2,7 +2,11 @@ Item(
name: "Leather Belt", name: "Leather Belt",
description: "A belt made from simple leather.", description: "A belt made from simple leather.",
kind: Armor( kind: Armor(
kind: Belt(Leather2), (
stats: (20), kind: Belt(Leather2),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/belt/plate_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Iron Belt", name: "Iron Belt",
description: "Belt\n\nArmor: 0\n\n<Right-Click to use>", description: "A belt with a buckle forged from iron.",
kind: Armor( kind: Armor(
kind: Belt(Plate0), (
stats: (20), kind: Belt(Plate0),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/belt/steel_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Steel Belt", name: "Steel Belt",
description: "A belt made from Steel.", description: "A belt forged from steel.",
kind: Armor( kind: Armor(
kind: Belt(Steel0), (
stats: (20), kind: Belt(Steel0),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/belt/twig.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Twig Belt", name: "Twig Belt",
description: "A belt made from woven from twigs.\n\n<Right-Click to use>", description: "A belt made from woven from twigs.",
kind: Armor( kind: Armor(
kind: Belt(Twig), (
stats: (20), kind: Belt(Twig),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/belt/twigsflowers.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Flowery Belt", name: "Flowery Belt",
description: "A belt woven from twigs and flowers.\n\n<Right-Click to use>", description: "A belt woven from twigs and flowers.",
kind: Armor( kind: Armor(
kind: Belt(Twigsflowers), (
stats: (20), kind: Belt(Twigsflowers),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/belt/twigsleaves.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Leafy Belt", name: "Leafy Belt",
description: "A belt woven from twigs and leaves.\n\n<Right-Click to use>", description: "A belt woven from twigs and leaves.",
kind: Armor( kind: Armor(
kind: Belt(Twigsleaves), (
stats: (20), kind: Belt(Twigsleaves),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/assassin.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Assassin Chest", name: "Assassin Chest",
description: "Chest\n\nArmor: 0\n\nOnly the best for a member of the creed.\n\n<Right-Click to use>", description: "Only the best for a member of the creed.",
kind: Armor( kind: Armor(
kind: Chest(Assassin), (
stats: (20), kind: Chest(Assassin),
stats: (
protection: Normal(6.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/cloth_blue_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Blue Linen Chest", name: "Blue Linen Chest",
description: "Chest\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>", description: "Soft and warm.",
kind: Armor( kind: Armor(
kind: Chest(ClothBlue0), (
stats: (20), kind: Chest(ClothBlue0),
stats: (
protection: Normal(1.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/cloth_green_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Green Linen Chest", name: "Green Linen Chest",
description: "Chest\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>", description: "Soft and warm.",
kind: Armor( kind: Armor(
kind: Chest(ClothGreen0), (
stats: (20), kind: Chest(ClothGreen0),
stats: (
protection: Normal(1.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/cloth_purple_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Purple Linen Chest", name: "Purple Linen Chest",
description: "Chest\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>", description: "Soft and warm.",
kind: Armor( kind: Armor(
kind: Chest(ClothPurple0), (
stats: (20), kind: Chest(ClothPurple0),
stats: (
protection: Normal(1.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/cultist_chest_blue.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Blue Cultist Chest", name: "Blue Cultist Chest",
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>", description: "Ceremonial attire used by members.",
kind: Armor( kind: Armor(
kind: Chest(CultistBlue), (
stats: (20), kind: Chest(CultistBlue),
stats: (
protection: Normal(30.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/cultist_chest_purple.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Purple Cultist Chest", name: "Purple Cultist Chest",
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>", description: "Ceremonial attire used by members.",
kind: Armor( kind: Armor(
kind: Chest(CultistPurple), (
stats: (20), kind: Chest(CultistPurple),
stats: (
protection: Normal(30.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/druid.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Druid's Vest", name: "Druid's Vest",
description: "Druidic chest wrappings.\n\n<Right-Click to use>", description: "Druidic chest wrappings.",
kind: Armor( kind: Armor(
kind: Chest(Druid), (
stats: (20), kind: Chest(Druid),
stats: (
protection: Normal(6.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/leather_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Swift Chest", name: "Swift Chest",
description: "Chest\n\nArmor: 0\n\nSwift like the wind.\n\n<Right-Click to use>", description: "Swift like the wind.",
kind: Armor( kind: Armor(
kind: Chest(Leather0), (
stats: (20), kind: Chest(Leather0),
stats: (
protection: Normal(10.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/leather_2.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Leather Cuirass", name: "Leather Cuirass",
description: "A cuirass made of simple leather", description: "A cuirass made of simple leather.",
kind: Armor( kind: Armor(
kind: Chest(Leather2), (
stats: (20), kind: Chest(Leather2),
stats: (
protection: Normal(10.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/plate_green_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Iron Chestplate", name: "Iron Chestplate",
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>", description: "A chestplate forged from iron.",
kind: Armor( kind: Armor(
kind: Chest(PlateGreen0), (
stats: (20), kind: Chest(PlateGreen0),
stats: (
protection: Normal(20.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/steel_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Steel Cuirass", name: "Steel Cuirass",
description: "A cuirass of steel plate", description: "A cuirass of steel plate.",
kind: Armor( kind: Armor(
kind: Chest(Steel0), (
stats: (20), kind: Chest(Steel0),
stats: (
protection: Normal(25.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/twig.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Twig Shirt", name: "Twig Shirt",
description: "A shirt woven from twigs.\n\n<Right-Click to use>", description: "A shirt woven from twigs.",
kind: Armor( kind: Armor(
kind: Chest(Twig), (
stats: (20), kind: Chest(Twig),
stats: (
protection: Normal(15.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/twigsflowers.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Flowery Shirt", name: "Flowery Shirt",
description: "A shirt woven from twigs and flowers.\n\n<Right-Click to use>", description: "A shirt woven from twigs and flowers.",
kind: Armor( kind: Armor(
kind: Chest(Twigsflowers), (
stats: (20), kind: Chest(Twigsflowers),
stats: (
protection: Normal(15.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/twigsleaves.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Leafy Shirt", name: "Leafy Shirt",
description: "A shirt woven from twigs and leaves.\n\n<Right-Click to use>", description: "A shirt woven from twigs and leaves.",
kind: Armor( kind: Armor(
kind: Chest(Twigsleaves), (
stats: (20), kind: Chest(Twigsleaves),
stats: (
protection: Normal(15.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/worker_green_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Green Worker Shirt", name: "Green Worker Shirt",
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>", description: "Was used by a farmer, until recently.",
kind: Armor( kind: Armor(
kind: Chest(WorkerGreen0), (
stats: (20), kind: Chest(WorkerGreen0),
stats: (
protection: Normal(1.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/worker_green_1.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Green Worker Shirt", name: "Green Worker Shirt",
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>", description: "Was used by a farmer, until recently.",
kind: Armor( kind: Armor(
kind: Chest(WorkerGreen1), (
stats: (20), kind: Chest(WorkerGreen1),
stats: (
protection: Normal(1.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/worker_orange_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Orange Worker Shirt", name: "Orange Worker Shirt",
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>", description: "Was used by a farmer, until recently.",
kind: Armor( kind: Armor(
kind: Chest(WorkerOrange0), (
stats: (20), kind: Chest(WorkerOrange0),
stats: (
protection: Normal(1.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/worker_orange_1.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Orange Worker Shirt", name: "Orange Worker Shirt",
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>", description: "Was used by a farmer, until recently.",
kind: Armor( kind: Armor(
kind: Chest(WorkerOrange1), (
stats: (20), kind: Chest(WorkerOrange1),
stats: (
protection: Normal(1.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/worker_purple_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Purple Worker Shirt", name: "Purple Worker Shirt",
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>", description: "Was used by a farmer, until recently.",
kind: Armor( kind: Armor(
kind: Chest(WorkerPurple0), (
stats: (20), kind: Chest(WorkerPurple0),
stats: (
protection: Normal(1.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/worker_purple_1.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Purple Worker Shirt", name: "Purple Worker Shirt",
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>", description: "Was used by a farmer, until recently.",
kind: Armor( kind: Armor(
kind: Chest(WorkerPurple1), (
stats: (20), kind: Chest(WorkerPurple1),
stats: (
protection: Normal(1.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/worker_red_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Red Worker Shirt", name: "Red Worker Shirt",
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>", description: "Was used by a farmer, until recently.",
kind: Armor( kind: Armor(
kind: Chest(WorkerRed0), (
stats: (20), kind: Chest(WorkerRed0),
stats: (
protection: Normal(1.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/worker_red_1.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Red Worker Shirt", name: "Red Worker Shirt",
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>", description: "Was used by a farmer, until recently.",
kind: Armor( kind: Armor(
kind: Chest(WorkerRed1), (
stats: (20), kind: Chest(WorkerRed1),
stats: (
protection: Normal(1.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/worker_yellow_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Yellow Worker Shirt", name: "Yellow Worker Shirt",
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>", description: "Was used by a farmer, until recently.",
kind: Armor( kind: Armor(
kind: Chest(WorkerYellow0), (
stats: (20), kind: Chest(WorkerYellow0),
stats: (
protection: Normal(1.0),
),
)
), ),
) )

10
assets/common/items/armor/chest/worker_yellow_1.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Yellow Worker Shirt", name: "Yellow Worker Shirt",
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>", description: "Was used by a farmer, until recently.",
kind: Armor( kind: Armor(
kind: Chest(WorkerYellow1), (
stats: (20), kind: Chest(WorkerYellow1),
stats: (
protection: Normal(1.0),
),
)
), ),
) )

10
assets/common/items/armor/foot/assassin.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Assassin Boots", name: "Assassin Boots",
description: "Feet\n\nArmor: 0\n\nOnly the best for a member of the creed.\n\n<Right-Click to use>", description: "Only the best for a member of the creed.",
kind: Armor( kind: Armor(
kind: Foot(Assassin), (
stats: (20), kind: Foot(Assassin),
stats: (
protection: Normal(1.0),
),
)
), ),
) )

10
assets/common/items/armor/foot/cloth_blue_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Blue Linen Boots", name: "Blue Linen Boots",
description: "Feet\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>", description: "Soft and warm.",
kind: Armor( kind: Armor(
kind: Foot(ClothBlue0), (
stats: (20), kind: Foot(ClothBlue0),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/foot/cloth_green_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Green Linen Boots", name: "Green Linen Boots",
description: "Feet\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>", description: "Soft and warm.",
kind: Armor( kind: Armor(
kind: Foot(ClothGreen0), (
stats: (20), kind: Foot(ClothGreen0),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/foot/cloth_purple_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Purple Linen Boots", name: "Purple Linen Boots",
description: "Feet\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>", description: "Soft and warm.",
kind: Armor( kind: Armor(
kind: Foot(ClothPurple0), (
stats: (20), kind: Foot(ClothPurple0),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/foot/cultist_boots.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Cultist Boots", name: "Cultist Boots",
description: "Feet\n\nArmor: 0\n\n<Right-Click to use>", description: "Ceremonial attire used by members.",
kind: Armor( kind: Armor(
kind: Foot(Cultist), (
stats: (20), kind: Foot(Cultist),
stats: (
protection: Normal(6.0),
),
)
), ),
) )

10
assets/common/items/armor/foot/druid.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Druid's Slippers", name: "Druid's Slippers",
description: "For treading softly through the woods.\n\n<Right-Click to use>", description: "For treading softly through the woods.",
kind: Armor( kind: Armor(
kind: Foot(Druid), (
stats: (20), kind: Foot(Druid),
stats: (
protection: Normal(1.0),
),
)
), ),
) )

10
assets/common/items/armor/foot/jackalope_slippers.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Fluffy Jackalope Slippers", name: "Fluffy Jackalope Slippers",
description: "So warm and cozy!\n\n<Right-Click to use>", description: "So warm and cozy!",
kind: Armor( kind: Armor(
kind: Foot(JackalopeSlips), (
stats: (20), kind: Foot(JackalopeSlips),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/foot/leather_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Swift Boots", name: "Swift Boots",
description: "Feet\n\nArmor: 0\n\nSwift like the wind.\nWon't make you run faster.\n\n<Right-Click to use>", description: "Swift like the wind.",
kind: Armor( kind: Armor(
kind: Foot(Leather0), (
stats: (20), kind: Foot(Leather0),
stats: (
protection: Normal(2.0),
),
)
), ),
) )

10
assets/common/items/armor/foot/leather_2.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Leather Boots", name: "Leather Boots",
description: "Boots made of simple leather", description: "Boots made of simple leather.",
kind: Armor( kind: Armor(
kind: Foot(Leather2), (
stats: (20), kind: Foot(Leather2),
stats: (
protection: Normal(2.0),
),
)
), ),
) )

10
assets/common/items/armor/foot/plate_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Iron Feet", name: "Iron Feet",
description: "Feet\n\nArmor: 0\n\n<Right-Click to use>", description: "Boots forged from iron.",
kind: Armor( kind: Armor(
kind: Foot(Plate0), (
stats: (20), kind: Foot(Plate0),
stats: (
protection: Normal(4.0),
),
)
), ),
) )

10
assets/common/items/armor/foot/steel_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Steel Boots", name: "Steel Boots",
description: "Boots plated in steel", description: "Boots forged from steel.",
kind: Armor( kind: Armor(
kind: Foot(Steel0), (
stats: (20), kind: Foot(Steel0),
stats: (
protection: Normal(5.0),
),
)
), ),
) )

10
assets/common/items/armor/foot/twig.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Twig Boots", name: "Twig Boots",
description: "Boots woven from twigs.\n\n<Right-Click to use>", description: "Boots woven from twigs.",
kind: Armor( kind: Armor(
kind: Foot(Twig), (
stats: (20), kind: Foot(Twig),
stats: (
protection: Normal(3.0),
),
)
), ),
) )

10
assets/common/items/armor/foot/twigsflowers.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Flowery Boots", name: "Flowery Boots",
description: "Boots woven from twigs and flowers.\n\n<Right-Click to use>", description: "Boots woven from twigs and flowers.",
kind: Armor( kind: Armor(
kind: Foot(Twigsflowers), (
stats: (20), kind: Foot(Twigsflowers),
stats: (
protection: Normal(3.0),
),
)
), ),
) )

10
assets/common/items/armor/foot/twigsleaves.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Leafy Boots", name: "Leafy Boots",
description: "Boots woven from twigs and leaves.\n\n<Right-Click to use>", description: "Boots woven from twigs and leaves.",
kind: Armor( kind: Armor(
kind: Foot(Twigsleaves), (
stats: (20), kind: Foot(Twigsleaves),
stats: (
protection: Normal(3.0),
),
)
), ),
) )

10
assets/common/items/armor/hand/assassin.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Assassin Gloves", name: "Assassin Gloves",
description: "Hands\n\nArmor: 0\n\nOnly the best for a member of the creed.\n\n<Right-Click to use>", description: "Only the best for a member of the creed.",
kind: Armor( kind: Armor(
kind: Hand(Assassin), (
stats: (20), kind: Hand(Assassin),
stats: (
protection: Normal(2.0),
),
)
), ),
) )

10
assets/common/items/armor/hand/cloth_blue_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Blue Linen Wrists", name: "Blue Linen Wrists",
description: "Hands\n\nArmor: 0\n\n<Right-Click to use>", description: "A strip of cloth.",
kind: Armor( kind: Armor(
kind: Hand(ClothBlue0), (
stats: (20), kind: Hand(ClothBlue0),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/hand/cloth_green_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Green Linen Wrists", name: "Green Linen Wrists",
description: "Hands\n\nArmor: 0\n\n<Right-Click to use>", description: "A strip of cloth.",
kind: Armor( kind: Armor(
kind: Hand(ClothGreen0), (
stats: (20), kind: Hand(ClothGreen0),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/hand/cloth_purple_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Purple Silk Wrists", name: "Purple Silk Wrists",
description: "Hands\n\nArmor: 0\n\n<Right-Click to use>", description: "A strip of cloth.",
kind: Armor( kind: Armor(
kind: Hand(ClothPurple0), (
stats: (20), kind: Hand(ClothPurple0),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/hand/cultist_hands_blue.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Blue Cultist Gloves", name: "Blue Cultist Gloves",
description: "Hands\n\nArmor: 0\n\n<Right-Click to use>", description: "Ceremonial attire used by members.",
kind: Armor( kind: Armor(
kind: Hand(CultistBlue), (
stats: (20), kind: Hand(CultistBlue),
stats: (
protection: Normal(12.0),
),
)
), ),
) )

10
assets/common/items/armor/hand/cultist_hands_purple.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Purple Cultist Gloves", name: "Purple Cultist Gloves",
description: "Hands\n\nArmor: 0\n\n<Right-Click to use>", description: "Ceremonial attire used by members.",
kind: Armor( kind: Armor(
kind: Hand(CultistPurple), (
stats: (20), kind: Hand(CultistPurple),
stats: (
protection: Normal(12.0),
),
)
), ),
) )

10
assets/common/items/armor/hand/druid.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Druid's Gloves", name: "Druid's Gloves",
description: "Soft, strong, and flexible.\n\n<Right-Click to use>", description: "Soft, strong, and flexible.",
kind: Armor( kind: Armor(
kind: Hand(Druid), (
stats: (20), kind: Hand(Druid),
stats: (
protection: Normal(2.0),
),
)
), ),
) )

10
assets/common/items/armor/hand/leather_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Swift Gloves", name: "Swift Gloves",
description: "Hands\n\nArmor: 0\n\nSwift like the wind.\n\n<Right-Click to use>", description: "Swift like the wind.",
kind: Armor( kind: Armor(
kind: Hand(Leather0), (
stats: (20), kind: Hand(Leather0),
stats: (
protection: Normal(4.0),
),
)
), ),
) )

10
assets/common/items/armor/hand/leather_2.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Leather Gloves", name: "Leather Gloves",
description: "Gloves made of simple leather", description: "Gloves made of simple leather.",
kind: Armor( kind: Armor(
kind: Hand(Leather2), (
stats: (20), kind: Hand(Leather2),
stats: (
protection: Normal(4.0),
),
)
), ),
) )

10
assets/common/items/armor/hand/plate_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Iron Handguards", name: "Iron Handguards",
description: "Hands\n\nArmor: 0\n\n<Right-Click to use>", description: "Gauntlets forged from iron.",
kind: Armor( kind: Armor(
kind: Hand(Plate0), (
stats: (20), kind: Hand(Plate0),
stats: (
protection: Normal(8.0),
),
)
), ),
) )

10
assets/common/items/armor/hand/steel_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Steel Gauntlets", name: "Steel Gauntlets",
description: "Gauntlets made of steel", description: "Gauntlets forged from steel.",
kind: Armor( kind: Armor(
kind: Hand(Steel0), (
stats: (20), kind: Hand(Steel0),
stats: (
protection: Normal(10.0),
),
)
), ),
) )

10
assets/common/items/armor/hand/twig.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Twig Wraps", name: "Twig Wraps",
description: "Handwraps woven from twigs.\n\n<Right-Click to use>", description: "Handwraps woven from twigs.",
kind: Armor( kind: Armor(
kind: Hand(Twig), (
stats: (20), kind: Hand(Twig),
stats: (
protection: Normal(6.0),
),
)
), ),
) )

10
assets/common/items/armor/hand/twigsflowers.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Flowery Wraps", name: "Flowery Wraps",
description: "Handwraps woven from twigs and flowers.\n\n<Right-Click to use>", description: "Handwraps woven from twigs and flowers.",
kind: Armor( kind: Armor(
kind: Hand(Twigsflowers), (
stats: (20), kind: Hand(Twigsflowers),
stats: (
protection: Normal(6.0),
),
)
), ),
) )

10
assets/common/items/armor/hand/twigsleaves.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Leafy Wraps", name: "Leafy Wraps",
description: "Handwraps woven from twigs and leaves.\n\n<Right-Click to use>", description: "Handwraps woven from twigs and leaves.",
kind: Armor( kind: Armor(
kind: Hand(Twigsleaves), (
stats: (20), kind: Hand(Twigsleaves),
stats: (
protection: Normal(6.0),
),
)
), ),
) )

10
assets/common/items/armor/head/assa_mask_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Dark Assassin Mask", name: "Dark Assassin Mask",
description: "Head\n\nArmor: 0\n\n<Right-Click to use>", description: "Used to obscure your face.",
kind: Armor( kind: Armor(
kind: Head(AssaMask0), (
stats: (20), kind: Head(AssaMask0),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/head/leather_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Swift Leather Cap", name: "Swift Leather Cap",
description: "Head\n\nArmor: 0\n\n<Right-Click to use>", description: "Swift like the wind.",
kind: Armor( kind: Armor(
kind: Head(Leather0), (
stats: (20), kind: Head(Leather0),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/neck/neck_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Plain Necklace", name: "Plain Necklace",
description: "Neck\n\nArmor: 0\n\n<Right-Click to use>", description: "It's become tarnished with age.",
kind: Armor( kind: Armor(
kind: Neck(Neck0), (
stats: (20), kind: Neck(Neck0),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/pants/assassin.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Assassin Pants", name: "Assassin Pants",
description: "Legs\n\nArmor: 0\n\nOnly the best for a member of the creed.\n\n<Right-Click to use>", description: "Only the best for a member of the creed.",
kind: Armor( kind: Armor(
kind: Pants(Assassin), (
stats: (20), kind: Pants(Assassin),
stats: (
protection: Normal(5.0),
),
)
), ),
) )

10
assets/common/items/armor/pants/cloth_blue_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Blue Linen Skirt", name: "Blue Linen Skirt",
description: "Legs\n\nArmor: 0\n\n<Right-Click to use>", description: "A skirt made from linen.",
kind: Armor( kind: Armor(
kind: Pants(ClothBlue0), (
stats: (20), kind: Pants(ClothBlue0),
stats: (
protection: Normal(1.0),
),
)
), ),
) )

10
assets/common/items/armor/pants/cloth_green_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Green Linen Skirt", name: "Green Linen Skirt",
description: "Legs\n\nArmor: 0\n\n<Right-Click to use>", description: "A skirt made from linen.",
kind: Armor( kind: Armor(
kind: Pants(ClothGreen0), (
stats: (20), kind: Pants(ClothGreen0),
stats: (
protection: Normal(1.0),
),
)
), ),
) )

10
assets/common/items/armor/pants/cloth_purple_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Purple Linen Skirt", name: "Purple Linen Skirt",
description: "Legs\n\nArmor: 0\n\n<Right-Click to use>", description: "A skirt made from linen.",
kind: Armor( kind: Armor(
kind: Pants(ClothPurple0), (
stats: (20), kind: Pants(ClothPurple0),
stats: (
protection: Normal(1.0),
),
)
), ),
) )

10
assets/common/items/armor/pants/cultist_legs_blue.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Blue Cultist Skirt", name: "Blue Cultist Skirt",
description: "Legs\n\nArmor: 0\n\n<Right-Click to use>", description: "Ceremonial attire used by members.",
kind: Armor( kind: Armor(
kind: Pants(CultistBlue), (
stats: (20), kind: Pants(CultistBlue),
stats: (
protection: Normal(24.0),
),
)
), ),
) )

10
assets/common/items/armor/pants/cultist_legs_purple.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Purple Cultist Skirt", name: "Purple Cultist Skirt",
description: "Legs\n\nArmor: 0\n\n<Right-Click to use>", description: "Ceremonial attire used by members.",
kind: Armor( kind: Armor(
kind: Pants(CultistPurple), (
stats: (20), kind: Pants(CultistPurple),
stats: (
protection: Normal(24.0),
),
)
), ),
) )

10
assets/common/items/armor/pants/druid.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Druid's Kilt", name: "Druid's Kilt",
description: "Feel the breeze!\n\n<Right-Click to use>", description: "Feel the breeze!",
kind: Armor( kind: Armor(
kind: Pants(Druid), (
stats: (20), kind: Pants(Druid),
stats: (
protection: Normal(4.0),
),
)
), ),
) )

10
assets/common/items/armor/pants/hunting.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Hunting Pants", name: "Hunting Pants",
description: "Crafted from soft, supple leather\n\n<Right-Click to use>", description: "Crafted from soft, supple leather.",
kind: Armor( kind: Armor(
kind: Pants(Hunting), (
stats: (20), kind: Pants(Hunting),
stats: (
protection: Normal(8.0),
),
)
), ),
) )

10
assets/common/items/armor/pants/leather_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Swift Pants", name: "Swift Pants",
description: "Legs\n\nArmor: 0\n\n<Right-Click to use>", description: "Swift like the wind.",
kind: Armor( kind: Armor(
kind: Pants(Leather0), (
stats: (20), kind: Pants(Leather0),
stats: (
protection: Normal(8.0),
),
)
), ),
) )

10
assets/common/items/armor/pants/leather_2.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Leather Leg Armour", name: "Leather Leg Armour",
description: "Leg armour made of simple leather", description: "Leg armour made of simple leather.",
kind: Armor( kind: Armor(
kind: Pants(Leather2), (
stats: (20), kind: Pants(Leather2),
stats: (
protection: Normal(8.0),
),
)
), ),
) )

10
assets/common/items/armor/pants/plate_green_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Iron Legguards", name: "Iron Legguards",
description: "Legs\n\nArmor: 0\n\n<Right-Click to use>", description: "Greaves forged from iron.",
kind: Armor( kind: Armor(
kind: Pants(PlateGreen0), (
stats: (20), kind: Pants(PlateGreen0),
stats: (
protection: Normal(16.0),
),
)
), ),
) )

10
assets/common/items/armor/pants/steel_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Steel Chausses", name: "Steel Chausses",
description: "Leg armour made of steel plates", description: "Greaves forged from steel.",
kind: Armor( kind: Armor(
kind: Pants(Steel0), (
stats: (20), kind: Pants(Steel0),
stats: (
protection: Normal(20.0),
),
)
), ),
) )

10
assets/common/items/armor/pants/twig.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Twig Pants", name: "Twig Pants",
description: "Pants woven from twigs. Chafey!\n\n<Right-Click to use>", description: "Pants woven from twigs. Chafey!",
kind: Armor( kind: Armor(
kind: Pants(Twig), (
stats: (20), kind: Pants(Twig),
stats: (
protection: Normal(12.0),
),
)
), ),
) )

10
assets/common/items/armor/pants/twigsflowers.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Flowery Pants", name: "Flowery Pants",
description: "Pants woven from twigs and flowers. Fragrant!\n\n<Right-Click to use>", description: "Pants woven from twigs and flowers. Fragrant!",
kind: Armor( kind: Armor(
kind: Pants(Twigsflowers), (
stats: (20), kind: Pants(Twigsflowers),
stats: (
protection: Normal(12.0),
),
)
), ),
) )

10
assets/common/items/armor/pants/twigsleaves.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Leafy Pants", name: "Leafy Pants",
description: "Pants woven from twigs and leaves. Slightly less chafey than the twig pants!\n\n<Right-Click to use>", description: "Pants woven from twigs and leaves. Slightly less chafey than the twig pants!",
kind: Armor( kind: Armor(
kind: Pants(Twigsleaves), (
stats: (20), kind: Pants(Twigsleaves),
stats: (
protection: Normal(12.0),
),
)
), ),
) )

10
assets/common/items/armor/pants/worker_blue_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Blue Worker Pants", name: "Blue Worker Pants",
description: "Legs\n\nArmor: 0\n\n<Right-Click to use>", description: "Pants used by a farmer, until recently.",
kind: Armor( kind: Armor(
kind: Pants(WorkerBlue0), (
stats: (20), kind: Pants(WorkerBlue0),
stats: (
protection: Normal(1.0),
),
)
), ),
) )

10
assets/common/items/armor/ring/ring_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Scratched Ring", name: "Scratched Ring",
description: "Ring\n\nBarely fits your finger.\n\n<Right-Click to use>", description: "Barely fits your finger.",
kind: Armor( kind: Armor(
kind: Ring(Ring0), (
stats: (20), kind: Ring(Ring0),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/shoulder/assassin.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Assassin Shoulder Guard", name: "Assassin Shoulder Guard",
description: "Shoulders\n\nArmor: 0\n\nOnly the best for a member of the creed.\n\n<Right-Click to use>", description: "Only the best for a member of the creed.",
kind: Armor( kind: Armor(
kind: Shoulder(Assassin), (
stats: (20), kind: Shoulder(Assassin),
stats: (
protection: Normal(3.0),
),
)
), ),
) )

10
assets/common/items/armor/shoulder/cloth_blue_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Blue Linen Coat", name: "Blue Linen Coat",
description: "Shoulders\n\nArmor: 0\n\n<Right-Click to use>", description: "A warm coat.",
kind: Armor( kind: Armor(
kind: Shoulder(ClothBlue0), (
stats: (20), kind: Shoulder(ClothBlue0),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/shoulder/cloth_blue_1.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Blue Cloth Pads", name: "Blue Cloth Pads",
description: "Simple shoulderpads made from blue cloth.\n\n<Right-click to use>", description: "Simple shoulderpads made from blue cloth.",
kind: Armor( kind: Armor(
kind: Shoulder(ClothBlue1), (
stats: (20), kind: Shoulder(ClothBlue1),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/shoulder/cloth_green_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Green Linen Coat", name: "Green Linen Coat",
description: "Shoulders\n\nArmor: 0\n\n<Right-Click to use>", description: "A warm coat.",
kind: Armor( kind: Armor(
kind: Shoulder(ClothGreen0), (
stats: (20), kind: Shoulder(ClothGreen0),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/shoulder/cloth_purple_0.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Purple Linen Coat", name: "Purple Linen Coat",
description: "Shoulders\n\nArmor: 0\n\n<Right-Click to use>", description: "A warm coat.",
kind: Armor( kind: Armor(
kind: Shoulder(ClothPurple0), (
stats: (20), kind: Shoulder(ClothPurple0),
stats: (
protection: Normal(0.0),
),
)
), ),
) )

10
assets/common/items/armor/shoulder/cultist_shoulder_blue.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Blue Cultist Mantle", name: "Blue Cultist Mantle",
description: "Shoulders\n\nArmor: 0\n\nA strong shoulder to lean on.\n\n<Right-Click to use>", description: "Ceremonial attire used by members.",
kind: Armor( kind: Armor(
kind: Shoulder(CultistBlue), (
stats: (20), kind: Shoulder(CultistBlue),
stats: (
protection: Normal(18.0),
),
)
), ),
) )

10
assets/common/items/armor/shoulder/cultist_shoulder_purple.ron
View File

@ -1,8 +1,12 @@
Item( Item(
name: "Purple Cultist Mantle", name: "Purple Cultist Mantle",
description: "Shoulders\n\nArmor: 0\n\nA strong shoulder to lean on.\n\n<Right-Click to use>", description: "Ceremonial attire used by members.",
kind: Armor( kind: Armor(
kind: Shoulder(CultistPurple), (
stats: (20), kind: Shoulder(CultistPurple),
stats: (
protection: Normal(18.0),
),
)
), ),
) )

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