Commit Graph

1306 Commits

Author SHA1 Message Date
Sam
680d987e11 Adlet hunter AI 2023-05-13 09:30:51 -04:00
Sam
92e28f09fc Adlet abilities 2023-05-13 09:30:51 -04:00
flo666
1750c9a0f2 structure work 2023-05-13 09:30:48 -04:00
Joshua Barretto
b506fe3110 Minor price tweaks 2023-05-12 13:28:11 +01:00
Joshua Barretto
25441df7af Made antlions less absurd 2023-05-12 12:34:55 +01:00
Marcel Märtens
3a19669d53 use workspace dependencies to make our life easier maintaining them :) 2023-05-10 18:16:25 +02:00
Isse
b4c3868dd4 different translation key for mounting Helm 2023-05-09 19:43:10 +02:00
Isse
78dc394c48 use sitting animation by default when sprite mounted 2023-05-09 19:43:10 +02:00
Isse
e39790e9e4 make sprites work on multiple ships at once 2023-05-09 19:43:09 +02:00
Isse
a35a1a34c4 more sprites on airships 2023-05-09 19:43:09 +02:00
Isse
6674cce2cc intercat with sprites on ships 2023-05-09 19:43:09 +02:00
Isse
7fbe2cd5ec particles on volume 2023-05-09 19:43:09 +02:00
Isse
fcb7011cde sprites on volumes 2023-05-09 19:43:09 +02:00
Joshua Barretto
1cc221f653 Merge branch 'zesterer/rtsim-tweaks' into 'master'
Started adding wandering rtsim monsters

See merge request veloren/veloren!3908
2023-05-09 14:51:15 +00:00
Sam
a38f336c9e Added dual wielding sword contextual abilities. 2023-05-07 20:43:51 -04:00
Sam
0ecf4fbe87 Dual wielding weapons of the same kind added as a context 2023-05-07 20:43:51 -04:00
Joshua Barretto
6fe102b86d Fixed cyclops loot table 2023-05-04 19:57:18 +01:00
Joshua Barretto
0f92f38967 Started adding wandering rtsim monsters 2023-05-01 18:29:32 +01:00
Isse
ab4076518f Add multiloot 2023-04-23 19:17:39 +00:00
Sam
5ba2ebf6d5 Added repair recipes for twig armor sets. 2023-04-14 18:32:33 -04:00
Sam
985661b674 Added repair recipes for pickaxes and craftsman hammer 2023-04-13 21:19:09 -04:00
Joshua Barretto
504ea158d2 Merge branch 'zesterer/towns' into 'master'
Improvements to towns and NPCs

See merge request veloren/veloren!3867
2023-04-13 21:03:02 +00:00
Joshua Barretto
8249675a72 Made airship captains invincible 2023-04-13 18:32:04 +01:00
Samuel Keiffer
7aa43e9e8a Merge branch 'taoist/better-dullahan' into 'master'
taoist&floppy/cyclops&dullahan

