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-08-02 20:56:54 +02:00
commit d4d4956e92
540 changed files with 6112 additions and 1753 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cargo/config
View File

@ -3,3 +3,5 @@ rustflags = [
"-C", "link-arg=-fuse-ld=gold",
]
[alias]
generate = "run --package tools --"

2
.gitignore vendored
View File

@ -30,6 +30,8 @@ run.sh
maps
screenshots
todo.txt
armorstats.csv
weaponstats.csv
# Game data
*.sqlite

4
CHANGELOG.md
View File

@ -46,6 +46,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Initial crafting system implementation
- Protection stat to armor that reduces incoming damage
- Loading-Screen tips
- Feeding animation for some animals
- Power stat to weapons which affects weapon damage
### Changed
@ -64,7 +66,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Replaced `log` with `tracing` in all crates
- Switch to a new network backend that will allow several improvements in the future
- Connection screen fails after 4 minutes if it can't connect to the server instead of 80 minutes
- Rebuilt quadruped_medium animation and assets
- Rebuilt quadruped_medium/quadruped_small animation and assets
- Disabled destruction of most blocks by explosions
- Disable damage to pets
- Made pets healable

94
Cargo.lock generated
View File

@ -120,7 +120,7 @@ version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc755b23c19211c270ef000fa7ce871377825e6cc7d1bfd0311076f22c5e6ba1"
dependencies = [
"proc-macro-error",
"proc-macro-error 0.4.12",
"proc-macro2 1.0.18",
"quote 1.0.7",
"syn 1.0.33",
@ -222,7 +222,7 @@ dependencies = [
[[package]]
name = "auth-common"
version = "0.1.0"
source = "git+https://gitlab.com/veloren/auth.git?rev=57784d2135a2c81ff0266f52a528da092ddf89e6#57784d2135a2c81ff0266f52a528da092ddf89e6"
source = "git+https://gitlab.com/veloren/auth.git?rev=b943c85e4a38f5ec60cd18c34c73097640162bfe#b943c85e4a38f5ec60cd18c34c73097640162bfe"
dependencies = [
"rand 0.7.3",
"serde",
@ -232,7 +232,7 @@ dependencies = [
[[package]]
name = "authc"
version = "1.0.0"
source = "git+https://gitlab.com/veloren/auth.git?rev=57784d2135a2c81ff0266f52a528da092ddf89e6#57784d2135a2c81ff0266f52a528da092ddf89e6"
source = "git+https://gitlab.com/veloren/auth.git?rev=b943c85e4a38f5ec60cd18c34c73097640162bfe#b943c85e4a38f5ec60cd18c34c73097640162bfe"
dependencies = [
"auth-common",
"fxhash",
@ -527,9 +527,13 @@ version = "2.33.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
dependencies = [
"ansi_term",
"atty",
"bitflags",
"strsim 0.8.0",
"textwrap",
"unicode-width",
"vec_map",
]
[[package]]
@ -1013,7 +1017,7 @@ dependencies = [
"ident_case",
"proc-macro2 1.0.18",
"quote 1.0.7",
"strsim",
"strsim 0.9.3",
"syn 1.0.33",
]
@ -1899,6 +1903,15 @@ dependencies = [
"serde",
]
[[package]]
name = "heck"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
dependencies = [
"unicode-segmentation",
]
[[package]]
name = "hermit-abi"
version = "0.1.13"
@ -3137,7 +3150,20 @@ version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7"
dependencies = [
"proc-macro-error-attr",
"proc-macro-error-attr 0.4.12",
"proc-macro2 1.0.18",
"quote 1.0.7",
"syn 1.0.33",
"version_check 0.9.2",
]
[[package]]
name = "proc-macro-error"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880"
dependencies = [
"proc-macro-error-attr 1.0.3",
"proc-macro2 1.0.18",
"quote 1.0.7",
"syn 1.0.33",
@ -3157,6 +3183,19 @@ dependencies = [
"version_check 0.9.2",
]
[[package]]
name = "proc-macro-error-attr"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50"
dependencies = [
"proc-macro2 1.0.18",
"quote 1.0.7",
"syn 1.0.33",
"syn-mid",
"version_check 0.9.2",
]
[[package]]
name = "proc-macro-hack"
version = "0.5.16"
@ -3982,12 +4021,42 @@ dependencies = [
"bytes",
]
[[package]]
name = "strsim"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
name = "strsim"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
[[package]]
name = "structopt"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c"
dependencies = [
"clap",
"lazy_static",
"structopt-derive",
]
[[package]]
name = "structopt-derive"
version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118"
dependencies = [
"heck",
"proc-macro-error 1.0.3",
"proc-macro2 1.0.18",
"quote 1.0.7",
"syn 1.0.33",
]
[[package]]
name = "sum_type"
version = "0.2.0"
@ -4293,6 +4362,15 @@ dependencies = [
"serde",
]
[[package]]
name = "tools"
version = "0.1.0"
dependencies = [
"csv",
"structopt",
"veloren-common",
]
[[package]]
name = "tracing"
version = "0.1.15"
@ -4434,6 +4512,12 @@ dependencies = [
"smallvec 1.4.0",
]
[[package]]
name = "unicode-segmentation"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
[[package]]
name = "unicode-width"
version = "0.1.7"

3
Cargo.toml
View File

@ -10,7 +10,8 @@ members = [
"voxygen",
"world",
"network",
"voxygen/src/anim"
"voxygen/src/anim",
"tools"
]
# default profile for devs, fast to compile, okay enough to run, no debug information

2
assets/common/items/boss_drops/potions.ron
View File

@ -4,7 +4,7 @@ Item(
kind: Consumable(
kind: Potion,
effect: Health((
amount: 100,
amount: 1000,
cause: Item,
)),
),

2
assets/common/items/consumable/potion_big.ron
View File

@ -4,7 +4,7 @@ Item(
kind: Consumable(
kind: PotionLarge,
effect: Health((
amount: 100,
amount: 1000,
cause: Item,
)),
),

2
assets/common/items/consumable/potion_med.ron
View File

@ -4,7 +4,7 @@ Item(
kind: Consumable(
kind: PotionMed,
effect: Health((
amount: 70,
amount: 700,
cause: Item,
)),
),

2
assets/common/items/consumable/potion_minor.ron
View File

@ -4,7 +4,7 @@ Item(
kind: Consumable(
kind: PotionMinor,
effect: Health((
amount: 50,
amount: 500,
cause: Item,
)),
),

5
assets/common/items/debug/boost.ron
View File

@ -3,8 +3,11 @@ Item(
description: "You can hear him giggle whenever\nyou hit the ground a bit too hard...",
kind: Tool(
(
kind: Debug(Boost),
kind: Debug("Boost"),
stats: (
equip_time_millis: 0,
power: 1.00,
),
)
),
)

5
assets/common/items/debug/possess.ron
View File

@ -3,8 +3,11 @@ Item(
description: "You can hear him giggle whenever\nyou hit the ground a bit too hard...",
kind: Tool(
(
kind: Debug(Boost),
kind: Debug("Boost"),
stats: (
equip_time_millis: 0,
power: 1.00,
),
)
),
)

2
assets/common/items/food/apple.ron
View File

@ -4,7 +4,7 @@ Item(
kind: Consumable(
kind: Apple,
effect: Health((
amount: 20,
amount: 200,
cause: Item,
)),
),

2
assets/common/items/food/apple_mushroom_curry.ron
View File

@ -4,7 +4,7 @@ Item(
kind: Consumable(
kind: AppleShroomCurry,
effect: Health((
amount: 120,
amount: 1200,
cause: Item,
)),
),

2
assets/common/items/food/apple_stick.ron
View File

@ -4,7 +4,7 @@ Item(
kind: Consumable(
kind: AppleStick,
effect: Health((
amount: 60,
amount: 600,
cause: Item,
)),
),

2
assets/common/items/food/cheese.ron
View File

@ -4,7 +4,7 @@ Item(
kind: Consumable(
kind: Cheese,
effect: Health((
amount: 15,
amount: 150,
cause: Item,
)),
),

2
assets/common/items/food/coconut.ron
View File

@ -4,7 +4,7 @@ Item(
kind: Consumable(
kind: Coconut,
effect: Health((
amount: 30,
amount: 300,
cause: Item,
)),
),

2
assets/common/items/food/mushroom.ron
View File

@ -4,7 +4,7 @@ Item(
kind: Consumable(
kind: Mushroom,
effect: Health((
amount: 10,
amount: 100,
cause: Item,
)),
),

2
assets/common/items/food/mushroom_stick.ron
View File

@ -4,7 +4,7 @@ Item(
kind: Consumable(
kind: MushroomStick,
effect: Health((
amount: 50,
amount: 500,
cause: Item,
)),
),

13
assets/common/items/weapons/axe/bloodsteel_axe-0.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Bloodsteel Axe",
description: "An axe forged from steel that thirsts for blood.",
kind: Tool(
(
kind: Axe("BloodsteelAxe0"),
stats: (
equip_time_millis: 400,
power: 1.60,
),
)
),
)

13
assets/common/items/weapons/axe/bloodsteel_axe-1.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Executioner's Axe",
description: "An axe forged from steel that thirsts for blood.",
kind: Tool(
(
kind: Axe("BloodsteelAxe1"),
stats: (
equip_time_millis: 400,
power: 1.60,
),
)
),
)

13
assets/common/items/weapons/axe/bloodsteel_axe-2.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Tribal Axe",
description: "An axe forged from steel that thirsts for blood.",
kind: Tool(
(
kind: Axe("BloodsteelAxe2"),
stats: (
equip_time_millis: 400,
power: 1.60,
),
)
),
)

13
assets/common/items/weapons/axe/bronze_axe-0.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Bronze Axe",
description: "Forged from bronze.",
kind: Tool(
(
kind: Axe("BronzeAxe0"),
stats: (
equip_time_millis: 400,
power: 1.00,
),
)
),
)

13
assets/common/items/weapons/axe/bronze_axe-1.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Discus Axe",
description: "Forged from bronze.",
kind: Tool(
(
kind: Axe("BronzeAxe1"),
stats: (
equip_time_millis: 400,
power: 1.00,
),
)
),
)

13
assets/common/items/weapons/axe/cobalt_axe-0.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Cobalt Axe",
description: "Forged from cobalt.",
kind: Tool(
(
kind: Axe("CobaltAxe0"),
stats: (
equip_time_millis: 400,
power: 1.80,
),
)
),
)

13
assets/common/items/weapons/axe/iron_axe-0.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Iron Greataxe",
description: "Forged from iron.",
kind: Tool(
(
kind: Axe("IronAxe0"),
stats: (
equip_time_millis: 400,
power: 1.20,
),
)
),
)

13
assets/common/items/weapons/axe/iron_axe-1.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Ceremonial Axe",
description: "Forged from iron.",
kind: Tool(
(
kind: Axe("IronAxe1"),
stats: (
equip_time_millis: 400,
power: 1.20,
),
)
),
)

13
assets/common/items/weapons/axe/iron_axe-2.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Cyclone Axe",
description: "Forged from iron.",
kind: Tool(
(
kind: Axe("IronAxe2"),
stats: (
equip_time_millis: 400,
power: 1.20,
),
)
),
)

13
assets/common/items/weapons/axe/iron_axe-3.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Iron Battleaxe",
description: "Forged from iron.",
kind: Tool(
(
kind: Axe("IronAxe3"),
stats: (
equip_time_millis: 400,
power: 1.20,
),
)
),
)

13
assets/common/items/weapons/axe/iron_axe-4.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Butcher's Axe",
description: "Forged from iron.",
kind: Tool(
(
kind: Axe("IronAxe4"),
stats: (
equip_time_millis: 400,
power: 1.20,
),
)
),
)

13
assets/common/items/weapons/axe/iron_axe-5.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Barbarian's Axe",
description: "Forged from iron.",
kind: Tool(
(
kind: Axe("IronAxe5"),
stats: (
equip_time_millis: 400,
power: 1.20,
),
)
),
)

13
assets/common/items/weapons/axe/iron_axe-6.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Iron Axe",
description: "Forged from iron.",
kind: Tool(
(
kind: Axe("IronAxe6"),
stats: (
equip_time_millis: 400,
power: 1.20,
),
)
),
)

13
assets/common/items/weapons/axe/iron_axe-7.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Iron Labrys",
description: "Forged from iron.",
kind: Tool(
(
kind: Axe("IronAxe7"),
stats: (
equip_time_millis: 400,
power: 1.20,
),
)
),
)

13
assets/common/items/weapons/axe/iron_axe-8.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Fanged Axe",
description: "Forged from iron.",
kind: Tool(
(
kind: Axe("IronAxe8"),
stats: (
equip_time_millis: 400,
power: 1.20,
),
)
),
)

13
assets/common/items/weapons/axe/iron_axe-9.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Wolfen Axe",
description: "Forged from iron.",
kind: Tool(
(
kind: Axe("IronAxe9"),
stats: (
equip_time_millis: 400,
power: 1.20,
),
)
),
)

13
assets/common/items/weapons/axe/malachite_axe-0.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Malachite Axe",
description: "An axe infused with malachite.",
kind: Tool(
(
kind: Axe("MalachiteAxe0"),
stats: (
equip_time_millis: 400,
power: 2.00,
),
)
),
)

