Commit graph

1110 commits

Author SHA1 Message Date
ancientmarinerdev
a648e53699 Merge pull request 'Import villager trade changes by Alessandra_Lozoya' (#3854) from Codiac/MineClone2:trades into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3854
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-09-02 15:44:13 +00:00
Codiac
98e7cd6e8e Merge branch 'master' into trades 2023-09-02 04:15:42 +00:00
Sab Pyrope
5b4a79a26d Update russian translation 2023-08-31 14:16:42 +08:00
ancientmarinerdev
3c266f5cfd Merge pull request 'Enable enchanting on sheers & allow enchanted shears to shear.' (#3884) from Codiac/MineClone2:shears_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3884
Reviewed-by: AFCMS <afcm.contact@gmail.com>
2023-08-27 23:42:53 +00:00
codiac
85c1c57e95 Fix formatting. Remove plain terracotta. 2023-08-19 11:36:04 +10:00
Sebastian Riedel
d7ea628270 Revert reversion of 822071c66b 2023-08-14 11:27:36 +02:00
codiac
246a95f973 Fix typo 2023-08-14 10:39:31 +10:00
codiac
8c64fdfa5d Enable enchanting on sheers & allow enchanted shears to shear. 2023-08-13 14:02:15 +10:00
codiac
4f2cb955b8 Use minetest.get_item_group for more flexibility 2023-08-05 15:09:53 +10:00
codiac
a3bbb3694c Allow villager to claim filled cauldrons.
Fixes #3733
2023-08-05 15:09:53 +10:00
codiac
2cf5183638 Import villager trade changes by Alessandra_Lozoya 2023-07-25 13:44:28 +10:00
Kristian
9c77cbc011 TOM Mobs 2023-06-27 21:09:03 +00:00
José Muñoz
c61df75370 Add spanish translations 2023-06-27 20:39:27 +00:00
ancientmarinerdev
dd5d1dad29 Nerf skeleton attack 2023-06-25 11:52:02 +00:00
ancientmarinerdev
7d51519f4d Fix wool farm crash 2023-06-21 20:47:54 +00:00
ancientmarinerdev
cc5a0971ac Object reference check before setting velocity 2023-06-05 15:03:45 +01:00
epCode
e49eac6d85 Fix sheep not regrowing wool after eating 2023-06-04 16:24:37 -07:00
epCode
e53b6c124c Make sheep always drop 1 wool (MC continuity) 2023-06-04 22:41:35 +00:00
epCode
92887f5501 fix sheep replace rate 2023-06-04 22:41:35 +00:00
epCode
86cd5711ca Rearange on replace code to be more general purpous 2023-06-04 22:41:35 +00:00
epCode
c049113f26 Fix sheep sliding, make eating timed, fix animation repeat 2023-06-04 22:41:35 +00:00
epCode
2e2f56122d Incorperate sheep eating animation. #3734 2023-06-04 22:41:35 +00:00
ancientmarinerdev
4287a261c8 Change order of numbers passed into random that crash on some Lua versions 2023-06-02 21:14:52 +01:00
ancientmarinerdev
812269264b Add in caps for underground water and axolotl 2023-06-01 20:05:25 +00:00
ancientmarinerdev
4d3e8e25e5 Add water_ambient cap 2023-06-01 20:05:25 +00:00
PrairieWind
5ed92a2695 Make pigs mountable without carrot on a stick, but require the carrot on a stick to actually control the pig 2023-05-22 21:40:23 +00:00
PrairieWind
873297d2cf Make Piglin Brutes drop golden axes
Instead of dropping crossbows
2023-05-17 20:55:09 +00:00
ancientmarinerdev
53637bbc19 Group attack configured so that sword piglins and piglins will also respond to aggression on other piglins. 2023-05-14 15:56:26 +00:00
ancientmarinerdev
92a8f23d22 Fix creeper name 2023-05-14 15:56:26 +00:00
ancientmarinerdev
2d89440972 Fix Piglin naming and add localisation entries 2023-05-14 15:56:26 +00:00
ancientmarinerdev
92c0809dbe Remove zombie pigman file as no longer needed 2023-05-14 15:56:26 +00:00
ancientmarinerdev
530c8ec0da Remove zombie pigmen and ensure zombie piglin named correctly. Add Piglin description names. 2023-05-14 15:56:26 +00:00
PrairieWind
be32ffde6b Remove Flower Forest Beaches from Wolf biome spawn list 2023-05-12 22:50:33 +00:00
ancientmarinerdev
3aed71fb85 Piglins no longer aggro for enchanted gold armour 2023-05-12 22:21:56 +00:00
3raven
9518d47662 (french) translation enhancements (#3643)
- Add missing translation
- Fix broken translations
- Fix unacurate description
- Correct/improve/change for cohesion french translation

Translations templates have been updated,other translations must be updated.

<!--
Please follow our contributing guidelines first:
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CONTRIBUTING.md#how-you-can-help-as-a-programmer

By submitting this pull request, you agree to follow our Code of Conduct:
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CODE_OF_CONDUCT.md
-->

Tell us about your pull request! Reference related issues, if necessary

### Testing
Tell us how to test your changes!

Co-authored-by: 3raven <elise_declerck@laposte.net>
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3643
Reviewed-by: AFCMS <afcm.contact@gmail.com>
Co-authored-by: 3raven <3raven@noreply.git.minetest.land>
Co-committed-by: 3raven <3raven@noreply.git.minetest.land>
2023-05-11 22:39:49 +00:00
ancientmarinerdev
39872f8ef6 Fix hoglin reach and view_range 2023-05-11 16:33:55 +00:00
ancientmarinerdev
8a771ebfce Allow adjustment of attack frequency. Reduce attack frequency of Hoglins. Move on_step and do_states functionality off of the attack timer on to their own timer. 2023-05-11 16:33:55 +00:00
megustanlosfrijoles
d14c074d6c Add spanish translations (#3678)
I'm working on adding more translations. I made this pull request to let everyone now I'm working on this.

So far I've completed 1 file/mod

Co-authored-by: José Muñoz <dr.cabra@disroot.org>
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3678
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: megustanlosfrijoles <dr.cabra@disroot.org>
Co-committed-by: megustanlosfrijoles <dr.cabra@disroot.org>
2023-05-10 23:12:37 +00:00
ancientmarinerdev
ea4ea3f05e Standardise despawn logic and add asserts. Add persistent flag for mobs that have been interacted with. 2023-05-09 22:24:40 +00:00
ancientmarinerdev
8b45cb2672 Remove slimes from mushroom islands 2023-05-09 14:56:51 +01:00
ancientmarinerdev
3bdc77a1aa Hoglins should only spawn in crimson forest 2023-03-26 13:03:46 +00:00
ancientmarinerdev
7f3734b6cb Ensure hoglins and piglins aren't faster than player. 2023-03-26 13:03:46 +00:00
ancientmarinerdev
b7079e8b19 Fix slime and some nether mob speeds 2023-03-26 13:03:46 +00:00
ancientmarinerdev
049406162e Fix crash when skeleton tries to jock when there is no pos, maybe because pos is unloaded. 2023-03-25 01:55:52 +00:00
ancientmarinerdev
41882e9e1f Adjust speeds to make it less ridiculous 2023-03-23 00:38:18 +00:00
ancientmarinerdev
2440b73e67 Bundled lua with 5.7 crashes when you right click a farmer villager. math.random needs correct order 2023-03-22 03:55:27 +00:00
ancientmarinerdev
81a258d33b Clean up and reorder code 2023-03-19 02:44:35 +00:00
ancientmarinerdev
bd579314ba Remove logging and clean up 2023-03-19 02:44:35 +00:00
ancientmarinerdev
b8b47e55e1 Add in slime chunks 2023-03-19 02:44:35 +00:00
ancientmarinerdev
e15d0cd5a0 Merge pull request 'Make enderman hostile towards endermites and fix it's behavior on other dimensions' (#3501) from anarquimico/MineClone2:enderman_hostile_endermite into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3501
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-03-08 21:47:40 +00:00
anarquimico
8c4f2fdd7b TP to dark spots only on the overworld 2023-03-03 21:55:56 -03:00
ancientmarinerdev
48fa2608ed Merge pull request 'spawn-egg-crash-fix' (#3492) from GuyLiner/MineClone2:spawn-egg-crash-fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3492
2023-03-04 00:34:45 +00:00
anarquimico
a3ab67cb55 Better fix for enderman behavior 2023-03-03 10:03:26 -03:00
anarquimico
7cbeae00cc Fix enderman behaviour for other dimesions 2023-03-02 10:22:08 -03:00
anarquimico
16a4448c5f Performance improvement 2 2023-03-02 09:57:33 -03:00
anarquimico
5093f31f28 Performance improvement 2023-03-02 09:20:00 -03:00
anarquimico
8825fb9860 Removes unnecessary commentary 2023-03-02 08:32:52 -03:00
anarquimico
d0022db2a5 Make enderman hostile towards endermites 2023-03-02 08:28:06 -03:00
epCode
dc9407701e fix crash skeleton jockey code 2023-02-28 17:46:21 +00:00
epCode
e48dabc8be Create the Jockey api and use it on Skel/Spid 2023-02-28 17:46:21 +00:00
GuyLiner
14039290a9 Added mobs that were missing from non_spawn_specific() 2023-02-26 11:06:38 -05:00
GuyLiner
f39cec2442 Added slime_big to non_spawn_specific instead of creating an exception for them in spawning.lua 2023-02-16 20:48:30 -05:00
GuyLiner
fbb2923a0b Added mcl_mobs:non_spawn_specific function for mobs that don't naturally spawn and for mobs that don't spawn in the overworld 2023-02-16 19:43:50 -05:00
Michieal
8bfa55fa7a Changed Salmon, Glow Squid, Cod, Cartography Table, Awards_Axolotl, Armor_Stand_Item. Glow-Ink_sac. 2023-02-14 01:43:16 +00:00
ancientmarinerdev
9445e10834 Pathfinding optimisations and villager has earlier bed time 2023-02-11 10:36:56 +00:00
ancientmarinerdev
4482068211 Nerf group spawning until group spawn is based on pack size, not per spawn attempt 2023-02-10 19:01:29 +00:00
ancientmarinerdev
7d46fa3362 Merge pull request 'texture-consolidation' (#3380) from texture-consolidation into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3380
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-04 03:23:13 +00:00
mrminer
01f814267e Update 'mods/ENTITIES/mobs_mc/villager.lua' 2023-01-31 21:14:23 +00:00
mrminer
8f4c69084d Make fletcher buy sticks 2023-01-31 21:12:01 +00:00
Michieal
6265148727 Move textures all into one centralized directory. 2023-01-30 22:55:53 -05:00
ancientmarinerdev
ce7d493890 Merge pull request 'Iron golem fixes' (#3309) from gldrk/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3309
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-22 00:45:53 +00:00
b3nderman
a7fac7c550 Fix tamed ocelot textures not being set correctly 2023-01-15 16:57:47 +00:00
gldrk
5412206743 Make iron golem protect villagers 2023-01-14 01:37:32 +03:00
gldrk
30521a8b2f Make iron golem defend itself from players 2023-01-14 01:34:28 +03:00
ancientmarinerdev
8e1f00d428 Villager breeding is now unburgered. Burger now needs right click to initiate follow. 2023-01-11 01:07:18 +00:00
ancientmarinerdev
ef90820f67 Fix farm animals so they don't get into combat state 2023-01-11 01:07:18 +00:00
ancientmarinerdev
d6d11b9526 Zombie villagers cannot despawn during curing process 2023-01-11 01:07:17 +00:00
ancientmarinerdev
b0264b2736 Endermen now despawn when not holding a block. 2023-01-11 01:07:17 +00:00
ancientmarinerdev
fb30564827 Ooooooh, lecterns. My favourite. 2023-01-09 22:32:14 +00:00
ancientmarinerdev
e4db91d35c Fix crash bug 2023-01-06 02:59:02 +00:00
ancientmarinerdev
85f7bbdb80 Optimisation. Don't even prepare to path if not ready to path 2023-01-06 02:59:02 +00:00
ancientmarinerdev
465a919f6b Villager will now reclaim job during the day even when it isn't work time 2023-01-06 02:59:02 +00:00
ancientmarinerdev
87f04bdd9f Prevent attempting to path through 2 doors until code supports it. Clean up also. 2023-01-06 02:59:02 +00:00
ancientmarinerdev
e3307d647b Fix pathing to bell that is sat on the ground 2023-01-06 02:59:02 +00:00
ancientmarinerdev
5c0a763b83 Optimisation - Only check for town bell if ready to path 2023-01-06 02:59:02 +00:00
ancientmarinerdev
9b1ceebf0d Villagers will now pathfind to town bell that isn't on the ground 2023-01-06 02:59:02 +00:00
Johannes Fritz
0b1916b807 Fix baby zombies going through 1 node high space 2023-01-04 07:52:48 -06: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
d2edc75407 Separate blue dye from lapis lazuli.
* Add craftitem "mcl_core:lapis".
* Add texture for blue dye item.
* Add crafting recipe for blue dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update lapis block crafting recipes.
* Update lapis ore drops.
* Update dungeon and shipwreck loot.
* Update enchanting table input.
* Update villager trade.
2022-12-29 03:08:49 +00:00
kabou
7311071303 Separate black dye from squid ink sac.
* Add craftitem "mcl_mobitems:ink_sac".
* Add texture for black dye item.
* Add crafting recipe for black dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update fishing loot.
2022-12-29 03:08:49 +00:00
kabou
60b0cfe89a Remove FIXME about slimes spawning in swamps.
* This has been fixed.
2022-12-29 02:13:57 +00:00
kabou
d8a883e81f Limit size of cow herds spawning.
* Cows should spawn in herds of max 4, not 8.
2022-12-29 02:13:57 +00:00
kabou
15f5c3c30a Make slimes spawn at night in swamps.
* Adds spawn definitions for large, small and tiny slimes to spawn in
  Swampland and MangroveSwamp biomes when light levels are less than 7.
2022-12-29 02:13:57 +00:00
kabou
4af8148850 Refactor spawn registrations.
* Unduplicate spawnable biome lists for slimes and magma cubes.
* Rename min and max spawndepth identifiers.
2022-12-29 02:13:57 +00:00
kabou
ea6201d32f Add missing biome to slime spawn list.
* Add "MangroveSwamp_underground" to the lists of spawnable biomes for
  big, small and tiny slimes.
2022-12-29 02:13:57 +00:00
kabou
da17ff8ea0 Remove stray dependency.
While mobs_mc_gameconfig was deleted at some point during the mob
refactoring, it was still listed in mobs_mc's mod.conf.
2022-12-29 02:13:57 +00:00
kabou
8279dcb3dd Add FIXME notes to slime mob code.
Missing features:
* Slimes should not only spawn in caves, but also at night in swamps.
* Slimes should only spawn on 10% of the map ("slime chunks").
* There are no spawn eggs registered for small and tiny slimes and magma
  cubes.
2022-12-29 02:13:57 +00:00
kabou
ea19f02e14 Assorted spawn_children_on_die fixes.
* Use proper vector semantics.
* Optimize away superfluous temp variables and repetitive local variable
  declarations.
2022-12-29 02:13:57 +00:00
kabou
95cbac78a8 Change number of children spawned on die.
When a slime or magma cube dies, it should spawn between 2 to 4 smaller
children.  The code was always spawning 4 children (3 for big magma
cubes).  This commit makes the following changes to the function
`spawn_children_on_die`:
* Make the number of children spawned a random number between 2 and 4.
* No longer accept the `children_count` as an argument, because this
  number should always be a random number between 2 and 4 anyway.
* Update all callers accordingly.
2022-12-29 02:13:57 +00:00
FossFanatic
522bbbbe26 Delete 'mods/ENTITIES/mobs_mc/textures/mobs_mc_enderman_block.png' 2022-12-22 12:47:44 +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
AFCMS
bbf21762a6
Format again 2022-12-07 18:22:54 +01:00
AFCMS
34a7cf3e9f
Remove duplicated reach field 2022-12-07 18:22:54 +01:00
AFCMS
3153c41f3a
Remove mtg compatibility code 2022-12-07 18:22:53 +01:00
AFCMS
489d3b7da6
Format file 2022-12-07 18:22:53 +01:00
ancientmarinerdev
a0a0c69213 Fix Axelotl crash for right click 2022-12-04 11:34:48 -06:00
cora
69c64a2c24 Fix wrong self ref with mcl_mobs.spawn_child 2022-11-28 03:26:51 +01:00
cora
c25287e493 Some cleanup 2022-11-27 14:53:16 +01:00
cora
e7d9ded9ab Split off combat funcs 2022-11-27 14:53:16 +01:00
cora
96d697c5cd Split off pathfinding, use metatables 2022-11-27 14:53:16 +01:00
cora
bbba7cee41 Add compat for old "wrong" : notation 2022-11-27 14:53:16 +01:00
cora
e82c318f0c Split off breeding 2022-11-27 14:53:16 +01:00
cora
70834d0f5d make register functions use the . notation 2022-11-27 14:53:16 +01:00
cora
bb73e5f1cd Make it possible to pick up fish with river water bucket 2022-11-26 22:18:46 +01:00
cora
d4c2501d62 Axolotl cleanup, remove clutter 2022-11-26 22:18:46 +01:00
cora
708fcfb368 Axolotl: remove cod-inherited swarming code 2022-11-26 22:18:46 +01:00
cora
d3349396b4 Save tropical fish properties in item meta on bucket pickup 2022-11-26 22:18:46 +01:00
cora
665e8a06a2 Save axolotl properties in item meta on bucket pickup 2022-11-26 22:18:46 +01:00
cora
67e8f13a96 Axolotl whitespace fixes 2022-11-26 22:18:46 +01:00
cora
8564a12398 Nerf vex summoning so evoker doesnt spawn infinite vexes 2022-11-26 17:06:04 +01:00
cora
0942949c5d Merge pull request 'Fix axolotl breeding' (#3007) from Axolotl into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3007
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-11-25 02:48:55 +00:00
PrairieWind
e1ba319616 Fix Baby Striders being extra small 2022-11-24 14:46:54 -07:00
Johannes Fritz
88897566d9 Fix axolotl breeding 2022-11-24 09:10:17 -06:00
cora
53c1ed9fbf Merge pull request 'Axolotl' (#2870) from TheOnlyJoeEnderman/MineClone2:Axolotl into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2870
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-11-23 03:18:36 +00:00
cora
a28f667b20 Villagers only summon golems when monsters are near 2022-11-17 02:26:51 +01:00
ancientmarinerdev
1a670bc41b Allow villagers to resettle and not run back to job and and old bed 2022-11-17 02:26:51 +01:00
TheOnlyJoeEnderman
9e73c2cd46 Remove spaces on line 70 (71)
Actually delete the spaces this time.
2022-11-16 08:00:35 +00:00
TheOnlyJoeEnderman
50e6dd94b2 Code cleaning
Remove outdated comment. Fix spaces on lines 40, 67, 70.
2022-11-16 07:58:07 +00:00
cora
f66a241188 turn villagers to z villagers not normal zs 2022-11-15 22:20:04 +00:00
cora
80fb648447 Turn villagers to zombies half the time when killed by zombies 2022-11-15 22:20:04 +00:00
ancientmarinerdev
59808c5190 Fix race condition where many villagers are fighting for same job 2022-11-12 02:35:00 +01:00
ancientmarinerdev
3000a378f3 Villagers can claim any bed. Player can steal villager bed. Villager won't take player bed 2022-11-12 02:35:00 +01:00
ancientmarinerdev
814ad39c09 Villagers can now claim any type of bed. 2022-11-12 02:35:00 +01:00
TheOnlyJoeEnderman
6a9387b752 Reverse axolotl model to fix the head look direction 2022-11-11 03:50:39 +00:00
TheOnlyJoeEnderman
cbb7a8edb0 Reverse axolotl model to fix the head look direction 2022-11-11 03:50:04 +00:00
TheOnlyJoeEnderman
012fe4b37e Move axolotl_bucket to buckets mod 2022-11-07 08:20:13 +00:00
TheOnlyJoeEnderman
dff028595c Remove old axolotl spawn icon 2022-11-07 08:13:26 +00:00
TheOnlyJoeEnderman
6e328153d4 axolotls are no longer mislabelled as passive 2022-11-06 02:18:47 +00:00
TheOnlyJoeEnderman
4695707188 Fix damage value for axolotls 2022-11-06 02:14:58 +00:00
TheOnlyJoeEnderman
432e196794 code cleaning
fixed some messy tabs/spaces, removed old comments.
2022-11-06 02:05:14 +00:00
TheOnlyJoeEnderman
a592d69990 add all current underwater creatures to list of mob to kill 2022-11-06 02:00:28 +00:00
TheOnlyJoeEnderman
310237be33 Fix axolotl hitbox, clean up some comments 2022-11-06 01:47:31 +00:00
TheOnlyJoeEnderman
cf6d04c716 fix flipped UVs on gill.right
That simple
2022-11-05 22:05:31 +00:00
TheOnlyJoeEnderman
c22997db09 Add persistence, attempt to fix breeding, add random look at player event
They look away from the player randomly for some reason. I think the rotation needs to be mirrored, but I am unsure how one would do that.
2022-11-05 21:44:51 +00:00
anarquimico
f977b1a253 Fix mason texture 2022-11-05 03:21:36 +01:00
anarquimico
ff3438f729 Add villager mason profession 2022-11-05 03:20:58 +01:00
cora
2c4a768685 Transform villager with on_lightning_strike 2022-11-05 01:16:27 +01:00
cora
95db6104e9 Transform pig with on_lightning_strike 2022-11-05 01:16:27 +01:00