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

This commit is contained in:
Joshua Yanovski 2020-08-03 05:49:27 +02:00
commit be37acf287
144 changed files with 531 additions and 841 deletions

View File

@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Display item name over loot/dropped items
- Added Lottery system for loot
- Added context-sensitive crosshair
- Announce alias changes to all clients
@ -76,6 +77,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- 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
- Fixed window resizing on Mac OS X.
### Removed

View File

@ -3,7 +3,7 @@ Item(
description: "With great power comes\ngreat responsibility.",
kind: Armor(
(
kind: Back(Admin),
kind: Back("Admin"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Smells like dark magic and candles.",
kind: Armor(
(
kind: Back(DungPurp0),
kind: Back("DungPurp0"),
stats: (
protection: Normal(3.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Probably made of the finest leather.",
kind: Armor(
(
kind: Back(Short0),
kind: Back("Short0"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Only the best for a member of the creed.",
kind: Armor(
(
kind: Belt(Assassin),
kind: Belt("Assassin"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Soft and warm",
kind: Armor(
(
kind: Belt(ClothBlue0),
kind: Belt("ClothBlue0"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Soft and warm.",
kind: Armor(
(
kind: Belt(ClothGreen0),
kind: Belt("ClothGreen0"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Soft and warm.",
kind: Armor(
(
kind: Belt(ClothPurple0),
kind: Belt("ClothPurple0"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Ceremonial attire used by members.",
kind: Armor(
(
kind: Belt(Cultist),
kind: Belt("Cultist"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Twisted vines to keep everything secure.",
kind: Armor(
(
kind: Belt(Druid),
kind: Belt("Druid"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Swift like the wind.",
kind: Armor(
(
kind: Belt(Leather0),
kind: Belt("Leather0"),
stats: (
protection: Normal(0.0),
),

View File

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

View File

@ -3,7 +3,7 @@ Item(
description: "A belt with a buckle forged from iron.",
kind: Armor(
(
kind: Belt(Plate0),
kind: Belt("Plate0"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "A belt forged from steel.",
kind: Armor(
(
kind: Belt(Steel0),
kind: Belt("Steel0"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "A belt made from woven from twigs.",
kind: Armor(
(
kind: Belt(Twig),
kind: Belt("Twig"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "A belt woven from twigs and flowers.",
kind: Armor(
(
kind: Belt(Twigsflowers),
kind: Belt("Twigsflowers"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "A belt woven from twigs and leaves.",
kind: Armor(
(
kind: Belt(Twigsleaves),
kind: Belt("Twigsleaves"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Only the best for a member of the creed.",
kind: Armor(
(
kind: Chest(Assassin),
kind: Chest("Assassin"),
stats: (
protection: Normal(6.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Soft and warm.",
kind: Armor(
(
kind: Chest(ClothBlue0),
kind: Chest("ClothBlue0"),
stats: (
protection: Normal(1.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Soft and warm.",
kind: Armor(
(
kind: Chest(ClothGreen0),
kind: Chest("ClothGreen0"),
stats: (
protection: Normal(1.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Soft and warm.",
kind: Armor(
(
kind: Chest(ClothPurple0),
kind: Chest("ClothPurple0"),
stats: (
protection: Normal(1.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Ceremonial attire used by members.",
kind: Armor(
(
kind: Chest(CultistBlue),
kind: Chest("CultistBlue"),
stats: (
protection: Normal(30.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Ceremonial attire used by members.",
kind: Armor(
(
kind: Chest(CultistPurple),
kind: Chest("CultistPurple"),
stats: (
protection: Normal(30.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Druidic chest wrappings.",
kind: Armor(
(
kind: Chest(Druid),
kind: Chest("Druid"),
stats: (
protection: Normal(6.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Swift like the wind.",
kind: Armor(
(
kind: Chest(Leather0),
kind: Chest("Leather0"),
stats: (
protection: Normal(10.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "A cuirass made of simple leather.",
kind: Armor(
(
kind: Chest(Leather2),
kind: Chest("Leather2"),
stats: (
protection: Normal(10.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "A chestplate forged from iron.",
kind: Armor(
(
kind: Chest(PlateGreen0),
kind: Chest("PlateGreen0"),
stats: (
protection: Normal(20.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "A cuirass of steel plate.",
kind: Armor(
(
kind: Chest(Steel0),
kind: Chest("Steel0"),
stats: (
protection: Normal(25.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "A shirt woven from twigs.",
kind: Armor(
(
kind: Chest(Twig),
kind: Chest("Twig"),
stats: (
protection: Normal(15.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "A shirt woven from twigs and flowers.",
kind: Armor(
(
kind: Chest(Twigsflowers),
kind: Chest("Twigsflowers"),
stats: (
protection: Normal(15.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "A shirt woven from twigs and leaves.",
kind: Armor(
(
kind: Chest(Twigsleaves),
kind: Chest("Twigsleaves"),
stats: (
protection: Normal(15.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Was used by a farmer, until recently.",
kind: Armor(
(
kind: Chest(WorkerGreen0),
kind: Chest("WorkerGreen0"),
stats: (
protection: Normal(1.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Was used by a farmer, until recently.",
kind: Armor(
(
kind: Chest(WorkerGreen1),
kind: Chest("WorkerGreen1"),
stats: (
protection: Normal(1.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Was used by a farmer, until recently.",
kind: Armor(
(
kind: Chest(WorkerOrange0),
kind: Chest("WorkerOrange0"),
stats: (
protection: Normal(1.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Was used by a farmer, until recently.",
kind: Armor(
(
kind: Chest(WorkerOrange1),
kind: Chest("WorkerOrange1"),
stats: (
protection: Normal(1.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Was used by a farmer, until recently.",
kind: Armor(
(
kind: Chest(WorkerPurple0),
kind: Chest("WorkerPurple0"),
stats: (
protection: Normal(1.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Was used by a farmer, until recently.",
kind: Armor(
(
kind: Chest(WorkerPurple1),
kind: Chest("WorkerPurple1"),
stats: (
protection: Normal(1.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Was used by a farmer, until recently.",
kind: Armor(
(
kind: Chest(WorkerRed0),
kind: Chest("WorkerRed0"),
stats: (
protection: Normal(1.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Was used by a farmer, until recently.",
kind: Armor(
(
kind: Chest(WorkerRed1),
kind: Chest("WorkerRed1"),
stats: (
protection: Normal(1.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Was used by a farmer, until recently.",
kind: Armor(
(
kind: Chest(WorkerYellow0),
kind: Chest("WorkerYellow0"),
stats: (
protection: Normal(1.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Was used by a farmer, until recently.",
kind: Armor(
(
kind: Chest(WorkerYellow1),
kind: Chest("WorkerYellow1"),
stats: (
protection: Normal(1.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Only the best for a member of the creed.",
kind: Armor(
(
kind: Foot(Assassin),
kind: Foot("Assassin"),
stats: (
protection: Normal(1.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Soft and warm.",
kind: Armor(
(
kind: Foot(ClothBlue0),
kind: Foot("ClothBlue0"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Soft and warm.",
kind: Armor(
(
kind: Foot(ClothGreen0),
kind: Foot("ClothGreen0"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Soft and warm.",
kind: Armor(
(
kind: Foot(ClothPurple0),
kind: Foot("ClothPurple0"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Ceremonial attire used by members.",
kind: Armor(
(
kind: Foot(Cultist),
kind: Foot("Cultist"),
stats: (
protection: Normal(6.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "For treading softly through the woods.",
kind: Armor(
(
kind: Foot(Druid),
kind: Foot("Druid"),
stats: (
protection: Normal(1.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "So warm and cozy!",
kind: Armor(
(
kind: Foot(JackalopeSlips),
kind: Foot("JackalopeSlips"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Swift like the wind.",
kind: Armor(
(
kind: Foot(Leather0),
kind: Foot("Leather0"),
stats: (
protection: Normal(2.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Boots made of simple leather.",
kind: Armor(
(
kind: Foot(Leather2),
kind: Foot("Leather2"),
stats: (
protection: Normal(2.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Boots forged from iron.",
kind: Armor(
(
kind: Foot(Plate0),
kind: Foot("Plate0"),
stats: (
protection: Normal(4.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Boots forged from steel.",
kind: Armor(
(
kind: Foot(Steel0),
kind: Foot("Steel0"),
stats: (
protection: Normal(5.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Boots woven from twigs.",
kind: Armor(
(
kind: Foot(Twig),
kind: Foot("Twig"),
stats: (
protection: Normal(3.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Boots woven from twigs and flowers.",
kind: Armor(
(
kind: Foot(Twigsflowers),
kind: Foot("Twigsflowers"),
stats: (
protection: Normal(3.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Boots woven from twigs and leaves.",
kind: Armor(
(
kind: Foot(Twigsleaves),
kind: Foot("Twigsleaves"),
stats: (
protection: Normal(3.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Only the best for a member of the creed.",
kind: Armor(
(
kind: Hand(Assassin),
kind: Hand("Assassin"),
stats: (
protection: Normal(2.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "A strip of cloth.",
kind: Armor(
(
kind: Hand(ClothBlue0),
kind: Hand("ClothBlue0"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "A strip of cloth.",
kind: Armor(
(
kind: Hand(ClothGreen0),
kind: Hand("ClothGreen0"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "A strip of cloth.",
kind: Armor(
(
kind: Hand(ClothPurple0),
kind: Hand("ClothPurple0"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Ceremonial attire used by members.",
kind: Armor(
(
kind: Hand(CultistBlue),
kind: Hand("CultistBlue"),
stats: (
protection: Normal(12.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Ceremonial attire used by members.",
kind: Armor(
(
kind: Hand(CultistPurple),
kind: Hand("CultistPurple"),
stats: (
protection: Normal(12.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Soft, strong, and flexible.",
kind: Armor(
(
kind: Hand(Druid),
kind: Hand("Druid"),
stats: (
protection: Normal(2.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Swift like the wind.",
kind: Armor(
(
kind: Hand(Leather0),
kind: Hand("Leather0"),
stats: (
protection: Normal(4.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Gloves made of simple leather.",
kind: Armor(
(
kind: Hand(Leather2),
kind: Hand("Leather2"),
stats: (
protection: Normal(4.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Gauntlets forged from iron.",
kind: Armor(
(
kind: Hand(Plate0),
kind: Hand("Plate0"),
stats: (
protection: Normal(8.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Gauntlets forged from steel.",
kind: Armor(
(
kind: Hand(Steel0),
kind: Hand("Steel0"),
stats: (
protection: Normal(10.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Handwraps woven from twigs.",
kind: Armor(
(
kind: Hand(Twig),
kind: Hand("Twig"),
stats: (
protection: Normal(6.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Handwraps woven from twigs and flowers.",
kind: Armor(
(
kind: Hand(Twigsflowers),
kind: Hand("Twigsflowers"),
stats: (
protection: Normal(6.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Handwraps woven from twigs and leaves.",
kind: Armor(
(
kind: Hand(Twigsleaves),
kind: Hand("Twigsleaves"),
stats: (
protection: Normal(6.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Used to obscure your face.",
kind: Armor(
(
kind: Head(AssaMask0),
kind: Head("AssaMask0"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Swift like the wind.",
kind: Armor(
(
kind: Head(Leather0),
kind: Head("Leather0"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "It's become tarnished with age.",
kind: Armor(
(
kind: Neck(Neck0),
kind: Neck("Neck0"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Only the best for a member of the creed.",
kind: Armor(
(
kind: Pants(Assassin),
kind: Pants("Assassin"),
stats: (
protection: Normal(5.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "A skirt made from linen.",
kind: Armor(
(
kind: Pants(ClothBlue0),
kind: Pants("ClothBlue0"),
stats: (
protection: Normal(1.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "A skirt made from linen.",
kind: Armor(
(
kind: Pants(ClothGreen0),
kind: Pants("ClothGreen0"),
stats: (
protection: Normal(1.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "A skirt made from linen.",
kind: Armor(
(
kind: Pants(ClothPurple0),
kind: Pants("ClothPurple0"),
stats: (
protection: Normal(1.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Ceremonial attire used by members.",
kind: Armor(
(
kind: Pants(CultistBlue),
kind: Pants("CultistBlue"),
stats: (
protection: Normal(24.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Ceremonial attire used by members.",
kind: Armor(
(
kind: Pants(CultistPurple),
kind: Pants("CultistPurple"),
stats: (
protection: Normal(24.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Feel the breeze!",
kind: Armor(
(
kind: Pants(Druid),
kind: Pants("Druid"),
stats: (
protection: Normal(4.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Crafted from soft, supple leather.",
kind: Armor(
(
kind: Pants(Hunting),
kind: Pants("Hunting"),
stats: (
protection: Normal(8.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Swift like the wind.",
kind: Armor(
(
kind: Pants(Leather0),
kind: Pants("Leather0"),
stats: (
protection: Normal(8.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Leg armour made of simple leather.",
kind: Armor(
(
kind: Pants(Leather2),
kind: Pants("Leather2"),
stats: (
protection: Normal(8.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Greaves forged from iron.",
kind: Armor(
(
kind: Pants(PlateGreen0),
kind: Pants("PlateGreen0"),
stats: (
protection: Normal(16.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Greaves forged from steel.",
kind: Armor(
(
kind: Pants(Steel0),
kind: Pants("Steel0"),
stats: (
protection: Normal(20.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Pants woven from twigs. Chafey!",
kind: Armor(
(
kind: Pants(Twig),
kind: Pants("Twig"),
stats: (
protection: Normal(12.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Pants woven from twigs and flowers. Fragrant!",
kind: Armor(
(
kind: Pants(Twigsflowers),
kind: Pants("Twigsflowers"),
stats: (
protection: Normal(12.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Pants woven from twigs and leaves. Slightly less chafey than the twig pants!",
kind: Armor(
(
kind: Pants(Twigsleaves),
kind: Pants("Twigsleaves"),
stats: (
protection: Normal(12.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Pants used by a farmer, until recently.",
kind: Armor(
(
kind: Pants(WorkerBlue0),
kind: Pants("WorkerBlue0"),
stats: (
protection: Normal(1.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Barely fits your finger.",
kind: Armor(
(
kind: Ring(Ring0),
kind: Ring("Ring0"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Only the best for a member of the creed.",
kind: Armor(
(
kind: Shoulder(Assassin),
kind: Shoulder("Assassin"),
stats: (
protection: Normal(3.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "A warm coat.",
kind: Armor(
(
kind: Shoulder(ClothBlue0),
kind: Shoulder("ClothBlue0"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Simple shoulderpads made from blue cloth.",
kind: Armor(
(
kind: Shoulder(ClothBlue1),
kind: Shoulder("ClothBlue1"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "A warm coat.",
kind: Armor(
(
kind: Shoulder(ClothGreen0),
kind: Shoulder("ClothGreen0"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "A warm coat.",
kind: Armor(
(
kind: Shoulder(ClothPurple0),
kind: Shoulder("ClothPurple0"),
stats: (
protection: Normal(0.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Ceremonial attire used by members.",
kind: Armor(
(
kind: Shoulder(CultistBlue),
kind: Shoulder("CultistBlue"),
stats: (
protection: Normal(18.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Ceremonial attire used by members.",
kind: Armor(
(
kind: Shoulder(CultistPurple),
kind: Shoulder("CultistPurple"),
stats: (
protection: Normal(18.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Forged for protectors of the wild.",
kind: Armor(
(
kind: Shoulder(DruidShoulder),
kind: Shoulder("DruidShoulder"),
stats: (
protection: Normal(3.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Iron shoulder pads with spikes attached.",
kind: Armor(
(
kind: Shoulder(IronSpikes),
kind: Shoulder("IronSpikes"),
stats: (
protection: Normal(12.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Shoulder pads made of leather.",
kind: Armor(
(
kind: Shoulder(Leather0),
kind: Shoulder("Leather0"),
stats: (
protection: Normal(6.0),
),

View File

@ -3,7 +3,7 @@ Item(
description: "Swift like the wind.",
kind: Armor(
(
kind: Shoulder(Leather1),
kind: Shoulder("Leather1"),
stats: (
protection: Normal(6.0),
),

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