13
assets/common/items/weapons/axe/orc_axe-0.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Beast Cleaver",
description: "Created by orcs to cleave beasts in 2.",
kind: Tool(
(
kind: Axe("OrcAxe0"),
stats: (
equip_time_millis: 400,
power: 0.60,
),
)
),
)

7
assets/common/items/weapons/axe/starter_axe.ron
View File

@ -1,10 +1,13 @@
Item(
name: "Notched Axe",
description: "Two-Hand Axe\n\nPower 3-14\n\nEvery dent tells the story of a chopped tree.\n\n<Right-Click to use>",
description: "Every dent tells the story of a chopped tree.",
kind: Tool(
(
kind: Axe(BasicAxe),
kind: Axe("BasicAxe"),
stats: (
equip_time_millis: 400,
power: 0.50,
),
)
),
)

13
assets/common/items/weapons/axe/steel_axe-0.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Steel Battleaxe",
description: "Forged from steel.",
kind: Tool(
(
kind: Axe("SteelAxe0"),
stats: (
equip_time_millis: 400,
power: 1.40,
),
)
),
)

13
assets/common/items/weapons/axe/steel_axe-1.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Steel Labrys",
description: "Forged from steel.",
kind: Tool(
(
kind: Axe("SteelAxe1"),
stats: (
equip_time_millis: 400,
power: 1.40,
),
)
),
)

