Commit graph

6691 commits

Author SHA1 Message Date
Elias Åström
573b1dc44b Do not include unnecessary tool_capabilities
This commit makes enchanted tools which have no use for
tool_capabilities to not include it in their metadata.  It does this by
not including tool_capabilities in the metadata of an enchanted tool if
at least one of two cases is true:

(1) The tool is not enchanted with unbreaking or efficiency
(2) The tool does not have tool_capabilities defined in its definition

The first case covers situations like having a pickaxe only being
enchanted with silk_touch.  The second case covers situations like a
piece of armor being enchanted with unbreaking.
2021-04-18 11:40:43 +02:00
Elias Åström
dd69dcfd9f Fix efficiency and unbreaking not working together
This commit fixes an issue were tools enchanted with both efficiency and
unbreaking would loose the effect of one of the enchantments in some
conditions.
2021-04-18 11:40:13 +02:00
Elias Fleckenstein
76271199c6 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-18 08:39:04 +02:00
kay27
bb902caa57 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-18 04:29:59 +04:00
kay27
11b66e83a2 [mcl_portals] Better NP search, no more teleports on the roof, fix https://git.minetest.land/MineClone2/MineClone2/issues/1560 2021-04-18 04:29:30 +04:00
jordan4ibanez
719bb2a3c9 Add in prototype jump-only mobs api 2021-04-17 18:21:33 -04:00
jordan4ibanez
db87b8e0a3 fix chicken rotation 2021-04-17 17:09:57 -04:00
jordan4ibanez
e2987245fd Balance out collision forces for mobs 2021-04-17 17:00:34 -04:00
jordan4ibanez
3cf263d292 Add in dynamic pitch in flying/swimming mobs 2021-04-17 16:23:38 -04:00
Elias Fleckenstein
a7e102426a Add time_of_day to get_light crash fix 2021-04-17 21:01:09 +02:00
Elias Fleckenstein
bcd058feb1 Fix get_light crash 2021-04-17 21:00:32 +02:00
Elias Fleckenstein
baebe3c2d2 Fix namtags being invisible 2021-04-17 20:57:12 +02:00
Elias Fleckenstein
48a2e4212a Fix namtags being invisible 2021-04-17 20:55:08 +02:00
Elias Fleckenstein
811efcf9f3 Merge branch 'master' into mineclone5 2021-04-17 20:32:30 +02:00
Elias Fleckenstein
205572cc69 Fix elytra code style 2021-04-17 19:34:23 +02:00
jordan4ibanez
5ade34115c Remove random state initialization in set_up.lua 2021-04-17 13:17:29 -04:00
jordan4ibanez
d9729fc865 Fix parrot's rotation 2021-04-17 13:13:45 -04:00
jordan4ibanez
58d9670e77 Remove collisionbox addition for y position for fly mobs 2021-04-17 13:11:39 -04:00
jordan4ibanez
a20f272e08 re-adjust logic gate for mobs floating in water and lava 2021-04-17 13:05:53 -04:00
jordan4ibanez
0794bc5437 Make flying mobs float in water and lava 2021-04-17 13:04:55 -04:00
kay27
ff07ee5d93 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-17 21:02:07 +04:00
Elias Fleckenstein
f8b54db392 Fix controls.register_on_press being called for every player in a globalstep 2021-04-17 18:55:56 +02:00
jordan4ibanez
8783912938 Add in mobs api swimming animation 2021-04-17 12:48:57 -04:00
jordan4ibanez
f2e909ab8d Add in fly logic gate 2021-04-17 12:41:14 -04:00
jordan4ibanez
07841c8963 Swap name of quick_rotate_45 to quick_rotate 2021-04-17 12:38:48 -04:00
jordan4ibanez
240d6ea211 Add note about quick_rotate_45 actually rotating 11.25 degrees 2021-04-17 12:37:04 -04:00
jordan4ibanez
e8148f81ab Make underwater mobs try to continuously swim around with quick_rotate_45 2021-04-17 12:36:19 -04:00
jordan4ibanez
061602d9d4 Overhaul separation of swimming and flying for ease of use with writing mobs api 2021-04-17 12:28:07 -04:00
Elias Fleckenstein
f79e12c8ae Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-17 18:16:19 +02:00
Elias Fleckenstein
5c928575f8 Fix #1572, server crash during login 2021-04-17 18:15:45 +02:00
jordan4ibanez
5365dec19a Adjust "flying" vector checks for mobs 2021-04-17 12:01:27 -04:00
NO11
06699c2cc4 Fix that an ax wears out if you right-click another block 2021-04-17 11:55:50 +00:00
AFCMS
6a55136517 Merge branch 'master' of ssh://git.minetest.land:29418/MineClone2/MineClone2 2021-04-17 09:26:49 +02:00
AFCMS
02f393998f fix many warnings (644 remaining) 2021-04-17 09:26:37 +02:00
AFCMS
22a2fdbf5f fix more codestyle 2021-04-17 07:46:24 +02:00
AFCMS
5f076d372a fix many codestyle errors 2021-04-17 07:42:49 +02:00
jordan4ibanez
dda7839d8c Add in prototype swimming 2021-04-16 21:43:02 -04:00
jordan4ibanez
f1141aed9f Make mobs flop when outside of flying node 2021-04-16 21:08:54 -04:00
jordan4ibanez
84ca7681fc Make squids fly in water flowing and water source 2021-04-16 20:47:16 -04:00
jordan4ibanez
52c3db041e Add in fly state prep for mobs 2021-04-16 20:32:05 -04:00
jordan4ibanez
6db4511dd5 Add notes 2021-04-16 20:06:55 -04:00
jordan4ibanez
15ea9c1c71 Implement self walking velocity for walking state 2021-04-16 19:59:20 -04:00
jordan4ibanez
9d6d042ee3 Fix formatting in ai.lua 2021-04-16 19:37:01 -04:00
jordan4ibanez
ce7f4918b0 Re-organize comments 2021-04-16 19:35:19 -04:00
jordan4ibanez
05d06a4c8f Add comment to state_execution 2021-04-16 18:36:23 -04:00
jordan4ibanez
c761db86c7 re-arrange mob logic for random wandering 2021-04-16 18:29:42 -04:00
jordan4ibanez
ed456ecb47 Make mobs not fear cliffs if fear_height is 0 2021-04-16 18:17:51 -04:00
jordan4ibanez
8ca5f221ec clean up ai.lua 2021-04-16 18:13:54 -04:00
jordan4ibanez
cadd53c103 Adjust mob jumping default to account for higher gravity 2021-04-16 16:39:03 -04:00
jordan4ibanez
57b293de2b Make mobs gravity equal to player's 2021-04-16 16:37:15 -04:00