Commit graph

331 commits

Author SHA1 Message Date
brightrim
ae07270c17 pulsegwynt druid spell 2026-04-21 18:39:43 +02:00
brightrim
9db8c4431d next step of druid magic tutorial + progress on druid magic framework 2026-04-13 21:58:39 +02:00
brightrim
0583cd1567 Merge branch 'master' into develop 2025-11-17 17:35:35 +01:00
brightrim
4b03f17ef9 isWeapon checks hotfix
Some checks failed
Code Review / iso-8859-1 (push) Failing after 5s
Code Review / syntax-lua (push) Failing after 2s
Code Review / formatting (push) Failing after 5s
Code Review / syntax-npc (push) Failing after 3s
Code Review / header (push) Failing after 6s
Code Review / binary (push) Failing after 10s
2025-11-17 17:35:07 +01:00
brightrim
20200c71ab No infinite throwing weapons 2025-10-05 17:23:47 +02:00
brightrim
48c04d4161 error fix 2025-09-15 17:07:18 +02:00
brightrim
94aa9e34a6 const bandaid for low const until fighting rework 2025-09-15 16:50:36 +02:00
brightrim
126d3ea160 paralysis fix 2025-07-04 13:22:17 +02:00
brightrim
716b9c15e6 training weapon sparring protection 2025-06-14 23:11:56 +02:00
brightrim
de89bca4c4 Scaling of XP by 3 in fighting changed to be dynamic 2025-05-19 22:20:38 +02:00
brightrim
1622b47edc Magic gem allocation changes 2025-05-18 21:21:36 +02:00
brightrim
3965ba130b made quality for training weapons useful and extended the list of which are training weapons 2025-05-18 20:43:58 +02:00
brightrim
0baf0c4f82 Fix of potential cause of server crash 2025-05-05 21:23:53 +02:00
brightrim
d90287b310 more convenient test logging that can be activated or deactivated via boolean 2025-03-30 19:10:05 +02:00
brightrim
51809655bb Clean up of relict rope script that has not been in use since forever 2025-03-30 16:53:38 +02:00
brightrim
3acad75fe3 handle wand to weapon swap for targets to future proof in case of any changes 2025-03-29 16:51:56 +01:00
brightrim
0ccd59c59a FHEN correction 2025-03-26 18:44:21 +01:00
brightrim
a2d5e6b693 temporary magic test logging removed 2025-02-26 20:17:15 +01:00
brightrim
9efe21afed Account for extreme luck scenarios with dwyfol 2025-02-04 13:50:55 +01:00
brightrim
aab2255eae give characters in extreme pvp match ups a chance to react by giving them a couple more seconds to react 2025-02-03 14:53:13 +01:00
brightrim
b3b02f56d2 damage increased to match wand magic for RA more closely, while also addind temporary logging for standard combat for comparisons sake 2025-02-02 13:59:31 +01:00
brightrim
336772968f magic defenders durability reduces the same way as in standardfighting
non mages no longer use the wand as a club to attack with
2025-02-02 10:05:54 +01:00
brightrim
f3f924defc Could this be the long awaited rune magic update!? 2025-01-31 20:16:56 +01:00
brightrim
be4c5e53fa Minor wrestling rework #424 2024-12-06 11:35:45 +01:00
brightrim
32a1ca8ce7 Different fire effect in glyphs and Dwyfol effect bugfixed #392 2024-07-27 11:51:38 +02:00
brightrim
19e4516f3b Enchanting Rework 2024-02-01 11:56:47 +01:00
brightrim
2df6346ada Druid's Escape
(cherry picked from commit 4a1049bfdc1804919962b18db799f4a749aaf488)
2022-11-13 13:37:18 +01:00
brightrim
51932a508a removal of spammy auto-emotes in fighting 2022-06-30 12:20:04 +02:00
brightrim
f5f0b57b22 Fix to bug in fighting unequipment of armour discovered by Capswick 2022-06-28 22:02:00 +02:00
brightrim
044daad8c6 first draft adjustment to gem bonus in fighting 2022-06-23 13:42:16 +02:00
brightrim
a1a0536b57 solution to issue #319, requires one line of German translation and testing 2022-06-19 18:56:58 +02:00
brightrim
9a451b30dc Revert "fix bug in standardfighting"
This reverts commit db39132b00.
2022-06-12 11:32:52 +02:00
brightrim
b9b5f2d7e6 check itemStruct instead of weaponStruct for whether the item is broken 2022-06-09 20:05:17 +02:00
brightrim
db39132b00 fix bug in standardfighting
Some checks failed
Code Review / iso-8859-1 (push) Failing after 6s
Code Review / formatting (push) Failing after 5s
Code Review / syntax-lua (push) Failing after 3s
Code Review / syntax-npc (push) Failing after 4s
Code Review / binary (push) Failing after 8s
Code Review / header (push) Failing after 5s
2022-06-05 20:44:43 +02:00
estralis
7b63201c48 Satisfy linter. 2022-01-24 11:26:44 +01:00
estralis
b9b6ccbcd9 Merge branch 'fighting_with_broken_items' into develop 2022-01-24 11:00:31 +01:00
David Jablonski
e25dfe72d0 fix missing nil check 2021-12-04 16:44:19 +01:00
David Jablonski
bad3051ad5 fighting: remove redundant parry weapon code 2021-12-04 15:50:38 +01:00
David Jablonski
c6ffb34cd2 fighting: do not learn armour skills with broken armour 2021-12-04 12:32:30 +01:00
David Jablonski
d20c3e8321 fighting: do not learn with broken weapon/parry item 2021-12-04 12:20:04 +01:00
estralis
4751690468 Simplify script, remove quality 1 exception, remove common function cascade (remove inform) 2021-08-24 11:30:58 +02:00
estralis
b0dd0d9a6a Remove unused variable, replace non-existing variable with nil. 2021-08-24 11:13:02 +02:00
estralis
b489214280 Remove double inform and increase priority 2021-08-24 11:11:20 +02:00
estralis
857f55be07 Merge branch 'magicalBlacksmith' of https://github.com/Kerruan/Illarion-Content into PR245
# Conflicts:
#	base/common.lua
#	item/general/checks.lua
2021-08-24 10:38:54 +02:00
estralis
9bffd992a3 Add check for the defender to detect PvP 2021-06-23 11:51:59 +02:00
merung
3b57f24966 Remove petsystem to clean up branch. Reimplementation planned in August 2021-06-06 10:54:06 +02:00
kerruan
88f371da01 Exclude clothing from auto-unequip 2021-05-02 23:46:37 +02:00
kerruan
41af012287 Fix access of undefined variable 2021-03-28 11:57:59 +02:00
kerruan
0123d8f208 Make broken armors and weapons unequippable 2021-03-28 11:11:40 +02:00
estralis
722f61f1e9 Satisfy linter 2021-03-16 01:30:22 +01:00