13
assets/common/items/weapons/axe/steel_axe-2.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Steel Axe",
description: "Forged from steel.",
kind: Tool(
(
kind: Axe("SteelAxe2"),
stats: (
equip_time_millis: 400,
power: 1.40,
),
)
),
)

13
assets/common/items/weapons/axe/steel_axe-3.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Crescent Axe",
description: "Forged from steel.",
kind: Tool(
(
kind: Axe("SteelAxe3"),
stats: (
equip_time_millis: 400,
power: 1.40,
),
)
),
)

13
assets/common/items/weapons/axe/steel_axe-4.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Moon Axe",
description: "Forged from steel.",
kind: Tool(
(
kind: Axe("SteelAxe4"),
stats: (
equip_time_millis: 400,
power: 1.40,
),
)
),
)

13
assets/common/items/weapons/axe/steel_axe-5.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Owl Axe",
description: "Forged from steel.",
kind: Tool(
(
kind: Axe("SteelAxe5"),
stats: (
equip_time_millis: 400,
power: 1.40,
),
)
),
)

13
assets/common/items/weapons/axe/steel_axe-6.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Spade Axe",
description: "Forged from steel.",
kind: Tool(
(
kind: Axe("SteelAxe6"),
stats: (
equip_time_millis: 400,
power: 1.40,
),
)
),
)

