forked from VoxeLibre/VoxeLibre
Compare commits
770 Commits
fix_slidin
...
master
Author | SHA1 | Date |
---|---|---|
|
c70ae8e535 | |
|
c1115c9cef | |
|
12b3e34f88 | |
|
59c5d54cbe | |
|
4b5afee4bb | |
|
3c2247d7c8 | |
|
324fd0dc4a | |
|
cd033aa4ff | |
|
1f3c7913dd | |
|
18db66c431 | |
|
cc3f092185 | |
|
9f64facbf9 | |
|
6694babbde | |
|
fc204c8717 | |
|
c664216104 | |
|
cd3426b5ce | |
|
9867c73eb3 | |
|
3db02bb022 | |
|
3c7597b75e | |
|
7bf3fbf13c | |
|
fc7133f1a8 | |
|
05eb3bb8aa | |
|
7583caca9b | |
|
882531b9fc | |
|
0b5c15d05f | |
|
cd930365b0 | |
|
ce56f396b1 | |
|
ba297001b4 | |
|
24eca01c3f | |
|
4e3cf9e04b | |
|
d285a48fed | |
|
d3d1bdf8d2 | |
|
f306d3768e | |
|
7463b97c69 | |
|
d11526f8e8 | |
|
8021a6a723 | |
|
1bad5659cf | |
|
befd98b83e | |
|
13341df20b | |
|
f866b56d06 | |
|
4a407679c0 | |
|
39f98ec6fb | |
|
9e3d7ce0f4 | |
|
cb7878249d | |
|
939905b9d8 | |
|
b1f7fecb59 | |
|
3d58878750 | |
|
b6938bad90 | |
|
9df4e2e95e | |
|
a2a4da5aed | |
|
e1d5899aa5 | |
|
dd7d56a385 | |
|
4bb46d7d30 | |
|
8071d0fbef | |
|
60c0483c12 | |
|
29d40ef553 | |
|
d59a6c6a00 | |
|
c20a37486e | |
|
85bc643442 | |
|
907e037430 | |
|
7b93c65c45 | |
|
73bcb0026f | |
|
01abafe50f | |
|
e28207f44e | |
|
a5370bc63d | |
|
f904512e61 | |
|
c1e3c69800 | |
|
d0697c70cc | |
|
bef3253d5c | |
|
ad099ed7c2 | |
|
a2b7549456 | |
|
f8ef5a15c5 | |
|
6c4101dc12 | |
|
8c0d9cc450 | |
|
1f370bf1f2 | |
|
6bffaf56d2 | |
|
04b77db7fa | |
|
aeeb5acc25 | |
|
9a8a6764d1 | |
|
3047568ed4 | |
|
2a8da574f0 | |
|
00bf5f0331 | |
|
2d5b57c60d | |
|
b476c703f1 | |
|
8f3936792f | |
|
8816e9fc61 | |
|
e291d9918e | |
|
bd19c8fe67 | |
|
7f36116146 | |
|
8afa57b914 | |
|
bc186560b4 | |
|
ae470f8809 | |
|
8b1ad1c217 | |
|
0638c67cf7 | |
|
3f0e77b971 | |
|
3e131a213f | |
|
d7c8c7a54a | |
|
fcd4a610e5 | |
|
cde4bc797e | |
|
cb6b4253d2 | |
|
6480c6923a | |
|
487f78d663 | |
|
908c46ce34 | |
|
90a758c002 | |
|
3a89d367b0 | |
|
6dac652241 | |
|
4a3369205e | |
|
8b02d7b0b2 | |
|
184a098964 | |
|
d57fbb047d | |
|
1c3003c85b | |
|
188f1cdaa6 | |
|
e536822b4d | |
|
c6fc911c12 | |
|
cb0c67b05f | |
|
427724ced2 | |
|
799462c4b4 | |
|
334ac81f58 | |
|
840381f73f | |
|
21a10751d1 | |
|
09a063256b | |
|
9701526d16 | |
|
e2746adea8 | |
|
a93ce7af1f | |
|
3684cb8d2a | |
|
0626c3329b | |
|
5489bf20ea | |
|
232740b5e6 | |
|
6f7ac46f05 | |
|
1524f63a6d | |
|
60377c56cd | |
|
b0b120dd28 | |
|
34c23bd578 | |
|
9be815956c | |
|
2da67765a0 | |
|
01641b5a8c | |
|
9371ed5c48 | |
|
527577cbcc | |
|
86d5e748bb | |
|
6cbd985974 | |
|
6f9b70a98d | |
|
76e941cbb6 | |
|
aef093ef4e | |
|
f824f109e2 | |
|
a3ccd4d032 | |
|
419456b835 | |
|
72a144f0b2 | |
|
f379a06998 | |
|
947d20ae96 | |
|
5c06c28b0f | |
|
df02770470 | |
|
51dc10c9ea | |
|
2370d155c9 | |
|
ad3ec48ec9 | |
|
beb06315ac | |
|
569dd69188 | |
|
92ee9c0557 | |
|
f63e5d3c19 | |
|
4d5d595310 | |
|
f9972aef01 | |
|
85d21fa1e9 | |
|
e6a64cfc69 | |
|
dd5a9178d9 | |
|
113f07581b | |
|
10dcdb7d6b | |
|
ec8f3f5530 | |
|
74ab3ffeee | |
|
9d62c4ca5e | |
|
c9d221976b | |
|
0d1a6d91e9 | |
|
0f82c623d5 | |
|
a1d390bd4d | |
|
325c6ab4ca | |
|
dc4c559ad9 | |
|
1f52b7051a | |
|
5e28ff2d06 | |
|
d5eda7352c | |
|
5071855d00 | |
|
4cfd4ef6ce | |
|
96fa6c251e | |
|
e19de85990 | |
|
76bff2b540 | |
|
ff882707de | |
|
d7ed37ef25 | |
|
ceada2fcec | |
|
99cc88ac42 | |
|
56ebb5ac09 | |
|
8a5058e032 | |
|
e312955a14 | |
|
5afd0aa255 | |
|
98b6ead591 | |
|
040ce8288e | |
|
f9b192e68f | |
|
08241f6ea3 | |
|
5bf6608483 | |
|
42ec62562d | |
|
7f5ce4e033 | |
|
3a007e3bb1 | |
|
a650f8b368 | |
|
580a1caa38 | |
|
2f8389d3f5 | |
|
4f3f59f4bc | |
|
36f661743e | |
|
0a17bbe731 | |
|
6cfb55e853 | |
|
bf41e116a1 | |
|
fc80d4fb9f | |
|
11c5d36c55 | |
|
44c656502f | |
|
fe90424ee4 | |
|
14cec16c63 | |
|
cc470b9d88 | |
|
ee51a500b2 | |
|
7f823f0155 | |
|
f5ba0b7981 | |
|
e202f20869 | |
|
692b101212 | |
|
07147e9d5b | |
|
d44b00a20e | |
|
12109e7f44 | |
|
200f7451eb | |
|
c39e55e2d4 | |
|
6d7ae8ba2d | |
|
8612350fa7 | |
|
0a8874ecad | |
|
e8ee9c4463 | |
|
32e91b45ae | |
|
8fbd72c142 | |
|
cfab59d68a | |
|
33e8337bbb | |
|
f799596db9 | |
|
9b9747b3d8 | |
|
c9692c6224 | |
|
cd83305f07 | |
|
d7b10d18d8 | |
|
8e2c5249f5 | |
|
ca556c052f | |
|
60367cdbe0 | |
|
ae169b2814 | |
|
cee5bbc206 | |
|
6b439fd1de | |
|
bf9e487fa9 | |
|
49af5d2013 | |
|
ed507d8509 | |
|
b2507c3640 | |
|
85b1f5247a | |
|
2b71462c1e | |
|
b0e33793ec | |
|
96aaf89036 | |
|
a8c2d4534a | |
|
a8806fe04e | |
|
ebd733be82 | |
|
a2c8d13f04 | |
|
610bcab0d6 | |
|
ed205190e4 | |
|
07eb70e9be | |
|
b3da7a473d | |
|
bc101314df | |
|
69903aa4ec | |
|
686646b86d | |
|
789c9a9a6d | |
|
cf51c60527 | |
|
55fe71d73b | |
|
58bb26a7ef | |
|
f5079f1568 | |
|
b4511fb8c7 | |
|
b02a3deec7 | |
|
26cfdf0b7c | |
|
8d34ff2a9a | |
|
e6ddc03d3c | |
|
351e31a889 | |
|
aff4216ccf | |
|
8b00fff4cb | |
|
cf70de0ecc | |
|
6dce3b4bc4 | |
|
a60540c17e | |
|
19fd075a2f | |
|
1ac65305d6 | |
|
8dcb62aa56 | |
|
1d2a7b35d8 | |
|
02e7ff41d5 | |
|
d4797e13af | |
|
3caa99a409 | |
|
ca71e949a8 | |
|
9a7e39654c | |
|
333db53e7b | |
|
47f920c9df | |
|
bb66f81999 | |
|
a344755894 | |
|
c03366aa12 | |
|
bb1e572287 | |
|
4127d120d2 | |
|
86dad4693e | |
|
f39fe17895 | |
|
0673fcc25b | |
|
589de76613 | |
|
1857341b59 | |
|
46d9c66000 | |
|
cca6645524 | |
|
24ffd64cad | |
|
e29654a0f6 | |
|
027e0e8337 | |
|
2ba73f832c | |
|
4b63ff1c2a | |
|
43e7a952ac | |
|
4cf865a36c | |
|
b57f6be81d | |
|
cd40861b3b | |
|
19728c5a19 | |
|
1da7bb0bdc | |
|
1044163717 | |
|
570ea114ec | |
|
8fd988da11 | |
|
f1c5f0ca1c | |
|
b4080b6275 | |
|
bb48e47488 | |
|
a6025b751a | |
|
af2f58248f | |
|
e324a1a74b | |
|
4836418cf6 | |
|
a001f84786 | |
|
2128dd4c15 | |
|
c183da7714 | |
|
fd17bf1a29 | |
|
0c7b4d473c | |
|
6ebd3ccb7d | |
|
d46b9071a0 | |
|
ead2e772c2 | |
|
19cea45c17 | |
|
b252e577ec | |
|
12568a6749 | |
|
559f500322 | |
|
40fb043de2 | |
|
5dda3033a5 | |
|
524c9c1bcc | |
|
a9f26fb354 | |
|
01d43bb33a | |
|
ca37ce5744 | |
|
5f0ad98dae | |
|
0e60231c2e | |
|
7fcc2e3be3 | |
|
356045b3e3 | |
|
07d2759ae4 | |
|
9da07af370 | |
|
47990eec2b | |
|
7523727521 | |
|
2af08c3188 | |
|
45532ebe6d | |
|
86da47b922 | |
|
7cbba73d50 | |
|
4df6f82c64 | |
|
6ee2dbe70c | |
|
613ab897b2 | |
|
e53d9ec8d7 | |
|
a764818e13 | |
|
378b8f8f6c | |
|
32ef89aca3 | |
|
accb8742dd | |
|
71282e196e | |
|
89c97690c8 | |
|
06f9486e4d | |
|
ae5564e658 | |
|
fdf823fff6 | |
|
52b65554d9 | |
|
5a069af072 | |
|
14f73a8c55 | |
|
dbab70ea38 | |
|
952a96b57d | |
|
e5a260b563 | |
|
9b2b8ee56e | |
|
00cfca5947 | |
|
c37da143da | |
|
520fd773fb | |
|
378df76e5f | |
|
3e12b3c700 | |
|
0637182697 | |
|
0580b14310 | |
|
98cf3b7f7a | |
|
e5829f719d | |
|
089e3d46f1 | |
|
5d8688dbeb | |
|
058684f17f | |
|
918b8eee38 | |
|
af206ed8b3 | |
|
f2eca64e42 | |
|
262100be24 | |
|
69dc013799 | |
|
a425d359f5 | |
|
83d6e2a5d2 | |
|
ce403b9245 | |
|
da911bd4d4 | |
|
8789411ab7 | |
|
5b1deedaf0 | |
|
fa1d8dfc47 | |
|
d2a4a6d042 | |
|
5e194b33bd | |
|
35bb569ee1 | |
|
5be506830f | |
|
4fcd1ae541 | |
|
f941817c39 | |
|
bc3bde4cf8 | |
|
8099a4bd17 | |
|
e2ed1ab4a6 | |
|
e43a8e267d | |
|
570caf47eb | |
|
59f3b53a51 | |
|
ec7e99019e | |
|
b320d008ca | |
|
3d7155c1b9 | |
|
e3ab94809e | |
|
a66be39d9b | |
|
3564f6ebde | |
|
f99ae93bf6 | |
|
8d440252a4 | |
|
d706833f21 | |
|
c874e01cf9 | |
|
7ce82b9dcb | |
|
645072507f | |
|
924a6c1c47 | |
|
20b0f0748d | |
|
d7c76e33d8 | |
|
966712f4ff | |
|
e4102e6124 | |
|
17c8f220e6 | |
|
df17688b7d | |
|
729d8ec9e0 | |
|
c9dc12b081 | |
|
a1b6819756 | |
|
f1568483b3 | |
|
d7fa24ebf8 | |
|
23468cc2dd | |
|
0c48a46f7c | |
|
712a6d6c66 | |
|
a620d24ec8 | |
|
178b24886f | |
|
8333281b4f | |
|
6d3e55ce12 | |
|
2c2f5595f3 | |
|
8936313fb3 | |
|
c51442704c | |
|
2bd6678b08 | |
|
e0c44244f9 | |
|
5b7352a23a | |
|
e8c658658d | |
|
e9d994b74d | |
|
eafe6627d8 | |
|
4046a68fbf | |
|
882c3ef339 | |
|
95db118361 | |
|
d2d7887e0f | |
|
b2ebcf5d4f | |
|
f57220f784 | |
|
7577d37b38 | |
|
bf4c7e1913 | |
|
11e3674926 | |
|
cc217d0089 | |
|
e6653b78ee | |
|
a960bf2e8e | |
|
2d9bffaa43 | |
|
eb658a4996 | |
|
b4c693bb20 | |
|
bd46428d65 | |
|
9e53efbc3e | |
|
6b36abfe91 | |
|
49e7449d7f | |
|
1d28a8e4ac | |
|
c32e88e910 | |
|
969fa98f18 | |
|
107420c80f | |
|
f9afc74077 | |
|
21f0c7750b | |
|
04b59b2190 | |
|
15bb4fa4bf | |
|
4c3e521779 | |
|
4c59b189dd | |
|
23d6c3d17b | |
|
61f489e71f | |
|
4616b6c3ec | |
|
d92296712c | |
|
5b212dd3fe | |
|
d3095fea57 | |
|
177196a8d2 | |
|
13d4841097 | |
|
0b7cec419a | |
|
cef6c72a71 | |
|
aca82fcafc | |
|
a7fcd62999 | |
|
d489c954f5 | |
|
8b0097df71 | |
|
cb407666a4 | |
|
969a08b7be | |
|
1749712318 | |
|
a648e53699 | |
|
878480d010 | |
|
b0208e622b | |
|
8c41fb53e3 | |
|
408c7f71da | |
|
8b7a71f93e | |
|
98e7cd6e8e | |
|
4853018bb0 | |
|
c6256295a7 | |
|
b911f99d23 | |
|
273165ce3b | |
|
aa08a176fc | |
|
7b764adbc0 | |
|
1502757732 | |
|
49bd28e109 | |
|
6c107ce990 | |
|
7c43c15fda | |
|
5b4a79a26d | |
|
291cbaf434 | |
|
fb74689f3d | |
|
da024bb4b8 | |
|
3c266f5cfd | |
|
5f0944062c | |
|
2f8bb9726b | |
|
8176e7319f | |
|
f008fa3323 | |
|
2eabeb119a | |
|
28d77a3e5b | |
|
149cb5d17c | |
|
1b5b2e4dc7 | |
|
560aead57f | |
|
438998de6a | |
|
4f0620c7c1 | |
|
4efb5bf8b9 | |
|
158ff8e860 | |
|
e936cede03 | |
|
df2ab1fd8c | |
|
dc20267b4f | |
|
9d184e9897 | |
|
3fe3153a40 | |
|
bf28bab427 | |
|
f7c251e7f2 | |
|
1bdbdc365d | |
|
a77930d4a1 | |
|
bb3771c0d2 | |
|
40bc219a86 | |
|
054dc22432 | |
|
06e2022c6d | |
|
2cb9eca8e1 | |
|
ae632fe773 | |
|
4db0631133 | |
|
0e13190ea4 | |
|
cd6dd4d851 | |
|
653f82198e | |
|
3bbae86baf | |
|
ee4f7d1b88 | |
|
7cf91c79cb | |
|
c8620685c0 | |
|
6a2ad4e618 | |
|
7d8a1e1e5f | |
|
ecb4c82600 | |
|
9831f2c25b | |
|
4055555ec1 | |
|
7c15fe6ac9 | |
|
5011e12209 | |
|
f6804600ba | |
|
bf57cf3aa3 | |
|
093d55861c | |
|
0da1822d26 | |
|
0ae76776b1 | |
|
e5ee0c4afc | |
|
842363464d | |
|
37176976b6 | |
|
1065eb4d8c | |
|
452cd26558 | |
|
9e83e531bd | |
|
04a58ddd24 | |
|
fbb51835b3 | |
|
fb79465052 | |
|
e093c69328 | |
|
c2032fe4de | |
|
691b93ac68 | |
|
4ee6a67516 | |
|
54b119cffa | |
|
558df5e4bd | |
|
cf01c0630c | |
|
f20fbfb95a | |
|
767c904258 | |
|
ac4db102b2 | |
|
85c1c57e95 | |
|
64bc57c6a4 | |
|
d3fb221641 | |
|
6756358307 | |
|
dd96af15c4 | |
|
6cdd679baf | |
|
11d275a471 | |
|
d7ea628270 | |
|
0d16acdd42 | |
|
246a95f973 | |
|
8c64fdfa5d | |
|
034382c883 | |
|
898a183ccd | |
|
6ae597c97f | |
|
e3bdedb4d5 | |
|
f884de5f87 | |
|
a609639585 | |
|
aa3b3421d5 | |
|
4f2cb955b8 | |
|
a3bbb3694c | |
|
b911da121e | |
|
a99daf4294 | |
|
f9eb31ed46 | |
|
80b21759d9 | |
|
2cf5183638 | |
|
86b5648442 | |
|
dd3969ff56 | |
|
80ac4aa930 | |
|
13fc47751d | |
|
2ff98f0d27 | |
|
bfde7445df | |
|
8cc0b1a85f | |
|
9e7ade8ae2 | |
|
f83f11bdaa | |
|
48bab788f0 | |
|
0304091756 | |
|
b998066391 | |
|
9bc48fec13 | |
|
650cb39606 | |
|
445370de09 | |
|
73af332262 | |
|
4365f4df77 | |
|
99af25fba3 | |
|
bd95528e73 | |
|
3255b7f754 | |
|
d346aa07ee | |
|
40e072ab89 | |
|
cf95a31066 | |
|
6e29ae5c6c | |
|
39b614a038 | |
|
eded3b8dc4 | |
|
f4e84b9091 | |
|
102f1a1490 | |
|
47e78d473c | |
|
543720d9a7 | |
|
90a6fb8925 | |
|
823f7ee5c7 | |
|
fe501e8021 | |
|
b05fa5562c | |
|
75a31a2106 | |
|
86cbca1d17 | |
|
f335171965 | |
|
8530f4d863 | |
|
d4e348a4bd | |
|
590cbc0c3c | |
|
6d767b7d11 | |
|
7ba0773769 | |
|
0f82364b3e | |
|
49a899170f | |
|
b8887b079a | |
|
9c77cbc011 | |
|
cc21b74125 | |
|
5c69daf5ba | |
|
09732acf77 | |
|
008dd95f1f | |
|
f6fb1d1121 | |
|
c61df75370 | |
|
158a5311f9 | |
|
d0e981e4db | |
|
70caacd369 | |
|
03341ade2e | |
|
3c4fb9abb2 | |
|
852c2c5710 | |
|
1dfbd612be | |
|
81569a6917 | |
|
17371ad60b | |
|
36f5372fe8 | |
|
0902e137e3 | |
|
67078ba3b1 | |
|
da71e7b521 | |
|
960f9adda8 | |
|
74742f7fc8 | |
|
c5c35ca786 | |
|
bba440b617 | |
|
101cde2a94 | |
|
0f8b709677 | |
|
dd5d1dad29 | |
|
378b413986 | |
|
a286cb5046 | |
|
8b9b4b00e5 | |
|
7d51519f4d | |
|
088f8dec2f | |
|
5806dd6017 | |
|
658f244ae4 | |
|
ed13590bb0 | |
|
23711950c1 | |
|
baf6ae65e7 | |
|
9ba503f99d | |
|
9d1840f4ca | |
|
5cc9038169 | |
|
460ef23b50 | |
|
1e16647fe9 | |
|
16415ae577 | |
|
2665980007 | |
|
8c8b3be0f5 | |
|
75d6509c3e | |
|
f7f8a72d08 | |
|
766c9efe33 | |
|
52fba55910 | |
|
358432c52a | |
|
4a17c8abc1 | |
|
da19aceb06 | |
|
67260b16be | |
|
7219f70d77 | |
|
bb2ce9ef92 | |
|
758d38894d | |
|
1192a46b9c | |
|
fd07cbdd5a | |
|
b409610537 | |
|
deb703fbc2 | |
|
ac31642ec9 | |
|
bc29e4dd95 | |
|
b76ed92aba | |
|
703f1f46fc | |
|
0b118c170e | |
|
8431ac34d0 | |
|
f57f73681a | |
|
049128972f | |
|
0c65d9d11a | |
|
311beeb31c | |
|
60c996b5ac | |
|
bc3da8dab8 | |
|
ed5232411b | |
|
6c6a27320d | |
|
82f2f4784e | |
|
8476865ea7 | |
|
b4273af245 | |
|
483285a612 | |
|
b154f2def1 | |
|
c62195662c | |
|
4dc5ad3bdb | |
|
cc186cc588 | |
|
df8c9625e4 | |
|
47f64f63a3 | |
|
cc5a0971ac | |
|
df8592df41 | |
|
5e4fa30aae | |
|
e49eac6d85 | |
|
e53b6c124c | |
|
92887f5501 | |
|
86cd5711ca | |
|
908ba9fba6 | |
|
91d94800d7 | |
|
74e55ca361 | |
|
c049113f26 | |
|
1f5247df06 | |
|
2e2f56122d | |
|
46d486c7cb | |
|
75e4000b30 | |
|
46f6731cf5 | |
|
0fba7eaed4 | |
|
7c46826958 | |
|
d6858b7e2a | |
|
9e5a45e3fd | |
|
4b9fc7046b | |
|
3eb2f745e2 | |
|
4287a261c8 | |
|
5cbb56d71b | |
|
c65f8c9e51 | |
|
812269264b | |
|
afb4540408 | |
|
4d3e8e25e5 | |
|
ae32ce4a0a | |
|
4c3d726882 | |
|
90842c5f25 | |
|
428ae9ac0d | |
|
adee1a49af | |
|
06077d1633 | |
|
b866d5d98e |
|
@ -5,3 +5,4 @@
|
||||||
*.blend3
|
*.blend3
|
||||||
/.idea/
|
/.idea/
|
||||||
*.xcf
|
*.xcf
|
||||||
|
.Rproj.user
|
22
.luacheckrc
22
.luacheckrc
|
@ -1,10 +1,12 @@
|
||||||
|
---@diagnostic disable
|
||||||
|
|
||||||
unused_args = false
|
unused_args = false
|
||||||
allow_defined_top = true
|
allow_defined_top = true
|
||||||
max_line_length = false
|
max_line_length = false
|
||||||
redefined = false
|
redefined = false
|
||||||
|
|
||||||
globals = {
|
globals = {
|
||||||
"minetest", "core",
|
"minetest", "core",
|
||||||
}
|
}
|
||||||
|
|
||||||
read_globals = {
|
read_globals = {
|
||||||
|
@ -40,16 +42,16 @@ read_globals = {
|
||||||
"factorial"
|
"factorial"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
------
|
------
|
||||||
--MODS
|
--MODS
|
||||||
------
|
------
|
||||||
|
|
||||||
--GENERAL
|
--GENERAL
|
||||||
"default",
|
"default",
|
||||||
|
|
||||||
--ENTITIES
|
--ENTITIES
|
||||||
"cmi",
|
"cmi",
|
||||||
|
|
||||||
--HUD
|
--HUD
|
||||||
"sfinv", "sfinv_buttons", "unified_inventory", "cmsg", "inventory_plus",
|
"sfinv", "sfinv_buttons", "unified_inventory", "cmsg", "inventory_plus",
|
||||||
}
|
}
|
|
@ -0,0 +1,22 @@
|
||||||
|
{
|
||||||
|
"runtime.version": "LuaJIT",
|
||||||
|
"diagnostics": { "disable": ["lowercase-global"] },
|
||||||
|
"diagnostics.globals": [
|
||||||
|
"minetest",
|
||||||
|
"dump",
|
||||||
|
"dump2",
|
||||||
|
"Raycast",
|
||||||
|
"Settings",
|
||||||
|
"PseudoRandom",
|
||||||
|
"PerlinNoise",
|
||||||
|
"VoxelManip",
|
||||||
|
"SecureRandom",
|
||||||
|
"VoxelArea",
|
||||||
|
"PerlinNoiseMap",
|
||||||
|
"PcgRandom",
|
||||||
|
"ItemStack",
|
||||||
|
"AreaStore",
|
||||||
|
"vector"
|
||||||
|
],
|
||||||
|
"workspace.ignoreDir": [".luacheckrc"]
|
||||||
|
}
|
|
@ -9,10 +9,9 @@ You can help with MineClone2's development in many different ways,
|
||||||
whether you're a programmer or not.
|
whether you're a programmer or not.
|
||||||
|
|
||||||
## MineClone2's development target is to...
|
## MineClone2's development target is to...
|
||||||
- Crucially, create a stable, moddable, free/libre clone of Minecraft
|
- Create a stable, peformant, moddable, free/libre game based on Minecraft
|
||||||
based on the Minetest engine with polished features, usable in both
|
using the Minetest engine, usable in both singleplayer and multiplayer.
|
||||||
singleplayer and multiplayer. Currently, a lot of Minecraft features
|
- Currently, a lot of features are already implemented.
|
||||||
are already implemented.
|
|
||||||
Polishing existing features is always welcome.
|
Polishing existing features is always welcome.
|
||||||
|
|
||||||
## Links
|
## Links
|
||||||
|
@ -120,11 +119,11 @@ It's also a good idea to join the Discord server
|
||||||
(or alternatively IRC or Matrix).
|
(or alternatively IRC or Matrix).
|
||||||
|
|
||||||
#### Textures
|
#### Textures
|
||||||
For textures we use the Pixel Perfection texture pack. For older Minecraft
|
For textures we prefer original art, but in the absence of that will accept
|
||||||
features that is mostly enough but a lot of the newer textures in it are
|
Pixel Perfection texture pack contributions. Be warned many of the newer
|
||||||
copies or slight modifications of the original MC textures so great caution
|
textures in it are copies or slight modifications of the original MC textures
|
||||||
needs to be taken when using any textures coming from Minecraft texture
|
so great caution needs to be taken when using any textures coming from
|
||||||
packs.
|
Minecraft texture packs.
|
||||||
If you want to make such contributions, join our Discord server. Demands
|
If you want to make such contributions, join our Discord server. Demands
|
||||||
for textures will be communicated there.
|
for textures will be communicated there.
|
||||||
|
|
||||||
|
@ -135,7 +134,10 @@ resource pack or minetest_game. Unfortunately, MineClone2 does not play
|
||||||
a sound in every situation you would get one in Minecraft. Any help with
|
a sound in every situation you would get one in Minecraft. Any help with
|
||||||
sounds is greatly appreciated, however if you add new sounds you should
|
sounds is greatly appreciated, however if you add new sounds you should
|
||||||
probably work together with a programmer, to write the code to actually
|
probably work together with a programmer, to write the code to actually
|
||||||
play these sounds in game.
|
play these sounds in game. All sounds should be released under an open
|
||||||
|
source license with clear information on the source, licencing and any
|
||||||
|
changes made by the contributor. Use the README files in the mod to
|
||||||
|
communicate this information.
|
||||||
|
|
||||||
#### 3D Models
|
#### 3D Models
|
||||||
Most of the 3D Models in MineClone2 come from
|
Most of the 3D Models in MineClone2 come from
|
||||||
|
@ -145,9 +147,9 @@ Blender on demand. Many of the models have to be patched, some new
|
||||||
animations have to be added etc.
|
animations have to be added etc.
|
||||||
|
|
||||||
#### Crediting
|
#### Crediting
|
||||||
Asset contributions will be credited in their own respective sections in
|
Asset contributions will be credited in their mods and their own respective
|
||||||
CREDITS.md. If you have commited the results yourself, you will also be
|
sections in CREDITS.md. If you have commited the results yourself, you will
|
||||||
credited in the Contributors section.
|
also be credited in the Contributors section.
|
||||||
|
|
||||||
### Contributing Translations
|
### Contributing Translations
|
||||||
|
|
||||||
|
@ -182,7 +184,12 @@ information about the game's performance and let us know places to
|
||||||
investigate optimization issues. This way we can make the game faster.
|
investigate optimization issues. This way we can make the game faster.
|
||||||
|
|
||||||
#### Using Minetest's profiler
|
#### Using Minetest's profiler
|
||||||
Minetest has a built in profiler. Simply set `profiler.load = true` in
|
We frequently will use profiling to optimise our code. We recommend use of
|
||||||
|
the JIT profiler (RIP Jude) to fully understand performance impact:
|
||||||
|
|
||||||
|
https://content.minetest.net/packages/jwmhjwmh/jitprofiler/
|
||||||
|
|
||||||
|
Minetest also has a built in profiler. Simply set `profiler.load = true` in
|
||||||
your configuration file and restart the server. After running the server
|
your configuration file and restart the server. After running the server
|
||||||
for some time, just run `/profiler save` in chat - then you will find a
|
for some time, just run `/profiler save` in chat - then you will find a
|
||||||
file in the world directory containing the results. Open a new issue and
|
file in the world directory containing the results. Open a new issue and
|
||||||
|
@ -213,10 +220,14 @@ they have made their donation Incognito).
|
||||||
* Fork the repository (in case you have not already)
|
* Fork the repository (in case you have not already)
|
||||||
* Do your change in a new branch
|
* Do your change in a new branch
|
||||||
* Create a pull request to get your changes merged into master
|
* Create a pull request to get your changes merged into master
|
||||||
* Keep your pull request up to date by regularly merging upstream. It is
|
* It is important that conflicts are resolved prior to merging the pull
|
||||||
imperative that conflicts are resolved prior to merging the pull
|
|
||||||
request.
|
request.
|
||||||
* After the pull request got merged, you can delete the branch
|
* We update our branches via rebasing. Please avoid merging master into
|
||||||
|
your branch unless it's the only way you can resolve a conflict. We can
|
||||||
|
rebase branches from the GUI if the user has not merged master into the
|
||||||
|
branch.
|
||||||
|
* After the pull request got merged, you can delete the branch if the
|
||||||
|
merger hasn't done this already.
|
||||||
|
|
||||||
### Discuss first
|
### Discuss first
|
||||||
If you feel like a problem needs to fixed or you want to make a new
|
If you feel like a problem needs to fixed or you want to make a new
|
||||||
|
@ -262,9 +273,7 @@ excessive git bureaucracy commits in master)
|
||||||
* Submodules should only be used if a) upstream is highly reliable and
|
* Submodules should only be used if a) upstream is highly reliable and
|
||||||
b) it is 100% certain that no mcl2 specific changes to the code will be
|
b) it is 100% certain that no mcl2 specific changes to the code will be
|
||||||
needed (this has never been the case before, hence mcl2 is submodule free so far)
|
needed (this has never been the case before, hence mcl2 is submodule free so far)
|
||||||
* Commit messages should be descriptive and never contain mcl2 specific
|
* Commit messages should be descriptive
|
||||||
issueids - there are other projects who might use commits from mcl2 and
|
|
||||||
it will confuse their issue trackers.
|
|
||||||
* Try to group your submissions best as you can:
|
* Try to group your submissions best as you can:
|
||||||
* Try to keep your PRs small: In some cases things reasonably be can't
|
* Try to keep your PRs small: In some cases things reasonably be can't
|
||||||
split up but in general multiple small PRs are better than a big one.
|
split up but in general multiple small PRs are better than a big one.
|
||||||
|
@ -348,18 +357,24 @@ end
|
||||||
|
|
||||||
### Developer status
|
### Developer status
|
||||||
Active and trusted contributors are often granted write access to the
|
Active and trusted contributors are often granted write access to the
|
||||||
MineClone2 repository.
|
MineClone2 repository as a contributor. Those that have demonstrated the right
|
||||||
|
technical skills and behaviours may be granted developer access. These are the
|
||||||
|
most trusted contributors who will contribute to ensure coding standards and
|
||||||
|
processes are followed.
|
||||||
|
|
||||||
#### Developer responsibilities
|
#### Developer responsibilities
|
||||||
- If you have developer privileges you can just open a new branch in the
|
- If you have developer/contributor privileges you can just open a new branch
|
||||||
mcl2 repository (which is preferred). From that you create a pull request.
|
in the mcl2 repository (which is preferred). From that you create a pull request.
|
||||||
This way other people can review your changes and make sure they work
|
This way other people can review your changes and make sure they work
|
||||||
before they get merged.
|
before they get merged.
|
||||||
- If you do not (yet) have developer privs you do your work on a branch
|
- If you do not (yet) have developer privs you do your work on a branch
|
||||||
on your private repository e.g. using the "fork" function on mesehub.
|
on your private repository e.g. using the "fork" function on mesehub.
|
||||||
- Any developer is welcome to review, test and merge PRs. A PR needs
|
- Any developer is welcome to review, test and approve PRs. A maintainer may prefer
|
||||||
at least one approval (by someone else than the author) but the maintainers
|
to merge the PR especially if it is in a similar area to what has been worked on
|
||||||
are usually relatively quick to react to new submissions.
|
and could result in merge conflicts for a larger older branch, or needs
|
||||||
|
art/licencing reviewing. A PR needs at least one approval (by someone else other
|
||||||
|
than the author).
|
||||||
|
- The maintainers are usually relatively quick to react to new submissions.
|
||||||
|
|
||||||
### Maintainer status
|
### Maintainer status
|
||||||
Maintainers carry the main responsibility for the project.
|
Maintainers carry the main responsibility for the project.
|
||||||
|
|
114
CREDITS.md
114
CREDITS.md
|
@ -6,40 +6,44 @@
|
||||||
## Creator of MineClone2
|
## Creator of MineClone2
|
||||||
* Wuzzy
|
* Wuzzy
|
||||||
|
|
||||||
|
|
||||||
## Maintainers
|
## Maintainers
|
||||||
* AncientMariner
|
* AncientMariner
|
||||||
* Nicu
|
* Herowl
|
||||||
|
|
||||||
## Previous Maintainers
|
## Previous Maintainers
|
||||||
* Fleckenstein
|
* Fleckenstein
|
||||||
* jordan4ibanez
|
|
||||||
* cora
|
* cora
|
||||||
|
* Nicu
|
||||||
|
|
||||||
## Developers
|
## Developers
|
||||||
* bzoss
|
|
||||||
* AFCMS
|
* AFCMS
|
||||||
* epCode
|
* epCode
|
||||||
* ryvnf
|
|
||||||
* iliekprogrammar
|
|
||||||
* MysticTempest
|
|
||||||
* Rootyjr
|
|
||||||
* aligator
|
|
||||||
* Code-Sploit
|
|
||||||
* NO11
|
|
||||||
* kabou
|
|
||||||
* rudzik8
|
|
||||||
* chmodsayshello
|
* chmodsayshello
|
||||||
* PrairieWind
|
|
||||||
* RandomLegoBrick
|
|
||||||
* SumianVoice
|
|
||||||
* MrRar
|
* MrRar
|
||||||
* talamh
|
|
||||||
* Faerraven / Michieal
|
|
||||||
* FossFanatic
|
* FossFanatic
|
||||||
* SmokeyDope
|
* SmokeyDope
|
||||||
|
* Faerraven / Michieal
|
||||||
|
* Codiac
|
||||||
|
|
||||||
|
## Past Developers
|
||||||
|
* jordan4ibanez
|
||||||
|
* iliekprogrammar
|
||||||
|
* kabou
|
||||||
|
* kay27
|
||||||
|
* MysticTempest
|
||||||
|
* NO11
|
||||||
|
* SumianVoice
|
||||||
|
* PrairieWind
|
||||||
|
|
||||||
## Contributors
|
## Contributors
|
||||||
|
* RandomLegoBrick
|
||||||
|
* rudzik8
|
||||||
|
* Code-Sploit
|
||||||
|
* aligator
|
||||||
|
* Rootyjr
|
||||||
|
* ryvnf
|
||||||
|
* bzoss
|
||||||
|
* talamh
|
||||||
* Laurent Rocher
|
* Laurent Rocher
|
||||||
* HimbeerserverDE
|
* HimbeerserverDE
|
||||||
* TechDudie
|
* TechDudie
|
||||||
|
@ -68,6 +72,10 @@
|
||||||
* Marcin Serwin
|
* Marcin Serwin
|
||||||
* erlehmann
|
* erlehmann
|
||||||
* E
|
* E
|
||||||
|
* n_to
|
||||||
|
* debiankaios
|
||||||
|
* Gustavo6046 / wallabra
|
||||||
|
* CableGuy67
|
||||||
* Benjamin Schötz
|
* Benjamin Schötz
|
||||||
* Doloment
|
* Doloment
|
||||||
* Sydney Gems
|
* Sydney Gems
|
||||||
|
@ -101,25 +109,33 @@
|
||||||
* gldrk
|
* gldrk
|
||||||
* atomdmac
|
* atomdmac
|
||||||
* emptyshore
|
* emptyshore
|
||||||
|
* FlamingRCCars
|
||||||
|
* uqers
|
||||||
|
* Niterux
|
||||||
|
* appgurueu
|
||||||
|
* seventeenthShulker
|
||||||
|
* DinoNuggies4665
|
||||||
|
* basxto
|
||||||
|
* Morik666
|
||||||
|
* Eliy21
|
||||||
|
* mdk
|
||||||
|
* Alessandra Lozoya
|
||||||
|
* VanicGame
|
||||||
|
* ThePython10110
|
||||||
|
* Araca
|
||||||
|
* Montandalar
|
||||||
|
* mim
|
||||||
|
* Dark
|
||||||
|
* Bakawun
|
||||||
|
* JoseDouglas26
|
||||||
|
* Zasco
|
||||||
|
|
||||||
## MineClone5
|
## Music
|
||||||
* kay27
|
* Jordach for the jukebox music compilation from Big Freaking Dig
|
||||||
* Debiankaios
|
* Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube) and Traitor (horizonchris96), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/
|
||||||
* epCode
|
* Jester for helping to finely tune MineClone2 (https://www.youtube.com/@Jester-8-bit). Songs: Hailing Forest, Gift, 0dd BL0ck, Flock of One (License CC BY-SA 4.0)
|
||||||
* NO11
|
* Exhale & Tim Unwin for some wonderful MineClone2 tracks (https://www.youtube.com/channel/UClFo_JDWoG4NGrPQY0JPD_g). Songs: Valley of Ghosts, Lonely Blossom, Farmer (License CC BY-SA 4.0)
|
||||||
* j45
|
* Diminixed for 3 fantastic tracks and remastering and leveling volumes. Songs: Afternoon Lullaby (pianowtune02), Spooled (ambientwip02), Never Grow Up (License CC BY-SA 4.0)
|
||||||
* chmodsayshello
|
|
||||||
* 3raven
|
|
||||||
* PrairieWind
|
|
||||||
* Gustavo6046 / wallabra
|
|
||||||
* CableGuy67
|
|
||||||
* MrRar
|
|
||||||
|
|
||||||
## Mineclonia
|
|
||||||
* erlehmann
|
|
||||||
* Li0n
|
|
||||||
* E
|
|
||||||
* n_to
|
|
||||||
|
|
||||||
## Original Mod Authors
|
## Original Mod Authors
|
||||||
* Wuzzy
|
* Wuzzy
|
||||||
|
@ -151,14 +167,20 @@
|
||||||
* 4Evergreen4
|
* 4Evergreen4
|
||||||
* jordan4ibanez
|
* jordan4ibanez
|
||||||
* paramat
|
* paramat
|
||||||
|
* debian044 / debian44
|
||||||
|
* chmodsayshello
|
||||||
* cora
|
* cora
|
||||||
* Faerraven / Michieal
|
* Faerraven / Michieal
|
||||||
|
* PrairieWind
|
||||||
|
* ChrisPHP
|
||||||
|
|
||||||
## 3D Models
|
## 3D Models
|
||||||
* 22i
|
* 22i
|
||||||
* tobyplowy
|
* tobyplowy
|
||||||
* epCode
|
* epCode
|
||||||
* Faerraven / Michieal
|
* Faerraven / Michieal
|
||||||
|
* SumianVoice
|
||||||
|
* thunder1035
|
||||||
|
|
||||||
## Textures
|
## Textures
|
||||||
* XSSheep
|
* XSSheep
|
||||||
|
@ -175,6 +197,11 @@
|
||||||
* Faerraven / Michieal
|
* Faerraven / Michieal
|
||||||
* Nicu
|
* Nicu
|
||||||
* Exhale
|
* Exhale
|
||||||
|
* Aeonix_Aeon
|
||||||
|
* Wbjitscool
|
||||||
|
* SmokeyDope
|
||||||
|
* thunder1035
|
||||||
|
* Herowl
|
||||||
|
|
||||||
## Translations
|
## Translations
|
||||||
* Wuzzy
|
* Wuzzy
|
||||||
|
@ -191,6 +218,13 @@
|
||||||
* SakuraRiu
|
* SakuraRiu
|
||||||
* anarquimico
|
* anarquimico
|
||||||
* syl
|
* syl
|
||||||
|
* Temak
|
||||||
|
* megustanlosfrijoles
|
||||||
|
* kbundg
|
||||||
|
* Isaac Dennis
|
||||||
|
* ADLON
|
||||||
|
* Sab Pyrope
|
||||||
|
* JoseDouglas26
|
||||||
|
|
||||||
## Funders
|
## Funders
|
||||||
* 40W
|
* 40W
|
||||||
|
@ -198,12 +232,6 @@
|
||||||
* Cora
|
* Cora
|
||||||
|
|
||||||
## Special thanks
|
## Special thanks
|
||||||
* celeron55 for creating Minetest
|
* The Minetest team for making and supporting an engine, and distribution infrastructure that makes this all possible
|
||||||
* Jordach for the jukebox music compilation from Big Freaking Dig
|
|
||||||
* wsor for working tirelessly in the shadows for the good of all of us, particularly helping with solving contentDB and copyright issues.
|
|
||||||
* The workaholics who spent way too much time writing for the Minecraft Wiki. It's an invaluable resource for creating this game
|
* The workaholics who spent way too much time writing for the Minecraft Wiki. It's an invaluable resource for creating this game
|
||||||
* Notch and Jeb for being the major forces behind Minecraft
|
* Notch and Jeb for being the major forces behind Minecraft
|
||||||
* Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube) and Traitor (horizonchris96), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/
|
|
||||||
* Jester for helping to finely tune MineClone2 (https://www.youtube.com/@Jester-8-bit). Songs: Hailing Forest, Gift, 0dd BL0ck, Flock of One (License CC BY-SA 4.0)
|
|
||||||
* Exhale & Tim Unwin for some wonderful MineClone2 tracks (https://www.youtube.com/channel/UClFo_JDWoG4NGrPQY0JPD_g). Songs: Valley of Ghosts, Lonely Blossom, Farmer (License CC BY-SA 4.0)
|
|
||||||
* Diminixed for 3 fantastic tracks and remastering and leveling volumes. Songs: Afternoon Lullaby (pianowtune02), Spooled (ambientwip02), Never Grow Up (License CC BY-SA 4.0)
|
|
||||||
|
|
12
GROUPS.md
12
GROUPS.md
|
@ -170,16 +170,8 @@ These groups are used mostly for informational purposes
|
||||||
* `ammo_bow=1`: Item is used as ammo for bows
|
* `ammo_bow=1`: Item is used as ammo for bows
|
||||||
* `non_combat_armor=1`: Item can be equipped as armor, but is not made for combat (e.g. zombie head, pumpkin)
|
* `non_combat_armor=1`: Item can be equipped as armor, but is not made for combat (e.g. zombie head, pumpkin)
|
||||||
* `container`: Node is a container which physically stores items within and has at least 1 inventory
|
* `container`: Node is a container which physically stores items within and has at least 1 inventory
|
||||||
* `container=2`: Has one inventory with list name `"main"`. Items can be placed and taken freely
|
* `container=1`: Container type, which does not allow hoppers to transfer items
|
||||||
* `container=3`: Same as `container=2`, but shulker boxes can not be inserted
|
* `container=2`: Items can be placed and taken freely. Can have inventory with list name `"main"` or define `_mcl_hoppers_on_try_pull`, `_mcl_hoppers_on_try_push`, `_mcl_hoppers_on_after_pull`, `_mcl_hoppers_on_after_push` to play along hoppers nicely.
|
||||||
* `container=4`: Furnace-like, has lists `"src"`, `"fuel"` and `"dst"`.
|
|
||||||
It is expected that this also reacts on `on_timer`;
|
|
||||||
the node timer must be started from other mods when they add into `"src"` or `"fuel"`
|
|
||||||
* `container=5`: Left part of a 2-part horizontal connected container. Both parts have a `"main"` inventory
|
|
||||||
list. Both inventories are considered to belong together. This is used for large chests.
|
|
||||||
* `container=6`: Same as above, but for the right part.
|
|
||||||
* `container=7`: Has inventory list "`main`", no movement allowed
|
|
||||||
* `container=1`: Other/unspecified container type
|
|
||||||
* `spawn_egg=1`: Spawn egg
|
* `spawn_egg=1`: Spawn egg
|
||||||
|
|
||||||
* `pressure_plate=1`: Pressure plate (off)
|
* `pressure_plate=1`: Pressure plate (off)
|
||||||
|
|
10
LEGAL.md
10
LEGAL.md
|
@ -5,7 +5,7 @@ Copying is an act of love. Please copy and share! <3
|
||||||
Here's the detailed legalese for those who need it:
|
Here's the detailed legalese for those who need it:
|
||||||
|
|
||||||
## License of source code
|
## License of source code
|
||||||
MineClone 2 (by kay27, EliasFleckenstein, Wuzzy, davedevils and countless others)
|
MineClone 2 (by Lizzy Fleckenstein, Wuzzy, davedevils and countless others)
|
||||||
is an imitation of Minecraft.
|
is an imitation of Minecraft.
|
||||||
|
|
||||||
MineClone 2 is free software: you can redistribute it and/or modify
|
MineClone 2 is free software: you can redistribute it and/or modify
|
||||||
|
@ -38,11 +38,15 @@ No non-free licenses are used anywhere.
|
||||||
The textures, unless otherwise noted, are based on the Pixel Perfection resource pack for Minecraft 1.11,
|
The textures, unless otherwise noted, are based on the Pixel Perfection resource pack for Minecraft 1.11,
|
||||||
authored by XSSheep. Most textures are verbatim copies, while some textures have been changed or redone
|
authored by XSSheep. Most textures are verbatim copies, while some textures have been changed or redone
|
||||||
from scratch.
|
from scratch.
|
||||||
The glazed terracotta textures have been created by (MysticTempest)[https://github.com/MysticTempest].
|
The glazed terracotta textures have been created by [MysticTempest](https://github.com/MysticTempest).
|
||||||
Source: <https://www.planetminecraft.com/texture_pack/131pixel-perfection/>
|
Source: <https://www.planetminecraft.com/texture_pack/131pixel-perfection/>
|
||||||
License: [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)
|
License: [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)
|
||||||
|
|
||||||
The main menu images are release under: [CC0](https://creativecommons.org/publicdomain/zero/1.0/)
|
Armor trim models were created by Aeonix_Aeon
|
||||||
|
Source: <https://www.curseforge.com/minecraft/texture-packs/ozocraft-remix>
|
||||||
|
License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/)
|
||||||
|
|
||||||
|
The main menu images are released under: [CC0](https://creativecommons.org/publicdomain/zero/1.0/)
|
||||||
|
|
||||||
All other files, unless mentioned otherwise, fall under:
|
All other files, unless mentioned otherwise, fall under:
|
||||||
Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
|
Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
|
||||||
|
|
23
MODELS.md
23
MODELS.md
|
@ -1,13 +1,14 @@
|
||||||
#Models in Minetest/Mineclone2
|
# Models in Minetest/Mineclone2
|
||||||
|
|
||||||
Models are an important part of all entities & unique nodes in Mineclone2. They provide a 3 dimensional map of an object for which textures are then applied to. This document is for modders, it quickly highlights some important information for the software needed to open models in Mineclone2.
|
Models are an important part of all entities & unique nodes in Mineclone2. They provide a 3 dimensional map of an object for which textures are then applied to. This document is for modders, it quickly highlights some important information for the software needed to open models in Mineclone2.
|
||||||
|
|
||||||
## Minetest Wiki
|
## Minetest Wiki
|
||||||
|
|
||||||
For more detailed information on actually using blender to create and modify models for Minetest/Mineclone2, please visit the Minetest wiki's page on using Blender [Here](https://wiki.minetest.net/Using_Blender)
|
For more detailed information on actually using blender to create and modify models for Minetest/Mineclone2, please visit the Minetest wiki's page on using Blender [Here](https://wiki.minetest.net/Using_Blender)
|
||||||
|
|
||||||
##Recommended software
|
## Recommended software
|
||||||
|
|
||||||
###Blender
|
### Blender
|
||||||
|
|
||||||
Blender is a very popular and free modeling software supported on Windows, MacOS, and most Linux distributions. It is recommended to use Blender to create and modify 3D models within the minetest engine.
|
Blender is a very popular and free modeling software supported on Windows, MacOS, and most Linux distributions. It is recommended to use Blender to create and modify 3D models within the minetest engine.
|
||||||
|
|
||||||
|
@ -19,14 +20,16 @@ Blitz 3D (.b3d) Is one of the main animated model formats used for entities in t
|
||||||
|
|
||||||
The most up to date version of this Blender plugin can be downloaded [Here](https://github.com/GreenXenith/io_scene_b3d/releases/tag/f189786)
|
The most up to date version of this Blender plugin can be downloaded [Here](https://github.com/GreenXenith/io_scene_b3d/releases/tag/f189786)
|
||||||
|
|
||||||
##Types of model formats
|
## Types of model formats
|
||||||
|
|
||||||
|
### Animated, skinned models
|
||||||
|
|
||||||
###Animated, skinned models
|
|
||||||
* Blitz 3D files (.b3d)
|
* Blitz 3D files (.b3d)
|
||||||
|
|
||||||
* Microsoft DirectX (.x) (binary & text, compression is not supported)
|
* Microsoft DirectX (.x) (binary & text, compression is not supported)
|
||||||
|
|
||||||
###Static meshes
|
### Static meshes
|
||||||
|
|
||||||
* Wavefront OBJ (.obj)
|
* Wavefront OBJ (.obj)
|
||||||
|
|
||||||
Note: The sometimes accompanying .mtl files are not supported and can safely be deleted.
|
Note: The sometimes accompanying .mtl files are not supported and can safely be deleted.
|
||||||
|
@ -45,16 +48,18 @@ Note: Do not use .b3d and .x files for static meshes at the moment, Minetest cur
|
||||||
|
|
||||||
Note: Any formats not mentioned above but known to work in the past were removed in 5.5.0 and aren't supported anymore.
|
Note: Any formats not mentioned above but known to work in the past were removed in 5.5.0 and aren't supported anymore.
|
||||||
|
|
||||||
##Pros & Cons of .b3d vs .x
|
## Pros & Cons of .b3d vs .x
|
||||||
|
|
||||||
|
### B3D
|
||||||
|
|
||||||
###B3D
|
|
||||||
* [+] Binary format means a small size
|
* [+] Binary format means a small size
|
||||||
|
|
||||||
* [-] Difficult to postprocess after exporting
|
* [-] Difficult to postprocess after exporting
|
||||||
|
|
||||||
* [-] Difficult to debug problems
|
* [-] Difficult to debug problems
|
||||||
|
|
||||||
###X (text version)
|
### X (text version)
|
||||||
|
|
||||||
* [+] Can be parsed easily with lua scripts
|
* [+] Can be parsed easily with lua scripts
|
||||||
|
|
||||||
* [+] Can be easily generated by scripts
|
* [+] Can be easily generated by scripts
|
||||||
|
|
42
README.md
42
README.md
|
@ -27,7 +27,7 @@ Or you can play in “creative mode” in which you can build almost anything in
|
||||||
## How to play (quick start)
|
## How to play (quick start)
|
||||||
### Getting started
|
### Getting started
|
||||||
* **Punch a tree** trunk until it breaks and collect wood
|
* **Punch a tree** trunk until it breaks and collect wood
|
||||||
* Place the **wood into the 2×2 grid** (your “crafting grid” in your inventory menu and craft 4 wood planks
|
* Place the **wood into the 2×2 grid** (your “crafting grid” in your inventory menu) and craft 4 wood planks
|
||||||
* Place the 4 wood planks in a 2×2 shape in the crafting grid to **make a crafting table**
|
* Place the 4 wood planks in a 2×2 shape in the crafting grid to **make a crafting table**
|
||||||
* **Rightclick the crafting table** for a 3×3 crafting grid to craft more complex things
|
* **Rightclick the crafting table** for a 3×3 crafting grid to craft more complex things
|
||||||
* Use the **crafting guide** (book icon) to learn all the possible crafting recipes
|
* Use the **crafting guide** (book icon) to learn all the possible crafting recipes
|
||||||
|
@ -37,15 +37,15 @@ Or you can play in “creative mode” in which you can build almost anything in
|
||||||
|
|
||||||
### Farming
|
### Farming
|
||||||
* Find seeds
|
* Find seeds
|
||||||
* Craft hoe
|
* Craft a hoe
|
||||||
* Rightclick dirt or similar block with hoe to create farmland
|
* Rightclick dirt or a similar block with a hoe to create farmland
|
||||||
* Place seeds on farmland and watch them grow
|
* Place seeds on farmland and watch them grow
|
||||||
* Collect plant when fully grown
|
* Collect plants when fully grown
|
||||||
* If near water, farmland becomes wet and speeds up growth
|
* If near water, farmland becomes wet and speeds up growth
|
||||||
|
|
||||||
### Furnace
|
### Furnace
|
||||||
* Craft furnace
|
* Craft a furnace
|
||||||
* Furnace allows you to obtain more items
|
* The furnace allows you to obtain more items
|
||||||
* Upper slot must contain a smeltable item (example: iron ore)
|
* Upper slot must contain a smeltable item (example: iron ore)
|
||||||
* Lower slot must contain a fuel item (example: coal)
|
* Lower slot must contain a fuel item (example: coal)
|
||||||
* See tooltips in crafting guide to learn about fuels and smeltable items
|
* See tooltips in crafting guide to learn about fuels and smeltable items
|
||||||
|
@ -79,34 +79,32 @@ The MineClone2 repository is hosted at Mesehub. To contribute or report issues,
|
||||||
* Mesehub: <https://git.minetest.land/MineClone2/MineClone2>
|
* Mesehub: <https://git.minetest.land/MineClone2/MineClone2>
|
||||||
* Discord: <https://discord.gg/xE4z8EEpDC>
|
* Discord: <https://discord.gg/xE4z8EEpDC>
|
||||||
* YouTube: <https://www.youtube.com/channel/UClI_YcsXMF3KNeJtoBfnk9A>
|
* YouTube: <https://www.youtube.com/channel/UClI_YcsXMF3KNeJtoBfnk9A>
|
||||||
* IRC: <https://web.libera.chat/#mineclone2>
|
|
||||||
* Matrix: <https://app.element.io/#/room/#mc2:matrix.org>
|
|
||||||
* Reddit: <https://www.reddit.com/r/MineClone2/>
|
|
||||||
* Minetest forums: <https://forum.minetest.net/viewtopic.php?f=50&t=16407>
|
|
||||||
* ContentDB: <https://content.minetest.net/packages/wuzzy/mineclone2/>
|
* ContentDB: <https://content.minetest.net/packages/wuzzy/mineclone2/>
|
||||||
* OpenCollective: <https://opencollective.com/mineclone2>
|
* OpenCollective: <https://opencollective.com/mineclone2>
|
||||||
|
* Mastodon: <https://fosstodon.org/@MineClone2>
|
||||||
|
* Lemmy: <https://lemmy.world/c/mineclone2>
|
||||||
|
* Matrix space: <https://app.element.io/#/room/#mcl2:matrix.org>
|
||||||
|
* Minetest forums: <https://forum.minetest.net/viewtopic.php?f=50&t=16407>
|
||||||
|
* Reddit: <https://www.reddit.com/r/MineClone2/>
|
||||||
|
* IRC (barely used): <https://web.libera.chat/#mineclone2>
|
||||||
|
|
||||||
## Target
|
## Target
|
||||||
- Crucially, create a stable, moddable, free/libre clone of Minecraft
|
- Create a stable, moddable, free/libre game based on Minecraft
|
||||||
based on the Minetest engine with polished features, usable in both
|
on the Minetest engine with polished features, usable in both
|
||||||
singleplayer and multiplayer. Currently, a lot of **Minecraft Java
|
singleplayer and multiplayer. Currently, a lot of **Minecraft Java
|
||||||
Edition** features are already implemented and polishing existing
|
Edition** features are already implemented and polishing existing
|
||||||
features are prioritized over new feature requests.
|
features are prioritized over new feature requests.
|
||||||
- With lessened priority yet strictly, implement features targetting
|
- Implement features targetting
|
||||||
**Current Minecraft versions + OptiFine** (OptiFine only as far as supported
|
**Current Minecraft versions + OptiFine** (OptiFine only as far as supported
|
||||||
by the Minetest Engine). This means features in parity with the listed
|
by the Minetest Engine).
|
||||||
Minecraft experiences are prioritized over those that don't fulfill this
|
- Create a performant experience that will run relatively
|
||||||
scope.
|
well on really low spec computers.
|
||||||
- Optionally, create a performant experience that will run relatively
|
|
||||||
well on really low spec computers. Unfortunately, due to Minecraft's
|
|
||||||
mechanisms and Minetest engine's limitations along with a very small
|
|
||||||
playerbase on low spec computers, optimizations are hard to investigate.
|
|
||||||
|
|
||||||
## Completion status
|
## Completion status
|
||||||
This game is currently in **beta** stage.
|
This game is currently in **beta** stage.
|
||||||
It is playable, but not yet feature-complete.
|
It is playable, but not yet feature-complete.
|
||||||
Backwards-compability is not entirely guaranteed, updating your world might cause small bugs.
|
Backwards-compability is not entirely guaranteed, updating your world might cause small bugs.
|
||||||
If you want to use the development version of MineClone2 in production, the master branch is usually relatively stable. The testing branch often features some experimental PRs and should be considered less stable.
|
If you want to use the development version of MineClone2 in production, the master branch is usually relatively stable.
|
||||||
|
|
||||||
The following main features are available:
|
The following main features are available:
|
||||||
|
|
||||||
|
@ -164,7 +162,7 @@ Bonus features (not found in Minecraft):
|
||||||
* Built-in crafting guide which shows you crafting and smelting recipes
|
* Built-in crafting guide which shows you crafting and smelting recipes
|
||||||
* In-game help system containing extensive help about gameplay basics, blocks, items and more
|
* In-game help system containing extensive help about gameplay basics, blocks, items and more
|
||||||
* Temporary crafting recipes. They only exist to make some otherwise unaccessible items available when you're not in creative mode. These recipes will be removed as development goes on an more features become available
|
* Temporary crafting recipes. They only exist to make some otherwise unaccessible items available when you're not in creative mode. These recipes will be removed as development goes on an more features become available
|
||||||
* Saplings in chests in mapgen v6
|
* Saplings in chests in [mapgen v6](https://wiki.minetest.net/Map_generator#v6)
|
||||||
* Fully moddable (thanks to Minetest's powerful Lua API)
|
* Fully moddable (thanks to Minetest's powerful Lua API)
|
||||||
* New blocks and items:
|
* New blocks and items:
|
||||||
* Lookup tool, shows you the help for whatever it touches
|
* Lookup tool, shows you the help for whatever it touches
|
||||||
|
|
|
@ -137,7 +137,7 @@ Fonctionnalités bonus (absentes de Minecraft) :
|
||||||
* Guide d'artisanat intégré au jeu qui montre les recettes d'artisanat et de cuisson
|
* Guide d'artisanat intégré au jeu qui montre les recettes d'artisanat et de cuisson
|
||||||
* Système d'aide intégré au jeu contenant des informations à propos des techniques de base, blocs, objets et plus
|
* Système d'aide intégré au jeu contenant des informations à propos des techniques de base, blocs, objets et plus
|
||||||
* Recettes d'artisanat temporaires. Elles existent uniquement pour rendre des objets accessibles qui ne le seraient pas autrement sauf en mode créatif. Elles seront retirées au cours de l'avancement du développement et de l'ajout de nouvelles fonctionnalités.
|
* Recettes d'artisanat temporaires. Elles existent uniquement pour rendre des objets accessibles qui ne le seraient pas autrement sauf en mode créatif. Elles seront retirées au cours de l'avancement du développement et de l'ajout de nouvelles fonctionnalités.
|
||||||
* Pousses dans les coffres en mapgen v6
|
* Pousses dans les coffres en [mapgen v6](https://wiki.minetest.net/Map_generator#v6)
|
||||||
* Entièrement moddable (grâce la puissante API Lua de Minetest)
|
* Entièrement moddable (grâce la puissante API Lua de Minetest)
|
||||||
* Nouveaux blocs et objets :
|
* Nouveaux blocs et objets :
|
||||||
* Outil de recherche, montre l'aide de ce qu'il touche
|
* Outil de recherche, montre l'aide de ce qu'il touche
|
||||||
|
|
|
@ -0,0 +1,193 @@
|
||||||
|
# MineClone2
|
||||||
|
Неофициальная игра в стиле Minecraft для Minetest. Форк MineClone от davedevils.
|
||||||
|
Разработана многими людьми. Не разработана и не одобрена Mojang AB.
|
||||||
|
|
||||||
|
### Игровой процесс
|
||||||
|
Вы начинаете в случайно сгенерированном мире созданном целиком из кубов. Вы можете
|
||||||
|
исследовать мир, выкопать и поставить почти каждый блок в мире, чтобы создавать новые
|
||||||
|
структуры. Вы можете играть в “режиме выживания” в котором вам придется бороться с
|
||||||
|
монстрами и голодом за выживание и медленно проходить через различные аспекты игры,
|
||||||
|
такие как копание, фермерство, постройка механизмов и так далее. Или вы можете играть
|
||||||
|
в “творческом режиме” в котором вы сразу можете строить что угодно.
|
||||||
|
|
||||||
|
#### Итоги геймплея
|
||||||
|
|
||||||
|
* Геймплей в стиле песочницы, без целей
|
||||||
|
* Выживайте: сражайтесь с враждебными монстрами и голодом
|
||||||
|
* Добывайте руды и прочие ценные предметы
|
||||||
|
* Магия: получайте опыт и зачаруйте ваше снаряжение
|
||||||
|
* Создавайте из собранных блоков величественные постройки ограниченные только воображением
|
||||||
|
* Собирайте цветы и другие красители, чтобы раскрасить ваш мир
|
||||||
|
* Найдите семена и заведите ферму
|
||||||
|
* Найдите или создайте один из сотен предметов
|
||||||
|
* Проложите рельсы и повеселитесь с вагонетками
|
||||||
|
* Постройте сложные механизмы со схемами из редстоуна
|
||||||
|
* В творческом режиме вы можете свободно строить всё без лимитов
|
||||||
|
|
||||||
|
## Как играть (быстрый старт)
|
||||||
|
### Начнем
|
||||||
|
|
||||||
|
* **Бейте по стволу дерева** пока оно не сломается и соберите древесину
|
||||||
|
* Поставьте **древесину в сетку 2×2** (“сетка крафта” в вашем инвентаре) и скрафтите 4 доски
|
||||||
|
* Разложите 4 доски в форме 2×2 в сетке крафта, чтобы **сделать верстак**
|
||||||
|
* **Правым кликом по верстаку**, чтобы открыть сетку крафта 3×3 для более сложных предметов
|
||||||
|
* Используйте **книгу рецептов** (иконка книги), чтобы узнать все возможные рецепты крафтов
|
||||||
|
* **Скрафтите деревянную кирку**, чтобы вы могли копать камень
|
||||||
|
* Разные инструменты добывают разные виды блоков. Опробуйте их все!
|
||||||
|
* Продолжайте играть как пожелаете. Повеселитесь!
|
||||||
|
|
||||||
|
### Фермерство
|
||||||
|
* Найдите семена
|
||||||
|
* Скрафтите мотыгу
|
||||||
|
* Правой кнопкой мотыгой по земле или похожему блоку, чтобы создать грядку
|
||||||
|
* Посадите семена на грядку и ждите пока они вырастут
|
||||||
|
* Соберите растение когда оно полностью созреет
|
||||||
|
* Рядом с водой грядка становится влажной и растения растут быстрее
|
||||||
|
|
||||||
|
### Переплавка
|
||||||
|
* Скрафтите печь
|
||||||
|
* Печь позволит вам получить больше предметов
|
||||||
|
* Верхний слот должен содержать переплавляемый предмет (например: железную руду)
|
||||||
|
* Нижний слот должен содержать топливо (например: уголь)
|
||||||
|
* Смотрите книгу рецептов, чтобы узнать о других переплавляемых предметах и топливе
|
||||||
|
|
||||||
|
### Дополнительная помощь
|
||||||
|
Больше информации о геймплее, блоках, предметах и многое другое можно найти во
|
||||||
|
внутриигровой справке. Вы можете перейти в неё через ваш инвентарь.
|
||||||
|
|
||||||
|
### Особые предметы
|
||||||
|
Следующие предметы интересны для творческого режима и для строителей приключенческих
|
||||||
|
карт. Их нельзя получить в игре или через творческий инвентарь.
|
||||||
|
|
||||||
|
* Барьер: `mcl_core:barrier`
|
||||||
|
|
||||||
|
Используйте чат-команду `/giveme`, чтобы получить их.
|
||||||
|
Смотрите справку для дальнейшей информации.
|
||||||
|
|
||||||
|
## Установка
|
||||||
|
Эта игра требует [Minetest](http://minetest.net) для запуска (версия 5.4.1 или
|
||||||
|
выше). Вам нужно сперва установить Minetest. Только стабильные версии поддерживаются
|
||||||
|
официально. Не поддерживается запуск MineClone2 на разрабатываемых версиях Minetest.
|
||||||
|
|
||||||
|
Чтобы установить MineClone2 (если вы этого еще не сделали), переместите эту папку в
|
||||||
|
“games” в папке данных Minetest. Смотрите справку Minetest, чтобы узнать больше.
|
||||||
|
|
||||||
|
## Полезные ссылки
|
||||||
|
Репозиторий MineClone2 хранится на Mesehub. Зайдите туда, чтобы оставить запрос или
|
||||||
|
поучаствовать в разработке.
|
||||||
|
|
||||||
|
* Mesehub: <https://git.minetest.land/MineClone2/MineClone2>
|
||||||
|
* Discord: <https://discord.gg/xE4z8EEpDC>
|
||||||
|
* YouTube: <https://www.youtube.com/channel/UClI_YcsXMF3KNeJtoBfnk9A>
|
||||||
|
* ContentDB: <https://content.minetest.net/packages/wuzzy/mineclone2/>
|
||||||
|
* OpenCollective: <https://opencollective.com/mineclone2>
|
||||||
|
* Mastodon: <https://fosstodon.org/@MineClone2>
|
||||||
|
* Lemmy: <https://lemmy.world/c/mineclone2>
|
||||||
|
* Matrix space: <https://app.element.io/#/room/#mcl2:matrix.org>
|
||||||
|
* Форум Minetest: <https://forum.minetest.net/viewtopic.php?f=50&t=16407>
|
||||||
|
* Reddit: <https://www.reddit.com/r/MineClone2/>
|
||||||
|
* IRC (едва используется): <https://web.libera.chat/#mineclone2>
|
||||||
|
|
||||||
|
## Цели
|
||||||
|
- Создать стабильную, модифицируемую, бесплатную и свободную игру основанную на
|
||||||
|
Minecraft на движке Minetest с проработанными возможностями для одиночной игры и
|
||||||
|
для мультиплеера. На данный момент множество возможностей **Minecraft Java
|
||||||
|
Edition** уже реализовано и доработка имеющегося контента в приоритете над
|
||||||
|
добавлением нового.
|
||||||
|
- Реализовать возможности на уровне **текущей версии Minecraft + OptiFine** (OptiFine
|
||||||
|
настолько, насколько это поддерживается движком Minetest).
|
||||||
|
- Добиться производительности для запуска на действительно слабых компьютерах.
|
||||||
|
|
||||||
|
## Готовность
|
||||||
|
Игра сейчас на стадии **бета**. Она играбельна, но еще не имеет всех возможностей.
|
||||||
|
Обратная совместимость целиком не гарантируется, обновление вашего мира может повлечь
|
||||||
|
за собой небольшие ошибки. Если вы хотите использовать разрабатываемую версию
|
||||||
|
Mineclone2, то ветка master обычно относительно стабильна.
|
||||||
|
|
||||||
|
Следущие возможности уже доступны:
|
||||||
|
|
||||||
|
* Инструменты, оружие, броня
|
||||||
|
* Система крафта: сетка 2×2, верстак (сетка 3×3) и книга рецептов
|
||||||
|
* Сундуки, большие сундуки, эндер-сундуки, ящики шалкера
|
||||||
|
* Печи и воронки
|
||||||
|
* Система голода
|
||||||
|
* Большинство монстров и животных
|
||||||
|
* Все руды из Minecraft
|
||||||
|
* Большинство блоков из Верхнего мира
|
||||||
|
* Вода и лава
|
||||||
|
* Погода
|
||||||
|
* 28 биомов + 5 биомов в Незере
|
||||||
|
* Незер, пылающий подземный мир в другом измерении
|
||||||
|
* Схемы из редстоуна (частично)
|
||||||
|
* Вагонетки (частично)
|
||||||
|
* Статусные эффекты (частично)
|
||||||
|
* Опыт
|
||||||
|
* Зачарование
|
||||||
|
* Зельеварение, зелья, смоченные стрелы (частично)
|
||||||
|
* Лодки
|
||||||
|
* Огонь
|
||||||
|
* Строительные блоки: ступени, плиты, двери, люки, заборы, калитки, стены
|
||||||
|
* Часы
|
||||||
|
* Компас
|
||||||
|
* Губки
|
||||||
|
* Блоки слизи
|
||||||
|
* Растения и саженцы
|
||||||
|
* Красители
|
||||||
|
* Флаги
|
||||||
|
* Декоративные блоки: стекло, окрашенное стекло, стеклянные панели, железные решетки, цветная керамика, головы и многое другое
|
||||||
|
* Рамки для предметов
|
||||||
|
* Прогрыватели
|
||||||
|
* Кровати
|
||||||
|
* Меню инвентаря
|
||||||
|
* Творческий инвентарь
|
||||||
|
* Фермерство
|
||||||
|
* Книги с пером
|
||||||
|
* Команды
|
||||||
|
* Деревни
|
||||||
|
* Измерение Края
|
||||||
|
* И многое другое!
|
||||||
|
|
||||||
|
Следующие возможности еще не завершены:
|
||||||
|
|
||||||
|
* Некоторые монстры и животные
|
||||||
|
* Предметы связанные с редстоуном
|
||||||
|
* Некоторые вагонетки (с сундуком и с воронкой уже работают)
|
||||||
|
* Пара нетривиальных блоков и предметов
|
||||||
|
|
||||||
|
Бонусные возможности (нет в Minecraft-е):
|
||||||
|
|
||||||
|
* Встроенный гайд для крафта покажет вам рецепты крафта и переплавки
|
||||||
|
* Внутриигровая справка содержит всестороннюю информацию об основах игры, блоках, предметах и прочее
|
||||||
|
* Временные рецепты крафта. Они существуют, чтобы получить доступ к ранее недоступным предметам вне творческого режима. Они будут удалены как только разработка позволит им стать доступными
|
||||||
|
* Саженцы в сундуках в [mapgen v6](https://wiki.minetest.net/Map_generator#v6)
|
||||||
|
* Полностью модифицируема (благодаря мощному Lua API в Minetest)
|
||||||
|
* Новые блоки и предметы:
|
||||||
|
* Инструмент просмотра покажет справку о том чего коснется
|
||||||
|
* Больше ступеней и плит
|
||||||
|
* Калитки и заборы из адских кирпичей
|
||||||
|
* Замены структур - малые верии структур из Minecraft пока большие структуры не будут сделаны:
|
||||||
|
* Лесная хижина (Особняк)
|
||||||
|
* Форт Незера (Крепости)
|
||||||
|
|
||||||
|
Технические отличия от Minecraft:
|
||||||
|
|
||||||
|
* Лимит высоты - 31000 блоков (намного больше чем в Minecraft)
|
||||||
|
* Горизонтальный размер мира - 62000×62000 блоков (намного меньше чем в Minecraft, но всё еще очень большой)
|
||||||
|
* Всё еще не завершен и содержит много багов
|
||||||
|
* Недостающие блоки, предметы, мобы
|
||||||
|
* Некоторые предметы с другими названиями, чтобы лучше их различать
|
||||||
|
* Другая музыка для проигрывателей
|
||||||
|
* Другие текстуры (Pixel Perfection)
|
||||||
|
* Другие звуки (разные источники)
|
||||||
|
* Другой движок (Minetest)
|
||||||
|
* Другие пасхалки
|
||||||
|
|
||||||
|
… и наконец, MineClone2 это свободное программное обеспечение!
|
||||||
|
|
||||||
|
## Другие readme файлы
|
||||||
|
|
||||||
|
* `LICENSE.txt`: текст лицензии GPLv3
|
||||||
|
* `CONTRIBUTING.md`: информация для тех кто хочет поучаствовать в разработке
|
||||||
|
* `API.md`: для моддеров Minetest кто хочет изменить эту игру
|
||||||
|
* `LEGAL.md`: юридическая информация
|
||||||
|
* `CREDITS.md`: список участников проекта
|
30
RELEASE.md
30
RELEASE.md
|
@ -1,10 +1,11 @@
|
||||||
### Standard Release
|
### Standard Release
|
||||||
|
|
||||||
#File to document release steps with a view to evolving into a script
|
# File to document release steps with a view to evolving into a script
|
||||||
|
|
||||||
#Update CREDITS.md
|
# Update CREDITS.md
|
||||||
#Update version in game.conf
|
# Update version in game.conf
|
||||||
|
|
||||||
|
```
|
||||||
lua tools/generate_ingame_credits.lua
|
lua tools/generate_ingame_credits.lua
|
||||||
|
|
||||||
git add CREDITS.md
|
git add CREDITS.md
|
||||||
|
@ -18,10 +19,11 @@ git commit -m "Pre-release update credits and set version 0.83.0"
|
||||||
git tag 0.83.0
|
git tag 0.83.0
|
||||||
|
|
||||||
git push origin 0.83.0
|
git push origin 0.83.0
|
||||||
|
```
|
||||||
|
|
||||||
#Update version in game.conf to the next version with -SNAPSHOT suffix
|
# Update version in game.conf to the next version with -SNAPSHOT suffix
|
||||||
|
|
||||||
git commit -m "Post-release set version 0.84.0-SNAPSHOT"
|
`git commit -m "Post-release set version 0.84.0-SNAPSHOT"`
|
||||||
|
|
||||||
### Hotfix Release
|
### Hotfix Release
|
||||||
|
|
||||||
|
@ -32,15 +34,17 @@ To mitigate this, you just release the last release, and the relevant bug fix. F
|
||||||
|
|
||||||
* Create release branch from the last release tag, push it:
|
* Create release branch from the last release tag, push it:
|
||||||
|
|
||||||
|
```
|
||||||
git checkout -b release/0.82.1 0.82.0
|
git checkout -b release/0.82.1 0.82.0
|
||||||
|
|
||||||
git push origin release/0.82.1
|
git push origin release/0.82.1
|
||||||
|
```
|
||||||
|
|
||||||
##### Prepare feature branch and fix
|
##### Prepare feature branch and fix
|
||||||
|
|
||||||
* Create feature branch from that release branch (can review it to check only fix is there, nothing else, and use to also merge into master separately)
|
* Create feature branch from that release branch (can review it to check only fix is there, nothing else, and use to also merge into master separately)
|
||||||
|
|
||||||
git checkout -b hotfix_bug_1_branch
|
`git checkout -b hotfix_bug_1_branch`
|
||||||
|
|
||||||
* Fix crash/serious bug and commit
|
* Fix crash/serious bug and commit
|
||||||
* Push branch and create pr to the release and also the master branch (Do not rebase, to reduce merge conflict risk. Do not delete after first merge or it needs to be repushed)
|
* Push branch and create pr to the release and also the master branch (Do not rebase, to reduce merge conflict risk. Do not delete after first merge or it needs to be repushed)
|
||||||
|
@ -53,11 +57,13 @@ git checkout -b hotfix_bug_1_branch
|
||||||
|
|
||||||
* Tag it, push tag and branch:
|
* Tag it, push tag and branch:
|
||||||
|
|
||||||
|
```
|
||||||
git tag 0.82.1
|
git tag 0.82.1
|
||||||
|
|
||||||
git push origin 0.82.1
|
git push origin 0.82.1
|
||||||
|
|
||||||
git push origin release/0.82.1
|
git push origin release/0.82.1
|
||||||
|
```
|
||||||
|
|
||||||
Note: If you have to do more than 1 hotfix release, can do it on the same release branch.
|
Note: If you have to do more than 1 hotfix release, can do it on the same release branch.
|
||||||
|
|
||||||
|
@ -71,5 +77,13 @@ Note: If you have to do more than 1 hotfix release, can do it on the same releas
|
||||||
|
|
||||||
##### Inform people
|
##### Inform people
|
||||||
|
|
||||||
* Add a comment to the forum post with the release number and what is involved, and maintainer will update main post.
|
* Upload video to YouTube
|
||||||
* Add a comment in Discord announcement
|
* Add a comment to the forum post with the release number and change log. Maintainer will update main post with code link.
|
||||||
|
* Add a Discord announcement post and @everyone with link to video, forum post and release notes.
|
||||||
|
* Share the news on reddit + Lemmy. Good subs to share with:
|
||||||
|
* r/linux_gaming
|
||||||
|
* r/opensourcegames
|
||||||
|
* r/opensource
|
||||||
|
* r/freesoftware
|
||||||
|
* r/linuxmasterrace
|
||||||
|
* r/MineClone2
|
||||||
|
|
|
@ -12,13 +12,13 @@ GIMP Tutorials has an excellent guide to making pixel art in GIMP. If you would
|
||||||
|
|
||||||
### GIMP
|
### GIMP
|
||||||
|
|
||||||
GIMP (Gnu Image Manipulation Program) is a very popular and free image editing software supported on Windows, MacOS, and most Linux distributions. It is recommended to use GIMP to create and modify textures within the minetest engine.
|
GIMP (GNU Image Manipulation Program) is a very popular and free image editing software supported on Windows, MacOS, and most Linux distributions. It is recommended to use GIMP to create and modify textures within the minetest engine.
|
||||||
|
|
||||||
Download GIMP [here](http://gimp.org/)
|
Download GIMP [here](http://gimp.org/)
|
||||||
|
|
||||||
# Getting Started
|
# Getting Started
|
||||||
## Creating a new file
|
## Creating a new file
|
||||||
the first thing to do is open GIMP and create a new file to work in by opening the File menu and choosing New.
|
the first thing to do is open GIMP and create a new file to work in by opening the File menu and choosing "New".
|
||||||
|
|
||||||
Choose width of 16 and height of 16 for the image size. While higher resolution textures are possible, The default size is 16x16. It is recommended you use this size as well, as it is universally supported on all systems.
|
Choose width of 16 and height of 16 for the image size. While higher resolution textures are possible, The default size is 16x16. It is recommended you use this size as well, as it is universally supported on all systems.
|
||||||
|
|
||||||
|
@ -50,7 +50,7 @@ For those running a GNU/linux distribution, you most likely have the 'optipng' c
|
||||||
|
|
||||||
First, Open up the terminal in the directory where your exported texture is located (or navigate to the directory with the 'cd your/directory/path/to/textures'), then run this command
|
First, Open up the terminal in the directory where your exported texture is located (or navigate to the directory with the 'cd your/directory/path/to/textures'), then run this command
|
||||||
```
|
```
|
||||||
optipng -o7 -zm1-9 -nc -clobber *.png
|
optipng -o7 -zm1-9 -nc -clobber -strip all *.png
|
||||||
```
|
```
|
||||||
This will further optimize all the textures in the directory.
|
This will further optimize all the textures in the directory.
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
A survival sandbox game. Survive, gather, hunt, mine, build, explore, and do much more. Faithful clone of Minecraft 1.12. This is a work in progress! Expect bugs!
|
A survival sandbox game. Survive, gather, hunt, mine, build, explore, and do much more.
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
title = MineClone 2
|
title = MineClone 2
|
||||||
description = A survival sandbox game. Survive, gather, hunt, build, explore, and do much more.
|
description = A survival sandbox game. Survive, gather, hunt, build, explore, and do much more.
|
||||||
disallowed_mapgens = v6
|
disallowed_mapgens = v6
|
||||||
version=0.84.0-SNAPSHOT
|
version=0.87.0-SNAPSHOT
|
||||||
|
|
|
@ -215,6 +215,10 @@ function mcl_autogroup.can_harvest(nodename, toolname, player)
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if minetest.get_item_group(nodename, "dig_immediate_piston") >= 1 then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
-- Check if it can be dug by tool
|
-- Check if it can be dug by tool
|
||||||
local tdef = minetest.registered_tools[toolname]
|
local tdef = minetest.registered_tools[toolname]
|
||||||
if tdef and tdef._mcl_diggroups then
|
if tdef and tdef._mcl_diggroups then
|
||||||
|
|
|
@ -31,6 +31,7 @@ local known_controls = {
|
||||||
aux1 = true,
|
aux1 = true,
|
||||||
down = true,
|
down = true,
|
||||||
up = true,
|
up = true,
|
||||||
|
zoom = true,
|
||||||
}
|
}
|
||||||
|
|
||||||
minetest.register_on_joinplayer(function(player)
|
minetest.register_on_joinplayer(function(player)
|
||||||
|
|
|
@ -96,8 +96,8 @@ function mcl_damage.finish_reason(mcl_reason)
|
||||||
end
|
end
|
||||||
|
|
||||||
function mcl_damage.from_mt(mt_reason)
|
function mcl_damage.from_mt(mt_reason)
|
||||||
if mt_reason._mcl_chached_reason then
|
if mt_reason._mcl_cached_reason then
|
||||||
return mt_reason._mcl_chached_reason
|
return mt_reason._mcl_cached_reason
|
||||||
end
|
end
|
||||||
|
|
||||||
local mcl_reason
|
local mcl_reason
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
# textdomain:mcl_explosions
|
||||||
|
@1 was caught in an explosion.=@1 foi pego(a) em uma explosão.
|
|
@ -0,0 +1,2 @@
|
||||||
|
# textdomain:mcl_explosions
|
||||||
|
@1 was caught in an explosion.=@1 попал(а) под взрыв.
|
|
@ -0,0 +1,14 @@
|
||||||
|
# Oxidization API for MineClone 2
|
||||||
|
This mods adds the oxidization api, so that modders can easily use the same features that copper uses.
|
||||||
|
|
||||||
|
## API
|
||||||
|
To take advantage of the actual oxidization, put `oxidizable = 1` into the list of groups for the oxidizable node.
|
||||||
|
You would also need to put `_mcl_oxidized_variant = itemstring of node this node will oxidize into` into the node definition.
|
||||||
|
For example, a copper block oxidizes into exposed copper, so the defintion would be `_mcl_oxidized_variant = "mcl_copper:block_exposed"`.
|
||||||
|
|
||||||
|
To utilize the ability to wax the block for protection from oxidization, put `mcl_waxed_variant = item string of waxed variant of node` into the node definition table.
|
||||||
|
For example, Copper Blocks have the definition arguement of `_mcl_waxed_variant = "mcl_copper:waxed_block"`.
|
||||||
|
|
||||||
|
For waxed nodes, scraping is easy. Start by putting `waxed = 1` into the list of groups of the waxed node.
|
||||||
|
Next put `_mcl_stripped_variant = item string of the unwaxed variant of the node` into the defintion table.
|
||||||
|
Waxed Copper Blocks can be scrapped into normal Copper Blocks because of the definition `_mcl_stripped_variant = "mcl_copper:block"`.
|
|
@ -0,0 +1,12 @@
|
||||||
|
minetest.register_abm({
|
||||||
|
label = "Oxidatize Nodes",
|
||||||
|
nodenames = { "group:oxidizable" },
|
||||||
|
interval = 500,
|
||||||
|
chance = 3,
|
||||||
|
action = function(pos, node)
|
||||||
|
local def = minetest.registered_nodes[node.name]
|
||||||
|
if def and def._mcl_oxidized_variant then
|
||||||
|
minetest.set_node(pos, { name = def._mcl_oxidized_variant, param2 = node.param2 })
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
})
|
|
@ -0,0 +1,4 @@
|
||||||
|
name = mcl_oxidation
|
||||||
|
title = Oxidation API for MineClone 2
|
||||||
|
author = PrairieWind, N011, Michael
|
||||||
|
description = API to allow oxidizing different nodes.
|
|
@ -22,6 +22,30 @@ function table.update_nil(t, ...)
|
||||||
return t
|
return t
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---Works the same as `pairs`, but order returned by keys
|
||||||
|
---
|
||||||
|
---Taken from https://www.lua.org/pil/19.3.html
|
||||||
|
---@generic T: table, K, V, C
|
||||||
|
---@param t T
|
||||||
|
---@param f? fun(a: C, b: C):boolean
|
||||||
|
---@return fun():K, V
|
||||||
|
function table.pairs_by_keys(t, f)
|
||||||
|
local a = {}
|
||||||
|
for n in pairs(t) do table.insert(a, n) end
|
||||||
|
table.sort(a, f)
|
||||||
|
|
||||||
|
local i = 0 -- iterator variable
|
||||||
|
local function iter() -- iterator function
|
||||||
|
i = i + 1
|
||||||
|
if a[i] == nil then
|
||||||
|
return nil
|
||||||
|
else
|
||||||
|
return a[i], t[a[i]]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return iter
|
||||||
|
end
|
||||||
|
|
||||||
local LOGGING_ON = minetest.settings:get_bool("mcl_logging_default", false)
|
local LOGGING_ON = minetest.settings:get_bool("mcl_logging_default", false)
|
||||||
local LOG_MODULE = "[MCL2]"
|
local LOG_MODULE = "[MCL2]"
|
||||||
function mcl_util.mcl_log(message, module, bypass_default_logger)
|
function mcl_util.mcl_log(message, module, bypass_default_logger)
|
||||||
|
@ -74,6 +98,18 @@ function mcl_util.check_dtime_timer(self, dtime, timer_name, threshold)
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- While we should always favour the new minetest vector functions such as vector.new or vector.offset which validate on
|
||||||
|
-- creation. There may be cases where state gets corrupted and we may have to check the vector is valid if created the
|
||||||
|
-- old way. This allows us to do this as a tactical solution until old style vectors are completely removed.
|
||||||
|
function mcl_util.validate_vector (vect)
|
||||||
|
if vect then
|
||||||
|
if tonumber(vect.x) and tonumber(vect.y) and tonumber(vect.z) then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
-- Minetest 5.3.0 or less can only measure the light level. This came in at 5.4
|
-- Minetest 5.3.0 or less can only measure the light level. This came in at 5.4
|
||||||
-- This function has been known to fail in multiple places so the error handling is added increase safety and improve
|
-- This function has been known to fail in multiple places so the error handling is added increase safety and improve
|
||||||
-- debugging. See:
|
-- debugging. See:
|
||||||
|
@ -124,7 +160,7 @@ function mcl_util.rotate_axis_and_place(itemstack, placer, pointed_thing, infini
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
local undef = minetest.registered_nodes[unode.name]
|
local undef = minetest.registered_nodes[unode.name]
|
||||||
if undef and undef.on_rightclick then
|
if undef and undef.on_rightclick and not invert_wall then
|
||||||
undef.on_rightclick(pointed_thing.under, unode, placer,
|
undef.on_rightclick(pointed_thing.under, unode, placer,
|
||||||
itemstack, pointed_thing)
|
itemstack, pointed_thing)
|
||||||
return
|
return
|
||||||
|
@ -162,25 +198,11 @@ function mcl_util.rotate_axis_and_place(itemstack, placer, pointed_thing, infini
|
||||||
|
|
||||||
local p2
|
local p2
|
||||||
if is_y then
|
if is_y then
|
||||||
if invert_wall then
|
p2 = 0
|
||||||
if fdir == 3 or fdir == 1 then
|
|
||||||
p2 = 12
|
|
||||||
else
|
|
||||||
p2 = 6
|
|
||||||
end
|
|
||||||
end
|
|
||||||
elseif is_x then
|
elseif is_x then
|
||||||
if invert_wall then
|
p2 = 12
|
||||||
p2 = 0
|
|
||||||
else
|
|
||||||
p2 = 12
|
|
||||||
end
|
|
||||||
elseif is_z then
|
elseif is_z then
|
||||||
if invert_wall then
|
p2 = 6
|
||||||
p2 = 0
|
|
||||||
else
|
|
||||||
p2 = 6
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
minetest.set_node(pos, {name = wield_name, param2 = p2})
|
minetest.set_node(pos, {name = wield_name, param2 = p2})
|
||||||
|
|
||||||
|
@ -229,34 +251,25 @@ function mcl_util.get_double_container_neighbor_pos(pos, param2, side)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Iterates through all items in the given inventory and
|
--- Selects item stack to transfer from
|
||||||
-- returns the slot of the first item which matches a condition.
|
---@param src_inventory InvRef Source innentory to pull from
|
||||||
-- Returns nil if no item was found.
|
---@param src_list string Name of source inventory list to pull from
|
||||||
--- source_inventory: Inventory to take the item from
|
---@param dst_inventory InvRef Destination inventory to push to
|
||||||
--- source_list: List name of the source inventory from which to take the item
|
---@param dst_list string Name of destination inventory list to push to
|
||||||
--- destination_inventory: Put item into this inventory
|
---@param condition? fun(stack: ItemStack) Condition which items are allowed to be transfered.
|
||||||
--- destination_list: List name of the destination inventory to which to put the item into
|
---@return integer Item stack number to be transfered
|
||||||
--- condition: Function which takes an itemstack and returns true if it matches the desired item condition.
|
function mcl_util.select_stack(src_inventory, src_list, dst_inventory, dst_list, condition)
|
||||||
--- If set to nil, the slot of the first item stack will be taken unconditionally.
|
local src_size = src_inventory:get_size(src_list)
|
||||||
-- dst_inventory and dst_list can also be nil if condition is nil.
|
|
||||||
function mcl_util.get_eligible_transfer_item_slot(src_inventory, src_list, dst_inventory, dst_list, condition)
|
|
||||||
local size = src_inventory:get_size(src_list)
|
|
||||||
local stack
|
local stack
|
||||||
for i = 1, size do
|
for i = 1, src_size do
|
||||||
stack = src_inventory:get_stack(src_list, i)
|
stack = src_inventory:get_stack(src_list, i)
|
||||||
if not stack:is_empty() and (condition == nil or condition(stack, src_inventory, src_list, dst_inventory, dst_list)) then
|
if not stack:is_empty() and dst_inventory:room_for_item(dst_list, stack) and ((condition == nil or condition(stack))) then
|
||||||
return i
|
return i
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Returns true if itemstack is a shulker box
|
|
||||||
local function is_not_shulker_box(itemstack)
|
|
||||||
local g = minetest.get_item_group(itemstack:get_name(), "shulker_box")
|
|
||||||
return g == 0 or g == nil
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Moves a single item from one inventory to another.
|
-- Moves a single item from one inventory to another.
|
||||||
--- source_inventory: Inventory to take the item from
|
--- source_inventory: Inventory to take the item from
|
||||||
--- source_list: List name of the source inventory from which to take the item
|
--- source_list: List name of the source inventory from which to take the item
|
||||||
|
@ -267,13 +280,6 @@ end
|
||||||
-- Returns true on success and false on failure
|
-- Returns true on success and false on failure
|
||||||
-- Possible failures: No item in source slot, destination inventory full
|
-- Possible failures: No item in source slot, destination inventory full
|
||||||
function mcl_util.move_item(source_inventory, source_list, source_stack_id, destination_inventory, destination_list)
|
function mcl_util.move_item(source_inventory, source_list, source_stack_id, destination_inventory, destination_list)
|
||||||
if source_stack_id == -1 then
|
|
||||||
source_stack_id = mcl_util.get_first_occupied_inventory_slot(source_inventory, source_list)
|
|
||||||
if source_stack_id == nil then
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
if not source_inventory:is_empty(source_list) then
|
if not source_inventory:is_empty(source_list) then
|
||||||
local stack = source_inventory:get_stack(source_list, source_stack_id)
|
local stack = source_inventory:get_stack(source_list, source_stack_id)
|
||||||
if not stack:is_empty() then
|
if not stack:is_empty() then
|
||||||
|
@ -291,150 +297,75 @@ function mcl_util.move_item(source_inventory, source_list, source_stack_id, dest
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Moves a single item from one container node into another. Performs a variety of high-level
|
--- Try pushing item from hopper inventory to destination inventory
|
||||||
-- checks to prevent invalid transfers such as shulker boxes into shulker boxes
|
---@param pos Vector
|
||||||
--- source_pos: Position ({x,y,z}) of the node to take the item from
|
---@param dst_pos Vector
|
||||||
--- destination_pos: Position ({x,y,z}) of the node to put the item into
|
function mcl_util.hopper_push(pos, dst_pos)
|
||||||
--- source_list (optional): List name of the source inventory from which to take the item. Default is normally "main"; "dst" for furnace
|
local hop_inv = minetest.get_meta(pos):get_inventory()
|
||||||
--- source_stack_id (optional): The inventory position ID of the source inventory to take the item from (-1 for slot of the first valid item; -1 is default)
|
local hop_list = 'main'
|
||||||
--- destination_list (optional): List name of the destination inventory. Default is normally "main"; "src" for furnace
|
|
||||||
-- Returns true on success and false on failure.
|
|
||||||
function mcl_util.move_item_container(source_pos, destination_pos, source_list, source_stack_id, destination_list)
|
|
||||||
local dpos = table.copy(destination_pos)
|
|
||||||
local spos = table.copy(source_pos)
|
|
||||||
local snode = minetest.get_node(spos)
|
|
||||||
local dnode = minetest.get_node(dpos)
|
|
||||||
|
|
||||||
local dctype = minetest.get_item_group(dnode.name, "container")
|
-- Get node pos' for item transfer
|
||||||
local sctype = minetest.get_item_group(snode.name, "container")
|
local dst = minetest.get_node(dst_pos)
|
||||||
|
if not minetest.registered_nodes[dst.name] then return end
|
||||||
|
local dst_type = minetest.get_item_group(dst.name, "container")
|
||||||
|
if dst_type ~= 2 then return end
|
||||||
|
local dst_def = minetest.registered_nodes[dst.name]
|
||||||
|
|
||||||
-- Container type 7 does not allow any movement
|
local dst_list = 'main'
|
||||||
if sctype == 7 then
|
local dst_inv, stack_id
|
||||||
return false
|
|
||||||
|
if dst_def._mcl_hoppers_on_try_push then
|
||||||
|
dst_inv, dst_list, stack_id = dst_def._mcl_hoppers_on_try_push(dst_pos, pos, hop_inv, hop_list)
|
||||||
|
else
|
||||||
|
local dst_meta = minetest.get_meta(dst_pos)
|
||||||
|
dst_inv = dst_meta:get_inventory()
|
||||||
|
stack_id = mcl_util.select_stack(hop_inv, hop_list, dst_inv, dst_list)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Normalize double container by forcing to always use the left segment first
|
if stack_id ~= nil then
|
||||||
local function normalize_double_container(pos, node, ctype)
|
local ok = mcl_util.move_item(hop_inv, hop_list, stack_id, dst_inv, dst_list)
|
||||||
if ctype == 6 then
|
if dst_def._mcl_hoppers_on_after_push then
|
||||||
pos = mcl_util.get_double_container_neighbor_pos(pos, node.param2, "right")
|
dst_def._mcl_hoppers_on_after_push(dst_pos)
|
||||||
if not pos then
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
node = minetest.get_node(pos)
|
|
||||||
ctype = minetest.get_item_group(node.name, "container")
|
|
||||||
-- The left segment seems incorrect? We better bail out!
|
|
||||||
if ctype ~= 5 then
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
return pos, node, ctype
|
if ok then
|
||||||
end
|
return true
|
||||||
|
|
||||||
spos, snode, sctype = normalize_double_container(spos, snode, sctype)
|
|
||||||
dpos, dnode, dctype = normalize_double_container(dpos, dnode, dctype)
|
|
||||||
if not spos or not dpos then return false end
|
|
||||||
|
|
||||||
local smeta = minetest.get_meta(spos)
|
|
||||||
local dmeta = minetest.get_meta(dpos)
|
|
||||||
|
|
||||||
local sinv = smeta:get_inventory()
|
|
||||||
local dinv = dmeta:get_inventory()
|
|
||||||
|
|
||||||
-- Default source lists
|
|
||||||
if not source_list then
|
|
||||||
-- Main inventory for most container types
|
|
||||||
if sctype == 2 or sctype == 3 or sctype == 5 or sctype == 6 or sctype == 7 then
|
|
||||||
source_list = "main"
|
|
||||||
-- Furnace: output
|
|
||||||
elseif sctype == 4 then
|
|
||||||
source_list = "dst"
|
|
||||||
-- Unknown source container type. Bail out
|
|
||||||
else
|
|
||||||
return false
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Automatically select stack slot ID if set to automatic
|
|
||||||
if not source_stack_id then
|
|
||||||
source_stack_id = -1
|
|
||||||
end
|
|
||||||
if source_stack_id == -1 then
|
|
||||||
local cond = nil
|
|
||||||
-- Prevent shulker box inception
|
|
||||||
if dctype == 3 then
|
|
||||||
cond = is_not_shulker_box
|
|
||||||
end
|
|
||||||
source_stack_id = mcl_util.get_eligible_transfer_item_slot(sinv, source_list, dinv, dpos, cond)
|
|
||||||
if not source_stack_id then
|
|
||||||
-- Try again if source is a double container
|
|
||||||
if sctype == 5 then
|
|
||||||
spos = mcl_util.get_double_container_neighbor_pos(spos, snode.param2, "left")
|
|
||||||
smeta = minetest.get_meta(spos)
|
|
||||||
sinv = smeta:get_inventory()
|
|
||||||
|
|
||||||
source_stack_id = mcl_util.get_eligible_transfer_item_slot(sinv, source_list, dinv, dpos, cond)
|
|
||||||
if not source_stack_id then
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
else
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Abort transfer if shulker box wants to go into shulker box
|
|
||||||
if dctype == 3 then
|
|
||||||
local stack = sinv:get_stack(source_list, source_stack_id)
|
|
||||||
if stack and minetest.get_item_group(stack:get_name(), "shulker_box") == 1 then
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
end
|
|
||||||
-- Container type 7 does not allow any placement
|
|
||||||
if dctype == 7 then
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
|
|
||||||
-- If it's a container, put it into the container
|
|
||||||
if dctype ~= 0 then
|
|
||||||
-- Automatically select a destination list if omitted
|
|
||||||
if not destination_list then
|
|
||||||
-- Main inventory for most container types
|
|
||||||
if dctype == 2 or dctype == 3 or dctype == 5 or dctype == 6 or dctype == 7 then
|
|
||||||
destination_list = "main"
|
|
||||||
-- Furnace source slot
|
|
||||||
elseif dctype == 4 then
|
|
||||||
destination_list = "src"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if destination_list then
|
|
||||||
-- Move item
|
|
||||||
local ok = mcl_util.move_item(sinv, source_list, source_stack_id, dinv, destination_list)
|
|
||||||
|
|
||||||
-- Try transfer to neighbor node if transfer failed and double container
|
|
||||||
if not ok and dctype == 5 then
|
|
||||||
dpos = mcl_util.get_double_container_neighbor_pos(dpos, dnode.param2, "left")
|
|
||||||
dmeta = minetest.get_meta(dpos)
|
|
||||||
dinv = dmeta:get_inventory()
|
|
||||||
|
|
||||||
ok = mcl_util.move_item(sinv, source_list, source_stack_id, dinv, destination_list)
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Update furnace
|
|
||||||
if ok and dctype == 4 then
|
|
||||||
-- Start furnace's timer function, it will sort out whether furnace can burn or not.
|
|
||||||
minetest.get_node_timer(dpos):start(1.0)
|
|
||||||
end
|
|
||||||
|
|
||||||
return ok
|
|
||||||
end
|
|
||||||
end
|
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Returns the ID of the first non-empty slot in the given inventory list
|
-- Try pulling from source inventory to hopper inventory
|
||||||
-- or nil, if inventory is empty.
|
---@param pos Vector
|
||||||
function mcl_util.get_first_occupied_inventory_slot(inventory, listname)
|
---@param src_pos Vector
|
||||||
return mcl_util.get_eligible_transfer_item_slot(inventory, listname)
|
function mcl_util.hopper_pull(pos, src_pos)
|
||||||
|
local hop_inv = minetest.get_meta(pos):get_inventory()
|
||||||
|
local hop_list = 'main'
|
||||||
|
|
||||||
|
-- Get node pos' for item transfer
|
||||||
|
local src = minetest.get_node(src_pos)
|
||||||
|
if not minetest.registered_nodes[src.name] then return end
|
||||||
|
local src_type = minetest.get_item_group(src.name, "container")
|
||||||
|
if src_type ~= 2 then return end
|
||||||
|
local src_def = minetest.registered_nodes[src.name]
|
||||||
|
|
||||||
|
local src_list = 'main'
|
||||||
|
local src_inv, stack_id
|
||||||
|
|
||||||
|
if src_def._mcl_hoppers_on_try_pull then
|
||||||
|
src_inv, src_list, stack_id = src_def._mcl_hoppers_on_try_pull(src_pos, pos, hop_inv, hop_list)
|
||||||
|
else
|
||||||
|
local src_meta = minetest.get_meta(src_pos)
|
||||||
|
src_inv = src_meta:get_inventory()
|
||||||
|
stack_id = mcl_util.select_stack(src_inv, src_list, hop_inv, hop_list)
|
||||||
|
end
|
||||||
|
|
||||||
|
if stack_id ~= nil then
|
||||||
|
local ok = mcl_util.move_item(src_inv, src_list, stack_id, hop_inv, hop_list)
|
||||||
|
if src_def._mcl_hoppers_on_after_pull then
|
||||||
|
src_def._mcl_hoppers_on_after_pull(src_pos)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local function drop_item_stack(pos, stack)
|
local function drop_item_stack(pos, stack)
|
||||||
|
@ -612,7 +543,7 @@ function mcl_util.deal_damage(target, damage, mcl_reason)
|
||||||
end
|
end
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
end
|
elseif not target:is_player() then return end
|
||||||
|
|
||||||
local is_immortal = target:get_armor_groups().immortal or 0
|
local is_immortal = target:get_armor_groups().immortal or 0
|
||||||
if is_immortal>0 then
|
if is_immortal>0 then
|
||||||
|
@ -1101,3 +1032,62 @@ function mcl_util.get_colorwallmounted_rotation(pos)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---Move items from one inventory list to another, drop items that do not fit in provided pos and direction.
|
||||||
|
---@param src_inv mt.InvRef
|
||||||
|
---@param src_listname string
|
||||||
|
---@param out_inv mt.InvRef
|
||||||
|
---@param out_listname string
|
||||||
|
---@param pos mt.Vector Position to throw items at
|
||||||
|
---@param dir? mt.Vector Direction to throw items in
|
||||||
|
---@param insta_collect? boolean Enable instant collection, let players collect dropped items instantly. Default `false`
|
||||||
|
function mcl_util.move_list(src_inv, src_listname, out_inv, out_listname, pos, dir, insta_collect)
|
||||||
|
local src_list = src_inv:get_list(src_listname)
|
||||||
|
|
||||||
|
if not src_list then return end
|
||||||
|
for i, stack in ipairs(src_list) do
|
||||||
|
if out_inv:room_for_item(out_listname, stack) then
|
||||||
|
out_inv:add_item(out_listname, stack)
|
||||||
|
else
|
||||||
|
local p = vector.copy(pos)
|
||||||
|
p.x = p.x + (math.random(1, 3) * 0.2)
|
||||||
|
p.z = p.z + (math.random(1, 3) * 0.2)
|
||||||
|
|
||||||
|
local obj = minetest.add_item(p, stack)
|
||||||
|
if obj then
|
||||||
|
if dir then
|
||||||
|
local v = vector.copy(dir)
|
||||||
|
v.x = v.x * 4
|
||||||
|
v.y = v.y * 4 + 2
|
||||||
|
v.z = v.z * 4
|
||||||
|
obj:set_velocity(v)
|
||||||
|
mcl_util.mcl_log("item velocity calculated "..vector.to_string(v), "[mcl_util]")
|
||||||
|
end
|
||||||
|
if not insta_collect then
|
||||||
|
obj:get_luaentity()._insta_collect = false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
stack:clear()
|
||||||
|
src_inv:set_stack(src_listname, i, stack)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
---Move items from a player's inventory list to its main inventory list, drop items that do not fit in front of him.
|
||||||
|
---@param player mt.PlayerObjectRef
|
||||||
|
---@param src_listname string
|
||||||
|
function mcl_util.move_player_list(player, src_listname)
|
||||||
|
mcl_util.move_list(player:get_inventory(), src_listname, player:get_inventory(), "main",
|
||||||
|
vector.offset(player:get_pos(), 0, 1.2, 0),
|
||||||
|
player:get_look_dir(), false)
|
||||||
|
end
|
||||||
|
|
||||||
|
function mcl_util.is_it_christmas()
|
||||||
|
local date = os.date("*t")
|
||||||
|
if date.month == 12 and date.day >= 24 or date.month == 1 and date.day <= 7 then
|
||||||
|
return true
|
||||||
|
else
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
|
@ -62,8 +62,13 @@ end
|
||||||
local function set_double_attach(boat)
|
local function set_double_attach(boat)
|
||||||
boat._driver:set_attach(boat.object, "",
|
boat._driver:set_attach(boat.object, "",
|
||||||
{x = 0, y = 0.42, z = 0.8}, {x = 0, y = 0, z = 0})
|
{x = 0, y = 0.42, z = 0.8}, {x = 0, y = 0, z = 0})
|
||||||
boat._passenger:set_attach(boat.object, "",
|
if boat._passenger:is_player() then
|
||||||
{x = 0, y = 0.42, z = -2.2}, {x = 0, y = 0, z = 0})
|
boat._passenger:set_attach(boat.object, "",
|
||||||
|
{x = 0, y = 0.42, z = -6.2}, {x = 0, y = 0, z = 0})
|
||||||
|
else
|
||||||
|
boat._passenger:set_attach(boat.object, "",
|
||||||
|
{x = 0, y = 0.42, z = -4.5}, {x = 0, y = 270, z = 0})
|
||||||
|
end
|
||||||
end
|
end
|
||||||
local function set_choat_attach(boat)
|
local function set_choat_attach(boat)
|
||||||
boat._driver:set_attach(boat.object, "",
|
boat._driver:set_attach(boat.object, "",
|
||||||
|
@ -155,7 +160,7 @@ local boat = {
|
||||||
minetest.register_on_respawnplayer(detach_object)
|
minetest.register_on_respawnplayer(detach_object)
|
||||||
|
|
||||||
function boat.on_rightclick(self, clicker)
|
function boat.on_rightclick(self, clicker)
|
||||||
if self._passenger or not clicker or clicker:get_attach() then
|
if self._passenger or not clicker or clicker:get_attach() or (self.name == "mcl_boats:chest_boat" and self._driver) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
attach_object(self, clicker)
|
attach_object(self, clicker)
|
||||||
|
@ -437,9 +442,9 @@ cboat.selectionbox = {-0.7, -0.15, -0.7, 0.7, 0.75, 0.7}
|
||||||
minetest.register_entity("mcl_boats:chest_boat", cboat)
|
minetest.register_entity("mcl_boats:chest_boat", cboat)
|
||||||
mcl_entity_invs.register_inv("mcl_boats:chest_boat","Boat",27)
|
mcl_entity_invs.register_inv("mcl_boats:chest_boat","Boat",27)
|
||||||
|
|
||||||
local boat_ids = { "boat", "boat_spruce", "boat_birch", "boat_jungle", "boat_acacia", "boat_dark_oak", "boat_obsidian", "boat_mangrove", "chest_boat", "chest_boat_spruce", "chest_boat_birch", "chest_boat_jungle", "chest_boat_acacia", "chest_boat_dark_oak", "chest_boat_mangrove" }
|
local boat_ids = { "boat", "boat_spruce", "boat_birch", "boat_jungle", "boat_acacia", "boat_dark_oak", "boat_obsidian", "boat_mangrove", "boat_cherry", "chest_boat", "chest_boat_spruce", "chest_boat_birch", "chest_boat_jungle", "chest_boat_acacia", "chest_boat_dark_oak", "chest_boat_mangrove", "chest_boat_cherry" }
|
||||||
local names = { S("Oak Boat"), S("Spruce Boat"), S("Birch Boat"), S("Jungle Boat"), S("Acacia Boat"), S("Dark Oak Boat"), S("Obsidian Boat"), S("Mangrove Boat"), S("Oak Chest Boat"), S("Spruce Chest Boat"), S("Birch Chest Boat"), S("Jungle Chest Boat"), S("Acacia Chest Boat"), S("Dark Oak Chest Boat"), S("Mangrove Chest Boat") }
|
local names = { S("Oak Boat"), S("Spruce Boat"), S("Birch Boat"), S("Jungle Boat"), S("Acacia Boat"), S("Dark Oak Boat"), S("Obsidian Boat"), S("Mangrove Boat"), S("Cherry Boat"), S("Oak Chest Boat"), S("Spruce Chest Boat"), S("Birch Chest Boat"), S("Jungle Chest Boat"), S("Acacia Chest Boat"), S("Dark Oak Chest Boat"), S("Mangrove Chest Boat"), S("Cherry Chest Boat") }
|
||||||
local craftstuffs = { "mcl_core:wood", "mcl_core:sprucewood", "mcl_core:birchwood", "mcl_core:junglewood", "mcl_core:acaciawood", "mcl_core:darkwood", "mcl_core:obsidian", "mcl_mangrove:mangrove_wood" }
|
local craftstuffs = { "mcl_core:wood", "mcl_core:sprucewood", "mcl_core:birchwood", "mcl_core:junglewood", "mcl_core:acaciawood", "mcl_core:darkwood", "mcl_core:obsidian", "mcl_mangrove:mangrove_wood", "mcl_cherry_blossom:cherrywood" }
|
||||||
|
|
||||||
for b=1, #boat_ids do
|
for b=1, #boat_ids do
|
||||||
local itemstring = "mcl_boats:"..boat_ids[b]
|
local itemstring = "mcl_boats:"..boat_ids[b]
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
# textdomain: mcl_boats
|
||||||
|
Acacia Boat=Akaciebåd
|
||||||
|
Birch Boat=Birkebåd
|
||||||
|
Boat=Båd
|
||||||
|
Boats are used to travel on the surface of water.=Både blier brugt til at rejse på vandoverflader.
|
||||||
|
Dark Oak Boat=Mørk egetræsbåd
|
||||||
|
Jungle Boat=Junglebåd
|
||||||
|
Oak Boat=Egetræsbåd
|
||||||
|
Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Use [Sneak] to leave the boat, punch the boat to make it drop as an item.=Højre-klik på en vand for at placere båden. Højre-klik på båden for at gå ombord. Brug [Left] og [Right] til at styre. [Forwards] for at øge hastigheden, og [Backwards] for at sænke farten eller sejle bagud. Brug [Sneak] for at forlade båden, slå båden for at lave den om til en genstand.
|
||||||
|
Spruce Boat=Granbåd
|
||||||
|
Water vehicle=Vandfartøj
|
||||||
|
Sneak to dismount=Snig for at stige ud
|
||||||
|
Obsidian Boat=Obsidianbåd
|
|
@ -12,6 +12,7 @@ Water vehicle=Véhicule aquatique
|
||||||
Sneak to dismount=Se baisser pour descendre
|
Sneak to dismount=Se baisser pour descendre
|
||||||
Obsidian Boat=Bateau en obsidienne
|
Obsidian Boat=Bateau en obsidienne
|
||||||
Mangrove Boat=Bateau en palétuvier
|
Mangrove Boat=Bateau en palétuvier
|
||||||
|
Cherry Boat=Bateau en cerisier
|
||||||
Oak Chest Boat=Bateau en chêne avec coffre
|
Oak Chest Boat=Bateau en chêne avec coffre
|
||||||
Spruce Chest Boat=Bateau en sapin avec coffre
|
Spruce Chest Boat=Bateau en sapin avec coffre
|
||||||
Birch Chest Boat=Bateau en bouleau avec coffre
|
Birch Chest Boat=Bateau en bouleau avec coffre
|
||||||
|
@ -19,3 +20,4 @@ Jungle Chest Boat=Bateau en acajou avec coffre
|
||||||
Acacia Chest Boat=Bateau en acacia avec coffre
|
Acacia Chest Boat=Bateau en acacia avec coffre
|
||||||
Dark Oak Chest Boat=Bateau en chêne noir avec coffre
|
Dark Oak Chest Boat=Bateau en chêne noir avec coffre
|
||||||
Mangrove Chest Boat=Bateau en palétuvier avec coffre
|
Mangrove Chest Boat=Bateau en palétuvier avec coffre
|
||||||
|
Cherry Chest Boat=Bateau en cerisier avec coffre
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
# textdomain: mcl_boats
|
||||||
|
Acacia Boat=Barco de Acácia
|
||||||
|
Birch Boat=Barco de Bétula
|
||||||
|
Boat=Barco
|
||||||
|
Boats are used to travel on the surface of water.=Barcos são usados para viajar na superfície da água
|
||||||
|
Dark Oak Boat=Barco de Carvalho Escuro
|
||||||
|
Jungle Boat=Barco de Selva
|
||||||
|
Oak Boat=Barco de Carvalho
|
||||||
|
Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Use [Sneak] to leave the boat, punch the boat to make it drop as an item.=Clique com o botão direito em uma fonte de água para posicionar o barco. Clique com o botão direito no barco para entrar nele. Use [Esquerda] e [Direita] para fazer curva, [Frente] para acelerar e [Trás] para frear e ir para trás. Use [Agachar] para deixar o barco, soque-o para fazê-lo dropar como um item.
|
||||||
|
Spruce Boat=Barco de Pinheiro
|
||||||
|
Water vehicle=Veículo aquático
|
||||||
|
Sneak to dismount=Agache para desmontar
|
||||||
|
Obsidian Boat=Barco de Obsidiana
|
||||||
|
Mangrove Boat=Barco de Mangue
|
||||||
|
Cherry Boat=Barco de Cerejeira
|
||||||
|
Oak Chest Boat=Barco de Carvalho com Baú
|
||||||
|
Spruce Chest Boat=Barco de Pinheiro com Baú
|
||||||
|
Birch Chest Boat=Barco de Bétula com Baú
|
||||||
|
Jungle Chest Boat=Barco de Selva com Baú
|
||||||
|
Acacia Chest Boat=Barco de Acácia com Baú
|
||||||
|
Dark Oak Chest Boat=Barco de Carvalho Escuro com Baú
|
||||||
|
Mangrove Chest Boat=Barco de Mangue com Baú
|
||||||
|
Cherry Chest Boat=Barco de Cerejeira com Baú
|
|
@ -1,11 +1,23 @@
|
||||||
# textdomain: mcl_boats
|
# textdomain: mcl_boats
|
||||||
Acacia Boat=Лодка из акации
|
Acacia Boat=Акациевая лодка
|
||||||
Birch Boat=Берёзовая лодка
|
Birch Boat=Берёзовая лодка
|
||||||
Boat=Лодка
|
Boat=Лодка
|
||||||
Boats are used to travel on the surface of water.=С помощью лодки можно путешествовать по водной поверхности.
|
Boats are used to travel on the surface of water.=На лодке можно плыть по водной поверхности.
|
||||||
Dark Oak Boat=Лодка из тёмного дуба
|
Dark Oak Boat=Лодка из тёмного дуба
|
||||||
Jungle Boat=Лодка из дерева джунглей
|
Jungle Boat=Лодка из тропического дерева
|
||||||
Oak Boat=Дубовая лодка
|
Oak Boat=Дубовая лодка
|
||||||
Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Rightclick the boat again to leave it, punch the boat to make it drop as an item.=Правый клик по воде спустит лодку на воду. Правый клик по лодке разместит вас в ней. [Влево] и [Вправо] - рулить, [Вперед] - разгоняться, [Назад] - тормозить или плыть назад. Правый клик по лодке, когда вы в ней, позволит выйти из неё. Удар по лодке превратит её обратно в предмет.
|
Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Use [Sneak] to leave the boat, punch the boat to make it drop as an item.=Правый клик на воде, чтобы установить лодку. Правый клик по лодке, чтобы сесть в нее. [Влево] и [Вправо] - рулить, [Вперед] - разгоняться, [Назад] - тормозить или плыть назад. Нажмите [Красться] для высадки, бейте по лодке, чтобы забрать её.
|
||||||
Spruce Boat=Еловая лодка
|
Spruce Boat=Еловая лодка
|
||||||
Water vehicle=Водный транспорт
|
Water vehicle=Водный транспорт
|
||||||
|
Sneak to dismount=Нажмите [Красться] для высадки
|
||||||
|
Obsidian Boat=Обсидиановая лодка
|
||||||
|
Mangrove Boat=Мангровая лодка
|
||||||
|
Cherry Boat=Вишнёвая лодка
|
||||||
|
Oak Chest Boat=Дубовая лодка с сундуком
|
||||||
|
Spruce Chest Boat=Еловая лодка с сундуком
|
||||||
|
Birch Chest Boat=Берёзовая лодка с сундуком
|
||||||
|
Jungle Chest Boat=Лодка из тропического дерева с сундуком
|
||||||
|
Acacia Chest Boat=Акациевая лодка с сундуком
|
||||||
|
Dark Oak Chest Boat=Лодка из тёмного дуба с сундуком
|
||||||
|
Mangrove Chest Boat=Мангровая лодка с сундуком
|
||||||
|
Cherry Chest Boat=Вишнёвая лодка с сундуком
|
|
@ -12,6 +12,7 @@ Water vehicle=
|
||||||
Sneak to dismount=
|
Sneak to dismount=
|
||||||
Obsidian Boat=
|
Obsidian Boat=
|
||||||
Mangrove Boat=
|
Mangrove Boat=
|
||||||
|
Cherry Boat=
|
||||||
Oak Chest Boat=
|
Oak Chest Boat=
|
||||||
Spruce Chest Boat=
|
Spruce Chest Boat=
|
||||||
Birch Chest Boat=
|
Birch Chest Boat=
|
||||||
|
@ -19,3 +20,4 @@ Jungle Chest Boat=
|
||||||
Acacia Chest Boat=
|
Acacia Chest Boat=
|
||||||
Dark Oak Chest Boat=
|
Dark Oak Chest Boat=
|
||||||
Mangrove Chest Boat=
|
Mangrove Chest Boat=
|
||||||
|
Cherry Chest Boat=
|
|
@ -21,7 +21,7 @@ mcl_dripping.register_drop({
|
||||||
-- The group the liquid's nodes belong to
|
-- The group the liquid's nodes belong to
|
||||||
liquid = "water",
|
liquid = "water",
|
||||||
-- The texture used (particles will take a random 2x2 area of it)
|
-- The texture used (particles will take a random 2x2 area of it)
|
||||||
texture = "default_water_source_animated.png",
|
texture = "mcl_core_water_source_animation.png",
|
||||||
-- Define particle glow, ranges from `0` to `minetest.LIGHT_MAX`
|
-- Define particle glow, ranges from `0` to `minetest.LIGHT_MAX`
|
||||||
light = 1,
|
light = 1,
|
||||||
-- The nodes (or node group) the particles will spawn under
|
-- The nodes (or node group) the particles will spawn under
|
||||||
|
|
|
@ -82,7 +82,7 @@ end
|
||||||
|
|
||||||
mcl_dripping.register_drop({
|
mcl_dripping.register_drop({
|
||||||
liquid = "water",
|
liquid = "water",
|
||||||
texture = "default_water_source_animated.png",
|
texture = "mcl_core_water_source_animation.png",
|
||||||
light = 1,
|
light = 1,
|
||||||
nodes = { "group:opaque", "group:leaves" },
|
nodes = { "group:opaque", "group:leaves" },
|
||||||
sound = "drippingwater_drip",
|
sound = "drippingwater_drip",
|
||||||
|
@ -92,7 +92,7 @@ mcl_dripping.register_drop({
|
||||||
|
|
||||||
mcl_dripping.register_drop({
|
mcl_dripping.register_drop({
|
||||||
liquid = "lava",
|
liquid = "lava",
|
||||||
texture = "default_lava_source_animated.png",
|
texture = "mcl_core_lava_source_animation.png",
|
||||||
light = math.max(7, minetest.registered_nodes["mcl_core:lava_source"].light_source - 3),
|
light = math.max(7, minetest.registered_nodes["mcl_core:lava_source"].light_source - 3),
|
||||||
nodes = { "group:opaque" },
|
nodes = { "group:opaque" },
|
||||||
sound = "drippingwater_lavadrip",
|
sound = "drippingwater_lavadrip",
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
# textdomain: mcl_falling_nodes
|
||||||
|
@1 was smashed by a falling anvil.=@1 blev smadret af en nedfaldende ambolt.
|
||||||
|
@1 was smashed by a falling block.=@1 blev smadret af en nedfaldende blok.
|
|
@ -0,0 +1,3 @@
|
||||||
|
# textdomain: mcl_falling_nodes
|
||||||
|
@1 was smashed by a falling anvil.=@1 fue aplastado por un yunque.
|
||||||
|
@1 was smashed by a falling block.=@1 fue aplastado por un bloque.
|
|
@ -0,0 +1,3 @@
|
||||||
|
# textdomain: mcl_falling_nodes
|
||||||
|
@1 was smashed by a falling anvil.=@1 foi esmagado(a) por uma bigorna em queda.
|
||||||
|
@1 was smashed by a falling block.=@1 foi esmagado(a) por um bloco em queda.
|
|
@ -0,0 +1,3 @@
|
||||||
|
# textdomain: mcl_falling_nodes
|
||||||
|
@1 was smashed by a falling anvil.=@1 был(а) раздавлен(а) падающей наковальней.
|
||||||
|
@1 was smashed by a falling block.=@1 был(а) раздавлен(а) падающим блоком.
|
|
@ -362,6 +362,121 @@ function minetest.handle_node_drops(pos, drops, digger)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- the following code is pulled from Minetest builtin without changes except for the call order being changed,
|
||||||
|
-- until a comment saying explicitly it's the end of such code
|
||||||
|
-- TODO if this gets a fix in the engine, remove the block of code
|
||||||
|
local function user_name(user)
|
||||||
|
return user and user:get_player_name() or ""
|
||||||
|
end
|
||||||
|
-- Returns a logging function. For empty names, does not log.
|
||||||
|
local function make_log(name)
|
||||||
|
return name ~= "" and minetest.log or function() end
|
||||||
|
end
|
||||||
|
function minetest.node_dig(pos, node, digger)
|
||||||
|
local diggername = user_name(digger)
|
||||||
|
local log = make_log(diggername)
|
||||||
|
local def = minetest.registered_nodes[node.name]
|
||||||
|
-- Copy pos because the callback could modify it
|
||||||
|
if def and (not def.diggable or
|
||||||
|
(def.can_dig and not def.can_dig(vector.copy(pos), digger))) then
|
||||||
|
log("info", diggername .. " tried to dig "
|
||||||
|
.. node.name .. " which is not diggable "
|
||||||
|
.. minetest.pos_to_string(pos))
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
|
if minetest.is_protected(pos, diggername) then
|
||||||
|
log("action", diggername
|
||||||
|
.. " tried to dig " .. node.name
|
||||||
|
.. " at protected position "
|
||||||
|
.. minetest.pos_to_string(pos))
|
||||||
|
minetest.record_protection_violation(pos, diggername)
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
|
log('action', diggername .. " digs "
|
||||||
|
.. node.name .. " at " .. minetest.pos_to_string(pos))
|
||||||
|
|
||||||
|
local wielded = digger and digger:get_wielded_item()
|
||||||
|
local drops = minetest.get_node_drops(node, wielded and wielded:get_name())
|
||||||
|
|
||||||
|
-- Check to see if metadata should be preserved.
|
||||||
|
if def and def.preserve_metadata then
|
||||||
|
local oldmeta = minetest.get_meta(pos):to_table().fields
|
||||||
|
-- Copy pos and node because the callback can modify them.
|
||||||
|
local pos_copy = vector.copy(pos)
|
||||||
|
local node_copy = {name=node.name, param1=node.param1, param2=node.param2}
|
||||||
|
local drop_stacks = {}
|
||||||
|
for k, v in pairs(drops) do
|
||||||
|
drop_stacks[k] = ItemStack(v)
|
||||||
|
end
|
||||||
|
drops = drop_stacks
|
||||||
|
def.preserve_metadata(pos_copy, node_copy, oldmeta, drops)
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Handle drops
|
||||||
|
minetest.handle_node_drops(pos, drops, digger)
|
||||||
|
|
||||||
|
if wielded then
|
||||||
|
local wdef = wielded:get_definition()
|
||||||
|
local tp = wielded:get_tool_capabilities()
|
||||||
|
local dp = minetest.get_dig_params(def and def.groups, tp, wielded:get_wear())
|
||||||
|
if wdef and wdef.after_use then
|
||||||
|
wielded = wdef.after_use(wielded, digger, node, dp) or wielded
|
||||||
|
else
|
||||||
|
-- Wear out tool
|
||||||
|
if not minetest.is_creative_enabled(diggername) then
|
||||||
|
wielded:add_wear(dp.wear)
|
||||||
|
if wielded:get_count() == 0 and wdef.sound and wdef.sound.breaks then
|
||||||
|
minetest.sound_play(wdef.sound.breaks, {
|
||||||
|
pos = pos,
|
||||||
|
gain = 0.5
|
||||||
|
}, true)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
digger:set_wielded_item(wielded)
|
||||||
|
end
|
||||||
|
|
||||||
|
local oldmetadata = nil
|
||||||
|
if def and def.after_dig_node then
|
||||||
|
oldmetadata = minetest.get_meta(pos):to_table()
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Remove node and update
|
||||||
|
minetest.remove_node(pos)
|
||||||
|
|
||||||
|
-- Play sound if it was done by a player
|
||||||
|
if diggername ~= "" and def and def.sounds and def.sounds.dug then
|
||||||
|
minetest.sound_play(def.sounds.dug, {
|
||||||
|
pos = pos,
|
||||||
|
exclude_player = diggername,
|
||||||
|
}, true)
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Run callback
|
||||||
|
if def and def.after_dig_node then
|
||||||
|
-- Copy pos and node because callback can modify them
|
||||||
|
local pos_copy = vector.copy(pos)
|
||||||
|
local node_copy = {name=node.name, param1=node.param1, param2=node.param2}
|
||||||
|
def.after_dig_node(pos_copy, node_copy, oldmetadata, digger)
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Run script hook
|
||||||
|
for _, callback in ipairs(minetest.registered_on_dignodes) do
|
||||||
|
local origin = minetest.callback_origins[callback]
|
||||||
|
minetest.set_last_run_mod(origin.mod)
|
||||||
|
|
||||||
|
-- Copy pos and node because callback can modify them
|
||||||
|
local pos_copy = vector.copy(pos)
|
||||||
|
local node_copy = {name=node.name, param1=node.param1, param2=node.param2}
|
||||||
|
callback(pos_copy, node_copy, digger)
|
||||||
|
end
|
||||||
|
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
-- end of code pulled from Minetest
|
||||||
|
|
||||||
-- Drop single items by default
|
-- Drop single items by default
|
||||||
function minetest.item_drop(itemstack, dropper, pos)
|
function minetest.item_drop(itemstack, dropper, pos)
|
||||||
if dropper and dropper:is_player() then
|
if dropper and dropper:is_player() then
|
||||||
|
|
|
@ -85,101 +85,93 @@ local function hopper_take_item(self, dtime)
|
||||||
for k, v in pairs(objs) do
|
for k, v in pairs(objs) do
|
||||||
local ent = v:get_luaentity()
|
local ent = v:get_luaentity()
|
||||||
|
|
||||||
if ent._removed or not ent.itemstring or ent.itemstring == "" then
|
if ent and not ent._removed and ent.itemstring and ent.itemstring ~= "" then
|
||||||
--minetest.log("Ignore this item")
|
local taken_items = false
|
||||||
break
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Don't forget actual hoppers
|
mcl_log("ent.name: " .. tostring(ent.name))
|
||||||
|
mcl_log("ent pos: " .. tostring(ent.object:get_pos()))
|
||||||
|
|
||||||
local taken_items = false
|
local inv = mcl_entity_invs.load_inv(self, 5)
|
||||||
|
if not inv then return false end
|
||||||
|
|
||||||
mcl_log("ent.name: " .. tostring(ent.name))
|
local current_itemstack = ItemStack(ent.itemstring)
|
||||||
mcl_log("ent pos: " .. tostring(ent.object:get_pos()))
|
|
||||||
|
|
||||||
local inv = mcl_entity_invs.load_inv(self, 5)
|
mcl_log("inv. size: " .. self._inv_size)
|
||||||
|
if inv:room_for_item("main", current_itemstack) then
|
||||||
|
mcl_log("Room")
|
||||||
|
inv:add_item("main", current_itemstack)
|
||||||
|
ent.object:get_luaentity().itemstring = ""
|
||||||
|
ent.object:remove()
|
||||||
|
taken_items = true
|
||||||
|
else
|
||||||
|
mcl_log("no Room")
|
||||||
|
end
|
||||||
|
|
||||||
if not inv then
|
if not taken_items then
|
||||||
mcl_log("No inv")
|
local items_remaining = current_itemstack:get_count()
|
||||||
return false
|
|
||||||
end
|
|
||||||
|
|
||||||
local current_itemstack = ItemStack(ent.itemstring)
|
-- This will take part of a floating item stack if no slot can hold the full amount
|
||||||
|
for i = 1, self._inv_size, 1 do
|
||||||
|
local stack = inv:get_stack("main", i)
|
||||||
|
|
||||||
mcl_log("inv. size: " .. self._inv_size)
|
mcl_log("i: " .. tostring(i))
|
||||||
if inv:room_for_item("main", current_itemstack) then
|
mcl_log("Items remaining: " .. items_remaining)
|
||||||
mcl_log("Room")
|
mcl_log("Name: " .. tostring(stack:get_name()))
|
||||||
inv:add_item("main", current_itemstack)
|
|
||||||
ent.object:get_luaentity().itemstring = ""
|
|
||||||
ent.object:remove()
|
|
||||||
taken_items = true
|
|
||||||
else
|
|
||||||
mcl_log("no Room")
|
|
||||||
end
|
|
||||||
|
|
||||||
if not taken_items then
|
if current_itemstack:get_name() == stack:get_name() then
|
||||||
local items_remaining = current_itemstack:get_count()
|
mcl_log("We have a match. Name: " .. tostring(stack:get_name()))
|
||||||
|
|
||||||
-- This will take part of a floating item stack if no slot can hold the full amount
|
local room_for = stack:get_stack_max() - stack:get_count()
|
||||||
for i = 1, self._inv_size, 1 do
|
mcl_log("Room for: " .. tostring(room_for))
|
||||||
local stack = inv:get_stack("main", i)
|
|
||||||
|
|
||||||
mcl_log("i: " .. tostring(i))
|
if room_for == 0 then
|
||||||
mcl_log("Items remaining: " .. items_remaining)
|
-- Do nothing
|
||||||
mcl_log("Name: " .. tostring(stack:get_name()))
|
mcl_log("No room")
|
||||||
|
elseif room_for < items_remaining then
|
||||||
|
mcl_log("We have more items remaining than space")
|
||||||
|
|
||||||
if current_itemstack:get_name() == stack:get_name() then
|
items_remaining = items_remaining - room_for
|
||||||
mcl_log("We have a match. Name: " .. tostring(stack:get_name()))
|
stack:set_count(stack:get_stack_max())
|
||||||
|
inv:set_stack("main", i, stack)
|
||||||
|
taken_items = true
|
||||||
|
else
|
||||||
|
local new_stack_size = stack:get_count() + items_remaining
|
||||||
|
stack:set_count(new_stack_size)
|
||||||
|
mcl_log("We have more than enough space. Now holds: " .. new_stack_size)
|
||||||
|
|
||||||
local room_for = stack:get_stack_max() - stack:get_count()
|
inv:set_stack("main", i, stack)
|
||||||
mcl_log("Room for: " .. tostring(room_for))
|
items_remaining = 0
|
||||||
|
|
||||||
if room_for == 0 then
|
ent.object:get_luaentity().itemstring = ""
|
||||||
-- Do nothing
|
ent.object:remove()
|
||||||
mcl_log("No room")
|
|
||||||
elseif room_for < items_remaining then
|
|
||||||
mcl_log("We have more items remaining than space")
|
|
||||||
|
|
||||||
items_remaining = items_remaining - room_for
|
taken_items = true
|
||||||
stack:set_count(stack:get_stack_max())
|
break
|
||||||
inv:set_stack("main", i, stack)
|
end
|
||||||
taken_items = true
|
|
||||||
else
|
|
||||||
local new_stack_size = stack:get_count() + items_remaining
|
|
||||||
stack:set_count(new_stack_size)
|
|
||||||
mcl_log("We have more than enough space. Now holds: " .. new_stack_size)
|
|
||||||
|
|
||||||
inv:set_stack("main", i, stack)
|
mcl_log("Count: " .. tostring(stack:get_count()))
|
||||||
items_remaining = 0
|
mcl_log("stack max: " .. tostring(stack:get_stack_max()))
|
||||||
|
--mcl_log("Is it empty: " .. stack:to_string())
|
||||||
ent.object:get_luaentity().itemstring = ""
|
|
||||||
ent.object:remove()
|
|
||||||
|
|
||||||
taken_items = true
|
|
||||||
break
|
|
||||||
end
|
end
|
||||||
|
|
||||||
mcl_log("Count: " .. tostring(stack:get_count()))
|
if i == self._inv_size and taken_items then
|
||||||
mcl_log("stack max: " .. tostring(stack:get_stack_max()))
|
mcl_log("We are on last item and still have items left. Set final stack size: " .. items_remaining)
|
||||||
--mcl_log("Is it empty: " .. stack:to_string())
|
current_itemstack:set_count(items_remaining)
|
||||||
end
|
--mcl_log("Itemstack2: " .. current_itemstack:to_string())
|
||||||
|
ent.itemstring = current_itemstack:to_string()
|
||||||
if i == self._inv_size and taken_items then
|
end
|
||||||
mcl_log("We are on last item and still have items left. Set final stack size: " .. items_remaining)
|
|
||||||
current_itemstack:set_count(items_remaining)
|
|
||||||
--mcl_log("Itemstack2: " .. current_itemstack:to_string())
|
|
||||||
ent.itemstring = current_itemstack:to_string()
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
--Add in, and delete
|
--Add in, and delete
|
||||||
if taken_items then
|
if taken_items then
|
||||||
mcl_log("Saving")
|
mcl_log("Saving")
|
||||||
mcl_entity_invs.save_inv(ent)
|
mcl_entity_invs.save_inv(ent)
|
||||||
return taken_items
|
return taken_items
|
||||||
else
|
else
|
||||||
mcl_log("No need to save")
|
mcl_log("No need to save")
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1,36 @@
|
||||||
|
# textdomain: mcl_minecarts
|
||||||
|
Minecart=Minevogn
|
||||||
|
Minecarts can be used for a quick transportion on rails.=Minevogne kan bruges til hurtig transport på spor.
|
||||||
|
Minecarts only ride on rails and always follow the tracks. At a T-junction with no straight way ahead, they turn left. The speed is affected by the rail type.=Minevogne kan kun køre på spor, og følger dem altid. Ved et T-kryds uden en vej ligeud drejer de altid til venstre. Farten påvirkes af sportypen.
|
||||||
|
You can place the minecart on rails. Right-click it to enter it. Punch it to get it moving.=Du kan placere minevogne på spor. Højre-klik for at stige ombord.
|
||||||
|
To obtain the minecart, punch it while holding down the sneak key.=For at at få minevognen i din oppakning.
|
||||||
|
A minecart with TNT is an explosive vehicle that travels on rail.=En minevogn med TNT as et eksplosivt fartøj som kører på spor.
|
||||||
|
Place it on rails. Punch it to move it. The TNT is ignited with a flint and steel or when the minecart is on an powered activator rail.=Placér den på spor. Slå den for at flytte den. TNTet bliver antændt med flint og stål eller når minevognen er på et aktiveringsspor.
|
||||||
|
To obtain the minecart and TNT, punch them while holding down the sneak key. You can't do this if the TNT was ignited.=For at få minevognen med TNT i din oppakning skal du slå den mens du holder snigeknappen nede. Du kan ikke gøre dette hvis TNTen er antændt.
|
||||||
|
A minecart with furnace is a vehicle that travels on rails. It can propel itself with fuel.=En minevogn med ovn er et fartøj som kører på spor. Den kan køre af sig selv med brændstof.
|
||||||
|
Place it on rails. If you give it some coal, the furnace will start burning for a long time and the minecart will be able to move itself. Punch it to get it moving.=Placér den på spor. Hvis du putter kul i den vil ovnen brænde i lang tid, og minevognen vil køre af sig selv. Slå den for at sætte den i bevægelse.
|
||||||
|
To obtain the minecart and furnace, punch them while holding down the sneak key.=For at få minevognen med ovn i din oppakning skal du slå den mens du holder snigeknappen nede.
|
||||||
|
Minecart with Chest=Minevogn med kiste
|
||||||
|
Minecart with Furnace=Minevogn med ovn
|
||||||
|
Minecart with Command Block=Minevogn med kommandoblok
|
||||||
|
Minecart with Hopper=Minevogn med tragt
|
||||||
|
Minecart with TNT=Minevogn med TNT
|
||||||
|
Place them on the ground to build your railway, the rails will automatically connect to each other and will turn into curves, T-junctions, crossings and slopes as needed.=Placér dem på jorden for at bygge din jerbane. Sporene kobler sig automatisk sammen med hinanden og laver sving, T-kryds, kryds og skråninger efter behov.
|
||||||
|
Rail=Spor
|
||||||
|
Rails can be used to build transport tracks for minecarts. Normal rails slightly slow down minecarts due to friction.=Spor kan bruges til at bygge jernbaner til minevogne. Normale spor sænker minevognene en smule på grund af friktionsmodstand.
|
||||||
|
Powered Rail=Strømspor
|
||||||
|
Rails can be used to build transport tracks for minecarts. Powered rails are able to accelerate and brake minecarts.=Spor kan bruges til at bygge jernbaner til minevogne. Strømspor kan accelerere eller bremse minevogne.
|
||||||
|
Without redstone power, the rail will brake minecarts. To make this rail accelerate minecarts, power it with redstone power.=Uden redstonekraft vil sporet bremse minevognen. For at accelerere minevognen skal den bruge redstoneskraft.
|
||||||
|
Activator Rail=Aktiveringsspor
|
||||||
|
Rails can be used to build transport tracks for minecarts. Activator rails are used to activate special minecarts.=Spor kan bruges til at bygge jernbaner til minevogne. Aktiveringsspor bruges til at aktivere specielle minevogne.
|
||||||
|
To make this rail activate minecarts, power it with redstone power and send a minecart over this piece of rail.=For at få dette spor til at aktiere minevogne skal du give det redstonekraft og sende en minevogn over dette sporstykke.
|
||||||
|
Detector Rail=Detektorspor
|
||||||
|
Rails can be used to build transport tracks for minecarts. A detector rail is able to detect a minecart above it and powers redstone mechanisms.=Spor kan bruges til at bygge jernbaner til minevogne. Et detektorspor kan opdage en minevogn som kører over det og give kraft til redstonemekanismer.
|
||||||
|
To detect a minecart and provide redstone power, connect it to redstone trails or redstone mechanisms and send any minecart over the rail.=For at opdage en minevogn og give redstonekraft skal den forbindes til redstonestøv eller redstonemekanismer og send en hvilkensomhelst minevogn hen over sporet.
|
||||||
|
Track for minecarts=Spor til minevogne.
|
||||||
|
Speed up when powered, slow down when not powered=Accelerérer når der er strøm, sænk hastigheden når der ikke er strøm.
|
||||||
|
Activates minecarts when powered=Aktieverer minevogne når der er strøm.
|
||||||
|
Emits redstone power when a minecart is detected=Udsender redstonekraft når en minevogn bliver opdaget.
|
||||||
|
Vehicle for fast travel on rails=Fartøj til hurtig kørsel på spor.
|
||||||
|
Can be ignited by tools or powered activator rail=Kan antændes med værktøj eller et aktivatorspor med strøm.
|
||||||
|
Sneak to dismount=Snig for at stige af.
|
|
@ -0,0 +1,36 @@
|
||||||
|
# textdomain: mcl_minecarts
|
||||||
|
Minecart=Carrinho
|
||||||
|
Minecarts can be used for a quick transportion on rails.=Carrinhos podem ser usados para transporte rápido em trilhos.
|
||||||
|
Minecarts only ride on rails and always follow the tracks. At a T-junction with no straight way ahead, they turn left. The speed is affected by the rail type.=Carrinhos viajam somente em trilhos e sempre seguem os traçados. Em uma junção em T sem linha reta à frente, eles viram à esquerda. A velocidade é afetada pelo tipo do trilho.
|
||||||
|
You can place the minecart on rails. Right-click it to enter it. Punch it to get it moving.=Você pode posicionar o carrinho em trilhos. Clique com o botão direito para entrar nele. Soque-o para fazê-lo mover.
|
||||||
|
To obtain the minecart, punch it while holding down the sneak key.=Para obter o carrinho, soque-o enquanto segura pressionada a tecla de agachar.
|
||||||
|
A minecart with TNT is an explosive vehicle that travels on rail.=Um carrinho com TNT é um veículo explosivo que viaja nos trilhos.
|
||||||
|
Place it on rails. Punch it to move it. The TNT is ignited with a flint and steel or when the minecart is on an powered activator rail.=Posicione-o nos trilhos. Soque-o para movê-lo. A TNT é acesa com um isqueiro ou quando o carrinho está sobre um trilho ativador energizado.
|
||||||
|
To obtain the minecart and TNT, punch them while holding down the sneak key. You can't do this if the TNT was ignited.=Para obter o carrinho e a TNT, soque-os enquanto segura pressionada a tecla de agachar. Você não consegue fazer isso se a TNT foi acesa.
|
||||||
|
A minecart with furnace is a vehicle that travels on rails. It can propel itself with fuel.=Um carrinho com fornalha é um veículo que viaja nos trilhos. Se move por conta própria com combustível.
|
||||||
|
Place it on rails. If you give it some coal, the furnace will start burning for a long time and the minecart will be able to move itself. Punch it to get it moving.=Posicione-o nos trilhos. Se você o der um pouco de carvão, a fornalha vai começar a queimar por um longo tempo e o carrinho será capaz de se mover por conta própria. Soque-o para fazê-lo mover.
|
||||||
|
To obtain the minecart and furnace, punch them while holding down the sneak key.=Para obter o carrinho e a fornalha, soque-os enquanto segura pressionada a tecla de agachar.
|
||||||
|
Minecart with Chest=Carrinho com Baú
|
||||||
|
Minecart with Furnace=Carrinho com Fornalha
|
||||||
|
Minecart with Command Block=Carrinho com Bloco de Comandos
|
||||||
|
Minecart with Hopper=Carrinho com Funil
|
||||||
|
Minecart with TNT=Carrinho com TNT
|
||||||
|
Place them on the ground to build your railway, the rails will automatically connect to each other and will turn into curves, T-junctions, crossings and slopes as needed.=Posicione-os no chão para construir suas linhas férreas, os trilhos vão conectar-se automaticamente uns nos outros e vão se transformar em curvas, junções em T, cruzamentos e rampas quando necessário.
|
||||||
|
Rail=Trilho
|
||||||
|
Rails can be used to build transport tracks for minecarts. Normal rails slightly slow down minecarts due to friction.=Trilhos podem ser usados para construir traçados de transporte para carrinhos. Trilhos normais freiam carrinhos gradativamente devido ao atrito.
|
||||||
|
Powered Rail=Trilho Energizador
|
||||||
|
Rails can be used to build transport tracks for minecarts. Powered rails are able to accelerate and brake minecarts.=Trilhos podem ser usados para construir traçados de transporte para carrinhos. Trilhos energizados são capazes de acelerar e frear carrinhos.
|
||||||
|
Without redstone power, the rail will brake minecarts. To make this rail accelerate minecarts, power it with redstone power.=Sem carga de redstone, o trilho vai frear os carrinhos. Para fazer o trilho acelerar os carrinhos, energize-o com uma carga de redstone.
|
||||||
|
Activator Rail=Trilho Ativador
|
||||||
|
Rails can be used to build transport tracks for minecarts. Activator rails are used to activate special minecarts.=Trilhos podem ser usados para construir traçados de transporte para carrinhos. Trilhos ativadores são usados para ativar carrinhos especiais.
|
||||||
|
To make this rail activate minecarts, power it with redstone power and send a minecart over this piece of rail.=Para fazer esse trilho ativar os carrinhos, energize-o com uma carga de redstone e envie um carrinho sobre esse pedaço de trilho.
|
||||||
|
Detector Rail=Trilho Detector
|
||||||
|
Rails can be used to build transport tracks for minecarts. A detector rail is able to detect a minecart above it and powers redstone mechanisms.=Trilhos podem ser usados para construir traçados de transporte para carrinhos. Um trilho detector é capaz de detectar um carrinho sobre ele e energizar mecanismos de redstone.
|
||||||
|
To detect a minecart and provide redstone power, connect it to redstone trails or redstone mechanisms and send any minecart over the rail.=Para detectar um carrinho e providenciar carga de redstone, conecte-o em trilhas de redstone ou mecanismos de redstone e envie qualquer carrinho sobre esse trilho.
|
||||||
|
Track for minecarts=Traçado para carrinhos
|
||||||
|
Speed up when powered, slow down when not powered=Acelera quando energizado, desacelera quando não energizado
|
||||||
|
Activates minecarts when powered=Ativa carrinhos quando energizado
|
||||||
|
Emits redstone power when a minecart is detected=Emite carga de redstone quando um carrinho é detectado
|
||||||
|
Vehicle for fast travel on rails=Veículo para viajar rápido em trilhos
|
||||||
|
Can be ignited by tools or powered activator rail=Pode ser aceso por ferramentas ou trilho ativador energizado
|
||||||
|
Sneak to dismount=Agache para desmontar
|
|
@ -1,36 +1,36 @@
|
||||||
# textdomain: mcl_minecarts
|
# textdomain: mcl_minecarts
|
||||||
Minecart=Вагонетка
|
Minecart=Вагонетка
|
||||||
Minecarts can be used for a quick transportion on rails.=Вагонетки нужны, чтобы быстро перемещаться по рельсам.
|
Minecarts can be used for a quick transportion on rails.=Вагонетка может быть использована для быстрого перемещения по рельсам.
|
||||||
Minecarts only ride on rails and always follow the tracks. At a T-junction with no straight way ahead, they turn left. The speed is affected by the rail type.=Вагонетки едут строго по проложенному железнодорожному пути. На Т-образной развилке они поворачивают налево. Скорость зависит от типа рельсов.
|
Minecarts only ride on rails and always follow the tracks. At a T-junction with no straight way ahead, they turn left. The speed is affected by the rail type.=Вагонетки едут только по проложенным рельсам. На Т-образной развилке они поворачивают налево. Скорость зависит от типа рельсов.
|
||||||
You can place the minecart on rails. Right-click it to enter it. Punch it to get it moving.=Вы ставите вагонетку на рельсы. Правым кликом садитесь в неё. Стукаете, чтобы начать движение.
|
You can place the minecart on rails. Right-click it to enter it. Punch it to get it moving.=Вы можете поставить вагонетку на рельсы. Правым кликом сядьте в неё. Ударьте по ней, чтобы она поехала.
|
||||||
To obtain the minecart, punch it while holding down the sneak key.=Чтобы взять вагонетку, стукните её, удерживая клавишу [Красться].
|
To obtain the minecart, punch it while holding down the sneak key.=Чтобы забрать вагонетку, ударьте по ней, удерживая клавишу [Красться].
|
||||||
A minecart with TNT is an explosive vehicle that travels on rail.=Вагон тротила это подрывной железнодорожный транспорт.
|
A minecart with TNT is an explosive vehicle that travels on rail.=Вагонетка с ТНТ это взрывающийся железнодорожный транспорт.
|
||||||
Place it on rails. Punch it to move it. The TNT is ignited with a flint and steel or when the minecart is on an powered activator rail.=Поместите его на рельсы. Стукните, чтобы он поехал. Тротил воспламеняется, если его поджечь огнивом, либо при попадании на подключенный рельсовый активатор.
|
Place it on rails. Punch it to move it. The TNT is ignited with a flint and steel or when the minecart is on an powered activator rail.=Поместите вагонетку на рельсы. Ударьте по ней, чтобы она поехала. ТНТ активируется, если его поджечь огнивом или когда вагонетка проедет через подключенные активирующие рельсы.
|
||||||
To obtain the minecart and TNT, punch them while holding down the sneak key. You can't do this if the TNT was ignited.=Чтобы взять вагон тротила, стукните его, удерживая клавишу [Красться]. Если тротил воспламенён, сделать это нельзя.
|
To obtain the minecart and TNT, punch them while holding down the sneak key. You can't do this if the TNT was ignited.=Чтобы забрать вагонетку с ТНТ, ударьте по ней, удерживая клавишу [Красться]. Если ТНТ подожжён, сделать это нельзя.
|
||||||
A minecart with furnace is a vehicle that travels on rails. It can propel itself with fuel.=Вагон с печью - это железнодорожный транспорт. Он может двигаться за счёт топлива.
|
A minecart with furnace is a vehicle that travels on rails. It can propel itself with fuel.=Вагонетка с печью это железнодорожный транспорт. Она может ехать сама за счёт топлива.
|
||||||
Place it on rails. If you give it some coal, the furnace will start burning for a long time and the minecart will be able to move itself. Punch it to get it moving.=Поставьте его на рельсы. Если добавить немного угля, то печь зажжётся на продолжительное время и вагон сможет ехать. Стукните вагон для начала движения.
|
Place it on rails. If you give it some coal, the furnace will start burning for a long time and the minecart will be able to move itself. Punch it to get it moving.=Поставьте вагонетку на рельсы. Если добавить в неё угля, то печь будет гореть продолжительное время и вагонетка сможет поехать сама. Ударьте по ней, чтобы она поехала.
|
||||||
To obtain the minecart and furnace, punch them while holding down the sneak key.=Чтобы взять вагон с печью, стукните его, удерживая клавишу [Красться].
|
To obtain the minecart and furnace, punch them while holding down the sneak key.=Чтобы забрать вагонетку с печью, ударьте по ней, удерживая клавишу [Красться].
|
||||||
Minecart with Chest=Вагон с сундуком
|
Minecart with Chest=Вагонетка с сундуком
|
||||||
Minecart with Furnace=Вагон с печью
|
Minecart with Furnace=Вагонетка с печью
|
||||||
Minecart with Command Block=Вагон с командным блоком
|
Minecart with Command Block=Вагонетка с командным блоком
|
||||||
Minecart with Hopper=Вагон с бункером
|
Minecart with Hopper=Вагонетка с воронкой
|
||||||
Minecart with TNT=Вагон тротила
|
Minecart with TNT=Вагонетка с ТНТ
|
||||||
Place them on the ground to build your railway, the rails will automatically connect to each other and will turn into curves, T-junctions, crossings and slopes as needed.=Поместите на землю, чтобы сделать железную дорогу, рельсы автоматически соединятся между собой и будут превращаться в плавный повороты, T-образные развилки, перекрёстки и уклоны там, где это потребуется.
|
Place them on the ground to build your railway, the rails will automatically connect to each other and will turn into curves, T-junctions, crossings and slopes as needed.=Поместите рельсы на землю, чтобы сделать железную дорогу, рельсы автоматически соединятся между собой и будут образовывать повороты, T-образные развилки, перекрёстки и склоны там, где это потребуется.
|
||||||
Rail=Рельсы
|
Rail=Рельсы
|
||||||
Rails can be used to build transport tracks for minecarts. Normal rails slightly slow down minecarts due to friction.=Рельсы используются для строительства железной дороги. Обычные рельсы немного замедляют движение вагонеток из-за трения.
|
Rails can be used to build transport tracks for minecarts. Normal rails slightly slow down minecarts due to friction.=Рельсы используются для строительства железной дороги. Обычные рельсы немного замедляют движение вагонеток из-за трения.
|
||||||
Powered Rail=Подключаемые рельсы
|
Powered Rail=Энергорельсы
|
||||||
Rails can be used to build transport tracks for minecarts. Powered rails are able to accelerate and brake minecarts.=Рельсы используются для строительства железной дороги. Подключённые рельсы могут разгонять и тормозить вагонетки.
|
Rails can be used to build transport tracks for minecarts. Powered rails are able to accelerate and brake minecarts.=Энергорельсы используются для строительства железной дороги. Энергорельсы могут ускорять и тормозить вагонетки.
|
||||||
Without redstone power, the rail will brake minecarts. To make this rail accelerate minecarts, power it with redstone power.=Без энергии редстоуна рельсы будут тормозить вагонетки.
|
Without redstone power, the rail will brake minecarts. To make this rail accelerate minecarts, power it with redstone power.=Неподключенные энергорельсы замедляют вагонетки. Чтобы энергорельсы ускоряли вагонетки, проведите к ним сигнал редстоуна.
|
||||||
Activator Rail=Рельсовый активатор
|
Activator Rail=Активирующие рельсы
|
||||||
Rails can be used to build transport tracks for minecarts. Activator rails are used to activate special minecarts.=Рельсы используются для строительства железной дороги. Рельсовый активатор активирует особые вагонетки.
|
Rails can be used to build transport tracks for minecarts. Activator rails are used to activate special minecarts.=Активирующие рельсы используются для строительства железной дороги. Активирующие рельсы активируют некоторые особые вагонетки.
|
||||||
To make this rail activate minecarts, power it with redstone power and send a minecart over this piece of rail.=Чтобы этот блок рельсов активировал вагонетку, подключите его к энергии редстоуна и направьте вагонетку через него.
|
To make this rail activate minecarts, power it with redstone power and send a minecart over this piece of rail.=Чтобы эти рельсы активировали вагонетки, подключите активирующие рельсы к сигналу редстоуна и направьте вагонетку через них.
|
||||||
Detector Rail=Рельсовый детектор
|
Detector Rail=Нажимные рельсы
|
||||||
Rails can be used to build transport tracks for minecarts. A detector rail is able to detect a minecart above it and powers redstone mechanisms.=Рельсы используются для строительства железной дороги. Рельсовый детектор может обнаруживать вагонетку у себя наверху и подключать механизмы редстоуна.
|
Rails can be used to build transport tracks for minecarts. A detector rail is able to detect a minecart above it and powers redstone mechanisms.=Нажимные рельсы используются для строительства железной дороги. Нажимные рельсы реагируют на проезжающие по ним вагонетки и выдают сигнал для механизмов из редстоуна.
|
||||||
To detect a minecart and provide redstone power, connect it to redstone trails or redstone mechanisms and send any minecart over the rail.=Чтобы обнаруживать вагонетку и подавать энергию редстоуна, подключите его к дорожке редстоуна или механизму редстоуна, после чего направьте любую вагонетку через него.
|
To detect a minecart and provide redstone power, connect it to redstone trails or redstone mechanisms and send any minecart over the rail.=Подсоедините к нажимным рельсам редстоун или редстоуновые механизмы, чтобы активировать их когда по рельсам проезжает вагонетка.
|
||||||
Track for minecarts=Железная дорога
|
Track for minecarts=Железная дорога
|
||||||
Speed up when powered, slow down when not powered=Разгоняет, если подключён, тормозит, если не подключён
|
Speed up when powered, slow down when not powered=Если подключены - ускоряют, если нет - тормозят
|
||||||
Activates minecarts when powered=Активирует особые вагонетки, если подключён
|
Activates minecarts when powered=Активирует особые вагонетки, если подключены
|
||||||
Emits redstone power when a minecart is detected=Испускает энергию редстоуна при обнаружении вагонетки
|
Emits redstone power when a minecart is detected=Подает сигнал редстоуна при обнаружении вагонетки
|
||||||
Vehicle for fast travel on rails=Быстрый железнодорожный транспорт
|
Vehicle for fast travel on rails=Железнодорожный транспорт
|
||||||
Can be ignited by tools or powered activator rail=Можно воспламенить с помощью инструмента или подключенного рельсового активатора
|
Can be ignited by tools or powered activator rail=Можно поджечь инструментом или активирующими рельсами
|
||||||
Sneak to dismount=Нажмите [Красться] для высадки
|
Sneak to dismount=Нажмите [Красться] для высадки
|
||||||
|
|
|
@ -32,6 +32,9 @@ function mob_class:feed_tame(clicker, feed_count, breed, tame, notake)
|
||||||
if not self.follow then
|
if not self.follow then
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
if clicker:get_wielded_item():get_definition()._mcl_not_consumable then
|
||||||
|
return false
|
||||||
|
end
|
||||||
-- can eat/tame with item in hand
|
-- can eat/tame with item in hand
|
||||||
if self.nofollow or self:follow_holding(clicker) then
|
if self.nofollow or self:follow_holding(clicker) then
|
||||||
local consume_food = false
|
local consume_food = false
|
||||||
|
|
|
@ -21,6 +21,8 @@ local function atan(x)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
mcl_mobs.effect_functions = {}
|
||||||
|
|
||||||
|
|
||||||
-- check if daytime and also if mob is docile during daylight hours
|
-- check if daytime and also if mob is docile during daylight hours
|
||||||
function mob_class:day_docile()
|
function mob_class:day_docile()
|
||||||
|
@ -382,7 +384,8 @@ function mob_class:monster_attack()
|
||||||
-- find specific mob to attack, failing that attack player/npc/animal
|
-- find specific mob to attack, failing that attack player/npc/animal
|
||||||
if specific_attack(self.specific_attack, name)
|
if specific_attack(self.specific_attack, name)
|
||||||
and (type == "player" or ( type == "npc" and self.attack_npcs )
|
and (type == "player" or ( type == "npc" and self.attack_npcs )
|
||||||
or (type == "animal" and self.attack_animals == true)) then
|
or (type == "animal" and self.attack_animals == true)
|
||||||
|
or (self.extra_hostile and not self.attack_exception(player))) then
|
||||||
p = player:get_pos()
|
p = player:get_pos()
|
||||||
sp = s
|
sp = s
|
||||||
|
|
||||||
|
@ -513,6 +516,28 @@ end
|
||||||
|
|
||||||
-- deal damage and effects when mob punched
|
-- deal damage and effects when mob punched
|
||||||
function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
|
function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
|
||||||
|
local is_player = hitter:is_player()
|
||||||
|
local mob_pos = self.object:get_pos()
|
||||||
|
local player_pos = hitter:get_pos()
|
||||||
|
|
||||||
|
if is_player then
|
||||||
|
-- is mob out of reach?
|
||||||
|
if vector.distance(mob_pos, player_pos) > 3 then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
-- is mob protected?
|
||||||
|
if self.protected and minetest.is_protected(mob_pos, hitter:get_player_name()) then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local time_now = minetest.get_us_time()
|
||||||
|
local time_diff = time_now - self.invul_timestamp
|
||||||
|
|
||||||
|
-- check for invulnerability time in microseconds (0.5 second)
|
||||||
|
if time_diff <= 500000 and time_diff >= 0 then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
-- custom punch function
|
-- custom punch function
|
||||||
if self.do_punch then
|
if self.do_punch then
|
||||||
|
@ -529,20 +554,15 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local is_player = hitter:is_player()
|
local time_now = minetest.get_us_time()
|
||||||
|
|
||||||
if is_player then
|
if is_player then
|
||||||
-- is mob protected?
|
|
||||||
if self.protected and minetest.is_protected(self.object:get_pos(), hitter:get_player_name()) then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
if minetest.is_creative_enabled(hitter:get_player_name()) then
|
if minetest.is_creative_enabled(hitter:get_player_name()) then
|
||||||
self.health = 0
|
self.health = 0
|
||||||
end
|
end
|
||||||
|
|
||||||
-- set/update 'drop xp' timestamp if hitted by player
|
-- set/update 'drop xp' timestamp if hitted by player
|
||||||
self.xp_timestamp = minetest.get_us_time()
|
self.xp_timestamp = time_now
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
@ -654,6 +674,9 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
|
||||||
-- do damage
|
-- do damage
|
||||||
self.health = self.health - damage
|
self.health = self.health - damage
|
||||||
|
|
||||||
|
-- give invulnerability
|
||||||
|
self.invul_timestamp = time_now
|
||||||
|
|
||||||
-- skip future functions if dead, except alerting others
|
-- skip future functions if dead, except alerting others
|
||||||
if self:check_for_death( "hit", {type = "punch", puncher = hitter}) then
|
if self:check_for_death( "hit", {type = "punch", puncher = hitter}) then
|
||||||
die = true
|
die = true
|
||||||
|
@ -669,10 +692,10 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
|
||||||
if not v then return end
|
if not v then return end
|
||||||
local r = 1.4 - math.min(punch_interval, 1.4)
|
local r = 1.4 - math.min(punch_interval, 1.4)
|
||||||
local kb = r * (math.abs(v.x)+math.abs(v.z))
|
local kb = r * (math.abs(v.x)+math.abs(v.z))
|
||||||
local up = 2
|
local up = 2.625
|
||||||
|
|
||||||
if die==true then
|
if die==true then
|
||||||
kb=kb*2
|
kb=kb*1.25
|
||||||
end
|
end
|
||||||
|
|
||||||
-- if already in air then dont go up anymore when hit
|
-- if already in air then dont go up anymore when hit
|
||||||
|
@ -686,7 +709,7 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
|
||||||
if tool_capabilities.damage_groups["knockback"] then
|
if tool_capabilities.damage_groups["knockback"] then
|
||||||
kb = tool_capabilities.damage_groups["knockback"]
|
kb = tool_capabilities.damage_groups["knockback"]
|
||||||
else
|
else
|
||||||
kb = kb * 1.5
|
kb = kb * 1.25
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
@ -696,9 +719,19 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
|
||||||
end
|
end
|
||||||
if hitter and is_player then
|
if hitter and is_player then
|
||||||
local wielditem = hitter:get_wielded_item()
|
local wielditem = hitter:get_wielded_item()
|
||||||
kb = kb + 3 * mcl_enchanting.get_enchantment(wielditem, "knockback")
|
kb = kb + 9 * mcl_enchanting.get_enchantment(wielditem, "knockback")
|
||||||
elseif luaentity and luaentity._knockback then
|
-- add player velocity to mob knockback
|
||||||
|
local hv = hitter:get_velocity()
|
||||||
|
local dir_dot = (hv.x * dir.x) + (hv.z * dir.z)
|
||||||
|
local player_mag = math.sqrt((hv.x * hv.x) + (hv.z * hv.z))
|
||||||
|
local mob_mag = math.sqrt((v.x * v.x) + (v.z * v.z))
|
||||||
|
if dir_dot > 0 and mob_mag <= player_mag * 0.625 then
|
||||||
|
kb = kb + ((math.abs(hv.x) + math.abs(hv.z)) * r)
|
||||||
|
end
|
||||||
|
elseif luaentity and luaentity._knockback and die == false then
|
||||||
kb = kb + luaentity._knockback
|
kb = kb + luaentity._knockback
|
||||||
|
elseif luaentity and luaentity._knockback and die == true then
|
||||||
|
kb = kb + luaentity._knockback * 0.25
|
||||||
end
|
end
|
||||||
self._kb_turn = true
|
self._kb_turn = true
|
||||||
self._turn_to=self.object:get_yaw()-1.57
|
self._turn_to=self.object:get_yaw()-1.57
|
||||||
|
@ -853,7 +886,8 @@ function mob_class:do_states_attack (dtime)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local target_line_of_sight = self:line_of_sight(s, p, 2)
|
local target_line_of_sight = self:target_visible(s)
|
||||||
|
|
||||||
if not target_line_of_sight then
|
if not target_line_of_sight then
|
||||||
if self.target_time_lost then
|
if self.target_time_lost then
|
||||||
local time_since_seen = os.time() - self.target_time_lost
|
local time_since_seen = os.time() - self.target_time_lost
|
||||||
|
@ -873,10 +907,13 @@ function mob_class:do_states_attack (dtime)
|
||||||
local dist = vector.distance(p, s)
|
local dist = vector.distance(p, s)
|
||||||
|
|
||||||
if self.attack_type == "explode" then
|
if self.attack_type == "explode" then
|
||||||
local vec = { x = p.x - s.x, z = p.z - s.z }
|
|
||||||
yaw = (atan(vec.z / vec.x) +math.pi/ 2) - self.rotate
|
if target_line_of_sight then
|
||||||
if p.x > s.x then yaw = yaw +math.pi end
|
local vec = { x = p.x - s.x, z = p.z - s.z }
|
||||||
yaw = self:set_yaw( yaw, 0, dtime)
|
yaw = (atan(vec.z / vec.x) +math.pi/ 2) - self.rotate
|
||||||
|
if p.x > s.x then yaw = yaw +math.pi end
|
||||||
|
yaw = self:set_yaw( yaw, 0, dtime)
|
||||||
|
end
|
||||||
|
|
||||||
local node_break_radius = self.explosion_radius or 1
|
local node_break_radius = self.explosion_radius or 1
|
||||||
local entity_damage_radius = self.explosion_damage_radius
|
local entity_damage_radius = self.explosion_damage_radius
|
||||||
|
@ -900,10 +937,10 @@ function mob_class:do_states_attack (dtime)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- walk right up to player unless the timer is active
|
-- walk right up to player unless the timer is active
|
||||||
if self.v_start and (self.stop_to_explode or dist < self.reach) then
|
if self.v_start and (self.stop_to_explode or dist < self.reach) or not target_line_of_sight then
|
||||||
self:set_velocity( 0)
|
self:set_velocity(0)
|
||||||
else
|
else
|
||||||
self:set_velocity( self.run_velocity)
|
self:set_velocity(self.run_velocity)
|
||||||
end
|
end
|
||||||
|
|
||||||
if self.animation and self.animation.run_start then
|
if self.animation and self.animation.run_start then
|
||||||
|
@ -1099,6 +1136,11 @@ function mob_class:do_states_attack (dtime)
|
||||||
full_punch_interval = 1.0,
|
full_punch_interval = 1.0,
|
||||||
damage_groups = {fleshy = self.damage}
|
damage_groups = {fleshy = self.damage}
|
||||||
}, nil)
|
}, nil)
|
||||||
|
if self.dealt_effect then
|
||||||
|
mcl_mobs.effect_functions[self.dealt_effect.name](
|
||||||
|
self.attack, self.dealt_effect.factor, self.dealt_effect.dur
|
||||||
|
)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
self.custom_attack(self, p)
|
self.custom_attack(self, p)
|
||||||
|
@ -1189,6 +1231,9 @@ function mob_class:do_states_attack (dtime)
|
||||||
-- important for mcl_shields
|
-- important for mcl_shields
|
||||||
ent._shooter = self.object
|
ent._shooter = self.object
|
||||||
ent._saved_shooter_pos = self.object:get_pos()
|
ent._saved_shooter_pos = self.object:get_pos()
|
||||||
|
if ent.homing then
|
||||||
|
ent._target = self.attack
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local amount = (vec.x * vec.x + vec.y * vec.y + vec.z * vec.z) ^ 0.5
|
local amount = (vec.x * vec.x + vec.y * vec.y + vec.z * vec.z) ^ 0.5
|
||||||
|
@ -1205,7 +1250,13 @@ function mob_class:do_states_attack (dtime)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
else
|
|
||||||
|
|
||||||
|
elseif self.attack_type == "custom" and self.attack_state then
|
||||||
|
self.attack_state(self, dtime)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if self.on_attack then
|
||||||
|
self.on_attack(self, dtime)
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
local math, tonumber, vector, minetest, mcl_mobs = math, tonumber, vector, minetest, mcl_mobs
|
local math, tonumber, vector, minetest, mcl_mobs = math, tonumber, vector, minetest, mcl_mobs
|
||||||
local mob_class = mcl_mobs.mob_class
|
local mob_class = mcl_mobs.mob_class
|
||||||
|
local validate_vector = mcl_util.validate_vector
|
||||||
|
|
||||||
local active_particlespawners = {}
|
local active_particlespawners = {}
|
||||||
local disable_blood = minetest.settings:get_bool("mobs_disable_blood")
|
local disable_blood = minetest.settings:get_bool("mobs_disable_blood")
|
||||||
local DEFAULT_FALL_SPEED = -9.81*1.5
|
local DEFAULT_FALL_SPEED = -9.81*1.5
|
||||||
|
@ -9,16 +11,6 @@ local PATHFINDING = "gowp"
|
||||||
local player_transfer_distance = tonumber(minetest.settings:get("player_transfer_distance")) or 128
|
local player_transfer_distance = tonumber(minetest.settings:get("player_transfer_distance")) or 128
|
||||||
if player_transfer_distance == 0 then player_transfer_distance = math.huge end
|
if player_transfer_distance == 0 then player_transfer_distance = math.huge end
|
||||||
|
|
||||||
|
|
||||||
local function validate_vector (vect)
|
|
||||||
if vect then
|
|
||||||
if tonumber(vect.x) and tonumber(vect.y) and tonumber(vect.z) then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
|
|
||||||
-- custom particle effects
|
-- custom particle effects
|
||||||
function mcl_mobs.effect(pos, amount, texture, min_size, max_size, radius, gravity, glow, go_down)
|
function mcl_mobs.effect(pos, amount, texture, min_size, max_size, radius, gravity, glow, go_down)
|
||||||
|
|
||||||
|
@ -316,8 +308,14 @@ local function who_are_you_looking_at (self, dtime)
|
||||||
|
|
||||||
local stop_look_at_player = stop_look_at_player_chance == 1
|
local stop_look_at_player = stop_look_at_player_chance == 1
|
||||||
|
|
||||||
if self.attack or self.following then
|
if self.attack then
|
||||||
self._locked_object = self.attack or self.following
|
if not self.target_time_lost then
|
||||||
|
self._locked_object = self.attack
|
||||||
|
else
|
||||||
|
self._locked_object = nil
|
||||||
|
end
|
||||||
|
elseif self.following then
|
||||||
|
self._locked_object = self.following
|
||||||
elseif self._locked_object then
|
elseif self._locked_object then
|
||||||
if stop_look_at_player then
|
if stop_look_at_player then
|
||||||
--minetest.log("Stop look: ".. self.name)
|
--minetest.log("Stop look: ".. self.name)
|
||||||
|
@ -412,7 +410,7 @@ function mob_class:check_head_swivel(dtime)
|
||||||
--final_rotation = vector.new(0,0,0)
|
--final_rotation = vector.new(0,0,0)
|
||||||
end
|
end
|
||||||
|
|
||||||
mcl_util.set_bone_position(self.object,self.head_swivel, vector.new(0,self.bone_eye_height,self.horrizonatal_head_height), final_rotation)
|
mcl_util.set_bone_position(self.object,self.head_swivel, vector.new(0,self.bone_eye_height,self.horizontal_head_height), final_rotation)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -147,7 +147,7 @@ function mcl_mobs.register_mob(name, def)
|
||||||
head_eye_height = def.head_eye_height or def.bone_eye_height or 0, -- how hight aproximatly the mobs head is fromm the ground to tell the mob how high to look up at the player
|
head_eye_height = def.head_eye_height or def.bone_eye_height or 0, -- how hight aproximatly the mobs head is fromm the ground to tell the mob how high to look up at the player
|
||||||
curiosity = def.curiosity or 1, -- how often mob will look at player on idle
|
curiosity = def.curiosity or 1, -- how often mob will look at player on idle
|
||||||
head_yaw = def.head_yaw or "y", -- axis to rotate head on
|
head_yaw = def.head_yaw or "y", -- axis to rotate head on
|
||||||
horrizonatal_head_height = def.horrizonatal_head_height or 0,
|
horizontal_head_height = def.horizontal_head_height or 0,
|
||||||
wears_armor = def.wears_armor, -- a number value used to index texture slot for armor
|
wears_armor = def.wears_armor, -- a number value used to index texture slot for armor
|
||||||
stepheight = def.stepheight or 0.6,
|
stepheight = def.stepheight or 0.6,
|
||||||
name = name,
|
name = name,
|
||||||
|
@ -171,6 +171,7 @@ function mcl_mobs.register_mob(name, def)
|
||||||
xp_min = def.xp_min or 0,
|
xp_min = def.xp_min or 0,
|
||||||
xp_max = def.xp_max or 0,
|
xp_max = def.xp_max or 0,
|
||||||
xp_timestamp = 0,
|
xp_timestamp = 0,
|
||||||
|
invul_timestamp = 0,
|
||||||
breath_max = def.breath_max or 15,
|
breath_max = def.breath_max or 15,
|
||||||
breathes_in_water = def.breathes_in_water or false,
|
breathes_in_water = def.breathes_in_water or false,
|
||||||
physical = true,
|
physical = true,
|
||||||
|
@ -217,6 +218,7 @@ function mcl_mobs.register_mob(name, def)
|
||||||
replace_with = def.replace_with,
|
replace_with = def.replace_with,
|
||||||
replace_offset = def.replace_offset or 0,
|
replace_offset = def.replace_offset or 0,
|
||||||
on_replace = def.on_replace,
|
on_replace = def.on_replace,
|
||||||
|
replace_delay = def.replace_delay or 0,
|
||||||
timer = 0,
|
timer = 0,
|
||||||
env_damage_timer = 0,
|
env_damage_timer = 0,
|
||||||
tamed = false,
|
tamed = false,
|
||||||
|
@ -286,6 +288,7 @@ function mcl_mobs.register_mob(name, def)
|
||||||
spawn_in_group_min = def.spawn_in_group_min,
|
spawn_in_group_min = def.spawn_in_group_min,
|
||||||
noyaw = def.noyaw or false,
|
noyaw = def.noyaw or false,
|
||||||
particlespawners = def.particlespawners,
|
particlespawners = def.particlespawners,
|
||||||
|
spawn_check = def.spawn_check,
|
||||||
-- End of MCL2 extensions
|
-- End of MCL2 extensions
|
||||||
on_spawn = def.on_spawn,
|
on_spawn = def.on_spawn,
|
||||||
on_blast = def.on_blast or function(self,damage)
|
on_blast = def.on_blast or function(self,damage)
|
||||||
|
@ -296,6 +299,7 @@ function mcl_mobs.register_mob(name, def)
|
||||||
return false, true, {}
|
return false, true, {}
|
||||||
end,
|
end,
|
||||||
do_punch = def.do_punch,
|
do_punch = def.do_punch,
|
||||||
|
deal_damage = def.deal_damage,
|
||||||
on_breed = def.on_breed,
|
on_breed = def.on_breed,
|
||||||
on_grown = def.on_grown,
|
on_grown = def.on_grown,
|
||||||
on_pick_up = def.on_pick_up,
|
on_pick_up = def.on_pick_up,
|
||||||
|
@ -310,8 +314,16 @@ function mcl_mobs.register_mob(name, def)
|
||||||
|
|
||||||
return self:mob_activate(staticdata, def, dtime)
|
return self:mob_activate(staticdata, def, dtime)
|
||||||
end,
|
end,
|
||||||
|
attack_state = def.attack_state, -- custom attack state
|
||||||
|
on_attack = def.on_attack, -- called after attack, useful with otherwise predefined attack states (not custom)
|
||||||
harmed_by_heal = def.harmed_by_heal,
|
harmed_by_heal = def.harmed_by_heal,
|
||||||
on_lightning_strike = def.on_lightning_strike
|
is_boss = def.is_boss,
|
||||||
|
dealt_effect = def.dealt_effect,
|
||||||
|
on_lightning_strike = def.on_lightning_strike,
|
||||||
|
extra_hostile = def.extra_hostile,
|
||||||
|
attack_exception = def.attack_exception or function(p) return false end,
|
||||||
|
|
||||||
|
_spawner = def._spawner,
|
||||||
}
|
}
|
||||||
minetest.register_entity(name, setmetatable(final_def,mcl_mobs.mob_class_meta))
|
minetest.register_entity(name, setmetatable(final_def,mcl_mobs.mob_class_meta))
|
||||||
|
|
||||||
|
@ -322,6 +334,13 @@ function mcl_mobs.register_mob(name, def)
|
||||||
end -- END mcl_mobs.register_mob function
|
end -- END mcl_mobs.register_mob function
|
||||||
|
|
||||||
|
|
||||||
|
function mcl_mobs.get_arrow_damage_func(damage, typ)
|
||||||
|
local typ = mcl_damage.types[typ] and typ or "arrow"
|
||||||
|
return function(projectile, object)
|
||||||
|
return mcl_util.deal_damage(object, damage, {type = typ})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
-- register arrow for shoot attack
|
-- register arrow for shoot attack
|
||||||
function mcl_mobs.register_arrow(name, def)
|
function mcl_mobs.register_arrow(name, def)
|
||||||
|
|
||||||
|
@ -338,13 +357,15 @@ function mcl_mobs.register_arrow(name, def)
|
||||||
hit_node = def.hit_node,
|
hit_node = def.hit_node,
|
||||||
hit_mob = def.hit_mob,
|
hit_mob = def.hit_mob,
|
||||||
hit_object = def.hit_object,
|
hit_object = def.hit_object,
|
||||||
|
homing = def.homing,
|
||||||
drop = def.drop or false, -- drops arrow as registered item when true
|
drop = def.drop or false, -- drops arrow as registered item when true
|
||||||
collisionbox = {0, 0, 0, 0, 0, 0}, -- remove box around arrows
|
collisionbox = {0, 0, 0, 0, 0, 0}, -- remove box around arrows
|
||||||
timer = 0,
|
timer = 0,
|
||||||
switch = 0,
|
switch = 0,
|
||||||
|
_lifetime = def._lifetime or 150,
|
||||||
owner_id = def.owner_id,
|
owner_id = def.owner_id,
|
||||||
rotate = def.rotate,
|
rotate = def.rotate,
|
||||||
on_punch = function(self)
|
on_punch = def.on_punch or function(self)
|
||||||
local vel = self.object:get_velocity()
|
local vel = self.object:get_velocity()
|
||||||
self.object:set_velocity({x=vel.x * -1, y=vel.y * -1, z=vel.z * -1})
|
self.object:set_velocity({x=vel.x * -1, y=vel.y * -1, z=vel.z * -1})
|
||||||
end,
|
end,
|
||||||
|
@ -361,7 +382,7 @@ function mcl_mobs.register_arrow(name, def)
|
||||||
local pos = self.object:get_pos()
|
local pos = self.object:get_pos()
|
||||||
|
|
||||||
if self.switch == 0
|
if self.switch == 0
|
||||||
or self.timer > 150
|
or self.timer > self._lifetime
|
||||||
or not within_limits(pos, 0) then
|
or not within_limits(pos, 0) then
|
||||||
mcl_burning.extinguish(self.object)
|
mcl_burning.extinguish(self.object)
|
||||||
self.object:remove();
|
self.object:remove();
|
||||||
|
@ -409,6 +430,17 @@ function mcl_mobs.register_arrow(name, def)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if self.homing and self._target then
|
||||||
|
local p = self._target:get_pos()
|
||||||
|
if p then
|
||||||
|
if minetest.line_of_sight(self.object:get_pos(), p) then
|
||||||
|
self.object:set_velocity(vector.direction(self.object:get_pos(), p) * self.velocity)
|
||||||
|
end
|
||||||
|
else
|
||||||
|
self._target = nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
if self.hit_player or self.hit_mob or self.hit_object then
|
if self.hit_player or self.hit_mob or self.hit_object then
|
||||||
|
|
||||||
for _,player in pairs(minetest.get_objects_inside_radius(pos, 1.5)) do
|
for _,player in pairs(minetest.get_objects_inside_radius(pos, 1.5)) do
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
# textdomain: mcl_mobs
|
||||||
|
Peaceful mode active! No monsters will spawn.=Fredelig tilstand aktiveret! Ingen monstre vil spawne.
|
||||||
|
This allows you to place a single mob.=Dette gør dig i stand til at placere et enkelt monster.
|
||||||
|
Just place it where you want the mob to appear. Animals will spawn tamed, unless you hold down the sneak key while placing. If you place this on a mob spawner, you change the mob it spawns.=Placér det blot der hvor du ønsker, at monsteret skal komme. Dyr vil spawne tamme, medmindre du holder snige-knappen nede mens du placerer dem. Hvis du placerer denne på et monsterspawn, ændrer du hvilket monster det spawner.
|
||||||
|
You need the “maphack” privilege to change the mob spawner.=Du skal have "maphack" privilegier for at ændre monsterspawneren.
|
||||||
|
Name Tag=Navneskilt
|
||||||
|
A name tag is an item to name a mob.=Et navneskilt bruges til at navngive et monster.
|
||||||
|
Before you use the name tag, you need to set a name at an anvil. Then you can use the name tag to name a mob. This uses up the name tag.=Før du bruger navneskiltet, skal du vælge navnet ved en ambolt. Derefter kan du bruge navneskiltet til at navngive et monster. Dette opbruger navneskiltet.
|
||||||
|
Only peaceful mobs allowed!=Kun fredelige monstre er tilladt!
|
||||||
|
Give names to mobs=Giv navne til monstre
|
||||||
|
Set name at anvil=Vælg navn ved en ambolt.
|
|
@ -0,0 +1,13 @@
|
||||||
|
# textdomain: mcl_mobs
|
||||||
|
Peaceful mode active! No monsters will spawn.=Modo pacífico ativado! Nenhum monstro será gerado.
|
||||||
|
This allows you to place a single mob.=Isso permite você posicionar um único mob.
|
||||||
|
Just place it where you want the mob to appear. Animals will spawn tamed, unless you hold down the sneak key while placing. If you place this on a mob spawner, you change the mob it spawns.=Posicione-o onde você deseja que o mob apareça. Animais serão gerados domesticados, a menos que você segure pressionada a tecla de agachar enquanto posiciona. Se você posicionar em um gerador de mobs, você muda o mob que será gerado.
|
||||||
|
You need the “maphack” privilege to change the mob spawner.=Você precisa do privilégio "maphack" para mudar o gerador de mobs.
|
||||||
|
Name Tag=Etiqueta
|
||||||
|
A name tag is an item to name a mob.=Uma etiqueta é um item para nomear um mob.
|
||||||
|
Before you use the name tag, you need to set a name at an anvil. Then you can use the name tag to name a mob. This uses up the name tag.=Antes de você usar a etiqueta, você precisa determinar um nome em uma bigorna. Assim você pode usar a etiqueta para nomear um mob. Isso consumirá a etiqueta.
|
||||||
|
Only peaceful mobs allowed!=Apenas mobs pacíficos permitidos!
|
||||||
|
Give names to mobs=Dá nome aos mobs
|
||||||
|
Set name at anvil=Determine um nome em uma bigorna
|
||||||
|
Removes specified mobs except nametagged and tamed ones. For the second parameter, use nametagged/tamed to select only nametagged/tamed mobs, or a range to specify a maximum distance from the player.=Remove mobs especifícos exceto os mobs nomeados ou domesticados. Como segundo parâmetro, use nametagged/tamed para selecionar apenas mobs nomeados/domesticados, ou um alcançe para especificar uma distância máxima em relação ao jogador.
|
||||||
|
Default usage. Clearing hostile mobs. For more options please type: /help clearmobs=Uso padrão. Eliminando mobs hostis. Para mais opções por favor digite: /help clearmobs
|
|
@ -1,11 +1,13 @@
|
||||||
# textdomain: mcl_mobs
|
# textdomain: mcl_mobs
|
||||||
Peaceful mode active! No monsters will spawn.=Мирный режим включён! Монстры не будут появляться.
|
Peaceful mode active! No monsters will spawn.=Мирный режим включён! Монстры не будут спауниться.
|
||||||
This allows you to place a single mob.=Позволяет вам разместить одного моба.
|
This allows you to place a single mob.=Позволяет вам заспаунить одного моба.
|
||||||
Just place it where you want the mob to appear. Animals will spawn tamed, unless you hold down the sneak key while placing. If you place this on a mob spawner, you change the mob it spawns.=Просто поместите это туда, где хотите, чтобы появился моб. Животные будут появляться уже прирученные, если это не нужно, удерживайте клавишу [Красться] при размещении. Если поместить это на спаунер, появляющийся из него моб будет изменён.
|
Just place it where you want the mob to appear. Animals will spawn tamed, unless you hold down the sneak key while placing. If you place this on a mob spawner, you change the mob it spawns.=Используйте предмет там, где вы хотите, чтобы заспаунился моб. Животные будут спауниться уже прирученные, если только вы не удерживаете клавишу [Красться] при размещении. Если использовать на спаунере мобов, изменится создаваемый им моб.
|
||||||
You need the “maphack” privilege to change the mob spawner.=Вам нужно обладать привилегией “maphack”, чтобы изменить спаунер моба.
|
You need the “maphack” privilege to change the mob spawner.=Вам нужна привилегия “maphack”, чтобы изменить спаунер мобов.
|
||||||
Name Tag=Именная бирка
|
Name Tag=Бирка
|
||||||
A name tag is an item to name a mob.=Именная бирка это предмет, чтобы дать мобу имя.
|
A name tag is an item to name a mob.=Бирка это предмет, дающий мобу имя.
|
||||||
Before you use the name tag, you need to set a name at an anvil. Then you can use the name tag to name a mob. This uses up the name tag.=Прежде чем использовать именную бирку, нужно задать имя на наковальне. Тогда вы сможете использовать бирку, чтобы дать имя мобу.
|
Before you use the name tag, you need to set a name at an anvil. Then you can use the name tag to name a mob. This uses up the name tag.=Прежде чем использовать бирку, нужно задать ей имя на наковальне. Тогда вы сможете использовать бирку, чтобы дать имя мобу.
|
||||||
Only peaceful mobs allowed!=Разрешены только мирные мобы!
|
Only peaceful mobs allowed!=Разрешены только мирные мобы!
|
||||||
Give names to mobs=Даёт имена мобам
|
Give names to mobs=Даёт имена мобам
|
||||||
Set name at anvil=Задайте имя при помощи наковальни
|
Set name at anvil=Задайте имя на наковальне
|
||||||
|
Removes specified mobs except nametagged and tamed ones. For the second parameter, use nametagged/tamed to select only nametagged/tamed mobs, or a range to specify a maximum distance from the player.=Удаляет указанных мобов кроме именованных и прирученных. Для второго параметра используйте nametagged/tamed, чтобы выбрать именованных/прирученных мобов или радиус указывающий максимальную дистанцию от игрока.
|
||||||
|
Default usage. Clearing hostile mobs. For more options please type: /help clearmobs=Параметры по умолчанию. Удаляем враждебных мобов. Для дополнительных опций введите: /help clearmobs
|
||||||
|
|
|
@ -76,6 +76,67 @@ function mob_class:is_node_waterhazard(nodename)
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
local function raycast_line_of_sight (origin, target)
|
||||||
|
local raycast = minetest.raycast(origin, target, false, true)
|
||||||
|
|
||||||
|
local los_blocked = false
|
||||||
|
|
||||||
|
for hitpoint in raycast do
|
||||||
|
if hitpoint.type == "node" then
|
||||||
|
--TODO type object could block vision, for example chests
|
||||||
|
local node = minetest.get_node(minetest.get_pointed_thing_position(hitpoint))
|
||||||
|
|
||||||
|
if node.name ~= "air" then
|
||||||
|
local nodef = minetest.registered_nodes[node.name]
|
||||||
|
if nodef and nodef.walkable then
|
||||||
|
los_blocked = true
|
||||||
|
break
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return not los_blocked
|
||||||
|
end
|
||||||
|
|
||||||
|
function mob_class:target_visible(origin)
|
||||||
|
if not origin then return end
|
||||||
|
|
||||||
|
if not self.attack then return end
|
||||||
|
local target_pos = self.attack:get_pos()
|
||||||
|
|
||||||
|
if not target_pos then return end
|
||||||
|
|
||||||
|
local origin_eye_pos = vector.offset(origin, 0, self.head_eye_height, 0)
|
||||||
|
|
||||||
|
--minetest.log("origin: " .. dump(origin))
|
||||||
|
--minetest.log("origin_eye_pos: " .. dump(origin_eye_pos))
|
||||||
|
|
||||||
|
local targ_head_height, targ_feet_height
|
||||||
|
if self.attack:is_player() then
|
||||||
|
local cbox = self.object:get_properties().collisionbox
|
||||||
|
targ_head_height = vector.offset(target_pos, 0, cbox[5], 0)
|
||||||
|
targ_feet_height = target_pos -- Cbox would put feet under ground which interferes with ray
|
||||||
|
else
|
||||||
|
targ_head_height = vector.offset(target_pos, 0, self.collisionbox[5], 0)
|
||||||
|
targ_feet_height = vector.offset(target_pos, 0, self.collisionbox[2], 0)
|
||||||
|
end
|
||||||
|
|
||||||
|
--minetest.log("start targ_head_height: " .. dump(targ_head_height))
|
||||||
|
if raycast_line_of_sight (origin_eye_pos, targ_head_height) then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
|
--minetest.log("Start targ_feet_height: " .. dump(targ_feet_height))
|
||||||
|
if raycast_line_of_sight (origin_eye_pos, targ_feet_height) then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
|
-- TODO mid way between feet and head
|
||||||
|
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
-- check line of sight (BrunoMine)
|
-- check line of sight (BrunoMine)
|
||||||
function mob_class:line_of_sight(pos1, pos2, stepsize)
|
function mob_class:line_of_sight(pos1, pos2, stepsize)
|
||||||
|
|
||||||
|
@ -355,9 +416,11 @@ function mob_class:do_jump()
|
||||||
jump_c_multiplier = v2/self.walk_velocity/2
|
jump_c_multiplier = v2/self.walk_velocity/2
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local yaw_dir = minetest.yaw_to_dir(self.object:get_yaw())
|
||||||
|
|
||||||
-- where is front
|
-- where is front
|
||||||
local dir_x = -math.sin(yaw) * (self.collisionbox[4] + 0.5)*jump_c_multiplier+0.6
|
local dir_x = -math.sin(yaw) * (self.collisionbox[4] + 0.5)*jump_c_multiplier+yaw_dir.x
|
||||||
local dir_z = math.cos(yaw) * (self.collisionbox[4] + 0.5)*jump_c_multiplier+0.6
|
local dir_z = math.cos(yaw) * (self.collisionbox[4] + 0.5)*jump_c_multiplier+yaw_dir.z
|
||||||
|
|
||||||
-- what is in front of mob?
|
-- what is in front of mob?
|
||||||
nod = node_ok({
|
nod = node_ok({
|
||||||
|
@ -480,6 +543,7 @@ end
|
||||||
-- find and replace what mob is looking for (grass, wheat etc.)
|
-- find and replace what mob is looking for (grass, wheat etc.)
|
||||||
function mob_class:replace_node(pos)
|
function mob_class:replace_node(pos)
|
||||||
|
|
||||||
|
|
||||||
if not self.replace_rate
|
if not self.replace_rate
|
||||||
or not self.replace_what
|
or not self.replace_what
|
||||||
or self.child == true
|
or self.child == true
|
||||||
|
@ -510,18 +574,21 @@ function mob_class:replace_node(pos)
|
||||||
|
|
||||||
local oldnode = {name = what, param2 = node.param2}
|
local oldnode = {name = what, param2 = node.param2}
|
||||||
local newnode = {name = with, param2 = node.param2}
|
local newnode = {name = with, param2 = node.param2}
|
||||||
local on_replace_return
|
local on_replace_return = false
|
||||||
|
|
||||||
if self.on_replace then
|
if self.on_replace then
|
||||||
on_replace_return = self.on_replace(self, pos, oldnode, newnode)
|
on_replace_return = self.on_replace(self, pos, oldnode, newnode)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
if on_replace_return ~= false then
|
if on_replace_return ~= false then
|
||||||
|
|
||||||
if mobs_griefing then
|
if mobs_griefing then
|
||||||
minetest.set_node(pos, newnode)
|
minetest.after(self.replace_delay, function()
|
||||||
|
if self and self.object and self.object:get_velocity() and self.health > 0 then
|
||||||
|
minetest.set_node(pos, newnode)
|
||||||
|
end
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
local math, vector, minetest, mcl_mobs = math, vector, minetest, mcl_mobs
|
local math, vector, minetest, mcl_mobs = math, vector, minetest, mcl_mobs
|
||||||
local mob_class = mcl_mobs.mob_class
|
local mob_class = mcl_mobs.mob_class
|
||||||
|
local validate_vector = mcl_util.validate_vector
|
||||||
|
|
||||||
local ENTITY_CRAMMING_MAX = 24
|
local ENTITY_CRAMMING_MAX = 24
|
||||||
local CRAMMING_DAMAGE = 3
|
local CRAMMING_DAMAGE = 3
|
||||||
|
@ -184,7 +185,7 @@ function mob_class:collision()
|
||||||
end
|
end
|
||||||
|
|
||||||
function mob_class:check_death_and_slow_mob()
|
function mob_class:check_death_and_slow_mob()
|
||||||
local d = 0.85
|
local d = 0.7
|
||||||
local dying = self:check_dying()
|
local dying = self:check_dying()
|
||||||
if dying then d = 0.92 end
|
if dying then d = 0.92 end
|
||||||
|
|
||||||
|
@ -217,7 +218,7 @@ function mob_class:set_velocity(v)
|
||||||
local vv = self.object:get_velocity()
|
local vv = self.object:get_velocity()
|
||||||
|
|
||||||
if vv and yaw then
|
if vv and yaw then
|
||||||
self.acc = vector.new(((math.sin(yaw) * -v) + c_x) * .27, 0, ((math.cos(yaw) * v) + c_y) * .27)
|
self.acc = vector.new(((math.sin(yaw) * -v) + c_x) * .4, 0, ((math.cos(yaw) * v) + c_y) * .4)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -327,9 +328,9 @@ function mob_class:set_yaw(yaw, delay, dtime)
|
||||||
end
|
end
|
||||||
|
|
||||||
if math.deg(yaw) > 360 then
|
if math.deg(yaw) > 360 then
|
||||||
yaw=yaw%360
|
yaw=math.rad(math.deg(yaw)%360)
|
||||||
elseif math.deg(yaw) < 0 then
|
elseif math.deg(yaw) < 0 then
|
||||||
yaw=((360*5)-yaw)%360
|
yaw=math.rad(((360*5)-math.deg(yaw))%360)
|
||||||
end
|
end
|
||||||
|
|
||||||
--calculate the shortest way to turn to find our target
|
--calculate the shortest way to turn to find our target
|
||||||
|
@ -353,9 +354,9 @@ function mob_class:set_yaw(yaw, delay, dtime)
|
||||||
ddtime = dtime
|
ddtime = dtime
|
||||||
end
|
end
|
||||||
|
|
||||||
if math.abs(target_shortest_path_nums) > 5 then
|
if math.abs(target_shortest_path_nums) > 10 then
|
||||||
self.object:set_yaw(self.object:get_yaw()+(target_shortest_path*(3.6*ddtime)))
|
self.object:set_yaw(self.object:get_yaw()+(target_shortest_path*(3.6*ddtime)))
|
||||||
if self.acc then
|
if validate_vector(self.acc) then
|
||||||
self.acc=vector.rotate_around_axis(self.acc,vector.new(0,1,0), target_shortest_path*(3.6*ddtime))
|
self.acc=vector.rotate_around_axis(self.acc,vector.new(0,1,0), target_shortest_path*(3.6*ddtime))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -675,13 +676,20 @@ function mob_class:do_env_damage()
|
||||||
self.standing_in = node_ok(pos, "air").name
|
self.standing_in = node_ok(pos, "air").name
|
||||||
self.standing_on = node_ok(pos2, "air").name
|
self.standing_on = node_ok(pos2, "air").name
|
||||||
|
|
||||||
|
local pos3 = vector.offset(pos, 0, 1, 0)
|
||||||
|
self.standing_under = node_ok(pos3, "air").name
|
||||||
|
|
||||||
-- don't fall when on ignore, just stand still
|
-- don't fall when on ignore, just stand still
|
||||||
if self.standing_in == "ignore" then
|
if self.standing_in == "ignore" then
|
||||||
self.object:set_velocity({x = 0, y = 0, z = 0})
|
self.object:set_velocity({x = 0, y = 0, z = 0})
|
||||||
|
-- wither rose effect
|
||||||
|
elseif self.standing_in == "mcl_flowers:wither_rose" then
|
||||||
|
mcl_potions.withering_func(self.object, 1, 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
local nodef = minetest.registered_nodes[self.standing_in]
|
local nodef = minetest.registered_nodes[self.standing_in]
|
||||||
local nodef2 = minetest.registered_nodes[self.standing_on]
|
local nodef2 = minetest.registered_nodes[self.standing_on]
|
||||||
|
local nodef3 = minetest.registered_nodes[self.standing_under]
|
||||||
|
|
||||||
-- rain
|
-- rain
|
||||||
if self.rain_damage > 0 then
|
if self.rain_damage > 0 then
|
||||||
|
@ -761,7 +769,7 @@ function mob_class:do_env_damage()
|
||||||
if minetest.get_item_group(self.standing_in, "water") == 0 then
|
if minetest.get_item_group(self.standing_in, "water") == 0 then
|
||||||
drowning = true
|
drowning = true
|
||||||
end
|
end
|
||||||
elseif nodef.drowning > 0 then
|
elseif nodef.drowning > 0 and nodef3.drowning > 0 then
|
||||||
drowning = true
|
drowning = true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -939,7 +947,7 @@ function mob_class:falling(pos)
|
||||||
|
|
||||||
-- in water then float up
|
-- in water then float up
|
||||||
if registered_node.groups.water then
|
if registered_node.groups.water then
|
||||||
if acc and self.floats == 1 then
|
if acc and self.floats == 1 and minetest.registered_nodes[node_ok(vector.offset(pos,0,self.collisionbox[5] -0.25,0)).name].groups.water then
|
||||||
self.object:set_acceleration(vector.new(0, -self.fall_speed / (math.max(1, v.y) ^ 2), 0))
|
self.object:set_acceleration(vector.new(0, -self.fall_speed / (math.max(1, v.y) ^ 2), 0))
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
|
|
@ -2,6 +2,13 @@
|
||||||
local math, vector, minetest, mcl_mobs = math, vector, minetest, mcl_mobs
|
local math, vector, minetest, mcl_mobs = math, vector, minetest, mcl_mobs
|
||||||
local mob_class = mcl_mobs.mob_class
|
local mob_class = mcl_mobs.mob_class
|
||||||
|
|
||||||
|
local modern_lighting = minetest.settings:get_bool("mcl_mobs_modern_lighting", true)
|
||||||
|
local nether_threshold = tonumber(minetest.settings:get("mcl_mobs_nether_threshold")) or 11
|
||||||
|
local end_threshold = tonumber(minetest.settings:get("mcl_mobs_end_threshold")) or 0
|
||||||
|
local overworld_threshold = tonumber(minetest.settings:get("mcl_mobs_overworld_threshold")) or 0
|
||||||
|
local overworld_sky_threshold = tonumber(minetest.settings:get("mcl_mobs_overworld_sky_threshold")) or 7
|
||||||
|
local overworld_passive_threshold = tonumber(minetest.settings:get("mcl_mobs_overworld_passive_threshold")) or 7
|
||||||
|
|
||||||
local get_node = minetest.get_node
|
local get_node = minetest.get_node
|
||||||
local get_item_group = minetest.get_item_group
|
local get_item_group = minetest.get_item_group
|
||||||
local get_node_light = minetest.get_node_light
|
local get_node_light = minetest.get_node_light
|
||||||
|
@ -27,8 +34,11 @@ local table_remove = table.remove
|
||||||
local pairs = pairs
|
local pairs = pairs
|
||||||
|
|
||||||
local LOGGING_ON = minetest.settings:get_bool("mcl_logging_mobs_spawning", false)
|
local LOGGING_ON = minetest.settings:get_bool("mcl_logging_mobs_spawning", false)
|
||||||
local function mcl_log (message)
|
local function mcl_log (message, property)
|
||||||
if LOGGING_ON then
|
if LOGGING_ON then
|
||||||
|
if property then
|
||||||
|
message = message .. ": " .. dump(property)
|
||||||
|
end
|
||||||
mcl_util.mcl_log (message, "[Mobs spawn]", true)
|
mcl_util.mcl_log (message, "[Mobs spawn]", true)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -52,21 +62,25 @@ local MOB_CAP_INNER_RADIUS = 32
|
||||||
local aoc_range = 136
|
local aoc_range = 136
|
||||||
|
|
||||||
local MISSING_CAP_DEFAULT = 15
|
local MISSING_CAP_DEFAULT = 15
|
||||||
local MOBS_CAP_CLOSE = 5
|
local MOBS_CAP_CLOSE = 10
|
||||||
|
|
||||||
local SPAWN_MAPGEN_LIMIT = mcl_vars.mapgen_limit - 150
|
local SPAWN_MAPGEN_LIMIT = mcl_vars.mapgen_limit - 150
|
||||||
|
|
||||||
local mob_cap = {
|
local mob_cap = {
|
||||||
hostile = tonumber(minetest.settings:get("mcl_mob_cap_monster")) or 70,
|
hostile = tonumber(minetest.settings:get("mcl_mob_cap_monster")) or 70,
|
||||||
passive = tonumber(minetest.settings:get("mcl_mob_cap_animal")) or 13,
|
passive = tonumber(minetest.settings:get("mcl_mob_cap_animal")) or 10,
|
||||||
ambient = tonumber(minetest.settings:get("mcl_mob_cap_ambient")) or 15,
|
ambient = tonumber(minetest.settings:get("mcl_mob_cap_ambient")) or 15,
|
||||||
water = tonumber(minetest.settings:get("mcl_mob_cap_water")) or 8,
|
water = tonumber(minetest.settings:get("mcl_mob_cap_water")) or 8,
|
||||||
water_ambient = tonumber(minetest.settings:get("mcl_mob_cap_water_ambient")) or 20, --currently unused
|
water_ambient = tonumber(minetest.settings:get("mcl_mob_cap_water_ambient")) or 20,
|
||||||
|
water_underground = tonumber(minetest.settings:get("mcl_mob_cap_water_underground")) or 5,
|
||||||
|
axolotl = tonumber(minetest.settings:get("mcl_mob_cap_axolotl")) or 2, -- TODO should be 5 when lush caves added
|
||||||
player = tonumber(minetest.settings:get("mcl_mob_cap_player")) or 75,
|
player = tonumber(minetest.settings:get("mcl_mob_cap_player")) or 75,
|
||||||
|
global_hostile = tonumber(minetest.settings:get("mcl_mob_cap_hostile")) or 300,
|
||||||
|
global_non_hostile = tonumber(minetest.settings:get("mcl_mob_cap_non_hostile")) or 300,
|
||||||
total = tonumber(minetest.settings:get("mcl_mob_cap_total")) or 500,
|
total = tonumber(minetest.settings:get("mcl_mob_cap_total")) or 500,
|
||||||
}
|
}
|
||||||
|
|
||||||
local peaceful_percentage_spawned = tonumber(minetest.settings:get("mcl_mob_peaceful_percentage_spawned")) or 35
|
local peaceful_percentage_spawned = tonumber(minetest.settings:get("mcl_mob_peaceful_percentage_spawned")) or 30
|
||||||
local peaceful_group_percentage_spawned = tonumber(minetest.settings:get("mcl_mob_peaceful_group_percentage_spawned")) or 15
|
local peaceful_group_percentage_spawned = tonumber(minetest.settings:get("mcl_mob_peaceful_group_percentage_spawned")) or 15
|
||||||
local hostile_group_percentage_spawned = tonumber(minetest.settings:get("mcl_mob_hostile_group_percentage_spawned")) or 20
|
local hostile_group_percentage_spawned = tonumber(minetest.settings:get("mcl_mob_hostile_group_percentage_spawned")) or 20
|
||||||
|
|
||||||
|
@ -340,15 +354,32 @@ local function count_mobs_all(categorise_by, pos)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function count_mobs_total_cap(mob_type)
|
local function count_mobs_total_cap(mob_type)
|
||||||
|
local total = 0
|
||||||
local num = 0
|
local num = 0
|
||||||
|
local hostile = 0
|
||||||
|
local non_hostile = 0
|
||||||
for _,l in pairs(minetest.luaentities) do
|
for _,l in pairs(minetest.luaentities) do
|
||||||
if l.is_mob then
|
if l.is_mob then
|
||||||
if ( mob_type == nil or l.type == mob_type ) and l.can_despawn and not l.nametag then
|
total = total + 1
|
||||||
|
local nametagged = l.nametag and l.nametag ~= ""
|
||||||
|
if ( mob_type == nil or l.type == mob_type ) and not nametagged then
|
||||||
|
if l.spawn_class == "hostile" then
|
||||||
|
hostile = hostile + 1
|
||||||
|
else
|
||||||
|
non_hostile = non_hostile + 1
|
||||||
|
end
|
||||||
num = num + 1
|
num = num + 1
|
||||||
|
else
|
||||||
|
mcl_log("l.name", l.name)
|
||||||
|
mcl_log("l.nametag", l.nametag)
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return num
|
mcl_log("Total mobs", total)
|
||||||
|
mcl_log("hostile", hostile)
|
||||||
|
mcl_log("non_hostile", non_hostile)
|
||||||
|
return num, non_hostile, hostile
|
||||||
end
|
end
|
||||||
|
|
||||||
local function output_mob_stats(mob_counts, total_mobs, chat_display)
|
local function output_mob_stats(mob_counts, total_mobs, chat_display)
|
||||||
|
@ -685,9 +716,6 @@ local function spawn_check(pos, spawn_def)
|
||||||
and spawn_def.dimension == dimension
|
and spawn_def.dimension == dimension
|
||||||
and biome_check(spawn_def.biomes, gotten_biome) then
|
and biome_check(spawn_def.biomes, gotten_biome) then
|
||||||
|
|
||||||
--mcl_log("Level 1 spawn check passed")
|
|
||||||
--minetest.log("Mob: " .. mob_def.name)
|
|
||||||
|
|
||||||
if (is_ground or spawn_def.type_of_spawning ~= "ground")
|
if (is_ground or spawn_def.type_of_spawning ~= "ground")
|
||||||
and (spawn_def.type_of_spawning ~= "ground" or not is_leaf)
|
and (spawn_def.type_of_spawning ~= "ground" or not is_leaf)
|
||||||
and (not is_farm_animal(spawn_def.name) or is_grass)
|
and (not is_farm_animal(spawn_def.name) or is_grass)
|
||||||
|
@ -697,20 +725,41 @@ local function spawn_check(pos, spawn_def)
|
||||||
and (spawn_def.check_position and spawn_def.check_position(pos) or spawn_def.check_position == nil)
|
and (spawn_def.check_position and spawn_def.check_position(pos) or spawn_def.check_position == nil)
|
||||||
and ( not spawn_protected or not minetest.is_protected(pos, "") ) then
|
and ( not spawn_protected or not minetest.is_protected(pos, "") ) then
|
||||||
|
|
||||||
--mcl_log("Level 2 spawn check passed")
|
|
||||||
|
|
||||||
local gotten_light = get_node_light(pos)
|
local gotten_light = get_node_light(pos)
|
||||||
if gotten_light >= spawn_def.min_light and gotten_light <= spawn_def.max_light then
|
|
||||||
--mcl_log("Level 3 spawn check passed")
|
if modern_lighting then
|
||||||
return true
|
local my_node = get_node(pos)
|
||||||
|
local sky_light = minetest.get_natural_light(pos)
|
||||||
|
local art_light = minetest.get_artificial_light(my_node.param1)
|
||||||
|
|
||||||
|
if mob_def.spawn_check then
|
||||||
|
return mob_def.spawn_check(pos, gotten_light, art_light, sky_light)
|
||||||
|
elseif mob_type == "monster" then
|
||||||
|
if dimension == "nether" then
|
||||||
|
if art_light <= nether_threshold then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
elseif dimension == "end" then
|
||||||
|
if art_light <= end_threshold then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
elseif dimension == "overworld" then
|
||||||
|
if art_light <= overworld_threshold and sky_light <= overworld_sky_threshold then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
else
|
||||||
|
-- passive threshold is apparently the same in all dimensions ...
|
||||||
|
if gotten_light > overworld_passive_threshold then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
else
|
else
|
||||||
mcl_log("Spawn check level 3 failed")
|
if gotten_light >= spawn_def.min_light and gotten_light <= spawn_def.max_light then
|
||||||
|
return true
|
||||||
|
end
|
||||||
end
|
end
|
||||||
else
|
|
||||||
mcl_log("Spawn check level 2 failed")
|
|
||||||
end
|
end
|
||||||
else
|
|
||||||
mcl_log("Spawn check level 1 failed")
|
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
@ -831,7 +880,7 @@ if mobs_spawn then
|
||||||
-- Get pos to spawn, x and z are randomised, y is range
|
-- Get pos to spawn, x and z are randomised, y is range
|
||||||
|
|
||||||
|
|
||||||
local function mob_cap_space (pos, mob_type, mob_counts_close, mob_counts_wide)
|
local function mob_cap_space (pos, mob_type, mob_counts_close, mob_counts_wide, cap_space_hostile, cap_space_non_hostile)
|
||||||
|
|
||||||
-- Some mob examples
|
-- Some mob examples
|
||||||
--type = "monster", spawn_class = "hostile",
|
--type = "monster", spawn_class = "hostile",
|
||||||
|
@ -847,9 +896,18 @@ if mobs_spawn then
|
||||||
mob_total_wide = 0
|
mob_total_wide = 0
|
||||||
end
|
end
|
||||||
|
|
||||||
local cap_space_wide = type_cap - mob_total_wide
|
local cap_space_wide = math.max(type_cap - mob_total_wide, 0)
|
||||||
if cap_space_wide < 1 then
|
|
||||||
cap_space_wide = 0
|
mcl_log("mob_type", mob_type)
|
||||||
|
mcl_log("cap_space_wide", cap_space_wide)
|
||||||
|
|
||||||
|
local cap_space_available = 0
|
||||||
|
if mob_type == "hostile" then
|
||||||
|
mcl_log("cap_space_global", cap_space_hostile)
|
||||||
|
cap_space_available = math.min(cap_space_hostile, cap_space_wide)
|
||||||
|
else
|
||||||
|
mcl_log("cap_space_global", cap_space_non_hostile)
|
||||||
|
cap_space_available = math.min(cap_space_non_hostile, cap_space_wide)
|
||||||
end
|
end
|
||||||
|
|
||||||
local mob_total_close = mob_counts_close[mob_type]
|
local mob_total_close = mob_counts_close[mob_type]
|
||||||
|
@ -858,12 +916,11 @@ if mobs_spawn then
|
||||||
mob_total_close = 0
|
mob_total_close = 0
|
||||||
end
|
end
|
||||||
|
|
||||||
local cap_space_close = close_zone_cap - mob_total_close
|
local cap_space_close = math.max(close_zone_cap - mob_total_close, 0)
|
||||||
if cap_space_close < 1 then
|
cap_space_available = math.min(cap_space_available, cap_space_close)
|
||||||
cap_space_close = 0
|
|
||||||
end
|
|
||||||
|
|
||||||
--mcl_log("spawn_class: " .. spawn_class)
|
mcl_log("cap_space_close", cap_space_close)
|
||||||
|
mcl_log("cap_space_available", cap_space_available)
|
||||||
|
|
||||||
if false and mob_type == "water" then
|
if false and mob_type == "water" then
|
||||||
mcl_log("mob_type: " .. mob_type .. " and pos: " .. minetest.pos_to_string(pos))
|
mcl_log("mob_type: " .. mob_type .. " and pos: " .. minetest.pos_to_string(pos))
|
||||||
|
@ -873,7 +930,7 @@ if mobs_spawn then
|
||||||
mcl_log("cap_space_close: " .. cap_space_close)
|
mcl_log("cap_space_close: " .. cap_space_close)
|
||||||
end
|
end
|
||||||
|
|
||||||
return cap_space_wide, cap_space_close
|
return cap_space_available
|
||||||
end
|
end
|
||||||
|
|
||||||
local function find_spawning_position(pos, max_times)
|
local function find_spawning_position(pos, max_times)
|
||||||
|
@ -884,7 +941,7 @@ if mobs_spawn then
|
||||||
|
|
||||||
local y_min, y_max = decypher_limits(pos.y)
|
local y_min, y_max = decypher_limits(pos.y)
|
||||||
|
|
||||||
mcl_log("mapgen_limit: " .. SPAWN_MAPGEN_LIMIT)
|
--mcl_log("mapgen_limit: " .. SPAWN_MAPGEN_LIMIT)
|
||||||
local i = 0
|
local i = 0
|
||||||
repeat
|
repeat
|
||||||
local goal_pos = get_next_mob_spawn_pos(pos)
|
local goal_pos = get_next_mob_spawn_pos(pos)
|
||||||
|
@ -916,7 +973,7 @@ if mobs_spawn then
|
||||||
return spawning_position
|
return spawning_position
|
||||||
end
|
end
|
||||||
|
|
||||||
local function spawn_a_mob(pos)
|
local function spawn_a_mob(pos, cap_space_hostile, cap_space_non_hostile)
|
||||||
--create a disconnected clone of the spawn dictionary, prevents memory leak
|
--create a disconnected clone of the spawn dictionary, prevents memory leak
|
||||||
local mob_library_worker_table = table_copy(spawn_dictionary)
|
local mob_library_worker_table = table_copy(spawn_dictionary)
|
||||||
|
|
||||||
|
@ -954,22 +1011,18 @@ if mobs_spawn then
|
||||||
if mob_def and mob_def.name and minetest.registered_entities[mob_def.name] then
|
if mob_def and mob_def.name and minetest.registered_entities[mob_def.name] then
|
||||||
|
|
||||||
local mob_def_ent = minetest.registered_entities[mob_def.name]
|
local mob_def_ent = minetest.registered_entities[mob_def.name]
|
||||||
--local mob_type = mob_def_ent.type
|
|
||||||
local mob_spawn_class = mob_def_ent.spawn_class
|
local mob_spawn_class = mob_def_ent.spawn_class
|
||||||
|
|
||||||
--mcl_log("mob_spawn_class: " .. mob_spawn_class)
|
local cap_space_available = mob_cap_space (spawning_position, mob_spawn_class, mob_counts_close, mob_counts_wide, cap_space_hostile, cap_space_non_hostile)
|
||||||
|
|
||||||
local cap_space_wide, cap_space_close = mob_cap_space (spawning_position, mob_spawn_class, mob_counts_close, mob_counts_wide)
|
if cap_space_available > 0 then
|
||||||
|
|
||||||
|
|
||||||
if cap_space_close > 0 and cap_space_wide > 0 then
|
|
||||||
--mcl_log("Cap space available")
|
--mcl_log("Cap space available")
|
||||||
|
|
||||||
-- Spawn caps for animals and water creatures fill up rapidly. Need to throttle this somewhat
|
-- Spawn caps for animals and water creatures fill up rapidly. Need to throttle this somewhat
|
||||||
-- for performance and for early game challenge. We don't want to reduce hostiles though.
|
-- for performance and for early game challenge. We don't want to reduce hostiles though.
|
||||||
local spawn_hostile = (mob_spawn_class == "hostile")
|
local spawn_hostile = (mob_spawn_class == "hostile")
|
||||||
local spawn_passive = (mob_spawn_class ~= "hostile") and math.random(100) < peaceful_percentage_spawned
|
local spawn_passive = (mob_spawn_class ~= "hostile") and math.random(100) < peaceful_percentage_spawned
|
||||||
-- or not hostile
|
|
||||||
--mcl_log("Spawn_passive: " .. tostring(spawn_passive))
|
--mcl_log("Spawn_passive: " .. tostring(spawn_passive))
|
||||||
--mcl_log("Spawn_hostile: " .. tostring(spawn_hostile))
|
--mcl_log("Spawn_hostile: " .. tostring(spawn_hostile))
|
||||||
|
|
||||||
|
@ -1000,13 +1053,10 @@ if mobs_spawn then
|
||||||
local group_min = mob_def_ent.spawn_in_group_min or 1
|
local group_min = mob_def_ent.spawn_in_group_min or 1
|
||||||
if not group_min then group_min = 1 end
|
if not group_min then group_min = 1 end
|
||||||
|
|
||||||
local amount_to_spawn = math.random(group_min,spawn_in_group)
|
local amount_to_spawn = math.random(group_min, spawn_in_group)
|
||||||
|
mcl_log("Spawning quantity: " .. amount_to_spawn)
|
||||||
if amount_to_spawn > cap_space_wide then
|
amount_to_spawn = math.min(amount_to_spawn, cap_space_available)
|
||||||
mcl_log("Spawning quantity: " .. amount_to_spawn)
|
mcl_log("throttled spawning quantity: " .. amount_to_spawn)
|
||||||
mcl_log("Throttle amount to cap space: " .. cap_space_wide)
|
|
||||||
amount_to_spawn = cap_space_wide
|
|
||||||
end
|
|
||||||
|
|
||||||
if logging then
|
if logging then
|
||||||
minetest.log("action", "[mcl_mobs] A group of " ..amount_to_spawn .. " " .. mob_def.name .. " mob spawns on " ..minetest.get_node(vector.offset(spawning_position,0,-1,0)).name .." at " .. minetest.pos_to_string(spawning_position, 1))
|
minetest.log("action", "[mcl_mobs] A group of " ..amount_to_spawn .. " " .. mob_def.name .. " mob spawns on " ..minetest.get_node(vector.offset(spawning_position,0,-1,0)).name .." at " .. minetest.pos_to_string(spawning_position, 1))
|
||||||
|
@ -1021,7 +1071,7 @@ if mobs_spawn then
|
||||||
|
|
||||||
if spawned then
|
if spawned then
|
||||||
--mcl_log("We have spawned")
|
--mcl_log("We have spawned")
|
||||||
mob_counts_close, mob_counts_wide, total_mobs = count_mobs_all("type", pos)
|
mob_counts_close, mob_counts_wide, total_mobs = count_mobs_all("spawn_class", pos)
|
||||||
local new_spawning_position = find_spawning_position(pos, FIND_SPAWN_POS_RETRIES_SUCCESS_RESPIN)
|
local new_spawning_position = find_spawning_position(pos, FIND_SPAWN_POS_RETRIES_SUCCESS_RESPIN)
|
||||||
if new_spawning_position then
|
if new_spawning_position then
|
||||||
mcl_log("Setting new spawning position")
|
mcl_log("Setting new spawning position")
|
||||||
|
@ -1034,7 +1084,7 @@ if mobs_spawn then
|
||||||
--mcl_log("Spawn check failed")
|
--mcl_log("Spawn check failed")
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
mcl_log("Cap space full")
|
--mcl_log("Cap space full")
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
@ -1054,7 +1104,13 @@ if mobs_spawn then
|
||||||
timer = 0
|
timer = 0
|
||||||
|
|
||||||
local players = get_connected_players()
|
local players = get_connected_players()
|
||||||
local total_mobs = count_mobs_total_cap()
|
local total_mobs, total_non_hostile, total_hostile = count_mobs_total_cap()
|
||||||
|
|
||||||
|
local cap_space_hostile = math.max(mob_cap.global_hostile - total_hostile, 0)
|
||||||
|
local cap_space_non_hostile = math.max(mob_cap.global_non_hostile - total_non_hostile, 0)
|
||||||
|
mcl_log("global cap_space_hostile", cap_space_hostile)
|
||||||
|
mcl_log("global cap_space_non_hostile", cap_space_non_hostile)
|
||||||
|
|
||||||
if total_mobs > mob_cap.total or total_mobs > #players * mob_cap.player then
|
if total_mobs > mob_cap.total or total_mobs > #players * mob_cap.player then
|
||||||
minetest.log("action","[mcl_mobs] global mob cap reached. no cycle spawning.")
|
minetest.log("action","[mcl_mobs] global mob cap reached. no cycle spawning.")
|
||||||
return
|
return
|
||||||
|
@ -1065,7 +1121,7 @@ if mobs_spawn then
|
||||||
local dimension = mcl_worlds.pos_to_dimension(pos)
|
local dimension = mcl_worlds.pos_to_dimension(pos)
|
||||||
-- ignore void and unloaded area
|
-- ignore void and unloaded area
|
||||||
if dimension ~= "void" and dimension ~= "default" then
|
if dimension ~= "void" and dimension ~= "default" then
|
||||||
spawn_a_mob(pos)
|
spawn_a_mob(pos, cap_space_hostile, cap_space_non_hostile)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
# textdomain:mcl_paintings
|
||||||
|
Painting=Maleri
|
|
@ -0,0 +1,2 @@
|
||||||
|
# textdomain:mcl_paintings
|
||||||
|
Painting=Pintura
|
|
@ -1,2 +1,2 @@
|
||||||
# textdomain:mcl_paintings
|
# textdomain:mcl_paintings
|
||||||
Painting=Рисование
|
Painting=Картина
|
||||||
|
|
|
@ -2,6 +2,9 @@ local dim = {"x", "z"}
|
||||||
|
|
||||||
local modpath = minetest.get_modpath(minetest.get_current_modname())
|
local modpath = minetest.get_modpath(minetest.get_current_modname())
|
||||||
|
|
||||||
|
local anti_troll = minetest.settings:get_bool("wither_anti_troll_measures", false)
|
||||||
|
local peaceful = minetest.settings:get_bool("only_peaceful_mobs", false)
|
||||||
|
|
||||||
local function load_schem(filename)
|
local function load_schem(filename)
|
||||||
local file = io.open(modpath .. "/schems/" .. filename, "r")
|
local file = io.open(modpath .. "/schems/" .. filename, "r")
|
||||||
local data = minetest.deserialize(file:read())
|
local data = minetest.deserialize(file:read())
|
||||||
|
@ -9,6 +12,14 @@ local function load_schem(filename)
|
||||||
return data
|
return data
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local wboss_overworld = 0
|
||||||
|
local wboss_nether = 0
|
||||||
|
local wboss_end = 0
|
||||||
|
|
||||||
|
local LIM_OVERWORLD = tonumber(minetest.settings:get("wither_cap_overworld")) or 3
|
||||||
|
local LIM_NETHER = tonumber(minetest.settings:get("wither_cap_nether")) or 10
|
||||||
|
local LIM_END = tonumber(minetest.settings:get("wither_cap_end")) or 5
|
||||||
|
|
||||||
local wither_spawn_schems = {}
|
local wither_spawn_schems = {}
|
||||||
|
|
||||||
for _, d in pairs(dim) do
|
for _, d in pairs(dim) do
|
||||||
|
@ -16,8 +27,13 @@ for _, d in pairs(dim) do
|
||||||
end
|
end
|
||||||
|
|
||||||
local function check_schem(pos, schem)
|
local function check_schem(pos, schem)
|
||||||
|
local cn_name
|
||||||
for _, n in pairs(schem) do
|
for _, n in pairs(schem) do
|
||||||
if minetest.get_node(vector.add(pos, n)).name ~= n.name then
|
cn_name = minetest.get_node(vector.add(pos, n)).name
|
||||||
|
if string.find(cn_name, "mcl_heads:wither_skeleton") then
|
||||||
|
cn_name = "mcl_heads:wither_skeleton"
|
||||||
|
end
|
||||||
|
if cn_name ~= n.name then
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -30,14 +46,32 @@ local function remove_schem(pos, schem)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local function wither_spawn(pos)
|
local function check_limit(pos)
|
||||||
|
local dim = mcl_worlds.pos_to_dimension(pos)
|
||||||
|
if dim == "overworld" and wboss_overworld >= LIM_OVERWORLD then return false
|
||||||
|
elseif dim == "end" and wboss_end >= LIM_END then return false
|
||||||
|
elseif wboss_nether >= LIM_NETHER then return false
|
||||||
|
else return true end
|
||||||
|
end
|
||||||
|
|
||||||
|
local function wither_spawn(pos, player)
|
||||||
|
if peaceful then return end
|
||||||
for _, d in pairs(dim) do
|
for _, d in pairs(dim) do
|
||||||
for i = 0, 2 do
|
for i = 0, 2 do
|
||||||
local p = vector.add(pos, {x = 0, y = -2, z = 0, [d] = -i})
|
local p = vector.add(pos, {x = 0, y = -2, z = 0, [d] = -i})
|
||||||
local schem = wither_spawn_schems[d]
|
local schem = wither_spawn_schems[d]
|
||||||
if check_schem(p, schem) then
|
if check_schem(p, schem) and (not anti_troll or check_limit(pos)) then
|
||||||
remove_schem(p, schem)
|
remove_schem(p, schem)
|
||||||
minetest.add_entity(vector.add(p, {x = 0, y = 1, z = 0, [d] = 1}), "mobs_mc:wither")
|
local wither = minetest.add_entity(vector.add(p, {x = 0, y = 1, z = 0, [d] = 1}), "mobs_mc:wither")
|
||||||
|
if not wither then return end
|
||||||
|
local wither_ent = wither:get_luaentity()
|
||||||
|
wither_ent._spawner = player:get_player_name()
|
||||||
|
local dim = mcl_worlds.pos_to_dimension(pos)
|
||||||
|
if dim == "overworld" then
|
||||||
|
wboss_overworld = wboss_overworld + 1
|
||||||
|
elseif dim == "end" then
|
||||||
|
wboss_end = wboss_end + 1
|
||||||
|
else wboss_nether = wboss_nether + 1 end
|
||||||
local objects = minetest.get_objects_inside_radius(pos, 20)
|
local objects = minetest.get_objects_inside_radius(pos, 20)
|
||||||
for _, players in ipairs(objects) do
|
for _, players in ipairs(objects) do
|
||||||
if players:is_player() then
|
if players:is_player() then
|
||||||
|
@ -54,7 +88,19 @@ local old_on_place = wither_head.on_place
|
||||||
function wither_head.on_place(itemstack, placer, pointed)
|
function wither_head.on_place(itemstack, placer, pointed)
|
||||||
local n = minetest.get_node(vector.offset(pointed.above,0,-1,0))
|
local n = minetest.get_node(vector.offset(pointed.above,0,-1,0))
|
||||||
if n and n.name == "mcl_nether:soul_sand" then
|
if n and n.name == "mcl_nether:soul_sand" then
|
||||||
minetest.after(0, wither_spawn, pointed.above)
|
minetest.after(0, wither_spawn, pointed.above, placer)
|
||||||
end
|
end
|
||||||
return old_on_place(itemstack, placer, pointed)
|
return old_on_place(itemstack, placer, pointed)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if anti_troll then
|
||||||
|
-- pull wither counts per dimension
|
||||||
|
minetest.register_globalstep(function(dtime)
|
||||||
|
wboss_overworld = mobs_mc.wither_count_overworld
|
||||||
|
wboss_nether = mobs_mc.wither_count_nether
|
||||||
|
wboss_end = mobs_mc.wither_count_end
|
||||||
|
mobs_mc.wither_count_overworld = 0
|
||||||
|
mobs_mc.wither_count_nether = 0
|
||||||
|
mobs_mc.wither_count_end = 0
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
|
|
@ -191,9 +191,10 @@ Origin of those models:
|
||||||
* [Spennnyyy](https://freesound.org/people/Spennnyyy/) (CC0)
|
* [Spennnyyy](https://freesound.org/people/Spennnyyy/) (CC0)
|
||||||
* `mcl_totems_totem.ogg`
|
* `mcl_totems_totem.ogg`
|
||||||
* Source: <https://freesound.org/people/Spennnyyy/sounds/323502/>
|
* Source: <https://freesound.org/people/Spennnyyy/sounds/323502/>
|
||||||
* [Baŝto](https://opengameart.org/users/ba%C5%9Dto)
|
* [Baŝto](https://opengameart.org/users/ba%C5%9Dto) (remixer) and [kantouth](https://freesound.org/people/kantouth/) (original author)
|
||||||
* `mobs_mc_skeleton_random.*.ogg` (CC BY 3.0)
|
* `mobs_mc_skeleton_random.*.ogg` (CC BY 3.0)
|
||||||
* Source: <https://opengameart.org/content/walking-skeleton>
|
* Source: <https://opengameart.org/content/walking-skeleton>
|
||||||
|
* Based on: <https://freesound.org/people/kantouth/sounds/115113/>
|
||||||
* [spookymodem](https://freesound.org/people/spookymodem/)
|
* [spookymodem](https://freesound.org/people/spookymodem/)
|
||||||
* `mobs_mc_skeleton_death.ogg` (CC0)
|
* `mobs_mc_skeleton_death.ogg` (CC0)
|
||||||
* <https://freesound.org/people/spookymodem/sounds/202091/>
|
* <https://freesound.org/people/spookymodem/sounds/202091/>
|
||||||
|
@ -304,7 +305,10 @@ Origin of those models:
|
||||||
* `mobs_mc_rabbit_random.*.ogg` (CC0)
|
* `mobs_mc_rabbit_random.*.ogg` (CC0)
|
||||||
* Changes were made.
|
* Changes were made.
|
||||||
* Source: <https://freesound.org/people/Alshred/>
|
* Source: <https://freesound.org/people/Alshred/>
|
||||||
|
* [epCode]
|
||||||
|
* `extra_mobs_hoglin*.ogg` (LGPL 3.0)
|
||||||
|
* Source: <https://git.minetest.land/epCode/extra_mobs/src/branch/master/sounds>
|
||||||
|
|
||||||
Note: Many of these sounds have been more or less modified to fit the game.
|
Note: Many of these sounds have been more or less modified to fit the game.
|
||||||
|
|
||||||
Sounds not mentioned hre are licensed under CC0.
|
Sounds not mentioned here are licensed under CC0.
|
||||||
|
|
|
@ -2,7 +2,7 @@ local S = minetest.get_translator(minetest.get_current_modname())
|
||||||
|
|
||||||
local axolotl = {
|
local axolotl = {
|
||||||
type = "animal",
|
type = "animal",
|
||||||
spawn_class = "water",
|
spawn_class = "axolotl",
|
||||||
can_despawn = true,
|
can_despawn = true,
|
||||||
passive = false,
|
passive = false,
|
||||||
hp_min = 14,
|
hp_min = 14,
|
||||||
|
@ -13,7 +13,7 @@ local axolotl = {
|
||||||
head_swivel = "head.control",
|
head_swivel = "head.control",
|
||||||
bone_eye_height = -1,
|
bone_eye_height = -1,
|
||||||
head_eye_height = -0.5,
|
head_eye_height = -0.5,
|
||||||
horrizonatal_head_height = 0,
|
horizontal_head_height = 0,
|
||||||
curiosity = 10,
|
curiosity = 10,
|
||||||
head_yaw="z",
|
head_yaw="z",
|
||||||
|
|
||||||
|
@ -78,7 +78,6 @@ local axolotl = {
|
||||||
attack_animals = true,
|
attack_animals = true,
|
||||||
specific_attack = {
|
specific_attack = {
|
||||||
"extra_mobs_cod",
|
"extra_mobs_cod",
|
||||||
"mobs_mc:sheep",
|
|
||||||
"extra_mobs_glow_squid",
|
"extra_mobs_glow_squid",
|
||||||
"extra_mobs_salmon",
|
"extra_mobs_salmon",
|
||||||
"extra_mobs_tropical_fish",
|
"extra_mobs_tropical_fish",
|
||||||
|
|
|
@ -2,6 +2,18 @@
|
||||||
|
|
||||||
local S = minetest.get_translator("mobs_mc")
|
local S = minetest.get_translator("mobs_mc")
|
||||||
|
|
||||||
|
local function spawn_check(pos, environmental_light, artificial_light, sky_light)
|
||||||
|
local date = os.date("*t")
|
||||||
|
local maxlight
|
||||||
|
if (date.month == 10 and date.day >= 20) or (date.month == 11 and date.day <= 3) then
|
||||||
|
maxlight = 6
|
||||||
|
else
|
||||||
|
maxlight = 3
|
||||||
|
end
|
||||||
|
|
||||||
|
return artificial_light <= maxlight
|
||||||
|
end
|
||||||
|
|
||||||
mcl_mobs.register_mob("mobs_mc:bat", {
|
mcl_mobs.register_mob("mobs_mc:bat", {
|
||||||
description = S("Bat"),
|
description = S("Bat"),
|
||||||
type = "animal",
|
type = "animal",
|
||||||
|
@ -50,6 +62,7 @@ mcl_mobs.register_mob("mobs_mc:bat", {
|
||||||
jump = false,
|
jump = false,
|
||||||
fly = true,
|
fly = true,
|
||||||
makes_footstep_sound = false,
|
makes_footstep_sound = false,
|
||||||
|
spawn_check = spawn_check,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,9 @@ local mod_target = minetest.get_modpath("mcl_target")
|
||||||
--################### BLAZE
|
--################### BLAZE
|
||||||
--###################
|
--###################
|
||||||
|
|
||||||
|
local function spawn_check(pos, environmental_light, artificial_light, sky_light)
|
||||||
|
return artificial_light <= 11
|
||||||
|
end
|
||||||
|
|
||||||
mcl_mobs.register_mob("mobs_mc:blaze", {
|
mcl_mobs.register_mob("mobs_mc:blaze", {
|
||||||
description = S("Blaze"),
|
description = S("Blaze"),
|
||||||
|
@ -137,6 +140,7 @@ mcl_mobs.register_mob("mobs_mc:blaze", {
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
|
spawn_check = spawn_check,
|
||||||
})
|
})
|
||||||
|
|
||||||
mcl_mobs:spawn_specific(
|
mcl_mobs:spawn_specific(
|
||||||
|
|
|
@ -23,7 +23,7 @@ mcl_mobs.register_mob("mobs_mc:chicken", {
|
||||||
head_swivel = "head.control",
|
head_swivel = "head.control",
|
||||||
bone_eye_height = 4,
|
bone_eye_height = 4,
|
||||||
head_eye_height = 1.5,
|
head_eye_height = 1.5,
|
||||||
horrizonatal_head_height = -.3,
|
horizontal_head_height = -.3,
|
||||||
curiosity = 10,
|
curiosity = 10,
|
||||||
head_yaw="z",
|
head_yaw="z",
|
||||||
visual_size = {x=1,y=1},
|
visual_size = {x=1,y=1},
|
||||||
|
|
|
@ -31,7 +31,7 @@ local S = minetest.get_translator(minetest.get_current_modname())
|
||||||
|
|
||||||
local cod = {
|
local cod = {
|
||||||
type = "animal",
|
type = "animal",
|
||||||
spawn_class = "water",
|
spawn_class = "water_ambient",
|
||||||
can_despawn = true,
|
can_despawn = true,
|
||||||
passive = true,
|
passive = true,
|
||||||
hp_min = 3,
|
hp_min = 3,
|
||||||
|
|
|
@ -24,7 +24,7 @@ local cow_def = {
|
||||||
head_swivel = "head.control",
|
head_swivel = "head.control",
|
||||||
bone_eye_height = 10,
|
bone_eye_height = 10,
|
||||||
head_eye_height = 1.1,
|
head_eye_height = 1.1,
|
||||||
horrizonatal_head_height=-1.8,
|
horizontal_head_height=-1.8,
|
||||||
curiosity = 2,
|
curiosity = 2,
|
||||||
head_yaw="z",
|
head_yaw="z",
|
||||||
makes_footstep_sound = true,
|
makes_footstep_sound = true,
|
||||||
|
@ -105,7 +105,7 @@ mooshroom_def.on_rightclick = function(self, clicker)
|
||||||
end
|
end
|
||||||
local item = clicker:get_wielded_item()
|
local item = clicker:get_wielded_item()
|
||||||
-- Use shears to get mushrooms and turn mooshroom into cow
|
-- Use shears to get mushrooms and turn mooshroom into cow
|
||||||
if item:get_name() == "mcl_tools:shears" then
|
if minetest.get_item_group(item:get_name(), "shears") > 0 then
|
||||||
local pos = self.object:get_pos()
|
local pos = self.object:get_pos()
|
||||||
minetest.sound_play("mcl_tools_shears_cut", {pos = pos}, true)
|
minetest.sound_play("mcl_tools_shears_cut", {pos = pos}, true)
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,7 @@ mcl_mobs.register_mob("mobs_mc:creeper", {
|
||||||
mesh = "mobs_mc_creeper.b3d",
|
mesh = "mobs_mc_creeper.b3d",
|
||||||
head_swivel = "Head_Control",
|
head_swivel = "Head_Control",
|
||||||
bone_eye_height = 2.35,
|
bone_eye_height = 2.35,
|
||||||
|
head_eye_height = 1.8;
|
||||||
curiosity = 2,
|
curiosity = 2,
|
||||||
textures = {
|
textures = {
|
||||||
{"mobs_mc_creeper.png",
|
{"mobs_mc_creeper.png",
|
||||||
|
@ -49,7 +50,7 @@ mcl_mobs.register_mob("mobs_mc:creeper", {
|
||||||
explosion_strength = 3,
|
explosion_strength = 3,
|
||||||
explosion_radius = 3.5,
|
explosion_radius = 3.5,
|
||||||
explosion_damage_radius = 3.5,
|
explosion_damage_radius = 3.5,
|
||||||
explosiontimer_reset_radius = 6,
|
explosiontimer_reset_radius = 3,
|
||||||
reach = 3,
|
reach = 3,
|
||||||
explosion_timer = 1.5,
|
explosion_timer = 1.5,
|
||||||
allow_fuse_reset = true,
|
allow_fuse_reset = true,
|
||||||
|
@ -171,7 +172,7 @@ mcl_mobs.register_mob("mobs_mc:creeper_charged", {
|
||||||
explosion_strength = 6,
|
explosion_strength = 6,
|
||||||
explosion_radius = 8,
|
explosion_radius = 8,
|
||||||
explosion_damage_radius = 8,
|
explosion_damage_radius = 8,
|
||||||
explosiontimer_reset_radius = 6,
|
explosiontimer_reset_radius = 3,
|
||||||
reach = 3,
|
reach = 3,
|
||||||
explosion_timer = 1.5,
|
explosion_timer = 1.5,
|
||||||
allow_fuse_reset = true,
|
allow_fuse_reset = true,
|
||||||
|
|
|
@ -136,6 +136,7 @@ mcl_mobs.register_mob("mobs_mc:enderdragon", {
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
fire_resistant = true,
|
fire_resistant = true,
|
||||||
|
is_boss = true,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ end
|
||||||
|
|
||||||
mcl_mobs.register_mob("mobs_mc:glow_squid", {
|
mcl_mobs.register_mob("mobs_mc:glow_squid", {
|
||||||
type = "animal",
|
type = "animal",
|
||||||
spawn_class = "water",
|
spawn_class = "water_underground",
|
||||||
can_despawn = true,
|
can_despawn = true,
|
||||||
passive = true,
|
passive = true,
|
||||||
hp_min = 10,
|
hp_min = 10,
|
||||||
|
|
|
@ -31,8 +31,9 @@ local hoglin = {
|
||||||
} },
|
} },
|
||||||
visual_size = {x=3, y=3},
|
visual_size = {x=3, y=3},
|
||||||
sounds = {
|
sounds = {
|
||||||
random = "extra_mobs_hoglin",
|
random = "extra_mobs_hoglin.1",
|
||||||
damage = "extra_mobs_hoglin_hurt",
|
damage = "extra_mobs_hoglin_hurt",
|
||||||
|
death = "extra_mobs_hoglin_hurt",
|
||||||
distance = 16,
|
distance = 16,
|
||||||
},
|
},
|
||||||
jump = true,
|
jump = true,
|
||||||
|
@ -92,6 +93,12 @@ local zoglin = table.copy(hoglin)
|
||||||
zoglin.description = S("Zoglin")
|
zoglin.description = S("Zoglin")
|
||||||
zoglin.fire_resistant = 1
|
zoglin.fire_resistant = 1
|
||||||
zoglin.textures = {"extra_mobs_zoglin.png"}
|
zoglin.textures = {"extra_mobs_zoglin.png"}
|
||||||
|
sounds = {
|
||||||
|
random = "extra_mobs_hoglin.2",
|
||||||
|
damage = "extra_mobs_hoglin_hurt",
|
||||||
|
death = "extra_mobs_hoglin_hurt",
|
||||||
|
distance = 16,
|
||||||
|
}
|
||||||
zoglin.do_custom = function()
|
zoglin.do_custom = function()
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
|
@ -44,18 +44,6 @@ local function get_drops(self)
|
||||||
max = 2,
|
max = 2,
|
||||||
looting = "common",
|
looting = "common",
|
||||||
})
|
})
|
||||||
if self._saddle then
|
|
||||||
table.insert(self.drops,{name = "mcl_mobitems:saddle",
|
|
||||||
chance = 1,
|
|
||||||
min = 1,
|
|
||||||
max = 1,})
|
|
||||||
end
|
|
||||||
if self._chest then
|
|
||||||
table.insert(self.drops,{name = "mcl_chests:chest",
|
|
||||||
chance = 1,
|
|
||||||
min = 1,
|
|
||||||
max = 1,})
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Helper functions to determine equipment rules
|
-- Helper functions to determine equipment rules
|
||||||
|
@ -245,10 +233,18 @@ local horse = {
|
||||||
|
|
||||||
on_die = function(self, pos)
|
on_die = function(self, pos)
|
||||||
|
|
||||||
-- drop saddle when horse is killed while riding
|
-- drop saddle when horse is killed
|
||||||
if self._saddle then
|
if self._saddle then
|
||||||
minetest.add_item(pos, "mcl_mobitems:saddle")
|
minetest.add_item(pos, "mcl_mobitems:saddle")
|
||||||
end
|
end
|
||||||
|
-- drop chest when mule/donkey is killed
|
||||||
|
if self._chest then
|
||||||
|
minetest.add_item(pos, "mcl_chests:chest")
|
||||||
|
end
|
||||||
|
-- drop armor when horse is killed
|
||||||
|
if self._wearing_armor then
|
||||||
|
minetest.add_item(pos, self._horse_armor)
|
||||||
|
end
|
||||||
-- also detach from horse properly
|
-- also detach from horse properly
|
||||||
if self.driver then
|
if self.driver then
|
||||||
mcl_mobs.detach(self.driver, {x = 1, y = 0, z = 1})
|
mcl_mobs.detach(self.driver, {x = 1, y = 0, z = 1})
|
||||||
|
@ -401,6 +397,7 @@ local horse = {
|
||||||
-- Put on armor and take armor from player's inventory
|
-- Put on armor and take armor from player's inventory
|
||||||
local armor = minetest.get_item_group(iname, "horse_armor")
|
local armor = minetest.get_item_group(iname, "horse_armor")
|
||||||
self._horse_armor = iname
|
self._horse_armor = iname
|
||||||
|
self._wearing_armor = true
|
||||||
local w = clicker:get_wielded_item()
|
local w = clicker:get_wielded_item()
|
||||||
if not minetest.is_creative_enabled(clicker:get_player_name()) then
|
if not minetest.is_creative_enabled(clicker:get_player_name()) then
|
||||||
w:take_item()
|
w:take_item()
|
||||||
|
|
|
@ -4,12 +4,14 @@
|
||||||
--License for code WTFPL and otherwise stated in readmes
|
--License for code WTFPL and otherwise stated in readmes
|
||||||
|
|
||||||
local S = minetest.get_translator("mobs_mc")
|
local S = minetest.get_translator("mobs_mc")
|
||||||
|
local allow_nav_hacks = minetest.settings:get_bool("mcl_mob_allow_nav_hacks ",false)
|
||||||
|
|
||||||
--###################
|
--###################
|
||||||
--################### IRON GOLEM
|
--################### IRON GOLEM
|
||||||
--###################
|
--###################
|
||||||
|
|
||||||
local etime = 0
|
local walk_dist = 40
|
||||||
|
local tele_dist = 80
|
||||||
|
|
||||||
mcl_mobs.register_mob("mobs_mc:iron_golem", {
|
mcl_mobs.register_mob("mobs_mc:iron_golem", {
|
||||||
description = S("Iron Golem"),
|
description = S("Iron Golem"),
|
||||||
|
@ -85,11 +87,23 @@ mcl_mobs.register_mob("mobs_mc:iron_golem", {
|
||||||
punch_start = 40, punch_end = 50,
|
punch_start = 40, punch_end = 50,
|
||||||
},
|
},
|
||||||
jump = true,
|
jump = true,
|
||||||
on_step = function(self,dtime)
|
do_custom = function(self, dtime)
|
||||||
etime = etime + dtime
|
self.home_timer = (self.home_timer or 0) + dtime
|
||||||
if etime > 10 then
|
|
||||||
if self._home and vector.distance(self._home,self.object:get_pos()) > 50 then
|
if self.home_timer > 10 then
|
||||||
self:gopath(self._home)
|
self.home_timer = 0
|
||||||
|
if self._home and self.state ~= "attack" then
|
||||||
|
local dist = vector.distance(self._home,self.object:get_pos())
|
||||||
|
if allow_nav_hacks and dist >= tele_dist then
|
||||||
|
self.object:set_pos(self._home)
|
||||||
|
self.state = "stand"
|
||||||
|
self.order = "follow"
|
||||||
|
elseif dist >= walk_dist then
|
||||||
|
self:gopath(self._home, function(self)
|
||||||
|
self.state = "stand"
|
||||||
|
self.order = "follow"
|
||||||
|
end)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
|
|
|
@ -62,7 +62,7 @@ mcl_mobs.register_mob("mobs_mc:llama", {
|
||||||
head_swivel = "head.control",
|
head_swivel = "head.control",
|
||||||
bone_eye_height = 11,
|
bone_eye_height = 11,
|
||||||
head_eye_height = 3,
|
head_eye_height = 3,
|
||||||
horrizonatal_head_height=0,
|
horizontal_head_height=0,
|
||||||
curiosity = 60,
|
curiosity = 60,
|
||||||
head_yaw = "z",
|
head_yaw = "z",
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,70 @@
|
||||||
|
# textdomain: mobs_mc
|
||||||
|
Agent=Agent
|
||||||
|
Axolotl=Salamander
|
||||||
|
Bat=Flagermus
|
||||||
|
Blaze=Blaze
|
||||||
|
Chicken=Kylling
|
||||||
|
Cow=Ko
|
||||||
|
Mooshroom=Svamp
|
||||||
|
Creeper=Creeper
|
||||||
|
Ender Dragon=Enderdrage
|
||||||
|
Enderman=Enderman
|
||||||
|
Endermite=Endermide
|
||||||
|
Ghast=Ghast
|
||||||
|
Elder Guardian=Gammel beskytter
|
||||||
|
Guardian=Beskytter
|
||||||
|
Horse=Hest
|
||||||
|
Skeleton Horse=Skelethest
|
||||||
|
Zombie Horse=Zombiehest
|
||||||
|
Donkey=Æsel
|
||||||
|
Mule=Muldyr
|
||||||
|
Iron Golem=Jerngolem
|
||||||
|
Llama=Lama
|
||||||
|
Ocelot=Ozelot
|
||||||
|
Parrot=Papegøje
|
||||||
|
Pig=Gris
|
||||||
|
Polar Bear=Isbjørn
|
||||||
|
Rabbit=Kanin
|
||||||
|
Killer Bunny=Dræberkanin
|
||||||
|
Sheep=Får
|
||||||
|
Shulker=Shulker
|
||||||
|
Silverfish=Sølvfisk
|
||||||
|
Skeleton=Skelet
|
||||||
|
Stray=Omstrejfer
|
||||||
|
Wither Skeleton=Wither-skelet
|
||||||
|
Magma Cube=Magmakube
|
||||||
|
Slime=Slimklump
|
||||||
|
Snow Golem=Snegolem
|
||||||
|
Spider=Edderkop
|
||||||
|
Cave Spider=Huleedderkop
|
||||||
|
Squid=Blæksprutte
|
||||||
|
Vex=Vex
|
||||||
|
Evoker=Fremkalder
|
||||||
|
Illusioner=Illusionist
|
||||||
|
Villager=Landsbyboer
|
||||||
|
Vindicator=Hævner
|
||||||
|
Zombie Villager=Zombie landsbyboer
|
||||||
|
Witch=Heks
|
||||||
|
Wither=Wither
|
||||||
|
Wolf=Ulv
|
||||||
|
Husk=Udtørretskal
|
||||||
|
Zombie=Zombie
|
||||||
|
Zombie Pigman=Zombificeret piglin
|
||||||
|
Farmer=Landmand
|
||||||
|
Fisherman=Fisker
|
||||||
|
Fletcher=Pilemager
|
||||||
|
Shepherd=Fårehyrde
|
||||||
|
Librarian=Bibliotikar
|
||||||
|
Cartographer=Kartograf
|
||||||
|
Armorer=Rustningesmed
|
||||||
|
Leatherworker=Læderarbejder
|
||||||
|
Butcher=Slagter
|
||||||
|
Weapon Smith=Våbensmed
|
||||||
|
Tool Smith=Værktøjssmed
|
||||||
|
Cleric=Gejstlig
|
||||||
|
Nitwit=Tåbe
|
||||||
|
Cod=Torsk
|
||||||
|
Salmon=Laks
|
||||||
|
Dolphin=Delfin
|
||||||
|
Pillager=Plyndrer
|
||||||
|
Tropical fish=Tropisk fisk
|
|
@ -69,3 +69,6 @@ Salmon=Salmón
|
||||||
Dolphin=Delfín
|
Dolphin=Delfín
|
||||||
Pillager=Saqueador
|
Pillager=Saqueador
|
||||||
Tropical fish=Pez tropical
|
Tropical fish=Pez tropical
|
||||||
|
Hoglin=Hoglin
|
||||||
|
Strider=Lavagante
|
||||||
|
Glow Squid=Calamar luminoso
|
||||||
|
|
|
@ -21,6 +21,7 @@ Mule=Mule
|
||||||
Iron Golem=Golem de fer
|
Iron Golem=Golem de fer
|
||||||
Llama=Lama
|
Llama=Lama
|
||||||
Ocelot=Ocelot
|
Ocelot=Ocelot
|
||||||
|
Cat=Chat
|
||||||
Parrot=Perroquet
|
Parrot=Perroquet
|
||||||
Pig=Cochon
|
Pig=Cochon
|
||||||
Polar Bear=Ours blanc
|
Polar Bear=Ours blanc
|
||||||
|
@ -48,8 +49,15 @@ Witch=Sorcière
|
||||||
Wither=Wither
|
Wither=Wither
|
||||||
Wolf=Loup
|
Wolf=Loup
|
||||||
Husk=Zombie Momifié
|
Husk=Zombie Momifié
|
||||||
|
Baby Husk=Bébé Zombie Momifié
|
||||||
Zombie=Zombie
|
Zombie=Zombie
|
||||||
Zombie Piglin=Zombie Cochon
|
Baby Zombie=Bébé Zombie
|
||||||
|
Piglin=Piglin
|
||||||
|
Baby Piglin=Bébé Piglin
|
||||||
|
Zombie Piglin=Piglin Zombie
|
||||||
|
Baby Zombie Piglin=Bébé Piglin Zombie
|
||||||
|
Sword Piglin=Piglin avec une épée
|
||||||
|
Piglin Brute=Piglin Barbare
|
||||||
Farmer=Fermier
|
Farmer=Fermier
|
||||||
Fisherman=Pêcheur
|
Fisherman=Pêcheur
|
||||||
Fletcher=Archer
|
Fletcher=Archer
|
||||||
|
@ -69,5 +77,7 @@ Dolphin=Dauphin
|
||||||
Pillager=Pilleur
|
Pillager=Pilleur
|
||||||
Tropical fish=Poisson tropical
|
Tropical fish=Poisson tropical
|
||||||
Hoglin=Hoglin
|
Hoglin=Hoglin
|
||||||
|
Baby hoglin=Bébé Hoglin
|
||||||
|
Zoglin=Zoglin
|
||||||
Strider=Arpenteur
|
Strider=Arpenteur
|
||||||
Glow Squid=Poulpe Brillant
|
Glow Squid=Poulpe Brillant
|
|
@ -0,0 +1,83 @@
|
||||||
|
# textdomain: mobs_mc
|
||||||
|
Agent=Agente
|
||||||
|
Axolotl=Axolote
|
||||||
|
Bat=Morcego
|
||||||
|
Blaze=Blaze
|
||||||
|
Chicken=Galinha
|
||||||
|
Cow=Vaca
|
||||||
|
Mooshroom=Coguvaca
|
||||||
|
Creeper=Creeper
|
||||||
|
Ender Dragon=Dragão do Fim
|
||||||
|
Enderman=Enderman
|
||||||
|
Endermite=Endermite
|
||||||
|
Ghast=Ghast
|
||||||
|
Elder Guardian=Guardião Ancião
|
||||||
|
Guardian=Guardião
|
||||||
|
Horse=Cavalo
|
||||||
|
Skeleton Horse=Cavalo Esqueleto
|
||||||
|
Zombie Horse=Cavalo Zumbi
|
||||||
|
Donkey=Burro
|
||||||
|
Mule=Mula
|
||||||
|
Iron Golem=Golem de Ferro
|
||||||
|
Llama=Lhama
|
||||||
|
Ocelot=Jaguatirica
|
||||||
|
Cat=Gato
|
||||||
|
Parrot=Papagaio
|
||||||
|
Pig=Porco
|
||||||
|
Polar Bear=Urso Polar
|
||||||
|
Rabbit=Coelho
|
||||||
|
Killer Bunny=Coelho Assassino
|
||||||
|
Sheep=Ovelha
|
||||||
|
Shulker=Shulker
|
||||||
|
Silverfish=Traça
|
||||||
|
Skeleton=Esqueleto
|
||||||
|
Stray=Esqueleto Errante
|
||||||
|
Wither Skeleton=Esqueleto Wither
|
||||||
|
Magma Cube=Cubo de Magma
|
||||||
|
Slime=Slime
|
||||||
|
Snow Golem=Golem de Neve
|
||||||
|
Spider=Aranha
|
||||||
|
Cave Spider=Aranha de Caverna
|
||||||
|
Squid=Lula
|
||||||
|
Vex=Vex
|
||||||
|
Evoker=Invocador
|
||||||
|
Illusioner=Ilusionista
|
||||||
|
Villager=Aldeão
|
||||||
|
Vindicator=Vingador
|
||||||
|
Zombie Villager=Aldeão Zumbi
|
||||||
|
Witch=Bruxa
|
||||||
|
Wither=Wither
|
||||||
|
Wolf=Lobo
|
||||||
|
Husk=Zumbi-Múmia
|
||||||
|
Baby Husk=Zumbi-Múmia Bebê
|
||||||
|
Zombie=Zumbi
|
||||||
|
Baby Zombie=Zumbi Bebê
|
||||||
|
Piglin=Piglin
|
||||||
|
Baby Piglin=Piglin Bebê
|
||||||
|
Zombie Piglin=Piglin Zumbi
|
||||||
|
Baby Zombie Piglin=Piglin Zumbi Bebê
|
||||||
|
Sword Piglin=Piglin Espadachim
|
||||||
|
Piglin Brute=Piglin Barbáro
|
||||||
|
Farmer=Fazendeiro
|
||||||
|
Fisherman=Pescador
|
||||||
|
Fletcher=Flecheiro
|
||||||
|
Shepherd=Pastor
|
||||||
|
Librarian=Bibliotecário
|
||||||
|
Cartographer=Cartógrafo
|
||||||
|
Armorer=Armoreiro
|
||||||
|
Leatherworker=Coureiro
|
||||||
|
Butcher=Açougueiro
|
||||||
|
Weapon Smith=Armeiro
|
||||||
|
Tool Smith=Ferramenteiro
|
||||||
|
Cleric=Clérigo
|
||||||
|
Nitwit=Palerma
|
||||||
|
Cod=Bacalhau
|
||||||
|
Salmon=Salmão
|
||||||
|
Dolphin=Golfinho
|
||||||
|
Pillager=Saqueador
|
||||||
|
Tropical fish=Peixe Tropical
|
||||||
|
Hoglin=Hoglin
|
||||||
|
Baby hoglin=Hoglin Bebê
|
||||||
|
Zoglin=Zoglin
|
||||||
|
Strider=Lavagante
|
||||||
|
Glow Squid=Lula Brilhante
|
|
@ -1,25 +1,27 @@
|
||||||
# textdomain: mobs_mc
|
# textdomain: mobs_mc
|
||||||
Agent=Агент
|
Agent=Агент
|
||||||
|
Axolotl=Аксолотль
|
||||||
Bat=Летучая мышь
|
Bat=Летучая мышь
|
||||||
Blaze=Ифрит
|
Blaze=Ифрит
|
||||||
Chicken=Курица
|
Chicken=Курица
|
||||||
Cow=Корова
|
Cow=Корова
|
||||||
Mooshroom=Гриб
|
Mooshroom=Грибная корова
|
||||||
Creeper=Крипер
|
Creeper=Крипер
|
||||||
Ender Dragon=Дракон Предела
|
Ender Dragon=Дракон Края
|
||||||
Enderman=Эндермен
|
Enderman=Эндермен
|
||||||
Endermite=Эндермит
|
Endermite=Эндермит
|
||||||
Ghast=Гаст
|
Ghast=Гаст
|
||||||
Elder Guardian=Древний страж
|
Elder Guardian=Древний страж
|
||||||
Guardian=Страж
|
Guardian=Страж
|
||||||
Horse=Лошадь
|
Horse=Лошадь
|
||||||
Skeleton Horse=Скелет лошади
|
Skeleton Horse=Лошадь-скелет
|
||||||
Zombie Horse=Зомби-лошадь
|
Zombie Horse=Лошадь-зомби
|
||||||
Donkey=Ослик
|
Donkey=Ослик
|
||||||
Mule=Мул
|
Mule=Мул
|
||||||
Iron Golem=Железный голем
|
Iron Golem=Железный голем
|
||||||
Llama=Лама
|
Llama=Лама
|
||||||
Ocelot=Оцелот
|
Ocelot=Оцелот
|
||||||
|
Cat=Кошка
|
||||||
Parrot=Попугай
|
Parrot=Попугай
|
||||||
Pig=Свинья
|
Pig=Свинья
|
||||||
Polar Bear=Полярный медведь
|
Polar Bear=Полярный медведь
|
||||||
|
@ -32,13 +34,13 @@ Skeleton=Скелет
|
||||||
Stray=Странник
|
Stray=Странник
|
||||||
Wither Skeleton=Скелет-иссушитель
|
Wither Skeleton=Скелет-иссушитель
|
||||||
Magma Cube=Лавовый куб
|
Magma Cube=Лавовый куб
|
||||||
Slime=Слизняк
|
Slime=Слизень
|
||||||
Snow Golem=Снежный голем
|
Snow Golem=Снежный голем
|
||||||
Spider=Паук
|
Spider=Паук
|
||||||
Cave Spider=Пещерный паук
|
Cave Spider=Пещерный паук
|
||||||
Squid=Кальмар
|
Squid=Спрут
|
||||||
Vex=Досаждатель
|
Vex=Досаждатель
|
||||||
Evoker=Маг
|
Evoker=Вызыватель
|
||||||
Illusioner=Иллюзор
|
Illusioner=Иллюзор
|
||||||
Villager=Житель
|
Villager=Житель
|
||||||
Vindicator=Поборник
|
Vindicator=Поборник
|
||||||
|
@ -47,8 +49,15 @@ Witch=Ведьма
|
||||||
Wither=Иссушитель
|
Wither=Иссушитель
|
||||||
Wolf=Волк
|
Wolf=Волк
|
||||||
Husk=Кадавр
|
Husk=Кадавр
|
||||||
|
Baby Husk=Кадавр-ребёнок
|
||||||
Zombie=Зомби
|
Zombie=Зомби
|
||||||
Zombie Pigman=Зомби-свиночеловек
|
Baby Zombie=Зомби-ребёнок
|
||||||
|
Piglin=Пиглин
|
||||||
|
Baby Piglin=Пиглин-ребёнок
|
||||||
|
Zombie Piglin=Зомби-пиглин
|
||||||
|
Baby Zombie Piglin=Зомби-пиглин-ребёнок
|
||||||
|
Sword Piglin=Пиглин-мечник
|
||||||
|
Piglin Brute=Жестокий пиглин
|
||||||
Farmer=Фермер
|
Farmer=Фермер
|
||||||
Fisherman=Рыбак
|
Fisherman=Рыбак
|
||||||
Fletcher=Лучник
|
Fletcher=Лучник
|
||||||
|
@ -62,3 +71,13 @@ Weapon Smith=Оружейник
|
||||||
Tool Smith=Инструментальщик
|
Tool Smith=Инструментальщик
|
||||||
Cleric=Церковник
|
Cleric=Церковник
|
||||||
Nitwit=Нищий
|
Nitwit=Нищий
|
||||||
|
Cod=Треска
|
||||||
|
Salmon=Лосось
|
||||||
|
Dolphin=Дельфин
|
||||||
|
Pillager=Разбойник
|
||||||
|
Tropical fish=Тропическая рыба
|
||||||
|
Hoglin=Хоглин
|
||||||
|
Baby hoglin=Детёныш хоглина
|
||||||
|
Zoglin=Зоглин
|
||||||
|
Strider=Страйдер
|
||||||
|
Glow Squid=Светящийся спрут
|
||||||
|
|
|
@ -21,6 +21,7 @@ Mule=
|
||||||
Iron Golem=
|
Iron Golem=
|
||||||
Llama=
|
Llama=
|
||||||
Ocelot=
|
Ocelot=
|
||||||
|
Cat=
|
||||||
Parrot=
|
Parrot=
|
||||||
Pig=
|
Pig=
|
||||||
Polar Bear=
|
Polar Bear=
|
||||||
|
@ -48,7 +49,9 @@ Witch=
|
||||||
Wither=
|
Wither=
|
||||||
Wolf=
|
Wolf=
|
||||||
Husk=
|
Husk=
|
||||||
|
Baby Husk=
|
||||||
Zombie=
|
Zombie=
|
||||||
|
Baby Zombie=
|
||||||
Piglin=
|
Piglin=
|
||||||
Baby Piglin=
|
Baby Piglin=
|
||||||
Zombie Piglin=
|
Zombie Piglin=
|
||||||
|
@ -74,5 +77,7 @@ Dolphin=
|
||||||
Pillager=
|
Pillager=
|
||||||
Tropical fish=
|
Tropical fish=
|
||||||
Hoglin=
|
Hoglin=
|
||||||
|
Baby hoglin=
|
||||||
|
Zoglin=
|
||||||
Strider=
|
Strider=
|
||||||
Glow Squid=
|
Glow Squid=
|
|
@ -2,4 +2,4 @@ name = mobs_mc
|
||||||
author = maikerumine
|
author = maikerumine
|
||||||
description = Adds Minecraft-like monsters and animals.
|
description = Adds Minecraft-like monsters and animals.
|
||||||
depends = mcl_init, mcl_particles, mcl_mobs, mcl_wip, mcl_core, mcl_util
|
depends = mcl_init, mcl_particles, mcl_mobs, mcl_wip, mcl_core, mcl_util
|
||||||
optional_depends = default, mcl_tnt, mcl_bows, mcl_throwing, mcl_fishing, bones, mesecons_materials, doc_items
|
optional_depends = default, mcl_tnt, mcl_bows, mcl_throwing, mcl_fishing, bones, mesecons_materials, doc_items, mcl_worlds
|
||||||
|
|
Binary file not shown.
|
@ -39,7 +39,7 @@ local ocelot = {
|
||||||
head_swivel = "head.control",
|
head_swivel = "head.control",
|
||||||
bone_eye_height = 6.2,
|
bone_eye_height = 6.2,
|
||||||
head_eye_height = 0.4,
|
head_eye_height = 0.4,
|
||||||
horrizonatal_head_height=-0,
|
horizontal_head_height=-0,
|
||||||
head_yaw="z",
|
head_yaw="z",
|
||||||
curiosity = 4,
|
curiosity = 4,
|
||||||
collisionbox = {-0.3, -0.01, -0.3, 0.3, 0.69, 0.3},
|
collisionbox = {-0.3, -0.01, -0.3, 0.3, 0.69, 0.3},
|
||||||
|
|
|
@ -137,7 +137,7 @@ mcl_mobs.register_mob("mobs_mc:parrot", {
|
||||||
xp_max = 3,
|
xp_max = 3,
|
||||||
head_swivel = "head.control",
|
head_swivel = "head.control",
|
||||||
bone_eye_height = 1.1,
|
bone_eye_height = 1.1,
|
||||||
horrizonatal_head_height=0,
|
horizontal_head_height=0,
|
||||||
curiosity = 10,
|
curiosity = 10,
|
||||||
collisionbox = {-0.25, -0.01, -0.25, 0.25, 0.89, 0.25},
|
collisionbox = {-0.25, -0.01, -0.25, 0.25, 0.89, 0.25},
|
||||||
visual = "mesh",
|
visual = "mesh",
|
||||||
|
|
|
@ -22,7 +22,7 @@ mcl_mobs.register_mob("mobs_mc:pig", {
|
||||||
head_swivel = "head.control",
|
head_swivel = "head.control",
|
||||||
bone_eye_height = 7.5,
|
bone_eye_height = 7.5,
|
||||||
head_eye_height = 0.8,
|
head_eye_height = 0.8,
|
||||||
horrizonatal_head_height=-1,
|
horizontal_head_height=-1,
|
||||||
curiosity = 3,
|
curiosity = 3,
|
||||||
head_yaw="z",
|
head_yaw="z",
|
||||||
makes_footstep_sound = true,
|
makes_footstep_sound = true,
|
||||||
|
|
|
@ -61,8 +61,10 @@ local piglin = {
|
||||||
} },
|
} },
|
||||||
visual_size = {x=1, y=1},
|
visual_size = {x=1, y=1},
|
||||||
sounds = {
|
sounds = {
|
||||||
random = "extra_mobs_piglin",
|
random = "mobs_mc_zombiepig_random",
|
||||||
damage = "extra_mobs_piglin_hurt",
|
war_cry = "mobs_mc_zombiepig_war_cry", death = "mobs_mc_zombiepig_death",
|
||||||
|
damage = "mobs_mc_zombiepig_hurt.2",
|
||||||
|
death = "mobs_mc_zombiepig_death.2",
|
||||||
distance = 16,
|
distance = 16,
|
||||||
},
|
},
|
||||||
jump = true,
|
jump = true,
|
||||||
|
@ -219,6 +221,10 @@ mcl_mobs.register_mob("mobs_mc:sword_piglin", sword_piglin)
|
||||||
-- Zombified Piglin --
|
-- Zombified Piglin --
|
||||||
|
|
||||||
|
|
||||||
|
local function spawn_check(pos, environmental_light, artificial_light, sky_light)
|
||||||
|
return artificial_light <= 11
|
||||||
|
end
|
||||||
|
|
||||||
local zombified_piglin = {
|
local zombified_piglin = {
|
||||||
description = S("Zombie Piglin"),
|
description = S("Zombie Piglin"),
|
||||||
-- type="animal", passive=false: This combination is needed for a neutral mob which becomes hostile, if attacked
|
-- type="animal", passive=false: This combination is needed for a neutral mob which becomes hostile, if attacked
|
||||||
|
@ -256,6 +262,7 @@ local zombified_piglin = {
|
||||||
},
|
},
|
||||||
jump = true,
|
jump = true,
|
||||||
makes_footstep_sound = true,
|
makes_footstep_sound = true,
|
||||||
|
spawn_check = spawn_check,
|
||||||
walk_velocity = .8,
|
walk_velocity = .8,
|
||||||
run_velocity = 2.6,
|
run_velocity = 2.6,
|
||||||
pathfinding = 1,
|
pathfinding = 1,
|
||||||
|
|
|
@ -27,7 +27,7 @@ mcl_mobs.register_mob("mobs_mc:polar_bear", {
|
||||||
head_swivel = "head.control",
|
head_swivel = "head.control",
|
||||||
bone_eye_height = 2.6,
|
bone_eye_height = 2.6,
|
||||||
head_eye_height = 1,
|
head_eye_height = 1,
|
||||||
horrizonatal_head_height = 0,
|
horizontal_head_height = 0,
|
||||||
curiosity = 20,
|
curiosity = 20,
|
||||||
head_yaw="z",
|
head_yaw="z",
|
||||||
visual_size = {x=3.0, y=3.0},
|
visual_size = {x=3.0, y=3.0},
|
||||||
|
|
|
@ -18,7 +18,7 @@ local rabbit = {
|
||||||
head_swivel = "head.control",
|
head_swivel = "head.control",
|
||||||
bone_eye_height = 2,
|
bone_eye_height = 2,
|
||||||
head_eye_height = 0.5,
|
head_eye_height = 0.5,
|
||||||
horrizonatal_head_height = -.3,
|
horizontal_head_height = -.3,
|
||||||
curiosity = 20,
|
curiosity = 20,
|
||||||
head_yaw="z",
|
head_yaw="z",
|
||||||
visual = "mesh",
|
visual = "mesh",
|
||||||
|
|
|
@ -11,7 +11,7 @@ local S = minetest.get_translator(minetest.get_current_modname())
|
||||||
|
|
||||||
local salmon = {
|
local salmon = {
|
||||||
type = "animal",
|
type = "animal",
|
||||||
spawn_class = "water",
|
spawn_class = "water_ambient",
|
||||||
can_despawn = true,
|
can_despawn = true,
|
||||||
passive = true,
|
passive = true,
|
||||||
hp_min = 3,
|
hp_min = 3,
|
||||||
|
|
|
@ -6,6 +6,8 @@ local S = minetest.get_translator("mobs_mc")
|
||||||
--################### SHEEP
|
--################### SHEEP
|
||||||
--###################
|
--###################
|
||||||
|
|
||||||
|
local WOOL_REPLACE_RATE = 80
|
||||||
|
|
||||||
local colors = {
|
local colors = {
|
||||||
-- group = { wool, textures }
|
-- group = { wool, textures }
|
||||||
unicolor_white = { "mcl_wool:white", "#FFFFFF00" },
|
unicolor_white = { "mcl_wool:white", "#FFFFFF00" },
|
||||||
|
@ -65,7 +67,7 @@ mcl_mobs.register_mob("mobs_mc:sheep", {
|
||||||
head_swivel = "head.control",
|
head_swivel = "head.control",
|
||||||
bone_eye_height = 3.3,
|
bone_eye_height = 3.3,
|
||||||
head_eye_height = 1.1,
|
head_eye_height = 1.1,
|
||||||
horrizonatal_head_height=-.7,
|
horizontal_head_height=-.7,
|
||||||
curiosity = 6,
|
curiosity = 6,
|
||||||
head_yaw="z",
|
head_yaw="z",
|
||||||
visual = "mesh",
|
visual = "mesh",
|
||||||
|
@ -101,17 +103,20 @@ mcl_mobs.register_mob("mobs_mc:sheep", {
|
||||||
stand_start = 0, stand_end = 0,
|
stand_start = 0, stand_end = 0,
|
||||||
walk_start = 0, walk_end = 40, walk_speed = 30,
|
walk_start = 0, walk_end = 40, walk_speed = 30,
|
||||||
run_start = 0, run_end = 40, run_speed = 40,
|
run_start = 0, run_end = 40, run_speed = 40,
|
||||||
|
eat_start = 40, eat_end = 80, eat_loop = false,
|
||||||
},
|
},
|
||||||
child_animations = {
|
child_animations = {
|
||||||
stand_start = 81, stand_end = 81,
|
stand_start = 81, stand_end = 81,
|
||||||
walk_start = 81, walk_end = 121, walk_speed = 45,
|
walk_start = 81, walk_end = 121, walk_speed = 45,
|
||||||
run_start = 81, run_end = 121, run_speed = 60,
|
run_start = 81, run_end = 121, run_speed = 60,
|
||||||
|
eat_start = 121, eat_start = 161, eat_loop = false,
|
||||||
},
|
},
|
||||||
follow = { "mcl_farming:wheat_item" },
|
follow = { "mcl_farming:wheat_item", "mcl_shepherd:shepherd_staff" },
|
||||||
view_range = 12,
|
view_range = 12,
|
||||||
|
|
||||||
-- Eat grass
|
-- Eat grass
|
||||||
replace_rate = 20,
|
replace_rate = WOOL_REPLACE_RATE,
|
||||||
|
replace_delay = 1.3,
|
||||||
replace_what = {
|
replace_what = {
|
||||||
{ "mcl_core:dirt_with_grass", "mcl_core:dirt", -1 },
|
{ "mcl_core:dirt_with_grass", "mcl_core:dirt", -1 },
|
||||||
{ "mcl_flowers:tallgrass", "air", 0 },
|
{ "mcl_flowers:tallgrass", "air", 0 },
|
||||||
|
@ -121,19 +126,39 @@ mcl_mobs.register_mob("mobs_mc:sheep", {
|
||||||
if not self.color or not colors[self.color] then
|
if not self.color or not colors[self.color] then
|
||||||
self.color = "unicolor_white"
|
self.color = "unicolor_white"
|
||||||
end
|
end
|
||||||
self.gotten = false
|
|
||||||
self.base_texture = sheep_texture(self.color)
|
self.base_texture = sheep_texture(self.color)
|
||||||
self.object:set_properties({ textures = self.base_texture })
|
|
||||||
self.drops = {
|
self.drops = {
|
||||||
{name = "mcl_mobitems:mutton",
|
{name = "mcl_mobitems:mutton",
|
||||||
chance = 1,
|
chance = 1,
|
||||||
min = 1,
|
min = 1,
|
||||||
max = 2,},
|
max = 2,},
|
||||||
{name = colors[self.color][1],
|
{name = colors[self.color][1],
|
||||||
chance = 1,
|
chance = 1,
|
||||||
min = 1,
|
min = 1,
|
||||||
max = 1,},
|
max = 1,},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
self.state = "eat"
|
||||||
|
self:set_animation("eat")
|
||||||
|
self:set_velocity(0)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
minetest.after(self.replace_delay, function()
|
||||||
|
if self and self.object and self.object:get_velocity() and self.health > 0 then
|
||||||
|
self.object:set_velocity(vector.zero())
|
||||||
|
self.gotten = false
|
||||||
|
self.object:set_properties({ textures = self.base_texture })
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
|
||||||
|
minetest.after(2.5, function()
|
||||||
|
if self and self.object and self.state == 'eat' and self.health > 0 then
|
||||||
|
self.state = "walk"
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
|
||||||
end,
|
end,
|
||||||
|
|
||||||
-- Set random color on spawn
|
-- Set random color on spawn
|
||||||
|
@ -209,7 +234,7 @@ mcl_mobs.register_mob("mobs_mc:sheep", {
|
||||||
if self:feed_tame(clicker, 1, true, false) then return end
|
if self:feed_tame(clicker, 1, true, false) then return end
|
||||||
if mcl_mobs:protect(self, clicker) then return end
|
if mcl_mobs:protect(self, clicker) then return end
|
||||||
|
|
||||||
if item:get_name() == "mcl_tools:shears" and not self.gotten and not self.child then
|
if minetest.get_item_group(item:get_name(), "shears") > 0 and not self.gotten and not self.child then
|
||||||
self.gotten = true
|
self.gotten = true
|
||||||
local pos = self.object:get_pos()
|
local pos = self.object:get_pos()
|
||||||
minetest.sound_play("mcl_tools_shears_cut", {pos = pos}, true)
|
minetest.sound_play("mcl_tools_shears_cut", {pos = pos}, true)
|
||||||
|
@ -226,12 +251,6 @@ mcl_mobs.register_mob("mobs_mc:sheep", {
|
||||||
item:add_wear(mobs_mc.shears_wear)
|
item:add_wear(mobs_mc.shears_wear)
|
||||||
clicker:get_inventory():set_stack("main", clicker:get_wield_index(), item)
|
clicker:get_inventory():set_stack("main", clicker:get_wield_index(), item)
|
||||||
end
|
end
|
||||||
self.drops = {
|
|
||||||
{name = "mcl_mobitems:mutton",
|
|
||||||
chance = 1,
|
|
||||||
min = 1,
|
|
||||||
max = 2,},
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
-- Dye sheep
|
-- Dye sheep
|
||||||
|
|
|
@ -35,7 +35,7 @@ mcl_mobs.register_mob("mobs_mc:shulker", {
|
||||||
type = "monster",
|
type = "monster",
|
||||||
spawn_class = "hostile",
|
spawn_class = "hostile",
|
||||||
attack_type = "shoot",
|
attack_type = "shoot",
|
||||||
shoot_interval = 0.5,
|
shoot_interval = 6,
|
||||||
arrow = "mobs_mc:shulkerbullet",
|
arrow = "mobs_mc:shulkerbullet",
|
||||||
shoot_offset = 0.5,
|
shoot_offset = 0.5,
|
||||||
passive = false,
|
passive = false,
|
||||||
|
@ -43,7 +43,7 @@ mcl_mobs.register_mob("mobs_mc:shulker", {
|
||||||
hp_max = 30,
|
hp_max = 30,
|
||||||
xp_min = 5,
|
xp_min = 5,
|
||||||
xp_max = 5,
|
xp_max = 5,
|
||||||
armor = 150,
|
armor = 20,
|
||||||
collisionbox = {-0.5, -0.01, -0.5, 0.5, 0.99, 0.5},
|
collisionbox = {-0.5, -0.01, -0.5, 0.5, 0.99, 0.5},
|
||||||
visual = "mesh",
|
visual = "mesh",
|
||||||
mesh = "mobs_mc_shulker.b3d",
|
mesh = "mobs_mc_shulker.b3d",
|
||||||
|
@ -51,7 +51,7 @@ mcl_mobs.register_mob("mobs_mc:shulker", {
|
||||||
-- TODO: sounds
|
-- TODO: sounds
|
||||||
-- TODO: Make shulker dye-able
|
-- TODO: Make shulker dye-able
|
||||||
visual_size = {x=3, y=3},
|
visual_size = {x=3, y=3},
|
||||||
walk_chance = 0,
|
walk_chance = 10,
|
||||||
knock_back = false,
|
knock_back = false,
|
||||||
jump = false,
|
jump = false,
|
||||||
can_despawn = false,
|
can_despawn = false,
|
||||||
|
@ -65,15 +65,19 @@ mcl_mobs.register_mob("mobs_mc:shulker", {
|
||||||
looting_factor = 0.0625},
|
looting_factor = 0.0625},
|
||||||
},
|
},
|
||||||
animation = {
|
animation = {
|
||||||
stand_speed = 25, walk_speed = 0, run_speed = 50, punch_speed = 25,
|
stand_speed = 25, walk_speed = 25, run_speed = 50, punch_speed = 25,
|
||||||
speed_normal = 25, speed_run = 50,
|
speed_normal = 25, speed_run = 50,
|
||||||
stand_start = 0, stand_end = 25,
|
stand_start = 0, stand_end = 25,
|
||||||
walk_start = 25, walk_end = 45,
|
walk_start = 45, walk_end = 65,
|
||||||
run_start = 45, run_end = 85,
|
walk_loop = false,
|
||||||
|
run_start = 65, run_end = 85,
|
||||||
|
run_loop = false,
|
||||||
punch_start = 80, punch_end = 100,
|
punch_start = 80, punch_end = 100,
|
||||||
},
|
},
|
||||||
view_range = 16,
|
view_range = 16,
|
||||||
fear_height = 0,
|
fear_height = 0,
|
||||||
|
walk_velocity = 0,
|
||||||
|
run_velocity = 0,
|
||||||
noyaw = true,
|
noyaw = true,
|
||||||
do_custom = function(self,dtime)
|
do_custom = function(self,dtime)
|
||||||
local pos = self.object:get_pos()
|
local pos = self.object:get_pos()
|
||||||
|
@ -81,12 +85,13 @@ mcl_mobs.register_mob("mobs_mc:shulker", {
|
||||||
self.object:set_yaw(0)
|
self.object:set_yaw(0)
|
||||||
mcl_mobs:yaw(self, 0, 0, dtime)
|
mcl_mobs:yaw(self, 0, 0, dtime)
|
||||||
end
|
end
|
||||||
if self.state == "walk" or self.state == "stand" then
|
|
||||||
self.state = "stand"
|
|
||||||
self:set_animation("stand")
|
|
||||||
end
|
|
||||||
if self.state == "attack" then
|
if self.state == "attack" then
|
||||||
self:set_animation("punch")
|
self:set_animation("run")
|
||||||
|
self.armor = 0
|
||||||
|
elseif self.state == "stand" then
|
||||||
|
self.armor = 20
|
||||||
|
elseif self.state == "walk" or self.state == "run" then
|
||||||
|
self.armor = 0
|
||||||
end
|
end
|
||||||
self.path.way = false
|
self.path.way = false
|
||||||
self.look_at_players = false
|
self.look_at_players = false
|
||||||
|
@ -149,6 +154,9 @@ mcl_mobs.register_mob("mobs_mc:shulker", {
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
|
on_attack = function(self, dtime)
|
||||||
|
self.shoot_interval = math.random(1, 6)
|
||||||
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
-- bullet arrow (weapon)
|
-- bullet arrow (weapon)
|
||||||
|
@ -156,27 +164,12 @@ mcl_mobs.register_arrow("mobs_mc:shulkerbullet", {
|
||||||
visual = "sprite",
|
visual = "sprite",
|
||||||
visual_size = {x = 0.25, y = 0.25},
|
visual_size = {x = 0.25, y = 0.25},
|
||||||
textures = {"mobs_mc_shulkerbullet.png"},
|
textures = {"mobs_mc_shulkerbullet.png"},
|
||||||
velocity = 6,
|
velocity = 5,
|
||||||
|
homing = true,
|
||||||
hit_player = function(self, player)
|
hit_player = mcl_mobs.get_arrow_damage_func(4),
|
||||||
player:punch(self.object, 1.0, {
|
hit_mob = mcl_mobs.get_arrow_damage_func(4),
|
||||||
full_punch_interval = 1.0,
|
|
||||||
damage_groups = {fleshy = 4},
|
|
||||||
}, nil)
|
|
||||||
end,
|
|
||||||
|
|
||||||
hit_mob = function(self, mob)
|
|
||||||
mob:punch(self.object, 1.0, {
|
|
||||||
full_punch_interval = 1.0,
|
|
||||||
damage_groups = {fleshy = 4},
|
|
||||||
}, nil)
|
|
||||||
end,
|
|
||||||
|
|
||||||
hit_node = function(self, pos, node)
|
|
||||||
end
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
mcl_mobs.register_egg("mobs_mc:shulker", S("Shulker"), "#946694", "#4d3852", 0)
|
mcl_mobs.register_egg("mobs_mc:shulker", S("Shulker"), "#946694", "#4d3852", 0)
|
||||||
mcl_mobs:non_spawn_specific("mobs_mc:shulker","overworld",0,minetest.LIGHT_MAX+1)
|
mcl_mobs:non_spawn_specific("mobs_mc:shulker","overworld",0,minetest.LIGHT_MAX+1)
|
||||||
--[[
|
--[[
|
||||||
|
|
|
@ -4,6 +4,10 @@
|
||||||
|
|
||||||
local S = minetest.get_translator("mobs_mc")
|
local S = minetest.get_translator("mobs_mc")
|
||||||
|
|
||||||
|
local function spawn_check(pos, environmental_light, artificial_light, sky_light)
|
||||||
|
return artificial_light <= 11
|
||||||
|
end
|
||||||
|
|
||||||
mcl_mobs.register_mob("mobs_mc:silverfish", {
|
mcl_mobs.register_mob("mobs_mc:silverfish", {
|
||||||
description = S("Silverfish"),
|
description = S("Silverfish"),
|
||||||
type = "monster",
|
type = "monster",
|
||||||
|
@ -53,6 +57,7 @@ mcl_mobs.register_mob("mobs_mc:silverfish", {
|
||||||
view_range = 16,
|
view_range = 16,
|
||||||
attack_type = "dogfight",
|
attack_type = "dogfight",
|
||||||
damage = 1,
|
damage = 1,
|
||||||
|
spawn_check = spawn_check,
|
||||||
})
|
})
|
||||||
|
|
||||||
mcl_mobs.register_egg("mobs_mc:silverfish", S("Silverfish"), "#6d6d6d", "#313131", 0)
|
mcl_mobs.register_egg("mobs_mc:silverfish", S("Silverfish"), "#6d6d6d", "#313131", 0)
|
||||||
|
|
|
@ -105,8 +105,7 @@ local skeleton = {
|
||||||
if self.attack then
|
if self.attack then
|
||||||
self.object:set_yaw(minetest.dir_to_yaw(vector.direction(self.object:get_pos(), self.attack:get_pos())))
|
self.object:set_yaw(minetest.dir_to_yaw(vector.direction(self.object:get_pos(), self.attack:get_pos())))
|
||||||
end
|
end
|
||||||
-- 2-4 damage per arrow
|
local dmg = math.random(2, 4)
|
||||||
local dmg = math.max(4, math.random(2, 8))
|
|
||||||
mcl_bows.shoot_arrow("mcl_bows:arrow", pos, dir, self.object:get_yaw(), self.object, nil, dmg)
|
mcl_bows.shoot_arrow("mcl_bows:arrow", pos, dir, self.object:get_yaw(), self.object, nil, dmg)
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
|
|
|
@ -96,6 +96,11 @@ mcl_mobs.register_mob("mobs_mc:witherskeleton", {
|
||||||
fear_height = 4,
|
fear_height = 4,
|
||||||
harmed_by_heal = true,
|
harmed_by_heal = true,
|
||||||
fire_resistant = true,
|
fire_resistant = true,
|
||||||
|
dealt_effect = {
|
||||||
|
name = "withering",
|
||||||
|
factor = 1,
|
||||||
|
dur = 10,
|
||||||
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
--spawn
|
--spawn
|
||||||
|
|
|
@ -161,6 +161,18 @@ local spawn_children_on_die = function(child_mob, spawn_distance, eject_speed)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local swamp_light_max = 7
|
||||||
|
|
||||||
|
local function slime_spawn_check(pos, environmental_light, artificial_light, sky_light)
|
||||||
|
local maxlight = swamp_light_max
|
||||||
|
|
||||||
|
if is_slime_chunk(pos) then
|
||||||
|
maxlight = minetest.LIGHT_MAX + 1
|
||||||
|
end
|
||||||
|
|
||||||
|
return artificial_light <= maxlight
|
||||||
|
end
|
||||||
|
|
||||||
-- Slime
|
-- Slime
|
||||||
local slime_big = {
|
local slime_big = {
|
||||||
description = S("Slime"),
|
description = S("Slime"),
|
||||||
|
@ -171,7 +183,7 @@ local slime_big = {
|
||||||
hp_max = 16,
|
hp_max = 16,
|
||||||
xp_min = 4,
|
xp_min = 4,
|
||||||
xp_max = 4,
|
xp_max = 4,
|
||||||
collisionbox = {-1.02, -0.01, -1.02, 1.02, 2.03, 1.02},
|
collisionbox = {-1.02, -0.01, -1.02, 1.02, 2.03, 1.02, rotate = true},
|
||||||
visual_size = {x=12.5, y=12.5},
|
visual_size = {x=12.5, y=12.5},
|
||||||
textures = {{"mobs_mc_slime.png", "mobs_mc_slime.png"}},
|
textures = {{"mobs_mc_slime.png", "mobs_mc_slime.png"}},
|
||||||
visual = "mesh",
|
visual = "mesh",
|
||||||
|
@ -185,7 +197,7 @@ local slime_big = {
|
||||||
distance = 16,
|
distance = 16,
|
||||||
},
|
},
|
||||||
damage = 4,
|
damage = 4,
|
||||||
reach = 3,
|
reach = 2.5,
|
||||||
armor = 100,
|
armor = 100,
|
||||||
drops = {},
|
drops = {},
|
||||||
-- TODO: Fix animations
|
-- TODO: Fix animations
|
||||||
|
@ -213,6 +225,7 @@ local slime_big = {
|
||||||
spawn_small_alternative = "mobs_mc:slime_small",
|
spawn_small_alternative = "mobs_mc:slime_small",
|
||||||
on_die = spawn_children_on_die("mobs_mc:slime_small", 1.0, 1.5),
|
on_die = spawn_children_on_die("mobs_mc:slime_small", 1.0, 1.5),
|
||||||
use_texture_alpha = true,
|
use_texture_alpha = true,
|
||||||
|
spawn_check = slime_spawn_check,
|
||||||
}
|
}
|
||||||
mcl_mobs.register_mob("mobs_mc:slime_big", slime_big)
|
mcl_mobs.register_mob("mobs_mc:slime_big", slime_big)
|
||||||
|
|
||||||
|
@ -222,10 +235,10 @@ slime_small.hp_min = 4
|
||||||
slime_small.hp_max = 4
|
slime_small.hp_max = 4
|
||||||
slime_small.xp_min = 2
|
slime_small.xp_min = 2
|
||||||
slime_small.xp_max = 2
|
slime_small.xp_max = 2
|
||||||
slime_small.collisionbox = {-0.51, -0.01, -0.51, 0.51, 1.00, 0.51}
|
slime_small.collisionbox = {-0.51, -0.01, -0.51, 0.51, 1.00, 0.51, rotate = true}
|
||||||
slime_small.visual_size = {x=6.25, y=6.25}
|
slime_small.visual_size = {x=6.25, y=6.25}
|
||||||
slime_small.damage = 3
|
slime_small.damage = 3
|
||||||
slime_small.reach = 2.75
|
slime_small.reach = 2.25
|
||||||
slime_small.walk_velocity = 1.8
|
slime_small.walk_velocity = 1.8
|
||||||
slime_small.run_velocity = 1.8
|
slime_small.run_velocity = 1.8
|
||||||
slime_small.jump_height = 4.3
|
slime_small.jump_height = 4.3
|
||||||
|
@ -239,10 +252,10 @@ slime_tiny.hp_min = 1
|
||||||
slime_tiny.hp_max = 1
|
slime_tiny.hp_max = 1
|
||||||
slime_tiny.xp_min = 1
|
slime_tiny.xp_min = 1
|
||||||
slime_tiny.xp_max = 1
|
slime_tiny.xp_max = 1
|
||||||
slime_tiny.collisionbox = {-0.2505, -0.01, -0.2505, 0.2505, 0.50, 0.2505}
|
slime_tiny.collisionbox = {-0.2505, -0.01, -0.2505, 0.2505, 0.50, 0.2505, rotate = true}
|
||||||
slime_tiny.visual_size = {x=3.125, y=3.125}
|
slime_tiny.visual_size = {x=3.125, y=3.125}
|
||||||
slime_tiny.damage = 0
|
slime_tiny.damage = 1
|
||||||
slime_tiny.reach = 2.5
|
slime_tiny.reach = 2
|
||||||
slime_tiny.drops = {
|
slime_tiny.drops = {
|
||||||
-- slimeball
|
-- slimeball
|
||||||
{name = "mcl_mobitems:slimeball",
|
{name = "mcl_mobitems:slimeball",
|
||||||
|
@ -297,7 +310,6 @@ local cave_min = mcl_vars.mg_overworld_min
|
||||||
local cave_max = water_level - 23
|
local cave_max = water_level - 23
|
||||||
|
|
||||||
local swampy_biomes = {"Swampland", "MangroveSwamp"}
|
local swampy_biomes = {"Swampland", "MangroveSwamp"}
|
||||||
local swamp_light_max = 7
|
|
||||||
local swamp_min = water_level
|
local swamp_min = water_level
|
||||||
local swamp_max = water_level + 27
|
local swamp_max = water_level + 27
|
||||||
|
|
||||||
|
@ -391,7 +403,7 @@ local magma_cube_big = {
|
||||||
hp_max = 16,
|
hp_max = 16,
|
||||||
xp_min = 4,
|
xp_min = 4,
|
||||||
xp_max = 4,
|
xp_max = 4,
|
||||||
collisionbox = {-1.02, -0.01, -1.02, 1.02, 2.03, 1.02},
|
collisionbox = {-1.02, -0.01, -1.02, 1.02, 2.03, 1.02, rotate = true},
|
||||||
visual_size = {x=12.5, y=12.5},
|
visual_size = {x=12.5, y=12.5},
|
||||||
textures = {{ "mobs_mc_magmacube.png", "mobs_mc_magmacube.png" }},
|
textures = {{ "mobs_mc_magmacube.png", "mobs_mc_magmacube.png" }},
|
||||||
visual = "mesh",
|
visual = "mesh",
|
||||||
|
@ -406,7 +418,7 @@ local magma_cube_big = {
|
||||||
walk_velocity = 2.5,
|
walk_velocity = 2.5,
|
||||||
run_velocity = 2.5,
|
run_velocity = 2.5,
|
||||||
damage = 6,
|
damage = 6,
|
||||||
reach = 3,
|
reach = 2.35,
|
||||||
armor = 53,
|
armor = 53,
|
||||||
drops = {
|
drops = {
|
||||||
{name = "mcl_mobitems:magma_cream",
|
{name = "mcl_mobitems:magma_cream",
|
||||||
|
@ -451,10 +463,10 @@ magma_cube_small.hp_min = 4
|
||||||
magma_cube_small.hp_max = 4
|
magma_cube_small.hp_max = 4
|
||||||
magma_cube_small.xp_min = 2
|
magma_cube_small.xp_min = 2
|
||||||
magma_cube_small.xp_max = 2
|
magma_cube_small.xp_max = 2
|
||||||
magma_cube_small.collisionbox = {-0.51, -0.01, -0.51, 0.51, 1.00, 0.51}
|
magma_cube_small.collisionbox = {-0.51, -0.01, -0.51, 0.51, 1.00, 0.51, rotate = true}
|
||||||
magma_cube_small.visual_size = {x=6.25, y=6.25}
|
magma_cube_small.visual_size = {x=6.25, y=6.25}
|
||||||
magma_cube_small.damage = 3
|
magma_cube_small.damage = 3
|
||||||
magma_cube_small.reach = 2.75
|
magma_cube_small.reach = 2.1
|
||||||
magma_cube_small.walk_velocity = .8
|
magma_cube_small.walk_velocity = .8
|
||||||
magma_cube_small.run_velocity = 2.0
|
magma_cube_small.run_velocity = 2.0
|
||||||
magma_cube_small.jump_height = 6
|
magma_cube_small.jump_height = 6
|
||||||
|
@ -473,13 +485,13 @@ magma_cube_tiny.hp_min = 1
|
||||||
magma_cube_tiny.hp_max = 1
|
magma_cube_tiny.hp_max = 1
|
||||||
magma_cube_tiny.xp_min = 1
|
magma_cube_tiny.xp_min = 1
|
||||||
magma_cube_tiny.xp_max = 1
|
magma_cube_tiny.xp_max = 1
|
||||||
magma_cube_tiny.collisionbox = {-0.2505, -0.01, -0.2505, 0.2505, 0.50, 0.2505}
|
magma_cube_tiny.collisionbox = {-0.2505, -0.01, -0.2505, 0.2505, 0.50, 0.2505, rotate = true}
|
||||||
magma_cube_tiny.visual_size = {x=3.125, y=3.125}
|
magma_cube_tiny.visual_size = {x=3.125, y=3.125}
|
||||||
magma_cube_tiny.walk_velocity = 1.02
|
magma_cube_tiny.walk_velocity = 1.02
|
||||||
magma_cube_tiny.run_velocity = 1.02
|
magma_cube_tiny.run_velocity = 1.02
|
||||||
magma_cube_tiny.jump_height = 4
|
magma_cube_tiny.jump_height = 4
|
||||||
magma_cube_tiny.damage = 3
|
magma_cube_tiny.damage = 3
|
||||||
magma_cube_tiny.reach = 2.5
|
magma_cube_tiny.reach = 2
|
||||||
magma_cube_tiny.armor = 50
|
magma_cube_tiny.armor = 50
|
||||||
magma_cube_tiny.drops = {}
|
magma_cube_tiny.drops = {}
|
||||||
magma_cube_tiny.spawn_small_alternative = nil
|
magma_cube_tiny.spawn_small_alternative = nil
|
||||||
|
|
|
@ -114,7 +114,7 @@ mcl_mobs.register_mob("mobs_mc:snowman", {
|
||||||
-- Remove pumpkin if using shears
|
-- Remove pumpkin if using shears
|
||||||
on_rightclick = function(self, clicker)
|
on_rightclick = function(self, clicker)
|
||||||
local item = clicker:get_wielded_item()
|
local item = clicker:get_wielded_item()
|
||||||
if self.gotten ~= true and item:get_name() == "mcl_tools:shears" then
|
if self.gotten ~= true and minetest.get_item_group(item:get_name(), "shears") > 0 then
|
||||||
-- Remove pumpkin
|
-- Remove pumpkin
|
||||||
self.gotten = true
|
self.gotten = true
|
||||||
self.object:set_properties({
|
self.object:set_properties({
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -114,9 +114,7 @@ mcl_mobs.register_mob("mobs_mc:spider", spider)
|
||||||
local cave_spider = table.copy(spider)
|
local cave_spider = table.copy(spider)
|
||||||
cave_spider.description = S("Cave Spider")
|
cave_spider.description = S("Cave Spider")
|
||||||
cave_spider.textures = { {"mobs_mc_cave_spider.png^(mobs_mc_spider_eyes.png^[makealpha:0,0,0)"} }
|
cave_spider.textures = { {"mobs_mc_cave_spider.png^(mobs_mc_spider_eyes.png^[makealpha:0,0,0)"} }
|
||||||
-- TODO: Poison damage
|
cave_spider.damage = 2
|
||||||
-- TODO: Revert damage to 2
|
|
||||||
cave_spider.damage = 3 -- damage increased to undo non-existing poison
|
|
||||||
cave_spider.hp_min = 1
|
cave_spider.hp_min = 1
|
||||||
cave_spider.hp_max = 12
|
cave_spider.hp_max = 12
|
||||||
cave_spider.collisionbox = {-0.35, -0.01, -0.35, 0.35, 0.46, 0.35}
|
cave_spider.collisionbox = {-0.35, -0.01, -0.35, 0.35, 0.46, 0.35}
|
||||||
|
@ -138,6 +136,11 @@ cave_spider.walk_velocity = 1.3
|
||||||
cave_spider.run_velocity = 3.2
|
cave_spider.run_velocity = 3.2
|
||||||
cave_spider.sounds = table.copy(spider.sounds)
|
cave_spider.sounds = table.copy(spider.sounds)
|
||||||
cave_spider.sounds.base_pitch = 1.25
|
cave_spider.sounds.base_pitch = 1.25
|
||||||
|
cave_spider.dealt_effect = {
|
||||||
|
name = "poison",
|
||||||
|
factor = 2.5,
|
||||||
|
dur = 7,
|
||||||
|
}
|
||||||
mcl_mobs.register_mob("mobs_mc:cave_spider", cave_spider)
|
mcl_mobs.register_mob("mobs_mc:cave_spider", cave_spider)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -59,7 +59,7 @@ end
|
||||||
|
|
||||||
local tropical_fish = {
|
local tropical_fish = {
|
||||||
type = "animal",
|
type = "animal",
|
||||||
spawn_class = "water",
|
spawn_class = "water_ambient",
|
||||||
can_despawn = true,
|
can_despawn = true,
|
||||||
passive = true,
|
passive = true,
|
||||||
hp_min = 3,
|
hp_min = 3,
|
||||||
|
|
|
@ -37,6 +37,7 @@ mcl_mobs.register_mob("mobs_mc:vex", {
|
||||||
walk_velocity = 3.2,
|
walk_velocity = 3.2,
|
||||||
run_velocity = 5.9,
|
run_velocity = 5.9,
|
||||||
attack_type = "dogfight",
|
attack_type = "dogfight",
|
||||||
|
attack_frequency = 2,
|
||||||
sounds = {
|
sounds = {
|
||||||
-- TODO: random
|
-- TODO: random
|
||||||
death = "mobs_mc_vex_death",
|
death = "mobs_mc_vex_death",
|
||||||
|
@ -63,10 +64,13 @@ mcl_mobs.register_mob("mobs_mc:vex", {
|
||||||
self.object:set_properties({textures=self.base_texture})
|
self.object:set_properties({textures=self.base_texture})
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
if self.base_texture[2] == "mobs_mc_vex_charging.png" then
|
||||||
|
self.base_texture[2] = "mobs_mc_vex.png"
|
||||||
|
end
|
||||||
if self.base_texture[1] ~= "default_tool_steelsword.png" then
|
if self.base_texture[1] ~= "default_tool_steelsword.png" then
|
||||||
self.base_texture[1] = "default_tool_steelsword.png"
|
self.base_texture[1] = "default_tool_steelsword.png"
|
||||||
self.object:set_properties({textures=self.base_texture})
|
|
||||||
end
|
end
|
||||||
|
self.object:set_properties({textures=self.base_texture})
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Take constant damage if the vex' life clock ran out
|
-- Take constant damage if the vex' life clock ran out
|
||||||
|
|
|
@ -101,28 +101,32 @@ local professions = {
|
||||||
jobsite = "mcl_composters:composter",
|
jobsite = "mcl_composters:composter",
|
||||||
trades = {
|
trades = {
|
||||||
{
|
{
|
||||||
{ { "mcl_farming:wheat_item", 18, 22, }, E1 },
|
{ { "mcl_farming:wheat_item", 20, 20, }, E1 },
|
||||||
{ { "mcl_farming:potato_item", 15, 19, }, E1 },
|
{ { "mcl_farming:potato_item", 26, 26, }, E1 },
|
||||||
{ { "mcl_farming:carrot_item", 15, 19, }, E1 },
|
{ { "mcl_farming:carrot_item", 22, 22, }, E1 },
|
||||||
{ E1, { "mcl_farming:bread", 2, 4 } },
|
{ { "mcl_farming:beetroot_item", 15, 15 }, E1 },
|
||||||
|
{ E1, { "mcl_farming:bread", 6, 6 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_farming:pumpkin", 6, 7 }, E1 },
|
{ { "mcl_farming:pumpkin", 6, 6 }, E1 },
|
||||||
{ E1, { "mcl_farming:pumpkin_pie", 2, 3} },
|
{ E1, { "mcl_farming:pumpkin_pie", 4, 4 } },
|
||||||
{ E1, { "mcl_core:apple", 2, 3} },
|
{ E1, { "mcl_core:apple", 4, 4 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_farming:melon", 7, 12 }, E1 },
|
{ { "mcl_farming:melon", 4, 4 }, E1 },
|
||||||
{ E1, {"mcl_farming:cookie", 5, 7 }, },
|
{ { "mcl_core:emerald", 3, 3 }, {"mcl_farming:cookie", 18, 18 }, },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
|
{ E1, { "mcl_cake:cake", 1, 1 } },
|
||||||
{ E1, { "mcl_mushrooms:mushroom_stew", 6, 10 } }, --FIXME: expert level farmer is supposed to sell sus stews.
|
{ E1, { "mcl_mushrooms:mushroom_stew", 6, 10 } }, --FIXME: expert level farmer is supposed to sell sus stews.
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ E1, { "mcl_farming:carrot_item_gold", 3, 10 } },
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_farming:carrot_item_gold", 3, 3 } },
|
||||||
{ E1, { "mcl_potions:speckled_melon", 1, 4 } },
|
{ { "mcl_core:emerald", 4, 4 }, { "mcl_potions:speckled_melon", 3, 3 } },
|
||||||
TRADE_V6_BIRCH_SAPLING,
|
TRADE_V6_BIRCH_SAPLING,
|
||||||
TRADE_V6_DARK_OAK_SAPLING,
|
TRADE_V6_DARK_OAK_SAPLING,
|
||||||
TRADE_V6_ACACIA_SAPLING,
|
TRADE_V6_ACACIA_SAPLING,
|
||||||
|
@ -135,31 +139,36 @@ local professions = {
|
||||||
jobsite = "mcl_barrels:barrel_closed",
|
jobsite = "mcl_barrels:barrel_closed",
|
||||||
trades = {
|
trades = {
|
||||||
{
|
{
|
||||||
{ { "mcl_fishing:fish_raw", 6, 6, "mcl_core:emerald", 1, 1 },{ "mcl_fishing:fish_cooked", 6, 6 } },
|
{ { "mcl_mobitems:string", 20, 20 }, E1 },
|
||||||
{ { "mcl_mobitems:string", 15, 20 }, E1 },
|
{ { "mcl_core:coal_lump", 10, 10 }, E1 },
|
||||||
{ { "mcl_core:coal_lump", 15, 10 }, E1 },
|
{ { "mcl_core:emerald", 1, 1, "mcl_fishing:fish_raw", 6, 6 }, { "mcl_fishing:fish_cooked", 6, 6 } },
|
||||||
-- FIXME missing: bucket of cod + fish should be cod.
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_buckets:bucket_cod", 1, 1 } },
|
||||||
},
|
},
|
||||||
{
|
|
||||||
{ { "mcl_fishing:fish_raw", 6, 15,}, E1 },
|
|
||||||
{ { "mcl_fishing:salmon_raw", 6, 6, "mcl_core:emerald", 1, 1 },{ "mcl_fishing:salmon_cooked", 6, 6 } },
|
|
||||||
{ { "mcl_core:emerald", 1, 2 },{"mcl_campfires:campfire_lit",1,1} },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
{ { "mcl_fishing:salmon_raw", 6, 13,}, E1 },
|
|
||||||
{ { "mcl_core:emerald", 7, 22 }, { "mcl_fishing:fishing_rod_enchanted", 1, 1} },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
{ { "mcl_fishing:clownfish_raw", 6, 6,}, E1 },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
{ { "mcl_fishing:pufferfish_raw", 4, 4,}, E1 },
|
|
||||||
|
|
||||||
{ { "mcl_boats:boat", 1, 1,}, E1 },
|
{
|
||||||
{ { "mcl_boats:boat_acacia", 1, 1,}, E1 },
|
{ { "mcl_fishing:fish_raw", 15, 15 }, E1 },
|
||||||
{ { "mcl_boats:boat_spruce", 1, 1,}, E1 },
|
{ { "mcl_core:emerald", 1, 1, "mcl_fishing:salmon_raw", 6, 6 }, { "mcl_fishing:salmon_cooked", 6, 6 } },
|
||||||
{ { "mcl_boats:boat_dark_oak", 1, 1,}, E1 },
|
{ { "mcl_core:emerald", 2, 2 }, {"mcl_campfires:campfire_lit", 1, 1 } },
|
||||||
{ { "mcl_boats:boat_birch", 1, 1,}, E1 },
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
{ { "mcl_fishing:salmon_raw", 13, 13 }, E1 },
|
||||||
|
{ { "mcl_core:emerald", 8, 22 }, { "mcl_fishing:fishing_rod_enchanted", 1, 1 } },
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
{ { "mcl_fishing:clownfish_raw", 6, 6 }, E1 },
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
{ { "mcl_fishing:pufferfish_raw", 4, 4 }, E1 },
|
||||||
|
|
||||||
|
--Boat cherry?
|
||||||
|
{ { "mcl_boats:boat", 1, 1 }, E1 },
|
||||||
|
{ { "mcl_boats:boat_acacia", 1, 1 }, E1 },
|
||||||
|
{ { "mcl_boats:boat_spruce", 1, 1 }, E1 },
|
||||||
|
{ { "mcl_boats:boat_dark_oak", 1, 1 }, E1 },
|
||||||
|
{ { "mcl_boats:boat_birch", 1, 1 }, E1 },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -169,25 +178,28 @@ local professions = {
|
||||||
jobsite = "mcl_fletching_table:fletching_table",
|
jobsite = "mcl_fletching_table:fletching_table",
|
||||||
trades = {
|
trades = {
|
||||||
{
|
{
|
||||||
{ { "mcl_mobitems:string", 15, 20 }, E1 },
|
|
||||||
{ E1, { "mcl_bows:arrow", 8, 12 } },
|
|
||||||
{ { "mcl_core:gravel", 10, 10, "mcl_core:emerald", 1, 1 }, { "mcl_core:flint", 6, 10 } },
|
|
||||||
{ { "mcl_core:stick", 32, 32 }, E1 },
|
{ { "mcl_core:stick", 32, 32 }, E1 },
|
||||||
|
{ E1, { "mcl_bows:arrow", 16, 16 } },
|
||||||
|
{ { "mcl_core:emerald", 1, 1, "mcl_core:gravel", 10, 10 }, { "mcl_core:flint", 10, 10 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_core:flint", 26, 26 }, E1 },
|
{ { "mcl_core:flint", 26, 26 }, E1 },
|
||||||
{ { "mcl_core:emerald", 2, 3 }, { "mcl_bows:bow", 1, 1 } },
|
{ { "mcl_core:emerald", 2, 2 }, { "mcl_bows:bow", 1, 1 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_mobitems:string", 14, 14 }, E1 },
|
{ { "mcl_mobitems:string", 14, 14 }, E1 },
|
||||||
{ { "mcl_core:emerald", 3, 3 }, { "mcl_bows:crossbow", 1, 1 } },
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_bows:crossbow", 1, 1 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_mobitems:string", 24, 24 }, E1 },
|
{ { "mcl_mobitems:feather", 24, 24 }, E1 },
|
||||||
{ { "mcl_core:emerald", 7, 21 } , { "mcl_bows:bow_enchanted", 1, 1 } },
|
{ { "mcl_core:emerald", 7, 21 } , { "mcl_bows:bow_enchanted", 1, 1 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
--FIXME: supposed to be tripwire hook{ { "tripwirehook", 24, 24 }, E1 },
|
--FIXME: supposed to be tripwire hook{ { "tripwirehook", 8, 8 }, E1 },
|
||||||
{ { "mcl_core:emerald", 8, 22 } , { "mcl_bows:crossbow_enchanted", 1, 1 } },
|
{ { "mcl_core:emerald", 8, 22 } , { "mcl_bows:crossbow_enchanted", 1, 1 } },
|
||||||
{ { "mcl_core:emerald", 2, 2, "mcl_bows:arrow", 5, 5 }, { "mcl_potions:healing_arrow", 5, 5 } },
|
{ { "mcl_core:emerald", 2, 2, "mcl_bows:arrow", 5, 5 }, { "mcl_potions:healing_arrow", 5, 5 } },
|
||||||
{ { "mcl_core:emerald", 2, 2, "mcl_bows:arrow", 5, 5 }, { "mcl_potions:harming_arrow", 5, 5 } },
|
{ { "mcl_core:emerald", 2, 2, "mcl_bows:arrow", 5, 5 }, { "mcl_potions:harming_arrow", 5, 5 } },
|
||||||
|
@ -209,27 +221,108 @@ local professions = {
|
||||||
jobsite = "mcl_loom:loom",
|
jobsite = "mcl_loom:loom",
|
||||||
trades = {
|
trades = {
|
||||||
{
|
{
|
||||||
{ { "mcl_wool:white", 16, 22 }, E1 },
|
{ { "mcl_wool:white", 18, 18 }, E1 },
|
||||||
{ { "mcl_core:emerald", 3, 4 }, { "mcl_tools:shears", 1, 1 } },
|
{ { "mcl_wool:brown", 18, 18 }, E1 },
|
||||||
|
{ { "mcl_wool:black", 18, 18 }, E1 },
|
||||||
|
{ { "mcl_wool:grey", 18, 18 }, E1 },
|
||||||
|
{ { "mcl_core:emerald", 2, 2 }, { "mcl_tools:shears", 1, 1 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:white", 1, 1 } },
|
{ { "mcl_dye:black", 12, 12 }, E1 },
|
||||||
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:grey", 1, 1 } },
|
{ { "mcl_dye:dark_grey", 12, 12 }, E1 },
|
||||||
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:silver", 1, 1 } },
|
{ { "mcl_dye:green", 12, 12 }, E1 },
|
||||||
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:black", 1, 1 } },
|
{ { "mcl_dye:lightblue", 12, 12 }, E1 },
|
||||||
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:yellow", 1, 1 } },
|
{ { "mcl_dye:white", 12, 12 }, E1 },
|
||||||
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:orange", 1, 1 } },
|
|
||||||
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:red", 1, 1 } },
|
{ E1, { "mcl_wool:white", 1, 1 } },
|
||||||
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:magenta", 1, 1 } },
|
{ E1, { "mcl_wool:grey", 1, 1 } },
|
||||||
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:purple", 1, 1 } },
|
{ E1, { "mcl_wool:silver", 1, 1 } },
|
||||||
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:blue", 1, 1 } },
|
{ E1, { "mcl_wool:black", 1, 1 } },
|
||||||
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:cyan", 1, 1 } },
|
{ E1, { "mcl_wool:yellow", 1, 1 } },
|
||||||
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:lime", 1, 1 } },
|
{ E1, { "mcl_wool:orange", 1, 1 } },
|
||||||
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:green", 1, 1 } },
|
{ E1, { "mcl_wool:red", 1, 1 } },
|
||||||
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:pink", 1, 1 } },
|
{ E1, { "mcl_wool:magenta", 1, 1 } },
|
||||||
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:light_blue", 1, 1 } },
|
{ E1, { "mcl_wool:purple", 1, 1 } },
|
||||||
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:brown", 1, 1 } },
|
{ E1, { "mcl_wool:blue", 1, 1 } },
|
||||||
|
{ E1, { "mcl_wool:cyan", 1, 1 } },
|
||||||
|
{ E1, { "mcl_wool:lime", 1, 1 } },
|
||||||
|
{ E1, { "mcl_wool:green", 1, 1 } },
|
||||||
|
{ E1, { "mcl_wool:pink", 1, 1 } },
|
||||||
|
{ E1, { "mcl_wool:light_blue", 1, 1 } },
|
||||||
|
{ E1, { "mcl_wool:brown", 1, 1 } },
|
||||||
|
|
||||||
|
{ E1, { "mcl_wool:white_carpet", 4, 4 } },
|
||||||
|
{ E1, { "mcl_wool:grey_carpet", 4, 4 } },
|
||||||
|
{ E1, { "mcl_wool:silver_carpet", 4, 4 } },
|
||||||
|
{ E1, { "mcl_wool:black_carpet", 4, 4 } },
|
||||||
|
{ E1, { "mcl_wool:yellow_carpet", 4, 4 } },
|
||||||
|
{ E1, { "mcl_wool:orange_carpet", 4, 4 } },
|
||||||
|
{ E1, { "mcl_wool:red_carpet", 4, 4 } },
|
||||||
|
{ E1, { "mcl_wool:magenta_carpet", 4, 4 } },
|
||||||
|
{ E1, { "mcl_wool:purple_carpet", 4, 4 } },
|
||||||
|
{ E1, { "mcl_wool:blue_carpet", 4, 4 } },
|
||||||
|
{ E1, { "mcl_wool:cyan_carpet", 4, 4 } },
|
||||||
|
{ E1, { "mcl_wool:lime_carpet", 4, 4 } },
|
||||||
|
{ E1, { "mcl_wool:green_carpet", 4, 4 } },
|
||||||
|
{ E1, { "mcl_wool:pink_carpet", 4, 4 } },
|
||||||
|
{ E1, { "mcl_wool:light_blue_carpet", 4, 4 } },
|
||||||
|
{ E1, { "mcl_wool:brown_carpet", 4, 4 } },
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
{ { "mcl_dye:red", 12, 12 }, E1 },
|
||||||
|
{ { "mcl_dye:grey", 12, 12 }, E1 },
|
||||||
|
{ { "mcl_dye:pink", 12, 12 }, E1 },
|
||||||
|
{ { "mcl_dye:yellow", 12, 12 }, E1 },
|
||||||
|
{ { "mcl_dye:orange", 12, 12 }, E1 },
|
||||||
|
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_red_bottom", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_blue_bottom", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_cyan_bottom", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_grey_bottom", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_silver_bottom", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_black_bottom", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_yellow_bottom", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_green_bottom", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_magenta_bottom", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_orange_bottom", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_purple_bottom", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_brown_bottom", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_pink_bottom", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_lime_bottom", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_light_blue_bottom", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_white_bottom", 1, 1 } },
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
{ { "mcl_dye:dark_green", 12, 12 }, E1 },
|
||||||
|
{ { "mcl_dye:brown", 12, 12 }, E1 },
|
||||||
|
{ { "mcl_dye:blue", 12, 12 }, E1 },
|
||||||
|
{ { "mcl_dye:violet", 12, 12 }, E1 },
|
||||||
|
{ { "mcl_dye:cyan", 12, 12 }, E1 },
|
||||||
|
{ { "mcl_dye:magenta", 12, 12 }, E1 },
|
||||||
|
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_white", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_grey", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_silver", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_black", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_red", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_yellow", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_green", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_cyan", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_blue", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_magenta", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_orange", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_purple", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_brown", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_pink", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_lime", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_light_blue", 1, 1 } },
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
{ { "mcl_core:emerald", 2, 2 }, { "mcl_paintings:painting", 3, 3 } },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -239,28 +332,28 @@ local professions = {
|
||||||
jobsite = "mcl_lectern:lectern",
|
jobsite = "mcl_lectern:lectern",
|
||||||
trades = {
|
trades = {
|
||||||
{
|
{
|
||||||
{ { "mcl_core:paper", 24, 36 }, E1 },
|
{ { "mcl_core:paper", 24, 24 }, E1 },
|
||||||
{ { "mcl_books:book", 8, 10 }, E1 },
|
{ { "mcl_core:emerald", 5, 64, "mcl_books:book", 1, 1 }, { "mcl_enchanting:book_enchanted", 1 ,1 } },
|
||||||
{ { "mcl_core:emerald", 9, 9 }, { "mcl_books:bookshelf", 1 ,1 }},
|
{ { "mcl_core:emerald", 9, 9 }, { "mcl_books:bookshelf", 1 ,1 } },
|
||||||
{ { "mcl_core:emerald", 5, 64, "mcl_books:book", 1, 1 }, { "mcl_enchanting:book_enchanted", 1 ,1 }},
|
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_books:written_book", 2, 2 }, E1 },
|
{ { "mcl_books:book", 4, 4 }, E1 },
|
||||||
{ { "mcl_core:emerald", 5, 64, "mcl_books:book", 1, 1 }, { "mcl_enchanting:book_enchanted", 1 ,1 }},
|
{ { "mcl_core:emerald", 5, 64, "mcl_books:book", 1, 1 }, { "mcl_enchanting:book_enchanted", 1 ,1 } },
|
||||||
{ E1, { "mcl_lanterns:lantern_floor", 1, 1 } },
|
{ E1, { "mcl_lanterns:lantern_floor", 1, 1 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_dye:black", 5, 5 }, E1 },
|
{ { "mcl_mobitems:ink_sac", 5, 5 }, E1 },
|
||||||
{ { "mcl_core:emerald", 5, 64, "mcl_books:book", 1, 1 }, { "mcl_enchanting:book_enchanted", 1 ,1 }},
|
{ { "mcl_core:emerald", 5, 64, "mcl_books:book", 1, 1 }, { "mcl_enchanting:book_enchanted", 1 ,1 } },
|
||||||
{ E1, { "mcl_core:glass", 4, 4 } },
|
{ E1, { "mcl_core:glass", 4, 4 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ E1, { "mcl_books:writable_book", 1, 1 } },
|
{ { "mcl_books:writable_book", 1, 1 }, E1 },
|
||||||
{ { "mcl_core:emerald", 5, 64, "mcl_books:book", 1, 1 }, { "mcl_enchanting:book_enchanted", 1 ,1 }},
|
{ { "mcl_core:emerald", 5, 64, "mcl_books:book", 1, 1 }, { "mcl_enchanting:book_enchanted", 1 ,1 } },
|
||||||
{ { "mcl_core:emerald", 4, 4 }, { "mcl_compass:compass", 1 ,1 }},
|
|
||||||
{ { "mcl_core:emerald", 5, 5 }, { "mcl_clock:clock", 1, 1 } },
|
{ { "mcl_core:emerald", 5, 5 }, { "mcl_clock:clock", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 4, 4 }, { "mcl_compass:compass", 1 ,1 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
|
@ -275,38 +368,43 @@ local professions = {
|
||||||
trades = {
|
trades = {
|
||||||
{
|
{
|
||||||
{ { "mcl_core:paper", 24, 24 }, E1 },
|
{ { "mcl_core:paper", 24, 24 }, E1 },
|
||||||
{ { "mcl_core:emerald", 7, 7}, { "mcl_maps:empty_map", 1, 1 } },
|
{ { "mcl_core:emerald", 7, 7 }, { "mcl_maps:empty_map", 1, 1 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
-- compass subject to special checks
|
-- compass subject to special checks
|
||||||
{ { "xpanes:pane_natural_flat", 11, 11 }, E1 },
|
{ { "xpanes:pane_natural_flat", 11, 11 }, E1 },
|
||||||
--{ { "mcl_core:emerald", 13, 13, "mcl_compass:compass", 1, 1 }, { "FIXME:ocean explorer map" 1, 1} },
|
--{ { "mcl_core:emerald", 13, 13, "mcl_compass:compass", 1, 1 }, { "FIXME:ocean explorer map" 1, 1 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_compass:compass", 1, 1 }, E1 },
|
{ { "mcl_compass:compass", 1, 1 }, E1 },
|
||||||
--{ { "mcl_core:emerald", 13, 13, "mcl_compass:compass", 1, 1 }, { "FIXME:woodland explorer map" 1, 1} },
|
--{ { "mcl_core:emerald", 14, 14, "mcl_compass:compass", 1, 1 }, { "FIXME:woodland explorer map" 1, 1 } },
|
||||||
},
|
},
|
||||||
{
|
|
||||||
{ { "mcl_core:emerald", 7, 7}, { "mcl_itemframes:item_frame", 1, 1 }},
|
|
||||||
|
|
||||||
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_white", 1, 1 }},
|
|
||||||
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_grey", 1, 1 }},
|
|
||||||
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_silver", 1, 1 }},
|
|
||||||
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_black", 1, 1 }},
|
|
||||||
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_red", 1, 1 }},
|
|
||||||
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_green", 1, 1 }},
|
|
||||||
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_cyan", 1, 1 }},
|
|
||||||
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_blue", 1, 1 }},
|
|
||||||
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_magenta", 1, 1 }},
|
|
||||||
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_orange", 1, 1 }},
|
|
||||||
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_purple", 1, 1 }},
|
|
||||||
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_brown", 1, 1 }},
|
|
||||||
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_pink", 1, 1 }},
|
|
||||||
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_lime", 1, 1 }},
|
|
||||||
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_light_blue", 1, 1 }},
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
--{ { "mcl_core:emerald", 8, 8}, { "FIXME: globe banner pattern", 1, 1 } },
|
{ { "mcl_core:emerald", 7, 7 }, { "mcl_itemframes:item_frame", 1, 1 } },
|
||||||
|
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_white", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_grey", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_silver", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_black", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_red", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_yellow", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_green", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_cyan", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_blue", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_magenta", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_orange", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_purple", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_brown", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_pink", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_lime", 1, 1 } },
|
||||||
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_light_blue", 1, 1 } },
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
--{ { "mcl_core:emerald", 8, 8 }, { "FIXME: globe banner pattern", 1, 1 } },
|
||||||
},
|
},
|
||||||
-- TODO: special maps
|
-- TODO: special maps
|
||||||
},
|
},
|
||||||
|
@ -330,6 +428,7 @@ local professions = {
|
||||||
{ { "mcl_core:emerald", 3, 3 }, { "mcl_armor:leggings_chain", 1, 1 } },
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_armor:leggings_chain", 1, 1 } },
|
||||||
{ { "mcl_core:emerald", 1, 1 }, { "mcl_armor:boots_chain", 1, 1 } },
|
{ { "mcl_core:emerald", 1, 1 }, { "mcl_armor:boots_chain", 1, 1 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_buckets:bucket_lava", 1, 1 }, E1 },
|
{ { "mcl_buckets:bucket_lava", 1, 1 }, E1 },
|
||||||
{ { "mcl_core:diamond", 1, 1 }, E1 },
|
{ { "mcl_core:diamond", 1, 1 }, E1 },
|
||||||
|
@ -342,6 +441,7 @@ local professions = {
|
||||||
{ { "mcl_core:emerald", 19, 33 }, { "mcl_armor:leggings_diamond_enchanted", 1, 1 } },
|
{ { "mcl_core:emerald", 19, 33 }, { "mcl_armor:leggings_diamond_enchanted", 1, 1 } },
|
||||||
{ { "mcl_core:emerald", 13, 27 }, { "mcl_armor:boots_diamond_enchanted", 1, 1 } },
|
{ { "mcl_core:emerald", 13, 27 }, { "mcl_armor:boots_diamond_enchanted", 1, 1 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_core:emerald", 13, 27 }, { "mcl_armor:helmet_diamond_enchanted", 1, 1 } },
|
{ { "mcl_core:emerald", 13, 27 }, { "mcl_armor:helmet_diamond_enchanted", 1, 1 } },
|
||||||
{ { "mcl_core:emerald", 21, 35 }, { "mcl_armor:chestplate_diamond_enchanted", 1, 1 } },
|
{ { "mcl_core:emerald", 21, 35 }, { "mcl_armor:chestplate_diamond_enchanted", 1, 1 } },
|
||||||
|
@ -351,29 +451,34 @@ local professions = {
|
||||||
leatherworker = {
|
leatherworker = {
|
||||||
name = N("Leatherworker"),
|
name = N("Leatherworker"),
|
||||||
texture = "mobs_mc_villager_leatherworker.png",
|
texture = "mobs_mc_villager_leatherworker.png",
|
||||||
jobsite = "mcl_cauldrons:cauldron",
|
jobsite = "group:cauldron",
|
||||||
trades = {
|
trades = {
|
||||||
{
|
{
|
||||||
{ { "mcl_mobitems:leather", 9, 12 }, E1 },
|
{ { "mcl_mobitems:leather", 6, 6 }, E1 },
|
||||||
{ { "mcl_core:emerald", 3, 3 }, { "mcl_armor:leggings_leather", 2, 4 } },
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_armor:leggings_leather", 1, 1 } },
|
||||||
{ { "mcl_core:emerald", 7, 7 }, { "mcl_armor:chestplate_leather", 2, 4 } },
|
{ { "mcl_core:emerald", 7, 7 }, { "mcl_armor:chestplate_leather", 1, 1 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_core:flint", 26, 26 }, E1 },
|
{ { "mcl_core:flint", 26, 26 }, E1 },
|
||||||
{ { "mcl_core:emerald", 5, 5 }, { "mcl_armor:helmet_leather", 2, 4 } },
|
{ { "mcl_core:emerald", 5, 5 }, { "mcl_armor:helmet_leather", 1, 1 } },
|
||||||
{ { "mcl_core:emerald", 4, 4 }, { "mcl_armor:boots_leather", 2, 4 } },
|
{ { "mcl_core:emerald", 4, 4 }, { "mcl_armor:boots_leather", 1, 1 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_mobitems:rabbit_hide", 9, 9 }, E1 },
|
{ { "mcl_mobitems:rabbit_hide", 9, 9 }, E1 },
|
||||||
{ { "mcl_core:emerald", 7, 7 }, { "mcl_armor:chestplate_leather", 1, 1 } },
|
{ { "mcl_core:emerald", 7, 7 }, { "mcl_armor:chestplate_leather", 1, 1 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
--{ { "FIXME: scute", 4, 4 }, E1 },
|
--{ { "FIXME: scute", 4, 4 }, E1 },
|
||||||
{ { "mcl_core:emerald", 8, 10 }, { "mcl_mobitems:saddle", 1, 1 } },
|
{ { "mcl_core:emerald", 8, 10 }, { "mcl_mobitems:saddle", 1, 1 } },
|
||||||
|
--FIXME: { { "mcl_core:emerald", 6, 6 }, { "mcl_mobitems:leather_horse_armor", 1, 1 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_core:emerald", 6, 6 }, { "mcl_mobitems:saddle", 1, 1 } },
|
{ { "mcl_core:emerald", 6, 6 }, { "mcl_mobitems:saddle", 1, 1 } },
|
||||||
{ { "mcl_core:emerald", 5, 5 }, { "mcl_armor:helmet_leather", 2, 4 } },
|
{ { "mcl_core:emerald", 5, 5 }, { "mcl_armor:helmet_leather", 1, 1 } },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -383,8 +488,8 @@ local professions = {
|
||||||
jobsite = "mcl_smoker:smoker",
|
jobsite = "mcl_smoker:smoker",
|
||||||
trades = {
|
trades = {
|
||||||
{
|
{
|
||||||
{ { "mcl_mobitems:beef", 14, 14 }, E1 },
|
{ { "mcl_mobitems:chicken", 14, 14 }, E1 },
|
||||||
{ { "mcl_mobitems:chicken", 7, 7 }, E1 },
|
{ { "mcl_mobitems:porkchop", 7, 7 }, E1 },
|
||||||
{ { "mcl_mobitems:rabbit", 4, 4 }, E1 },
|
{ { "mcl_mobitems:rabbit", 4, 4 }, E1 },
|
||||||
{ E1, { "mcl_mobitems:rabbit_stew", 1, 1 } },
|
{ E1, { "mcl_mobitems:rabbit_stew", 1, 1 } },
|
||||||
},
|
},
|
||||||
|
@ -394,16 +499,15 @@ local professions = {
|
||||||
{ E1, { "mcl_mobitems:cooked_porkchop", 5, 5 } },
|
{ E1, { "mcl_mobitems:cooked_porkchop", 5, 5 } },
|
||||||
{ E1, { "mcl_mobitems:cooked_chicken", 8, 8 } },
|
{ E1, { "mcl_mobitems:cooked_chicken", 8, 8 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_mobitems:mutton", 7, 7 }, E1 },
|
{ { "mcl_mobitems:mutton", 7, 7 }, E1 },
|
||||||
{ { "mcl_mobitems:beef", 10, 10 }, E1 },
|
{ { "mcl_mobitems:beef", 10, 10 }, E1 },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_mobitems:mutton", 7, 7 }, E1 },
|
{ { "mcl_ocean:dried_kelp_block", 10, 10 }, E1 },
|
||||||
{ { "mcl_mobitems:beef", 10, 10 }, E1 },
|
{ { "mcl_farming:sweet_berry", 10, 10 }, E1 },
|
||||||
},
|
|
||||||
{
|
|
||||||
--{ { "FIXME: Sweet Berries", 10, 10 }, E1 },
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -422,11 +526,13 @@ local professions = {
|
||||||
{ { "mcl_core:iron_ingot", 4, 4 }, E1 },
|
{ { "mcl_core:iron_ingot", 4, 4 }, E1 },
|
||||||
{ { "mcl_core:emerald", 36, 36 }, { "mcl_bells:bell", 1, 1 } },
|
{ { "mcl_core:emerald", 36, 36 }, { "mcl_bells:bell", 1, 1 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_core:flint", 7, 9 }, E1 },
|
{ { "mcl_core:flint", 24, 24 }, E1 },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_core:diamond", 7, 9 }, E1 },
|
{ { "mcl_core:diamond", 1, 1 }, E1 },
|
||||||
{ { "mcl_core:emerald", 17, 31 }, { "mcl_tools:axe_diamond_enchanted", 1, 1 } },
|
{ { "mcl_core:emerald", 17, 31 }, { "mcl_tools:axe_diamond_enchanted", 1, 1 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -452,6 +558,7 @@ local professions = {
|
||||||
{ { "mcl_core:iron_ingot", 4, 4 }, E1 },
|
{ { "mcl_core:iron_ingot", 4, 4 }, E1 },
|
||||||
{ { "mcl_core:emerald", 36, 36 }, { "mcl_bells:bell", 1, 1 } },
|
{ { "mcl_core:emerald", 36, 36 }, { "mcl_bells:bell", 1, 1 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_core:flint", 30, 30 }, E1 },
|
{ { "mcl_core:flint", 30, 30 }, E1 },
|
||||||
{ { "mcl_core:emerald", 6, 20 }, { "mcl_tools:axe_iron_enchanted", 1, 1 } },
|
{ { "mcl_core:emerald", 6, 20 }, { "mcl_tools:axe_iron_enchanted", 1, 1 } },
|
||||||
|
@ -459,11 +566,13 @@ local professions = {
|
||||||
{ { "mcl_core:emerald", 8, 22 }, { "mcl_tools:pick_iron_enchanted", 1, 1 } },
|
{ { "mcl_core:emerald", 8, 22 }, { "mcl_tools:pick_iron_enchanted", 1, 1 } },
|
||||||
{ { "mcl_core:emerald", 4, 4 }, { "mcl_farming:hoe_diamond", 1, 1 } },
|
{ { "mcl_core:emerald", 4, 4 }, { "mcl_farming:hoe_diamond", 1, 1 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_core:diamond", 1, 1 }, E1 },
|
{ { "mcl_core:diamond", 1, 1 }, E1 },
|
||||||
{ { "mcl_core:emerald", 17, 31 }, { "mcl_tools:axe_diamond_enchanted", 1, 1 } },
|
{ { "mcl_core:emerald", 17, 31 }, { "mcl_tools:axe_diamond_enchanted", 1, 1 } },
|
||||||
{ { "mcl_core:emerald", 10, 24 }, { "mcl_tools:shovel_diamond_enchanted", 1, 1 } },
|
{ { "mcl_core:emerald", 10, 24 }, { "mcl_tools:shovel_diamond_enchanted", 1, 1 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_core:emerald", 18, 32 }, { "mcl_tools:pick_diamond_enchanted", 1, 1 } },
|
{ { "mcl_core:emerald", 18, 32 }, { "mcl_tools:pick_diamond_enchanted", 1, 1 } },
|
||||||
},
|
},
|
||||||
|
@ -478,71 +587,96 @@ local professions = {
|
||||||
{ { "mcl_mobitems:rotten_flesh", 32, 32 }, E1 },
|
{ { "mcl_mobitems:rotten_flesh", 32, 32 }, E1 },
|
||||||
{ E1, { "mesecons:redstone", 2, 2 } },
|
{ E1, { "mesecons:redstone", 2, 2 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_core:gold_ingot", 3, 3 }, E1 },
|
{ { "mcl_core:gold_ingot", 3, 3 }, E1 },
|
||||||
{ E1, { "mcl_core:lapis", 1, 1 } },
|
{ E1, { "mcl_core:lapis", 1, 1 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_mobitems:rabbit_foot", 2, 2 }, E1 },
|
{ { "mcl_mobitems:rabbit_foot", 2, 2 }, E1 },
|
||||||
{ E1, { "mcl_nether:glowstone", 4, 4 } },
|
{ { "mcl_core:emerald", 4, 4 }, { "mcl_nether:glowstone", 1, 1 } },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
--{ { "FIXME: scute", 4, 4 }, E1 },
|
--{ { "FIXME: scute", 4, 4 }, E1 },
|
||||||
{ { "mcl_potions:glass_bottle", 9, 9 }, E1 },
|
{ { "mcl_potions:glass_bottle", 9, 9 }, E1 },
|
||||||
{ { "mcl_core:emerald", 5, 5 }, { "mcl_throwing:ender_pearl", 1, 1 } },
|
{ { "mcl_core:emerald", 5, 5 }, { "mcl_throwing:ender_pearl", 1, 1 } },
|
||||||
TRADE_V6_RED_SANDSTONE,
|
TRADE_V6_RED_SANDSTONE,
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
{ { "mcl_nether:nether_wart_item", 22, 22 }, E1 },
|
{ { "mcl_nether:nether_wart_item", 22, 22 }, E1 },
|
||||||
{ { "mcl_core:emerald", 3, 3 }, { "mcl_experience:bottle", 1, 1 } },
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_experience:bottle", 1, 1 } },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
mason = {
|
mason = {
|
||||||
name = N("Mason"),
|
name = N("Mason"),
|
||||||
texture = "mobs_mc_villager_mason.png",
|
texture = "mobs_mc_villager_mason.png",
|
||||||
jobsite = "mcl_stonecutter:stonecutter",
|
jobsite = "mcl_stonecutter:stonecutter",
|
||||||
trades = {
|
trades = {
|
||||||
{
|
|
||||||
{ { "mcl_core:clay_lump", 10, 10 }, E1 },
|
|
||||||
{ E1, { "mcl_core:brick", 10, 10 } },
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
{ { "mcl_core:stone", 20, 20 }, E1 },
|
{ { "mcl_core:clay_lump", 10, 10 }, E1 },
|
||||||
{ E1, { "mcl_core:stonebrickcarved", 4, 4 } },
|
{ E1, { "mcl_core:brick", 10, 10 } },
|
||||||
},
|
},
|
||||||
{
|
|
||||||
{ { "mcl_core:granite", 16, 16 }, E1 },
|
{
|
||||||
{ { "mcl_core:andesite", 16, 16 }, E1 },
|
{ { "mcl_core:stone", 20, 20 }, E1 },
|
||||||
{ { "mcl_core:diorite", 16, 16 }, E1 },
|
{ E1, { "mcl_core:stonebrickcarved", 4, 4 } },
|
||||||
{ E1, { "mcl_core:granite_smooth", 4, 4 } },
|
},
|
||||||
{ E1, { "mcl_core:andesite_smooth", 4, 4 } },
|
|
||||||
{ E1, { "mcl_core:diorite_smooth", 4, 4 } },
|
{
|
||||||
},
|
{ { "mcl_core:granite", 16, 16 }, E1 },
|
||||||
{
|
{ { "mcl_core:andesite", 16, 16 }, E1 },
|
||||||
{ { "mcl_nether:quartz", 12, 12 }, E1 },
|
{ { "mcl_core:diorite", 16, 16 }, E1 },
|
||||||
{ E1, { "mcl_colorblocks:hardened_clay", 1, 1} },
|
{ E1, { "mcl_core:andesite_smooth", 4, 4 } },
|
||||||
{ E1, { "mcl_colorblocks:hardened_clay_white", 1, 1} },
|
{ E1, { "mcl_core:granite_smooth", 4, 4 } },
|
||||||
{ E1, { "mcl_colorblocks:hardened_clay_grey", 1, 1} },
|
{ E1, { "mcl_core:diorite_smooth", 4, 4 } },
|
||||||
{ E1, { "mcl_colorblocks:hardened_clay_silver", 1, 1} },
|
--FIXME: { E1, { "Dripstone Block", 4, 4 } },
|
||||||
{ E1, { "mcl_colorblocks:hardened_clay_black", 1, 1} },
|
},
|
||||||
{ E1, { "mcl_colorblocks:hardened_clay_red", 1, 1} },
|
|
||||||
{ E1, { "mcl_colorblocks:hardened_clay_yellow", 1, 1} },
|
{
|
||||||
{ E1, { "mcl_colorblocks:hardened_clay_green", 1, 1} },
|
{ { "mcl_nether:quartz", 12, 12 }, E1 },
|
||||||
{ E1, { "mcl_colorblocks:hardened_clay_cyan", 1, 1} },
|
{ E1, { "mcl_colorblocks:hardened_clay_white", 1, 1 } },
|
||||||
{ E1, { "mcl_colorblocks:hardened_clay_blue", 1, 1} },
|
{ E1, { "mcl_colorblocks:hardened_clay_grey", 1, 1 } },
|
||||||
{ E1, { "mcl_colorblocks:hardened_clay_magenta", 1, 1} },
|
{ E1, { "mcl_colorblocks:hardened_clay_silver", 1, 1 } },
|
||||||
{ E1, { "mcl_colorblocks:hardened_clay_orange", 1, 1} },
|
{ E1, { "mcl_colorblocks:hardened_clay_black", 1, 1 } },
|
||||||
{ E1, { "mcl_colorblocks:hardened_clay_brown", 1, 1} },
|
{ E1, { "mcl_colorblocks:hardened_clay_red", 1, 1 } },
|
||||||
{ E1, { "mcl_colorblocks:hardened_clay_pink", 1, 1} },
|
{ E1, { "mcl_colorblocks:hardened_clay_yellow", 1, 1 } },
|
||||||
{ E1, { "mcl_colorblocks:hardened_clay_light_blue", 1, 1} },
|
{ E1, { "mcl_colorblocks:hardened_clay_green", 1, 1 } },
|
||||||
{ E1, { "mcl_colorblocks:hardened_clay_lime", 1, 1} },
|
{ E1, { "mcl_colorblocks:hardened_clay_cyan", 1, 1 } },
|
||||||
{ E1, { "mcl_colorblocks:hardened_clay_purple", 1, 1 } },
|
{ E1, { "mcl_colorblocks:hardened_clay_blue", 1, 1 } },
|
||||||
},
|
{ E1, { "mcl_colorblocks:hardened_clay_magenta", 1, 1 } },
|
||||||
{
|
{ E1, { "mcl_colorblocks:hardened_clay_orange", 1, 1 } },
|
||||||
{ E1, { "mcl_nether:quartz_pillar", 1, 1 } },
|
{ E1, { "mcl_colorblocks:hardened_clay_brown", 1, 1 } },
|
||||||
{ E1, { "mcl_nether:quartz_block", 1, 1 } },
|
{ E1, { "mcl_colorblocks:hardened_clay_pink", 1, 1 } },
|
||||||
},
|
{ E1, { "mcl_colorblocks:hardened_clay_light_blue", 1, 1 } },
|
||||||
|
{ E1, { "mcl_colorblocks:hardened_clay_lime", 1, 1 } },
|
||||||
|
{ E1, { "mcl_colorblocks:hardened_clay_purple", 1, 1 } },
|
||||||
|
|
||||||
|
{ E1, { "mcl_colorblocks:glazed_terracotta_white", 1, 1 } },
|
||||||
|
{ E1, { "mcl_colorblocks:glazed_terracotta_grey", 1, 1 } },
|
||||||
|
{ E1, { "mcl_colorblocks:glazed_terracotta_silver", 1, 1 } },
|
||||||
|
{ E1, { "mcl_colorblocks:glazed_terracotta_black", 1, 1 } },
|
||||||
|
{ E1, { "mcl_colorblocks:glazed_terracotta_red", 1, 1 } },
|
||||||
|
{ E1, { "mcl_colorblocks:glazed_terracotta_yellow", 1, 1 } },
|
||||||
|
{ E1, { "mcl_colorblocks:glazed_terracotta_green", 1, 1 } },
|
||||||
|
{ E1, { "mcl_colorblocks:glazed_terracotta_cyan", 1, 1 } },
|
||||||
|
{ E1, { "mcl_colorblocks:glazed_terracotta_blue", 1, 1 } },
|
||||||
|
{ E1, { "mcl_colorblocks:glazed_terracotta_magenta", 1, 1 } },
|
||||||
|
{ E1, { "mcl_colorblocks:glazed_terracotta_orange", 1, 1 } },
|
||||||
|
{ E1, { "mcl_colorblocks:glazed_terracotta_brown", 1, 1 } },
|
||||||
|
{ E1, { "mcl_colorblocks:glazed_terracotta_pink", 1, 1 } },
|
||||||
|
{ E1, { "mcl_colorblocks:glazed_terracotta_light_blue", 1, 1 } },
|
||||||
|
{ E1, { "mcl_colorblocks:glazed_terracotta_lime", 1, 1 } },
|
||||||
|
{ E1, { "mcl_colorblocks:glazed_terracotta_purple", 1, 1 } },
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
{ E1, { "mcl_nether:quartz_pillar", 1, 1 } },
|
||||||
|
{ E1, { "mcl_nether:quartz_block", 1, 1 } },
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
nitwit = {
|
nitwit = {
|
||||||
|
@ -1008,7 +1142,15 @@ end
|
||||||
----- JOBSITE LOGIC
|
----- JOBSITE LOGIC
|
||||||
local function get_profession_by_jobsite(js)
|
local function get_profession_by_jobsite(js)
|
||||||
for k,v in pairs(professions) do
|
for k,v in pairs(professions) do
|
||||||
if v.jobsite == js then return k end
|
if v.jobsite == js then
|
||||||
|
return k
|
||||||
|
-- Catch Nitwit doesn't have a jobsite
|
||||||
|
elseif v.jobsite and v.jobsite:find("^group:") then
|
||||||
|
local group = v.jobsite:gsub("^group:", "")
|
||||||
|
if minetest.get_item_group(js, group) > 0 then
|
||||||
|
return k
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -1799,6 +1941,7 @@ local trade_inventory = {
|
||||||
if not wanted2:is_empty() then
|
if not wanted2:is_empty() then
|
||||||
inv:remove_item("input", inv:get_stack("wanted", 2))
|
inv:remove_item("input", inv:get_stack("wanted", 2))
|
||||||
end
|
end
|
||||||
|
local name = player:get_player_name()
|
||||||
local trader = player_trading_with[name]
|
local trader = player_trading_with[name]
|
||||||
minetest.sound_play("mobs_mc_villager_accept", {to_player = player:get_player_name(),object=trader.object}, true)
|
minetest.sound_play("mobs_mc_villager_accept", {to_player = player:get_player_name(),object=trader.object}, true)
|
||||||
end
|
end
|
||||||
|
|
|
@ -42,6 +42,7 @@ mcl_mobs.register_mob("mobs_mc:evoker", {
|
||||||
run_velocity = 1.4,
|
run_velocity = 1.4,
|
||||||
group_attack = true,
|
group_attack = true,
|
||||||
attack_type = "dogfight",
|
attack_type = "dogfight",
|
||||||
|
attack_frequency = 15,
|
||||||
-- Summon vexes
|
-- Summon vexes
|
||||||
custom_attack = function(self, to_attack)
|
custom_attack = function(self, to_attack)
|
||||||
if not spawned_vexes[self] then spawned_vexes[self] = {} end
|
if not spawned_vexes[self] then spawned_vexes[self] = {} end
|
||||||
|
@ -64,7 +65,6 @@ mcl_mobs.register_mob("mobs_mc:evoker", {
|
||||||
table.insert(spawned_vexes[self],ent)
|
table.insert(spawned_vexes[self],ent)
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
shoot_interval = 15,
|
|
||||||
passive = false,
|
passive = false,
|
||||||
drops = {
|
drops = {
|
||||||
{name = "mcl_core:emerald",
|
{name = "mcl_core:emerald",
|
||||||
|
@ -86,6 +86,11 @@ mcl_mobs.register_mob("mobs_mc:evoker", {
|
||||||
},
|
},
|
||||||
view_range = 16,
|
view_range = 16,
|
||||||
fear_height = 4,
|
fear_height = 4,
|
||||||
|
|
||||||
|
on_spawn = function(self)
|
||||||
|
self.timer = 15
|
||||||
|
return true
|
||||||
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
-- spawn eggs
|
-- spawn eggs
|
||||||
|
|
|
@ -70,6 +70,11 @@ mcl_mobs.register_mob("mobs_mc:witch", {
|
||||||
},
|
},
|
||||||
view_range = 16,
|
view_range = 16,
|
||||||
fear_height = 4,
|
fear_height = 4,
|
||||||
|
deal_damage = function(self, damage, mcl_reason)
|
||||||
|
local factor = 1
|
||||||
|
if mcl_reason.type == "magic" then factor = 0.15 end
|
||||||
|
self.health = self.health - factor*damage
|
||||||
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
-- potion projectile (EXPERIMENTAL)
|
-- potion projectile (EXPERIMENTAL)
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue