mim
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity
10,909 Commits 67 Branches 76 Tags 158 MiB
Commit Graph

1990 Commits

Author SHA1 Message Date
ancientmarinerdev 7daa79a3f8 Fix wither crash on certain version of Lua. 2023-02-02 02:22:21 +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 06effcd786 Merge branch 'master' into texture-consolidation 2023-01-30 22:57:38 -05:00
Michieal 6265148727 Move textures all into one centralized directory. 2023-01-30 22:55:53 -05:00
ancientmarinerdev 245ce99223 Using mcl_vars 2023-01-31 02:28:04 +00:00
ancientmarinerdev 1f107ec0c7 Tidy 2023-01-31 02:28:04 +00:00
ancientmarinerdev c209537cfe Make it a bit less chatty for logging 2023-01-31 02:28:04 +00:00
ancientmarinerdev d583ccb986 Oooops, wrong number 2023-01-31 02:28:04 +00:00
ancientmarinerdev 7d803e174c Set freeze and warning when mobs too close to boundary of world 2023-01-31 02:28:04 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 a1cc24f8d3 Slowing creative digging 2023-01-24 11:16:28 -06:00
ancientmarinerdev e4f26a4688 Fix self object checks for check suspend 2023-01-23 20:10:28 +00:00
ancientmarinerdev af86e73280 Fix self object reference in player_in_active_range 2023-01-23 20:10:28 +00:00
ancientmarinerdev 32be8f9602 Fix more self object references in falling 2023-01-23 20:10:28 +00:00
ancientmarinerdev 15560d969c Change order of mob step 2023-01-23 20:10:28 +00:00
ancientmarinerdev 6bbf3af97b Remove log line 2023-01-23 20:10:28 +00:00
ancientmarinerdev 84317afc93 Review feedback implemented and planned changes 2023-01-23 20:10:28 +00:00
ancientmarinerdev 2cd6629ae1 Add some mob object checks to avoid crashing 2023-01-23 20:10:28 +00:00
ancientmarinerdev ce7d493890 Merge pull request 'Iron golem fixes' (#3309) from gldrk/MineClone2:master into master 
Reviewed-on: MineClone2/MineClone2#3309
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-01-22 00:45:53 +00:00
ancientmarinerdev 30d3b7ee23 Merge pull request 'mcl_bamboo Part 2.' (#3208) from mcl_bamboo_too into master 
Reviewed-on: MineClone2/MineClone2#3208
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-01-16 20:22:09 +00:00
ancientmarinerdev 9b28baaad6 Give longer to breed mobs. 1.5s is not enough 2023-01-16 00:00:28 +00:00
b3nderman f9b021e4c6 Fix animals jumping way too high upon growing up 2023-01-15 22:47:05 +00:00
Michieal e9c202ae45 Added Bamboo Biomes to spawning.lua. 2023-01-15 15:30:34 -05: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
gldrk 1536338199 Allow passive mobs to have protectors 2023-01-14 01:32:42 +03:00
gldrk 3697ef8069 Fix summoning friends for mobs 2023-01-14 01:28:35 +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 4fd4425aae Improved mob debug 2023-01-11 01:07:18 +00:00
ancientmarinerdev ac4cd2c325 Improve performance for head swivel check 2023-01-11 01:07:18 +00:00
ancientmarinerdev 01c8009c6a Tidy on_step function 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 59694ebc7c Fix merge conflict 2023-01-06 13:52:03 +00:00
ancientmarinerdev e4db91d35c Fix crash bug 2023-01-06 02:59:02 +00:00
ancientmarinerdev 2527479401 Clean up on isle 5, please 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 325a666c62 Added pathfinder constants to make it easier to tweak 2023-01-06 02:59:02 +00:00
ancientmarinerdev e9b54e85c2 Pathfinding clean up 2023-01-06 02:59:02 +00:00
ancientmarinerdev 4324fe2489 Villager will now path from one house to another in search of available job or bed 2023-01-06 02:59:02 +00:00
ancientmarinerdev d6804bf4b7 Fix distance to target issue, and refactor pathing actions 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 29cd73cb84 Pathfinding through door should also check door closest to position so villager can leave current house 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
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 0b1916b807 Fix baby zombies going through 1 node high space 2023-01-04 07:52:48 -06:00
ancientmarinerdev f8ae702ce4 Function name consistency 2023-01-02 00:58:23 +00:00
ancientmarinerdev 5faf060122 Fix crash and remove unused duplicate variables 2023-01-02 00:54:08 +00:00
ancientmarinerdev 8c648d1fc3 Refactor mob_step and do_states 2023-01-02 00:00:40 +00:00
iliekprogrammar c2ba70a601 Merge branch 'master' into mcl-item-entity-fixes 2022-12-30 18:34:41 +00:00
ancientmarinerdev e6e898671a Merge pull request 'add japanese translation' (#3149) from SakuraRiu/MineClone2:master into master 
Reviewed-on: MineClone2/MineClone2#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 6756ee340c Mob spawning chatcommand refactoring. 
* Put calculations that are only used conditionally inside the
  related `if` block.
* Make code logic more explicit.
* Take logging statement out of return value assignment.
* Remove duplicate assignment.
* Fix a typo in the function's description.
 2022-12-29 02:13:57 +00:00
kabou 0c454a34c9 Use vectors in `get_next_mob_spawn_pos()` 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
ancientmarinerdev 254caaff37 Merge conflict fixes for release 0.81.1 2022-12-14 21:38:53 +00:00
CyberMango f7f2b97b13 Fixed #2313 - baby mobs cant jump over blocks. 
Simply removed a line that specifies they shouldnt do that.
 2022-12-10 19:54:44 +02:00
ancientmarinerdev e408dd45e5 Remove easter egg taking 3% of processing 2022-12-09 19:30:06 +00: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 9508cd4c25 Fix creeper crash 2022-11-29 03:28:19 +01:00
cora 69c64a2c24 Fix wrong self ref with mcl_mobs.spawn_child 2022-11-28 03:26:51 +01:00
cora 318da7e3c9 Fix local go_to_pos call 2022-11-28 03:26:51 +01:00
cora ebf214c043 Check if spawndef exists when spawning 2022-11-27 14:53:17 +01:00
cora 7bd0b5a9b1 Some more missing arg fixes 2022-11-27 14:53:16 +01:00
cora bc496a8682 Finally indent register_mob and make registered mobs global 2022-11-27 14:53:16 +01:00
cora a3415647d4 Fix do_jump call in combat.lua 2022-11-27 14:53:16 +01:00
cora 4909ef6ff7 Restructure on_step a bit 2022-11-27 14:53:16 +01:00
cora 3c6d79ecb3 Add entity name to debug box 2022-11-27 14:53:16 +01:00
cora 6948b77226 move debug/nametag code back to api.lua 2022-11-27 14:53:16 +01:00
cora 90321ee578 Fix leftover local do_attack call 2022-11-27 14:53:16 +01:00
cora 2b691dea07 Fix some more global var warnings 2022-11-27 14:53:16 +01:00
cora c25287e493 Some cleanup 2022-11-27 14:53:16 +01:00
epCode 762f64a4d1 Fix mob rotation glitching out near 0/360 in degrees 
The problem mainly was that the set_yaw function was not allowing for negitive values.
 2022-11-27 14:53:16 +01:00
cora db63f1c453 fix leftover pi shortcut 2022-11-27 14:53:16 +01:00
cora faa38ffab8 Fix some warnings 2022-11-27 14:53:16 +01:00
cora 19d6d43b39 move on_blast default to mob default def 2022-11-27 14:53:16 +01:00
cora 28b6fcf289 Move detach_child to mount.lua 2022-11-27 14:53:16 +01:00
cora 80490b4c11 Move smooth rotation to separate function 2022-11-27 14:53:16 +01:00
cora 5e177c61f6 Move on_step despawning to separate function 2022-11-27 14:53:16 +01:00
cora c9c2b874be move relative animation speed to separate function 2022-11-27 14:53:16 +01:00
cora 18c415f6a0 put head swivel in separate function 2022-11-27 14:53:16 +01:00
cora 49670d1d28 put water flow code in separate function 2022-11-27 14:53:16 +01:00
cora a25cd921f2 move do_states to movement.lua 2022-11-27 14:53:16 +01:00
cora 91b5b6266c move stray particle spawner func to effects 2022-11-27 14:53:16 +01:00
cora 148b30694f Fix monster_attack and some other settings issues 2022-11-27 14:53:16 +01:00
cora f4374d9efd Fix item drops 2022-11-27 14:53:16 +01:00
cora b41d6a1cae Fix mob_punch 2022-11-27 14:53:16 +01:00
cora 6548b7fe47 move stray pathfinding funcs to pathfinding file 2022-11-27 14:53:16 +01:00
cora c7681af53e Move registration functions to init.lua 2022-11-27 14:53:16 +01:00
cora cc77e109f5 Split off general movement functions 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 01abfea16d Split off item management 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 d62dbcb852 effects -> separate file + metatable 2022-11-27 14:53:16 +01:00
cora 67fd8c8b40 split off physics functions into separate file + use metatable 2022-11-27 14:53:16 +01:00
cora 90639ef99d remove unused functions 2022-11-27 14:53:16 +01:00
cora 31ef791cfd Add proper metatable to mobs 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: MineClone2/MineClone2#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
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 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: MineClone2/MineClone2#2870
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-23 03:18:36 +00:00
cora adfbf4bc64 Fix lightning boat crash 2022-11-20 02:54:42 +01: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
AFCMS 96e83e866c
Make `mcl_item_entity` API public 2022-11-15 21:48:58 +01:00
AFCMS 3bb86fd436
Fix warnings + add type annotations 
- fix wrong usage of `mcl_enchanting.get_enchantments`
- use new vectors everywhere
- simplify code
- make code lines less long
 2022-11-15 21:48:57 +01:00
cora 033b051689 Fix crash when rightclicking parrot 2022-11-15 21:16:48 +01:00
ancientmarinerdev e6d778b214 Remove WIP flag for hopper minecart 2022-11-14 04:07:41 +01:00
ancientmarinerdev a2732b655f Code cleanup 2022-11-14 04:07:41 +01:00
ancientmarinerdev 9065170b1c Clean up hopper minecart 2022-11-14 04:07:41 +01:00
ancientmarinerdev ce457eb351 Who doesn't love hopper minecarts? 2022-11-14 04:07:41 +01: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 3e1a475442 Logging improvements 2022-11-12 02:35:00 +01:00