13
assets/common/items/weapons/axe/worn_iron_axe-0.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Worn Dwarven Axe",
description: "Hopefully it's previous owner won't miss it.",
kind: Tool(
(
kind: Axe("WornIronAxe0"),
stats: (
equip_time_millis: 400,
power: 0.80,
),
)
),
)

13
assets/common/items/weapons/axe/worn_iron_axe-1.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Worn Elven Axe",
description: "Hopefully it's previous owner won't miss it.",
kind: Tool(
(
kind: Axe("WornIronAxe1"),
stats: (
equip_time_millis: 400,
power: 0.80,
),
)
),
)

13
assets/common/items/weapons/axe/worn_iron_axe-2.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Worn Human Axe",
description: "Hopefully it's previous owner won't miss it.",
kind: Tool(
(
kind: Axe("WornIronAxe2"),
stats: (
equip_time_millis: 400,
power: 0.80,
),
)
),
)

13
assets/common/items/weapons/axe/worn_iron_axe-3.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Worn Orcish Axe",
description: "Hopefully it's previous owner won't miss it.",
kind: Tool(
(
kind: Axe("WornIronAxe3"),
stats: (
equip_time_millis: 400,
power: 0.80,
),
)
),
)

13
assets/common/items/weapons/axe/worn_iron_axe-4.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Beetle Axe",
description: "The blade is in the shape of a beetle.",
kind: Tool(
(
kind: Axe("WornIronAxe4"),
stats: (
equip_time_millis: 400,
power: 0.80,
),
)
),
)

