Commit Graph

136 Commits

Author SHA1 Message Date
Sam
21084e48f0 Removed old weapons that were migrated to modular weapons. 2022-05-16 15:11:00 -04:00
Sam
c0ac8891ab Added initial recipes for bow, staff, and sceptre components. 2022-05-16 15:10:58 -04:00
Sam
762b3be3c3 Modular weapons can now be dropped as loot or assigned to enemies. 2022-05-16 15:10:56 -04:00
Sam
f9256ecd62 Added recipes 2022-05-16 15:10:51 -04:00
Sam
77934c9214 Made changes to crafting to allow modular weapons to work as intended. 2022-05-16 15:10:48 -04:00
Youssef Fahmy
9cd87b1af7 Christmas Cleanup 2021-12-30 18:58:15 +00:00
UncomfySilence
e70fd8d397 + Added Gemu models
+ Created manifest files for each
+ Created stats and other needs
+ Changed Event date from (24..=25) to (20..=30)
2021-12-20 18:06:19 +00:00
UncomfySilence
cd995b5ffe + Added limited event recipe. Can make one diamond with 20 coal. (actual conversion ratio would be around 12.5) 2021-12-20 18:03:52 +00:00
James Melkonian
5f6d1c3438 Convert Armor Stats to Options 2021-12-12 00:25:35 +00:00
Monty Marz
ec07dbb05e Merchant Outfit 2021-11-18 16:31:12 +00:00
Youssef Fahmy
6c52d4ca5e Minor edits 2021-11-03 21:27:47 +00:00
Evelyn
91477f7a5c Add new gliders 2021-10-30 20:48:04 +00:00
Sam
111abbc3bc Added salvage tags to items, removed old salvage recipes from recipe book. 2021-10-27 17:02:29 -04:00
Sam
ed5cf8ebf9 Backend stuff for salvaging. 2021-10-27 17:02:29 -04:00
Kemper
b85f535f3c Add moonweave to the orichalcum cape recipe
So that the ingredients include some cloth since it’s a cape.
2021-10-24 23:43:24 +00:00
Doctor Kompot
51f8aa06df DoctorKompot - New Necklaces 2021-10-22 05:24:20 +00:00
Seth
d42d9166a1 Reduce duplication in glider asset identifiers 2021-09-26 13:49:49 +00:00
Monty Marz
14eb0f9aa2 Remove sceptre, add swords 2021-07-29 22:38:35 +00:00
juliancoffee
1e358e6f0c Make ItemEquality work
+ Create own directory for trade_pricing `assets/common/trading`
+ Move fictive loot tables there
+ Mark sellable/non-sellable items in trade_pricing tests
2021-07-05 19:55:08 +03:00
juliancoffee
8b9316a2c6 Change Mortar and Pestle crafting recipe
- Make it require bowl instead of coconut
2021-07-05 10:56:29 +03:00
juliancoffee
12243bd0c0 Add is_recycling field to recipe book 2021-06-26 21:37:13 +03:00
juliancoffee
3d4eb7d6a4 Dismantle Leather items to Thick Leather
- Previously both Leather and Rawhide items were dismantled to simple
leather
2021-06-26 21:37:13 +03:00
Justin Shipsey
f983295318 Merge branch 'swilliams/jewellery' into 'master'
Gem Rings and small change to trading.

See merge request veloren/veloren!2500
2021-06-26 02:44:04 +00:00
Scott Williams
8d0a1ad7b4 Gem Rings and small change to trading. 2021-06-26 02:44:02 +00:00
Snowram
ef6d6563ea Ajust new npcs from feedback 2021-06-25 03:26:32 +02:00
jshipsey
0941f03608 buffs to stretch progression 2021-06-16 20:50:46 -04:00
Monty
c17e3ad996 Cactus Colada
Made cacti lootable
Cactus colada recipe and item
price balance
fmt

 "make it 8 and drop it to 20 or 25? Not really sure tbh"
2021-06-13 13:52:56 +02:00
Justin Shipsey
7eda90b8f7 Update simple_leather.ron 2021-06-11 08:32:49 +00:00
jshipsey
7cb5323eb6 small tweaks
t
2021-06-09 01:58:08 -04:00
jshipsey
fe1cbec37c various fixes to items 2021-06-07 21:21:12 -04:00
Christof Petig
c0f952030c Enable spinning flax (recipe got overwritten by linen from linen items) 2021-06-07 23:40:25 +02:00
Snowram
76ca99ece4 Derive str from Material, better deserialization 2021-06-07 11:03:50 +02:00
jshipsey
4deeb42155 cave adjustments 2021-06-07 11:02:34 +02:00
jshipsey
9034d0f25d comment addressing, cave tweaks 2021-06-07 11:01:46 +02:00
jshipsey
0e269b59d7 tooltip work 2021-06-07 11:01:32 +02:00
Snowram
29a38e6d4f Split tags into material class and material 2021-06-07 11:00:57 +02:00
Snowram
3fa7d0b6d4 Add material and armor class tags 2021-06-07 11:00:31 +02:00
jshipsey
7a573efab7 proper recipes, tanning racks, various fixes 2021-06-07 11:00:14 +02:00
jshipsey
8acd3832e3 more loot tables, overworld ores, more items 2021-06-07 11:00:00 +02:00
jshipsey
1c17d8fe5e cave changes 2021-06-07 10:59:44 +02:00
jshipsey
754b60d810 crafting stations 2021-06-07 10:59:35 +02:00
jshipsey
58bd51a9e8 icon work, more models 2021-06-07 10:58:27 +02:00
Sam
f2233d5b5d Recipe book fix 2021-06-07 10:58:07 +02:00
jshipsey
18e9b5b890 recipes, re-organization, cleanup 2021-06-07 10:58:05 +02:00
jshipsey
1b575a5a04 crafting item partial re-organization, armor recipes, some specific animal drops 2021-06-07 10:56:35 +02:00
jshipsey
f387b8d259 hides/leathers 2021-06-07 10:56:04 +02:00
jshipsey
451ccf8d73 more meat 2021-06-07 10:55:50 +02:00
jshipsey
ca907f1b87 added some meat 2021-06-07 10:55:34 +02:00
Monty
a4d56e7843 more sprite stuff and crafting UI update
fix item images
fix CR display
2021-04-20 02:46:06 +02:00
Monty
a1fe7c12c3 fmt, add sprites 2021-04-20 02:46:04 +02:00
Joshua Barretto
5598d07944 Added crafting stations 2021-04-20 02:45:59 +02:00
Scott Williams
d35475eaef Added leather scraps recipe 2021-03-26 16:44:38 +00:00
Joshua Barretto
f9612c1c26 Made pickaxe obtainable 2021-03-22 00:24:07 +00:00
Joshua Barretto
fb3980e273 Outcome for block destruction, take select_pos from ControllerInputs 2021-03-21 20:10:05 +00:00
Sarra
db3bc1b9bb added a white firework 2021-03-07 03:48:50 -05:00
jshipsey
8944115f8e more asset organization 2021-02-28 22:18:43 -05:00
Snowram
1172c2f2c3 Merge branch 'Sarrakitty/OceanFlora' into 'master'
added coral reefs, kelp forests, and seagrass

See merge request veloren/veloren!1819
2021-02-27 01:52:33 +00:00
Samuel Keiffer
6af9e58965 Merge branch 'add-gemu-models' into 'master'
Add sword and bow models from backlog

See merge request veloren/veloren!1818
2021-02-26 02:59:51 +00:00
Avi Weinstock
e1484c28c0 Finish plumbing MaterialStatsManifest. Fix issue with speed clamping when recursing through components. Improve statblocks in item tooltips. 2021-02-25 15:26:49 -05:00
Sarra
f39f5ab5d3 added coral reefs, kelp forests, and seagrass 2021-02-25 05:33:18 -05:00
Sam
b0b4a07b9e Bows 2021-02-24 20:37:43 -05:00
Sam
ee5c9d78ca Swords 2021-02-24 18:54:06 -05:00
Avi Weinstock
78014d7d3b Put material stats in their own manifest, and multiply a form's stats by the weighted average of the material multipliers. 2021-02-23 15:49:34 -05:00
Avi Weinstock
4e57678f34 Support modular weapon components made from a tagged material using the material as a multiplier. 2021-02-23 15:31:51 -05:00
Avi Weinstock
03d28f7d93 Implement tags for items, allowing a crafting recipe to take any item with that tag as input.
- Added a recipe that turns any of the cloth equipment dropped by villagers into 1x cloth scraps.
- Animate placeholder items for tagged crafting.
2021-02-16 01:05:54 +00:00
Sarra
7c23f97d89 tweaked a few things with the moth glider 2021-02-10 20:14:50 -05:00
Sarra
14b344469a basic gliders 2021-02-10 19:02:36 -05:00
Avi Weinstock
5d0c18efeb Crafting UI: sort items lexicographically by craftability and then alphabetically. 2021-02-09 19:30:54 -05:00
Scott Williams
e50bd4dc6f Changed some recipes to use other gems. Removed DELETE statements from migration. 2021-01-24 19:45:44 +00:00
Scott Williams
157e56d8ca Removed Shiny Gem, Added migration to change shiny gems to diamonds. Changed shiny gem recipes to diamonds 2021-01-24 16:40:22 +00:00
Monty
7cbf946a65 6 new sceptres, add DPS display to tooltips 2021-01-23 23:10:36 +01:00
Sarra Kitty
e7d852835c Sarrakitty/rotsys item sprites 2021-01-19 18:23:44 +00:00
Ben Wallis
aef2637288 Refactored loadout to have public functions for each slot instead of requiring callers to use the _INDEX consts 2021-01-08 19:12:09 +00:00
Sarra Kitty
e8eb2b3a6c new gliders
added sandraptor glider

