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
8,629 Commits 151 Branches 18 Tags 2.1 GiB
279731a9e1
Commit Graph

606 Commits

Author SHA1 Message Date
Avi Weinstock
3684cf0454 Fix economy data not properly being used to price trades, resulting in default prices being applied at most towns. 
Also add an exporter from econsim results to sqlite to aid in debugging the economy (which revealed this bug).
 2021-05-28 15:09:29 -04:00
Justin Shipsey
d7c7f6bf5d Merge branch 'sam/rework-bow' into 'master' 
Bow Rework

See merge request veloren/veloren!2310
 2021-05-26 04:44:09 +00:00
juliancoffee
c618ec7222 fmt 2021-05-25 01:23:32 +03:00
juliancoffee
2d56b5dcde Unique loot tables for each dungeon chest 2021-05-25 00:42:43 +03:00
juliancoffee
3700cc8a67 Overhaul loot tables 2021-05-25 00:20:18 +03:00
juliancoffee
940655dcb6 Adding different chests for each dungeon 2021-05-24 23:00:44 +03:00
juliancoffee
457e5b14d8 Add tests for validation assets 2021-05-23 22:27:33 +03:00
juliancoffee
8c1643cad9 Switch to using EquipSlot key instead of String 2021-05-23 21:37:41 +03:00
juliancoffee
00b182c183 Remove unused LoadoutConfig-s 2021-05-23 19:19:20 +03:00
juliancoffee
6656cfe010 Add directory hierarchy 2021-05-23 19:19:20 +03:00
juliancoffee
0722861364 Move loadout config handling to .ron files 2021-05-23 19:19:20 +03:00
juliancoffee
a8699cfa15 Add support for .ron loadouts 2021-05-23 19:19:20 +03:00
Samuel Keiffer
95f3a12d41 Merge branch 'juliancoffee/dungeon_mobs' into 'master' 
Dungeon rebalance

See merge request veloren/veloren!2333
 2021-05-22 22:38:21 +00:00
juliancoffee
7e909be2b5 Move fireworks into own table 2021-05-23 01:04:11 +03:00
juliancoffee
4156f373c1 Adjust loot tables 
- Add regular drop to T5 miniboss
- Fixup cultist loot table
- Give own loot table to Deadwood in T0
 2021-05-23 01:04:11 +03:00
Sam
7828112486 Balance tweaks. 2021-05-22 15:00:05 -05:00
Samuel Keiffer
e543941073 Merge branch 'juliancoffee/boss_armour' into 'master' 
Boss armor

See merge request veloren/veloren!2327
 2021-05-22 17:42:27 +00:00
Sam
f993f28eff Various tweaks. 2021-05-22 12:41:47 -05:00
Sam
1014ac45bf Made new skills for reworked bow. 
Created migration to reset bow skills.
 2021-05-22 12:33:21 -05:00
Sam
3f16d15bbb Reworked bow 2021-05-22 12:33:20 -05:00
Monty Marz
30bcc6aaa3 Ferocious armour for t5-dungeon minibosses 2021-05-22 10:55:36 +00:00
juliancoffee
7dc50891d2 Add placeholders for bosses armour 2021-05-22 00:20:56 +03:00
juliancoffee
df58fa9acf Fixing loot tables 
- Use quad_low and quad_medium loot table for corresponding mobs in
dungeons
- Remove cultist loot table from T3-T4 loot tables
- Use resize instead of vec[obj; len] to create different loot and not
duplicated for miniboss_1
 2021-05-21 11:31:39 +03:00
juliancoffee
e48e3e11ba Give bosses own creation function and loot table 
- Make goose miniboss fallback to differentiate bosses and minibosses
 2021-05-21 11:01:47 +03:00
juliancoffee
287b531b47 Set poise_resilience to sane values 
- Druid Shoulders to 1.0
- Rugged Chest to 1.0
- Cultist Gloves to 1.0
 2021-05-16 01:07:55 +03:00