13
assets/common/items/weapons/bow/horn_longbow-0.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Horn Bow",
description: "You don't recognize the creature these horns belong to.",
kind: Tool(
(
kind: Bow("HornLongbow0"),
stats: (
equip_time_millis: 400,
power: 1.50,
),
)
),
)

13
assets/common/items/weapons/bow/iron_longbow-0.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Soldier's Bow",
description: "Has an insignia on it.",
kind: Tool(
(
kind: Bow("IronLongbow0"),
stats: (
equip_time_millis: 400,
power: 1.75,
),
)
),
)

13
assets/common/items/weapons/bow/leafy_longbow-0.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Elven Longbow",
description: "There's a new leaf starting to grow.",
kind: Tool(
(
kind: Bow("LeafyLongbow0"),
stats: (
equip_time_millis: 400,
power: 1.25,
),
)
),
)

13
assets/common/items/weapons/bow/leafy_shortbow-0.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Elven Shortbow",
description: "The wood still seems alive.",
kind: Tool(
(
kind: Bow("LeafyShortbow0"),
stats: (
equip_time_millis: 400,
power: 1.00,
),
)
),
)

13
assets/common/items/weapons/bow/rare_longbow.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Enchanted Longbow",
description: "You can sense power resting in the bow.",
kind: Tool(
(
kind: Bow("RareLongbow"),
stats: (
equip_time_millis: 400,
power: 2.00,
),
)
),
)

7
assets/common/items/weapons/bow/starter_bow.ron
View File

@ -1,10 +1,13 @@
Item(
name: "Uneven Bow",
description: "Bow\n\nPower: 5\n\nSomeone carved his initials into it...\n\n<Right-Click to use>",
description: "Someone carved his initials into it.",
kind: Tool(
(
kind: Bow(ShortBow0),
kind: Bow("ShortBow0"),
stats: (
equip_time_millis: 400,
power: 0.50,
),
)
),
)

13
assets/common/items/weapons/bow/wood_longbow-0.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Longbow",
description: "It's been well used.",
kind: Tool(
(
kind: Bow("WoodLongbow0"),
stats: (
equip_time_millis: 400,
power: 1.00,
),
)
),
)

13
assets/common/items/weapons/bow/wood_longbow-1.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Recurve Bow",
description: "It's hard to pull all the way back.",
kind: Tool(
(
kind: Bow("WoodLongbow1"),
stats: (
equip_time_millis: 400,
power: 1.00,
),
)
),
)

13
assets/common/items/weapons/bow/wood_shortbow-0.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Hunting Bow",
description: "Strips of leather are wrapped around the handle.",
kind: Tool(
(
kind: Bow("WoodShortbow0"),
stats: (
equip_time_millis: 400,
power: 0.75,
),
)
),
)

13
assets/common/items/weapons/bow/wood_shortbow-1.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Horse Bow",
description: "Works on the ground too.",
kind: Tool(
(
kind: Bow("WoodShortbow1"),
stats: (
equip_time_millis: 400,
power: 0.75,
),
)
),
)

7
assets/common/items/weapons/dagger/starter_dagger.ron
View File

@ -1,10 +1,13 @@
Item(
name: "Rusty Dagger",
description: "One-Hand Dagger\n\nPower 5-6\n\n#writing.\n\n<Right-Click to use>",
description: "Easily concealed.",
kind: Tool(
(
kind: Dagger(BasicDagger),
kind: Dagger("BasicDagger"),
stats: (
equip_time_millis: 300,
power: 1.00,
),
)
),
)

10
assets/common/items/weapons/empty.ron
View File

@ -1,10 +0,0 @@
Item(
name: "Empty",
description: "",
kind: Tool (
(
kind: Empty,
equip_time_millis: 200,
)
),
)

13
assets/common/items/weapons/empty/empty.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Empty",
description: "You expected a description?",
kind: Tool (
(
kind: Empty,
stats: (
equip_time_millis: 200,
power: 1.00,
),
)
),
)

13
assets/common/items/weapons/hammer/bronze_hammer-0.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Bronze Hammer",
description: "Forged with bronze.",
kind: Tool(
(
kind: Hammer("BronzeHammer0"),
stats: (
equip_time_millis: 500,
power: 1.00,
),
)
),
)

13
assets/common/items/weapons/hammer/bronze_hammer-1.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Bronze Club",
description: "Forged with bronze.",
kind: Tool(
(
kind: Hammer("BronzeHammer1"),
stats: (
equip_time_millis: 500,
power: 1.00,
),
)
),
)

13
assets/common/items/weapons/hammer/cobalt_hammer-0.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Cobalt Hammer",
description: "Forged with cobalt.",
kind: Tool(
(
kind: Hammer("CobaltHammer0"),
stats: (
equip_time_millis: 500,
power: 1.60,
),
)
),
)

13
assets/common/items/weapons/hammer/cobalt_hammer-1.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Cobalt Mace",
description: "Forged with cobalt.",
kind: Tool(
(
kind: Hammer("CobaltHammer1"),
stats: (
equip_time_millis: 500,
power: 1.60,
),
)
),
)

13
assets/common/items/weapons/hammer/flimsy_hammer.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Flimsy Hammer",
description: "The head is barely secured.",
kind: Tool(
(
kind: Hammer("FlimsyHammer"),
stats: (
equip_time_millis: 500,
power: 0.50,
),
)
),
)

7
assets/common/items/weapons/hammer/hammer_1.ron
View File

@ -1,10 +1,13 @@
Item(
name: "Crude Mallet",
description: "Two-Hand Hammer\n\nPower: 10-12\n\nBreaks bones like sticks and stones.\n\n<Right-Click to use>",
description: "Breaks bones like sticks and stones.",
kind: Tool(
(
kind: Hammer(BasicHammer),
kind: Hammer("BasicHammer"),
stats: (
equip_time_millis: 500,
power: 0.50,
),
)
)
)

13
assets/common/items/weapons/hammer/iron_hammer-0.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Iron Hammer",
description: "Forged with iron.",
kind: Tool(
(
kind: Hammer("IronHammer0"),
stats: (
equip_time_millis: 500,
power: 1.20,
),
)
),
)

13
assets/common/items/weapons/hammer/iron_hammer-1.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Iron Battlehammer",
description: "Forged with iron.",
kind: Tool(
(
kind: Hammer("IronHammer1"),
stats: (
equip_time_millis: 500,
power: 1.20,
),
)
),
)

13
assets/common/items/weapons/hammer/iron_hammer-2.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Iron Mace",
description: "Forged with iron.",
kind: Tool(
(
kind: Hammer("IronHammer2"),
stats: (
equip_time_millis: 500,
power: 1.20,
),
)
),
)

13
assets/common/items/weapons/hammer/iron_hammer-3.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Crowned Mace",
description: "Forged with iron.",
kind: Tool(
(
kind: Hammer("IronHammer3"),
stats: (
equip_time_millis: 500,
power: 1.20,
),
)
),
)