added sandraptor glider

stuff

working on other raptor gliders

adding file and placeholder model (copy of morpho) for monarch butterfly gliders

adding models for snow and wood raptor gliders

added a proper model for the monarch glider

adding crafting recipies for raptor gliders, and raptor feather item for the recipe. Made monarch and morpho rare drops in cave loot table

made raptors drop their feathers

fmt
2020-12-24 02:54:18 +00:00
Entropy
98688651b5 changed kickers to use 3 leather 2020-12-08 16:27:21 -08:00
Monty Marz
ca932f6c15 easier to get minor potions
increase cost of a minor potion to 4 apples
2020-11-06 01:08:32 +01:00
Monty Marz
2b800a2b63 make clippy happy
Delete glider.ron
2020-10-07 02:23:20 +00:00
Monty Marz
13d9b814ab separate sceptres from staffs, show values below 1.0 as decimals in the SCT, add starting sceptre
remove firebolt from starting sceptre
2020-09-29 19:48:07 -05:00
Monty Marz
c9438c0947 Fixes
Fix Cave NPCs only spawning very deep inside caves

Increase twig density

Adjust armour values and ingredients for starter sword

fix healing rod using the wrong model

Hung up the lianas again
2020-08-22 23:37:45 +00:00
Monty Marz
e3eb34085f craftable starting set
velorite staff update

ore_nature_longbow

model fix
humanoid colours

Update agent.rs

improve rng (according to zesterer)

slower fleeing

More adjustments

fix cult leader name

more loot tables

all kinds of adjustments

smöl adjustments
2020-08-21 19:36:21 +02:00
Sam
9d2fe79a78 Changes to how critical hits function for melee attacks. Removed ability for explosions to crit. Velorite sceptre now functions as healing staff. 2020-08-21 19:36:20 +02:00
Monty Marz
55d126861f fix tooltips in char selection, more balancing
fix talking animals

fix critter exp, stronger villagers

biped large balancing

more villager balancing, mushroom spawning rate

more balancing

fix rebase

multiple loottables

Add tarasque and bonerattler armour

Added loot tables for different groups of weapons and armor based off relative strength. Added loot table for cultist boss.

Added loot tables for consumables and food. Trimmed down default loot table.

remove male and female sign from char creation

chest loot tables

fix loot tables

lootable crates

lantern keybinding display

more loot tables

loot table changes

fixed loot tables

fix typo
more grass

rebase fix, better lantern

re-add sprite rotation for grass

crafting window alignment fix, new streetlamps, new shopsigns, new healing staff

height change
2020-08-21 19:36:19 +02:00
Sam
924d09e46c balancing
more specific stats

Update body.rs

more balancing

non hostile catoblepas and mouflons

quad low
more adjustments
Animals with enemy alignment now deal correct damage. Made health scaling species-specific.
2020-08-21 19:36:17 +02:00
Monty Marz
6789b7ae27 Add firework hues 2020-08-12 22:29:06 +08:00
scott-c
9aab296264 Add firework item 2020-08-12 22:25:28 +08:00
Joshua Barretto
8d6b442193 Crafting 2020-07-14 20:11:39 +00:00