Sam
d286806b52 Shifted poise damage of sword dash 2021-05-15 10:30:39 -05:00
Sam
7f6c6c5603 Fixed offsets for laser and rocket attacks of clay golem. 2021-05-10 18:54:04 -05:00
jshipsey
770d07ac90 anims 2021-05-10 18:54:03 -05:00
Sam
0d53e790fd Made golem laser spawn based off of orientation rather than look_dir. Additional balance tweaks. 2021-05-10 18:54:00 -05:00
Sam
fca56be4c0 Balance tweaks 2021-05-10 18:53:52 -05:00
Sam
d14fd59711 Increased exp of clay golems. 2021-05-10 18:53:51 -05:00
Sam
4e5a456b18 Balance tweaks. 2021-05-10 18:53:49 -05:00
Snowram
47a2bf7de8 Adds haniwa sentry object 2021-05-10 18:53:48 -05:00
Sam
c67c56d194 Dungeon placement. Tweaks to melee. 2021-05-10 18:53:47 -05:00
Sam
9f8aeb91c0 Added armor, more ai tweaks. 2021-05-10 18:53:46 -05:00
Sam
1c8db241e2 Golem AI 2021-05-10 18:53:43 -05:00
Sam
5fa4358e74 Clay golem attacks done. 2021-05-10 18:53:01 -05:00
Avi Weinstock
abcb6f34a3 Remove the dependency of the new mindflayer AI on action_state.timer. 2021-05-09 21:16:57 -04:00
Avi Weinstock
1dfcdce1c0 Add a purple fireball to mindflayer and have it shoot it a few times before teleporting, and fix mindflayer AI's husk summons. 2021-05-09 18:09:31 -04:00
Illia Denysenko
cb2412148b Miniboss Loot quickfix 2021-05-09 21:29:35 +00:00
Snowram
831bfd0be9 Snowram/craft mats 2021-05-07 17:03:45 +00:00
Avi Weinstock
e4cda4309e Add DamageKind, and make piercing damage partially ignore damage resistence. 
- Tweak bow/staff M1 stats.
 2021-05-06 17:39:06 -04:00
Sam
dc7e45c8bd Rebalancing 2021-05-05 14:43:56 -04:00
Sam
240a8e577d Minor balancing tweaks. 2021-05-04 08:45:13 -04:00
Sam
5c241850f1 Added sfx. Addressed comments. 2021-05-04 08:45:12 -04:00
Sam
48fa4e7c1f Balancing. 2021-05-04 08:45:11 -04:00
Sam
164fd0de04 Particles for frenzy buff and ground cleave. 2021-05-04 08:45:10 -04:00
Sam
2290a22a15 Gave minotaur AI. 2021-05-04 08:45:09 -04:00
jshipsey
c886accaf1 anims 2021-05-04 08:45:08 -04:00
Sam
257c670aaf Fix charge being broken. 2021-05-04 08:45:07 -04:00
Sam
d1139c3b7c Added frenzy ability to minotaur. 
Added self-buff character state.
Added frenzied buff kind.
Added better comments on each buff kind.
 2021-05-04 08:45:07 -04:00
Sam
e052c7b516 Cleave functional 2021-05-04 08:45:06 -04:00
Sam
160bd3ef0c Crippling strike now functional. Crippled debuff added. 2021-05-04 08:45:05 -04:00
Sam
660423932c Miscellaneous balancing 2021-05-04 08:45:05 -04:00
Sam
f11c10d3be Charge attack for minotaur functional. 2021-05-04 08:45:04 -04:00
Samuel Keiffer
771a8db2a8 Merge branch 'slipped/oritweak' into 'master' 
ori tweaks, animal adjusts

See merge request veloren/veloren!2234
 2021-05-03 18:49:22 +00:00
jshipsey
63fdc4f590 animal adjustments 2021-05-02 23:17:58 -04:00
jshipsey
769e21104e higher health lower damage 2021-05-01 12:29:28 -04:00
jshipsey
dc5a38f1e8 ori addition to combomelee 2021-05-01 12:29:28 -04:00
Sam
d500a00414 Made naming of fields more explicit. 2021-05-01 09:25:56 -04:00
Sam
dd113c56cb Fixed ItemDef for custom weapons. 2021-05-01 09:25:54 -04:00
Sam
3cb0ee98c8 Removed all unique and simple tool kinds. 2021-05-01 09:25:51 -04:00
Sam
a35b8b4aad Removed ability set as field on items. 2021-05-01 09:25:49 -04:00
Sam
7870109856 Deduplicated stuff in npc_armor. 2021-04-29 15:45:14 -04:00
Sam
91bb6392bb Removed old 2h variants of 1h weapons. 2021-04-29 13:18:04 -04:00
Scott Bronson
b7ac7b64f3 Fix spelling in seashells.ron 2021-04-28 16:32:19 +00:00
jshipsey
2c74a86170 skill adjustments, ori changes 2021-04-25 22:02:32 -04:00
Joshua Barretto
805822b0b0 Rebalanced arrow speed 2021-04-25 20:06:29 +01:00
Sam
b9d6bd2fd2 Parrying no longer requires releasing the block button, and instead can parry if block happened in buildup. 2021-04-25 13:09:07 -04:00
Sam
f5ec23df48 Parrying 2021-04-25 13:08:42 -04:00
Sam
91c6288213 Melee weapons can now block. 2021-04-25 13:08:42 -04:00
Snowram
8f54a0bf31 More phoenix AI work 
More phoenix AI work
 2021-04-25 04:07:12 +02:00
James Melkonian
0cf7e7114f Phoenix AI pass 2021-04-25 04:07:11 +02:00
Snowram
8cf8e51962 Phoenix npc + AI (WIP) 2021-04-25 04:07:11 +02:00
Snowram
fd177c9669 Breathe and stun anims 2021-04-25 02:14:50 +02:00
Snowram
eb98360183 Cockatrice bird_large conversion 2021-04-25 02:14:50 +02:00
Snowram
bc95484863 Swaps bird_small skeleton to a new bird_large 2021-04-25 02:14:49 +02:00
Monty Marz
b69eb61e7b Add handles to lanterns, fix cooking pot scale 2021-04-22 17:12:07 +00:00
jshipsey
9d82b20891 remove 0.8, add snow's mixed_vel idea for other bodies 2021-04-22 00:04:39 -04:00
Ludvig Böklin
762c68cfbb Basic fluid dynamics and physical properties for entities 2021-04-20 17:38:19 +02:00
Monty
a1b4e0bdaf remove old craftsman hammer, add migration 2021-04-20 03:34:11 +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
Sam
ce7581037c Overhauled dash melee. 2021-04-18 18:36:12 -04:00
Joshua Barretto
cb817c0313 Merge branch 'zesterer/econ-tweaks' into 'master' 
Rebalanced economy somewhat

See merge request veloren/veloren!2148
 2021-04-18 21:20:49 +00:00
Avi Weinstock
0404250300 Unlock dodge roll iframes and staff explosion by default. 2021-04-18 16:16:06 -04:00
Joshua Barretto
352fce239e Allow trading items not sold by merchants 2021-04-18 20:07:00 +01:00
Joshua Barretto
cac9ac6807 Trading stock limits 2021-04-18 18:58:26 +01:00
Joshua Barretto
250733a123 Better price rationalisation 2021-04-18 18:11:00 +01:00
Joshua Barretto
c0b71d0731 Removed legendaries from trading 2021-04-18 17:29:22 +01:00
Joshua Barretto
11683084ad Use labour value for prices 2021-04-18 17:05:14 +01:00
Joshua Barretto
fcc23a4427 Normalised prices within sites 2021-04-18 15:09:21 +01:00
Joshua Barretto
b72e454148 Rebalanced economy somewhat 2021-04-18 14:08:48 +01:00
Samuel Keiffer
c962c5f12e Merge branch 'gGmMsS/Burning' into 'master' 
Added burning debuff for Staff M2

See merge request veloren/veloren!2134
 2021-04-15 23:51:33 +00:00
gGmMsS123
0d956610ec Added burning debuff for Staff M2 2021-04-15 23:34:28 +03:00
jshipsey
8f20d17c9a attacking movement tweaks 2021-04-15 12:13:50 -04:00
jshipsey
896d2a5b63 combat tweaks 2021-04-15 11:43:52 -04:00
Sam
c88df846a7 Fixes animation parameters so a 2h weapon in the offhand slot doesn't look wonky. 2021-04-14 17:38:37 -04:00
jshipsey
161382d06a changelog 2021-04-13 20:19:35 -04:00