13
assets/common/items/weapons/hammer/iron_hammer-4.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Forge Hammer",
description: "Forged with iron.",
kind: Tool(
(
kind: Hammer("IronHammer4"),
stats: (
equip_time_millis: 500,
power: 1.20,
),
)
),
)

13
assets/common/items/weapons/hammer/iron_hammer-5.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Pike Hammer",
description: "Forged with iron.",
kind: Tool(
(
kind: Hammer("IronHammer5"),
stats: (
equip_time_millis: 500,
power: 1.20,
),
)
),
)

13
assets/common/items/weapons/hammer/iron_hammer-6.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Spiked Maul",
description: "Forged with iron.",
kind: Tool(
(
kind: Hammer("IronHammer6"),
stats: (
equip_time_millis: 500,
power: 1.20,
),
)
),
)

13
assets/common/items/weapons/hammer/iron_hammer-7.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Giant's Fist",
description: "Forged with iron.",
kind: Tool(
(
kind: Hammer("IronHammer7"),
stats: (
equip_time_millis: 500,
power: 1.20,
),
)
),
)

13
assets/common/items/weapons/hammer/iron_hammer-8.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Lucerne Hammer",
description: "Forged with iron.",
kind: Tool(
(
kind: Hammer("IronHammer8"),
stats: (
equip_time_millis: 500,
power: 1.20,
),
)
),
)

13
assets/common/items/weapons/hammer/mjolnir.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Mjolnir",
description: "It's crackling with lightning.",
kind: Tool(
(
kind: Hammer("Mjolnir"),
stats: (
equip_time_millis: 500,
power: 2.00,
),
)
),
)

13
assets/common/items/weapons/hammer/ramshead_hammer.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Ram's Head Mace",
description: "You feel an evil presence in the hammer.",
kind: Tool(
(
kind: Hammer("RamsheadHammer"),
stats: (
equip_time_millis: 500,
power: 1.80,
),
)
),
)

13
assets/common/items/weapons/hammer/runic_hammer.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Runic Hammer",
description: "There are strange runes inscribed into it.",
kind: Tool(
(
kind: Hammer("RunicHammer"),
stats: (
equip_time_millis: 500,
power: 1.80,
),
)
),
)

7
assets/common/items/weapons/hammer/starter_hammer.ron
View File

@ -1,10 +1,13 @@
Item(
name: "Sturdy Old Hammer",
description: "Two-Hand Hammer\n\nPower: 10-12\n\n'Property of...' The rest is missing.\n\n<Right-Click to use>",
description: "'Property of...' The rest is missing.",
kind: Tool(
(
kind: Hammer(BasicHammer),
kind: Hammer("BasicHammer"),
stats: (
equip_time_millis: 500,
power: 0.50,
),
)
),
)

13
assets/common/items/weapons/hammer/steel_hammer-0.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Steel Hammer",
description: "Forged with steel.",
kind: Tool(
(
kind: Hammer("SteelHammer0"),
stats: (
equip_time_millis: 500,
power: 1.40,
),
)
),
)

13
assets/common/items/weapons/hammer/steel_hammer-1.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Steel Greathammer",
description: "Forged with steel.",
kind: Tool(
(
kind: Hammer("SteelHammer1"),
stats: (
equip_time_millis: 500,
power: 1.40,
),
)
),
)

13
assets/common/items/weapons/hammer/steel_hammer-2.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Steel Club",
description: "Forged with steel.",
kind: Tool(
(
kind: Hammer("SteelHammer2"),
stats: (
equip_time_millis: 500,
power: 1.40,
),
)
),
)

13
assets/common/items/weapons/hammer/steel_hammer-3.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Battle Mace",
description: "Forged with steel.",
kind: Tool(
(
kind: Hammer("SteelHammer3"),
stats: (
equip_time_millis: 500,
power: 1.40,
),
)
),
)

13
assets/common/items/weapons/hammer/steel_hammer-4.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Brute's Hammer",
description: "Forged with steel.",
kind: Tool(
(
kind: Hammer("SteelHammer4"),
stats: (
equip_time_millis: 500,
power: 1.40,
),
)
),
)

13
assets/common/items/weapons/hammer/steel_hammer-5.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Morning Star",
description: "Forged with steel.",
kind: Tool(
(
kind: Hammer("SteelHammer5"),
stats: (
equip_time_millis: 500,
power: 1.40,
),
)
),
)

