Commit graph

302 commits

Author SHA1 Message Date
SmokeyDope
3839250b38 Fix potatoes stage 2 hitbox 2023-03-18 21:59:46 +00:00
syl
1d981876d9 Fix syntax errors in French 2023-03-14 11:55:07 +01:00
syl
96b2f6a01d Improve French translation 2023-03-10 22:48:46 +01:00
Michieal
6265148727 Move textures all into one centralized directory. 2023-01-30 22:55:53 -05:00
CyberMango
c57f797226 Make the velocity checks absolute.
Now sweet berries will cause damage in all directions.
2023-01-20 19:15:55 +02:00
Michieal
ac30e25065 Remove "mcl_farming:beetroot_item" from fortune drop, so Fortune only gives seeds. 2023-01-16 19:40:07 -05:00
Michieal
ff7299a444 Fix beetroot seeds not dropping.
Changed drop rate to 1-4.

Added in Fortune drops too. (Per the minecraft wiki.)
2023-01-10 21:38:42 -05:00
CyberMango
5e969ba928 Added sweet berries death messages. 2023-01-04 23:04:19 +02:00
CyberMango
17e02aec3c Applying bone meal on a stage 3 sweet berry no longer grows it.
It now ignores the bone meal and harvests the sweet berry as normal.
2023-01-04 23:04:19 +02:00
CyberMango
0f569fdbaa Bone meal on sweet berries in creative mode is no longer wasted and
minor fixes.