See merge request veloren/veloren!3859
2023-04-12 22:53:38 +00:00
Tao In Way
e32460f9ee taoist&floppy/cyclops&dullahan 2023-04-12 22:53:38 +00:00
Joshua Barretto
2eaf3c7e92 Spawn dogs and cats in towns 2023-04-09 19:25:57 +01:00
Joshua Barretto
5aaee96cb1 Removed special-casing of merchants 2023-04-09 19:25:56 +01:00
Isse
adb2e1ba85 very simple repopulation 2023-04-09 19:25:55 +01:00
Isse
1a117f1331 rtsim vehicles 2023-04-09 19:25:54 +01:00
Joshua Barretto
077da13a5f Improved herbalist, hunter, farmer, added cultist factions 2023-04-09 19:25:54 +01:00
IsseW
ca02b5e97c cleaner entity creation 2023-04-09 19:25:52 +01:00
Sam
a68ef7af30 Tweaks 2023-04-06 10:57:16 -04:00
Sam
f7765a8471 Added some repair recipes for some missed items. 2023-04-06 10:57:15 -04:00
Sam
92165a8fd8 Repair recipes no longer show ingredients as required when they are not damaged enough to need any 2023-04-06 10:57:14 -04:00
Sam
6a8fc3a423 Tweaked repair recipes 2023-04-06 10:57:14 -04:00
UncomfySilence
3dae7b6d4a small tweaks to repair recipe and addition of cultist, and uncraftable weapon repairs 2023-04-06 10:57:12 -04:00
Sam
536d88a2c7 Repair costs scale based on how damaged the item is. 2023-04-06 10:54:50 -04:00
UncomfySilence
85ceae3354 repair recipes for armor pieces 2023-04-06 10:54:50 -04:00
Sam
0966753699 Added repair recipes 2023-04-06 10:54:48 -04:00
Youssef Fahmy
7c85460f18 Teeny changes to crippling stance abilities 2023-04-05 23:17:57 +00:00
Isse
c34e5ad4ed Small fixes 2023-03-29 23:11:59 +00:00
Sam
c9af470cc7 Final tweaks 2023-03-28 20:55:21 -04:00
Sam
4309767898 Tweak 2023-03-27 21:51:45 -04:00
Sam
cdaf9e5c0e Ability changes 2023-03-26 21:41:22 -04:00
Sam
ef7b400cca Number tweaking 2023-03-26 19:50:42 -04:00
Sam
124c8cfb65 Weapon stat tweaks 2023-03-25 13:05:26 -04:00
Sam
f2dfaf0276 Fixed dullahan AI. Some number tweaks. 2023-03-23 21:56:16 -04:00
Sam
e962690fb8 Tweaks to various stats and earth splitter animation. 2023-03-21 20:18:31 -04:00
Sam
25c42e927a Rebase 2023-03-21 20:18:28 -04:00
Sam
cc84fb3df3 Fix manifest 2023-03-21 20:16:58 -04:00
Sam
1a58b7a8d4 Balance tweaks 2023-03-21 20:13:48 -04:00
Sam
e37e4016d6 Balance tweaks 2023-03-21 20:10:44 -04:00
Sam
868a42ba39 Addressed UX feedback 2023-03-21 20:10:40 -04:00
Sam
c9db227e43 Various things can cause one to naturally leave a stance. Also mildly buffed cultists. 2023-03-21 20:07:34 -04:00
Sam
34168d9c76 Advanced AI for every stance. 2023-03-21 20:03:21 -04:00
Sam
e31668b188 Fixed dynlib features to not have UB when allocating. 2023-03-21 20:03:20 -04:00
Sam
7365fcb530 Rolls cancel recover at the cost of additional energy, sitting ends active stances. 2023-03-21 20:03:15 -04:00
Sam
b3edc5f7c6 Fix crash 2023-03-21 19:59:06 -04:00
Sam
39b30b3458 Decontextualized some sword abilities, added UI for sword skill tree. 2023-03-21 19:59:05 -04:00
Sam
f43d25d3fe Ability icons 2023-03-21 19:59:04 -04:00
Sam
e552cf579e Added english localization for sword abilities. 2023-03-21 19:59:04 -04:00
Sam
27463758e5 Finisher abilities 2023-03-21 19:59:03 -04:00
Sam
86dfa34ec9 Cleaving stance required abilities 2023-03-21 19:59:00 -04:00
Sam
fed96b2e15 Crippling stance required abilities 2023-03-21 19:58:13 -04:00
Sam
c3026d388a Defensive stance required abilities 2023-03-21 19:58:11 -04:00
Sam
69665b5418 Agility stance required abilities 2023-03-21 19:56:35 -04:00
Sam
a3d655970e Heavy stance required abilities 2023-03-21 19:56:32 -04:00
Sam
e73236819a Cross cut 2023-03-21 19:39:42 -04:00
Sam
d64c155115 Cascade 2023-03-21 19:39:41 -04:00
Sam
f8c246e5fc Skewer 2023-03-21 19:39:41 -04:00
Sam
cdaff6bec1 Fell strike 2023-03-21 19:39:40 -04:00
Sam
e0a7449a99 Crescent slash 2023-03-21 19:39:40 -04:00
Sam
fce9211d49 Secondaries for all stances 2023-03-21 19:39:39 -04:00
Sam
596fe715b8 Cleaving stance skill abilities. 2023-03-21 19:39:39 -04:00
Sam
070c6d94a5 Crippling stance skill abilities. 2023-03-21 19:39:38 -04:00
Sam
d544010c05 Defensive stance skill abilities. 2023-03-21 19:39:38 -04:00
Sam
c23139d501 Agile stance skill abilities. 2023-03-21 19:39:37 -04:00
Sam
ed0de15a5a Heavy stance skill abilities. 2023-03-21 19:39:35 -04:00
Sam
57806d7be9 Sword M1 abilities 2023-03-21 19:39:22 -04:00
Sam
61f0b424b9 Old sword mostly torn out, new sword framework in place 2023-03-21 19:39:22 -04:00
Sam
7ec9a7677f Stances change secondary abilities now. Contextual abilities try to fallback to no context if skill not owned for contextual ability. 2023-03-21 19:38:18 -04:00
Sam
b376228d45 Primary and secondary abilities can now be contextual. BasicStance character state added. 2023-03-21 19:38:15 -04:00
Sam
9875008efa Added stance component that persists even after sheathing weapon (does not yet work with M1 replacement). 2023-03-21 19:29:34 -04:00
Sam
9efac9957d Changed buff effects so they did not need to mutably change buffs every tick. Buff system now no longer mutably accesses buffs component. 2023-03-11 16:45:11 -05:00
Sam
89aa934c3c Initial work 2023-03-11 16:45:10 -05:00
Monty Marz
277a402781 Initial quest window work, spot fixes 2023-03-10 22:16:26 +00:00
Monty Marz
9a025cfcc8 More spot features 2023-03-03 23:21:37 +00:00
flo
98e93d1a1c spawn and loot tweaks, tursus and werewolf anims 2023-02-22 01:32:05 +00:00
flo
bf81ffc029 frost_gigas 2023-02-15 00:10:37 +00:00
flo
0531b40fae bird_medium_2 2023-02-14 23:17:20 +00:00
Avi Weinstock
707e189034 Nerf non-potion drinks. 2023-02-01 20:39:29 -05:00
flo666
9c09000256 - change bristlemane to bristleback
- axebeak tweaks
2023-01-31 20:34:41 +01:00
flo666
e109f5c377 axebeak, tursus 2023-01-31 20:34:40 +01:00
flo666
75bfbff2c3 bristlemane 2023-01-31 20:34:40 +01:00
flo666
271b80b832 seal 2023-01-31 20:34:40 +01:00
Marcel
c165d28e7d Merge branch 'wyvern_wings' into 'master'
wyverns

See merge request veloren/veloren!3720
2023-01-28 21:25:17 +00:00
flo
5e1fd02095 wyverns 2023-01-28 21:25:17 +00:00
Avi Weinstock
060b8cc0ec Decrease the duration of potion sickness to 45 seconds. Make agents more averse to incurring further stacks of potion sickness, and give villagers iced tea. 2023-01-19 15:06:13 -05:00
Avi Weinstock
78845a0d73 Implement potion sickness, which causes diminishing returns on healing from potions. 2023-01-19 15:06:12 -05:00
Joshua Barretto
44f4dcc6f7 Added canary asset 2023-01-18 22:01:00 +00:00
Joshua Barretto
295e3c4109 Merge branch 'floppy-autodelete_of_summoned_sprites' into 'master'
autodelete of summoned sprites

See merge request veloren/veloren!3735
2023-01-15 18:28:38 +00:00
flo
650ef9a5e2 autodelete of summoned sprites 2023-01-15 18:28:38 +00:00
flo
0eba37ce6a dark_guitar & icy_talharpa 2023-01-13 13:37:45 +00:00
flo
466ed2c382 dagon_kit 2022-11-30 15:27:21 +00:00
flo
e7b802712d reduce mossdrake, fix woodgolem loottable 2022-11-21 14:22:15 +00:00
Samuel Keiffer
5709427e63 Merge branch 'sam/small-fixes' into 'master'
Small fixes for sword

See merge request veloren/veloren!3694
2022-11-16 23:33:12 +00:00
Marcel
997c5a4e61 Merge branch 'ythern/more_unique_abilities' into 'master'
Ythern/roshwalr kit