13
assets/common/items/weapons/hammer/stone_hammer-0.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Basalt Sledgehammer",
description: "It seems brittle.",
kind: Tool(
(
kind: Hammer("StoneHammer0"),
stats: (
equip_time_millis: 500,
power: 0.70,
),
)
),
)

13
assets/common/items/weapons/hammer/stone_hammer-1.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Granite Sledgehammer",
description: "It seems brittle.",
kind: Tool(
(
kind: Hammer("StoneHammer1"),
stats: (
equip_time_millis: 500,
power: 0.70,
),
)
),
)

13
assets/common/items/weapons/hammer/stone_hammer-2.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Rocky Maul",
description: "It seems brittle.",
kind: Tool(
(
kind: Hammer("StoneHammer2"),
stats: (
equip_time_millis: 500,
power: 0.70,
),
)
),
)

13
assets/common/items/weapons/hammer/stone_hammer-3.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Stone Sledgehammer",
description: "It seems brittle.",
kind: Tool(
(
kind: Hammer("StoneHammer3"),
stats: (
equip_time_millis: 500,
power: 0.70,
),
)
),
)

13
assets/common/items/weapons/hammer/wood_hammer-0.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Hardwood Mallet",
description: "Seems sturdy enough.",
kind: Tool(
(
kind: Hammer("WoodHammer0"),
stats: (
equip_time_millis: 500,
power: 0.60,
),
)
),
)

13
assets/common/items/weapons/hammer/worn_iron_hammer-0.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Worn Dwarven Hammer",
description: "The previous owner won't miss it much.",
kind: Tool(
(
kind: Hammer("WornIronHammer0"),
stats: (
equip_time_millis: 500,
power: 0.85,
),
)
),
)

13
assets/common/items/weapons/hammer/worn_iron_hammer-1.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Worn Elven Hammer",
description: "The previous owner won't miss it much.",
kind: Tool(
(
kind: Hammer("WornIronHammer1"),
stats: (
equip_time_millis: 500,
power: 0.85,
),
)
),
)

13
assets/common/items/weapons/hammer/worn_iron_hammer-2.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Worn Human Mace",
description: "The previous owner won't miss it much.",
kind: Tool(
(
kind: Hammer("WornIronHammer2"),
stats: (
equip_time_millis: 500,
power: 0.85,
),
)
),
)

13
assets/common/items/weapons/hammer/worn_iron_hammer-3.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Worn Orcish Hammer",
description: "The previous owner won't miss it much.",
kind: Tool(
(
kind: Hammer("WornIronHammer3"),
stats: (
equip_time_millis: 500,
power: 0.85,
),
)
),
)

7
assets/common/items/weapons/shield/shield_1.ron
View File

@ -1,10 +1,13 @@
Item(
name: "A Tattered Targe",
description: "One-Hand Shield\n\nPower 5-6\n\n#writing.\n\n<Right-Click to use>",
description: "Should withstand a few more hits, hopefully...",
kind: Tool (
(
kind: Shield(BasicShield),
kind: Shield("BasicShield"),
stats: (
equip_time_millis: 400,
power: 1.00,
),
)
),
)

13
assets/common/items/weapons/staff/amethyst_staff.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Amethyst Staff",
description: "The amethyst faintly glows.",
kind: Tool(
(
kind: Staff("AmethystStaff"),
stats: (
equip_time_millis: 300,
power: 1.50,
),
)
),
)

13
assets/common/items/weapons/staff/bone_staff.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Bone Staff",
description: "There's a red gem suspended in the bones.",
kind: Tool(
(
kind: Staff("BoneStaff"),
stats: (
equip_time_millis: 300,
power: 1.00,
),
)
),
)

13
assets/common/items/weapons/staff/cultist_staff.ron Normal file
View File

@ -0,0 +1,13 @@
Item(
name: "Cultist Staff",
description: "The fire gives off no heat.",
kind: Tool(
(
kind: Staff("CultistStaff"),
stats: (
equip_time_millis: 300,
power: 2.00,
),
)
),
)

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