removed an unnecessary -- in a comment.
Removed a redundant concatination.
2023-01-04 23:04:19 +02:00
CyberMango
8a7fcfde82 Fixed sweet berries bugs.
Now they can only be placed a tile's upper part.
Also when destroyed bushes at stage 2 drop 1 or 2 berries, while bushes
at stage 3 drop 2 or 3 (instead of fixed numbers of 1 and 3
respectively).
Also harvesting sweet berries at stage 3 (final) brings them to stage 1
instead of just to stage 2. Number of dropped berries was adjusted.
2023-01-04 23:04:19 +02:00
CyberMango
fb51067c78 Created a shared function for planting a seed that can also be consumed. 2023-01-04 23:04:19 +02:00
ancientmarinerdev
e6e898671a Merge pull request 'add japanese translation' (#3149) from SakuraRiu/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3149
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2022-12-29 22:14:48 +00:00
kabou
92ee402971 Separate white dye from bone meal.
* Add craftitem for ":mcl_bone_meal:bone_meal" to mcl_dye (temporarily.)
* Add crafting recipe for bone meal.
* Add texture for white dye item.
* Merge craftitem registration for "mcl_dye:white" with generic dyes.
* Add crafting recipe for white dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update mcl_crimson and sweet berry on_rightclick handlers.
* Update composter output, both as freestanding and to hoppers.
* Update bone block crafting recipes.
* Update tropical fish, cod and salmon mob drops.
2022-12-29 03:08:50 +00:00
kabou
7d8fdc6ec3 Separate brown dye from cocoa beans.
* Add craftitem "mcl_cocoas:cocoa_beans".
* Add texture for brown dye item.
* Merge craftitem registration for "mcl_dye:brown" with generic dyes.
* Add crafting recipe for brown dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update cookie recipe.
2022-12-29 03:08:49 +00:00
Riu Sakura
3faa930bdc Added missing translations.
In addition, the translation of "Grass Block" has been corrected to a better phrase.
2022-12-21 10:24:26 +09:00
Riu Sakura
2b61231f82 add japanese translation 2022-12-19 15:33:31 +09:00
cora
d395c82183 Fix bonemeal creative for sweet berries and nether vines 2022-11-29 12:20:39 +01:00
cora
34a558ced9 Sweetberry, nethervines: Fix placing in protected area 2022-11-29 12:20:39 +01:00
cora
142f3d6d5a Handle bonemealing in the sweetberry on_rightclick 2022-11-17 19:42:02 +00:00
cora
c5ec3c770c Sweet berries: Add rightclick harvesting 2022-11-17 19:42:02 +00:00
Michieal
99a7df7ce6 Fix the Pumpkin/Melon grass position.
Also, updated the license.
2022-11-17 02:16:59 +01:00
PrairieWind
e8b983bcc5 Place sweet berries on wet farmland and bonemeal the sweet berries to progress growth 2022-10-26 15:57:17 +00:00
cora
ae91640234 Add missing biomes, correct saturation 2022-10-26 15:57:17 +00:00
cora
d6c0561d5a Only do damage from stage 1 and up 2022-10-26 15:57:17 +00:00
cora
2664fb871b sweet berries plantable not only on farming soil 2022-10-26 15:57:17 +00:00
cora
2b08f9ac53 Slow down player movement while inside sweet berry 2022-10-26 15:57:17 +00:00
cora
8d456d8ff9 implement sweet berry damage
0.5 per second while moving inside it
2022-10-26 15:57:17 +00:00
cora
b00f2784ff Sweet berry bushes are flammable 2022-10-26 15:57:17 +00:00
cora
280bcddcb2 Move sweet berry decoration to mcl_biomes 2022-10-26 15:57:17 +00:00
balazsszalab
495378b85e Register sweet berry bush by add_plant function to enable plant growth
Without calling the add_plant function, sweet berry bushes will not go through growth stages and it is impossible to farm them. Sweet berry bush and beetroot have the same number of growth stages, so I used beetroot's interval and chance values here. If somebody has a better approximation of these values, feel free to change them.
2022-10-26 15:57:16 +00:00
cora
5f4d7774ae Add sweet berry compostability 2022-10-26 15:57:16 +00:00
kay27
a7c3878cae [mineclone5] Tune sweet berries a bit 2022-10-26 15:57:16 +00:00
kay27
eb313f9482 [mineclone5] Move sweet berries into farming as a quick fix 2022-10-26 15:57:16 +00:00
Sumyjkl
58d80e5e9c netherite items (except armour) will float in lava and not burn 2022-07-22 23:06:35 +10:00
Code-Sploit
10ea6da4e8 Add all pixel-perfection textures for netherite 2022-06-30 14:11:13 +02:00
Code-Sploit
3b2a34c670 Add first try of code for smithing table (Thanks to Fleckenstein), add _mcl_upgradable and _mcl_upgrade_item to every diamond tool/armor piece 2022-06-30 14:11:12 +02:00
Code-Sploit
aee4d15a57 Fix crash in netherite hoe by adding netherite to uses{} 2022-06-30 14:11:12 +02:00
Code-Sploit
9b25567274 Add netherite hoe texture 2022-06-30 14:11:12 +02:00
Code-Sploit
f2375abc47 Add netherite tools 2022-06-30 14:11:12 +02:00
mrminer
110b293297 Update 'mods/ITEMS/mcl_farming/potatoes.lua' 2022-06-15 01:30:55 +00:00
cora
9cea10a706 fix more blast resistance and hardness values 2022-06-13 02:48:00 +02:00
Elias Fleckenstein
e7898352d8 Remove mobs_mc_gameconfig 2022-05-27 02:44:39 +02:00
Elias Fleckenstein
f6a40ffb78
Run tools/strip_trailing_whitespace.sh 2022-05-26 07:29:28 +02:00
AFCMS
3ca40cd4e4 Remove 2D preview 2022-05-04 23:15:11 +00:00
kabou
f1a494ea62 Change stone tool repair materal to group:cobble.
* Update repair material for stone tools (pick, shovel, axe, sword and
  hoe) to use any cobble group stone.
2022-05-05 01:01:29 +02:00
kabou
64bb50dfd5 Change some crafting recipes to use group:cobble.
* Update crafting recipes for stone tools (pick, shovel, axe, sword and
hoe), furnace and brewing stand to use any cobble group stone.
2022-05-04 15:54:12 +02:00
Nils Dagsson Moskopp
56db877360 Disconnect gourd stems after destruct
While testing the previous commit, it became clear that gourd stems do
not disconnect properly if the gourd disappears while not being dug. A
simple method to create illegal curved stems was to explode the gourd.

This patch changes gourds so that the stem curves back after a gourd is
destroyed, regardless of reason. This hopefully makes curved stems that
are not connected to matching gourds a relict of the past.
2022-04-22 18:07:37 +00:00
Nils Dagsson Moskopp
e1d67a2095 Disconnect stems from carved pumpkins after dig
Carved pumpkins can end up being connected to a stem – either if they
were grown in a previous version of MineClone2 or Mineclonia, or if a
player carves them before harvesting them. This patch makes sure that
stems turn into unconnected stems after such a carved pumpkin is dug.
2022-04-22 18:07:37 +00:00
Nils Dagsson Moskopp
4fda54b0d1 Remove pumpkin pie recipe with carved pumpkin
Shearing an uncarved pumpkin turns it into a carved pumpkin and drops
four pumpkin seeds. As map generation and growing mechanics have been
changed to generate uncarved pumpkins instead of carved, preserving a
recipe to get pumpkin pie from carved pumpkins enabled players to get
both seeds and pumpkin pie from grown pumpkins, which was unintended.
2022-04-22 18:07:37 +00:00
Nils Dagsson Moskopp
9a53761b08 Remove pumpkin seeds recipe with carved pumpkin
Shearing an uncarved pumpkin turns it into a carved pumpkin and drops
four pumpkin seeds. As map generation and growing mechanics have been
changed to generate uncarved pumpkins instead of carved, preserving a
recipe to get seeds from carved pumpkins enables players to get twice
the amount of seeds as intended. Because of this, the recipe must go.
2022-04-22 18:07:37 +00:00
Alexander Minges
9b614c115c Grow uncarved pumpkin from seeds instead of carved
Carved pumpkin has to be explicitly registered as a separate node, as
registering a carved pumpkin node happened as a side effect of invoking
mcl_farming:add_gourd() for the carved pumpkin.

The iron / snow golem spawning checks that trigger whenever a carved
pumpkin is placed had to be moved out of the mcl_farming:add_gourd()
invocation to preserve the existing behaviour.

Note that uncarved pumpkin must not be registered as a separate node,
as invoking mcl_farming:add_gourd() for a registered node name leads to
stems not updating when an adjacent node is manually placed or mined.
2022-04-22 18:07:37 +00:00
kabou
de16eb3c5a Add compostability to node definition group.
* mcl_cake/init.lua (cake);
* mcl_core/craftitems.lua (apple);
* mcl_core/nodes_base.lua (dirt with grass);
* mcl_core/nodes_cactuscane.lua (cactus, sugarcane);
* mcl_core/nodes_climb.lua (vines);
* mcl_core/nodes_trees.lua (leaves, saplings);
* mcl_dye/init.lua (cocoa beans);
* mcl_farming/beetroot.lua (beetroot, & seeds);
* mcl_farming/carrots.lua (carrot);
* mcl_farming/melon.lua (melon, & slice, & seeds);
* mcl_farming/potatoes.lua (potato, baked potato);
* mcl_farming/pumpkin.lua (pumpkin, carved &, & seeds, & pie);
* mcl_farming/wheat.lua (wheat, cookie, bread, hay block);
* mcl_flowers/init.lua (flowers, ferns, grass, & tall variants);
* mcl_mushrooms/small.lua (red and brown mushrooms);
* mcl_mushrooms/huge.lua (red and brown huge mushrooms);
* mcl_nether/init.lua (nether wart block);
* mcl_nether/nether_wart.lua (nether wart);
* mcl_ocean/kelp.lua (kelp, dried &, & block);
* mcl_ocean/sea_pickle.lua (sea pickle);
* mcl_ocean/seagrass.lua (seagrass).
2022-04-02 03:32:56 +02:00
Emojigit
ad42c3588b mcl_farming 2022-02-23 23:58:05 +01:00
Emojigit
9734c74c56 (WIP) mcl_farming 2022-02-23 23:58:05 +01:00
NO11
627c37cd97 Fix pumpkin hud 2022-01-02 12:37:20 +00:00
Elias Fleckenstein
64d3a28578 Merge pull request 'Fix #1795 (Don't remove Pumpkin HUD when it is removed on death if keepinventory is enabled)' (#1796) from pumpkin_hud into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1796
2021-06-14 11:44:21 +00:00
AFCMS
e11dc4b58e fix some luacheck warnings 2021-06-12 00:28:07 +02:00
NO11
3577585d74 Use get_bool 2021-06-10 15:34:57 +00:00
NO11
c350b5158b Fix #1795 (Don't remove Pumpkin HUD when it is removed on death if keepinventory is enabled) 2021-06-09 18:31:21 +00:00
Elias Fleckenstein
4324e97db0 Merge pull request 'Pumpkin hud' (#1754) from pumpkin_hud into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1754
2021-06-08 11:06:22 +00:00
marcin-serwin
cbe8583cef Merge branch 'master' into polish-translation 2021-06-02 10:14:25 +00:00
AFCMS
cd33d406b2 fix many codestyle issues (functions, strings, modpaths) 2021-05-29 16:12:33 +02:00
NO11
ec542a142a Improve pumkin hud a bit 2021-05-29 08:56:11 +00:00
NO11
47b6a8d7f8 Remove unused variable 2021-05-25 09:03:06 +00:00
NO11
ba38f787e2 Fix local function code style 2021-05-24 11:09:47 +00:00
NO11
8b11e2fec8 Add multiplayer support for pumpkin hud 2021-05-23 22:31:13 +00:00
NO11
9b9ec13967 „mods/ITEMS/mcl_farming/pumpkin.lua“ ändern 2021-05-23 19:38:49 +00:00
NO11
d5a2e5e514 Add "fake" crosshair when the player is wearing a pumpkin 2021-05-23 17:38:53 +00:00
NO11
dddaed42b6 Obstruct the view of the player when wearing a pumpkin 2021-05-23 16:50:09 +00:00
NO11
973a8201ad Pumpkin blur texture 2021-05-23 16:44:01 +00:00
AFCMS
fcc2087b97 [mcl_farming] fix warnings 2021-05-22 23:50:28 +02:00
Elias Fleckenstein
33c6e5cdad Fix wearing pumpkin heads as armor 2021-05-04 08:59:01 +02:00
Elias Fleckenstein
ca75a893db Merge branch 'master' into damage 2021-04-17 12:58:19 +02:00
AFCMS
a602f64ea5 fix many warnings 2021-04-15 23:41:34 +02:00
Marcin Serwin
2a06be02b3 Add polish translation of mcl_farming 2021-04-14 21:20:58 +02:00
Elias Fleckenstein
ce0148d9a8 Rewrite armor; new damage system 2021-04-14 15:46:52 +02:00
Elias Fleckenstein
d3a3253563 Revert "Revert "Make hoe dig some blocks faster""
This reverts commit db5626fcb4.
2021-04-12 16:34:40 +02:00
Elias Fleckenstein
db5626fcb4 Revert "Make hoe dig some blocks faster"
This reverts commit c1e295de5f.
2021-04-12 15:05:01 +02:00
AFCMS
339e3e2792 fix some tools not using right var 2021-04-05 14:32:48 +02:00
AFCMS
84819bf9f5 MAKE EVERY SINGLE MOD USE PROPER COLORS!!! 2021-03-30 00:01:29 +02:00
Elias Åström
c1e295de5f Make hoe dig some blocks faster
- Sponges
- Hay and kelp blocks
- Nether wart
- Leaves
2021-03-21 12:39:14 +01:00
Nicu
a40e1c4737 Reduce the size of the pumpkin texture
2732 -> 303 bytes

* We need smaller file sizes for better game startup time, especially for multiplayer and mobile gaming.
2021-03-19 17:41:37 +00:00
Elias Fleckenstein
d168bfa791 Fix pumpking breaking armor display 2021-03-19 14:47:52 +01:00
Elias Åström
ed30fa0868 Move data from deprecated files to mod.conf
Move data from deprecated files (depends.txt and description.txt) into
fields in mod.conf for all mods.

This was done with a shell script :)
2021-03-18 17:37:12 +01:00
AFCMS
06e8e972cc add help text to mcl_farming 2021-03-12 00:48:53 +01:00
AFCMS
bed3dd87ad Add API for mcl_jukebox 2021-03-12 00:10:50 +01:00
AFCMS
1a60d08a37 mcl_farming make plantlist copy global and mcl_jukebox cleanup
Sorry, I forgot to commit between the 2 features :-(
2021-03-11 23:39:26 +01:00
Elias Fleckenstein
aeb7078c05 Update use_texture_alpha to the minetest 5.4 conventions 2021-02-18 14:00:17 +01:00
Elias Fleckenstein
9b349a1684 More flexible wield rotation determination 2021-02-18 09:28:12 +01:00
Midgard
f27fbd866e
Correct hoe repair material 2021-02-12 17:13:58 +01:00
kay27
fd4ce3c688 Scale mcl_farming_pumpkin_face_preview.png 32x64 to 16x32 according to https://git.minetest.land/Wuzzy/MineClone2/issues/974 2021-01-08 14:30:11 +01:00
Wuzzy
39a0fdd24c No enchant 4 flint&steel,pumpkin,head,screwdriver 2020-12-19 16:26:12 +01:00
Elias Fleckenstein
ed738da016 Added Enchanting Table 2020-11-25 12:47:27 +01:00
Elias Fleckenstein
86b2cd70f9 Fortune 2020-11-06 13:46:52 +01:00
Elias Fleckenstein
7c28bf8507 Silk Touch 2020-11-02 19:09:23 +01:00
kay27
f2d68d909e Add some growth for unloaded farming plants 2020-09-05 21:49:12 +04:00
Wuzzy
eff6c4c476 Clean up poisonous foods 2020-08-13 19:20:52 +02:00
kay27
ba51686e6c Russian translation 2020-07-20 00:11:13 +00:00
Wuzzy
c106a62979 Use minetest.is_creative_enabled 2020-07-10 16:45:40 +02:00