See merge request veloren/veloren!3692
2022-11-15 09:58:06 +00:00
Eternalisime
7c66c94fa2 fix loot table 2022-11-13 22:49:29 +01:00
Eternalisime
48e23dba49 combat: reverted tweak on shockwave and changed loot table 2022-11-13 22:45:05 +01:00
Eternalisime
6e18683d98 combat: tweak on shockwave 2022-11-13 22:24:01 +01:00
Eternalisime
71e59e4b81 combat: tweaks and modified shockwave animation 2022-11-13 22:04:00 +01:00
Sam
4784b61656 Small fixes 2022-11-13 14:03:37 -05:00
flo
0351bf1d63 Moss Drake 2022-11-12 13:00:42 +00:00
Eternalisime
ed25a84c72 combat: tweaked roshwalr melee detection and range 2022-11-12 13:51:27 +01:00
Eternalisime
13980861f8 combat: tweaked roshwalr AI 2022-11-11 16:37:58 +01:00
Eternalisime
8f4863be28 combat: balance tweaks on roshwalr 2022-11-11 10:22:23 +01:00
Monty Marz
a763a865fe Musical Instruments part 2 2022-11-10 20:59:53 +00:00
Eternalisime
918d5eb345 combat: added a unique kit to roshwalr 2022-11-10 13:53:12 +01:00
flo
da65485228 bats 2022-11-01 15:01:18 +00:00
Sam
7022350693 Sword AI now randomly rolls again 2022-10-27 20:07:11 -04:00
Sam
d60839010a Rebase commit 2022-10-27 20:07:10 -04:00
Sam
0fe073fcdc Addressed feedback from testing 2022-10-27 20:07:10 -04:00
Sam
8cfe62e6dc Activated abilities can now be contextualized 2022-10-27 20:07:07 -04:00
Sam
5674923a54 Changed exp/sp progression for sword skill tree 2022-10-27 20:07:06 -04:00
Sam
a21ce80daf Tweaked sword component stats 2022-10-27 20:07:05 -04:00
Sam
38ce87d80b Initial balance pass on sword ability stats 2022-10-27 20:07:05 -04:00
Sam
eb67cc2cf7 Reaching stance AI 2022-10-27 20:07:04 -04:00
Sam
43a5a2a93a Parrying stance AI 2022-10-27 20:07:03 -04:00
Sam
df9ef691fd Cleaving stance AI 2022-10-27 20:07:03 -04:00
Sam
5358016ba0 Crippling stance AI 2022-10-27 20:07:02 -04:00
Sam
c7d3aa19e4 Mobility stance AI 2022-10-27 20:07:02 -04:00
Sam
c97bfdfb94 Defensive stance AI 2022-10-27 20:07:01 -04:00
Sam
7dcb3582e6 Sword AI for offensive abilities 2022-10-27 20:07:01 -04:00
Sam
4ab3abfc07 Balanced stance AI 2022-10-27 20:07:01 -04:00
Sam
b3a15f61aa Fixed issue where you could cancel combo melee 2 mid strike 2022-10-27 20:06:58 -04:00
Sam
d3a52bd63b Buffed cleaving spin 2022-10-27 20:06:56 -04:00
Sam
ac2e2fd724 Added animations for recover section of all abilities 2022-10-27 20:06:55 -04:00
Sam
a8212d6f41 Dive melee now scales its attack off of the entity's vertical speed.
Parries now cause the attacker to effectively have a recover that is either twice as long or 0.5s longer, whichever is more.
Counters now deal twice as much damage to the target if the target is in the buildup portion of an ability.
2022-10-27 20:06:55 -04:00
Sam
b09b0222c4 Animation for reaching flurry, tweaked animation for balanced combo. 2022-10-27 20:06:54 -04:00
Sam
9091d46554 Animation for reaching charge. Changed dash melee code to probe with a test melee instead of performing the actual melee strike during charge. 2022-10-27 20:06:53 -04:00
Sam
2e5dfd86de Animation for reaching skewer 2022-10-27 20:06:53 -04:00
Sam
035f9135d6 Animation for reaching combo 2022-10-27 20:06:52 -04:00
Sam
73a36235fc Animation for mobility feint 2022-10-27 20:06:52 -04:00
Sam
eb7c2337dd Animation for heavy finisher 2022-10-27 20:06:50 -04:00
Sam
be3f2dca92 Animation for heavy pommel strike 2022-10-27 20:06:49 -04:00
Sam
ba4c28e83a Animation for heavy combo 2022-10-27 20:06:49 -04:00
Sam
d7a0a6e743 Animation for parrying counter 2022-10-27 20:06:49 -04:00
Sam
632941e99d Animation for parrying riposte 2022-10-27 20:06:48 -04:00
Sam
7c22847009 Animation for parrying parry 2022-10-27 20:06:48 -04:00
Sam
dd37a699c0 Animation for parrying combo 2022-10-27 20:06:47 -04:00