Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity
11,203 Commits
85 Branches
80 Tags
173 MiB
Commit Graph

1001 Commits (aa3b3421d54ba6ea2578f8d1786d969381baaf36)

Author SHA1 Message Date
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
cora 5cf2f488a8 Transform creeper with on_lightning_strike 2022-11-05 01:16:27 +01:00
cora 97468cde0c Add mcl_util to mobs_mc depends 2022-11-05 01:16:27 +01:00
cora 220b542cbf Mooshroom color change with on_lightning_strike 2022-11-05 01:16:27 +01:00
cora 32e4a122a1 Comment out stray debug lines 2022-11-05 01:14:54 +01:00
TheOnlyJoeEnderman faa7ca1f68 Change axolotl spawn egg to palette instead of texture 2022-11-04 02:21:58 +00:00
ancientmarinerdev ad137304bc Fix bug where if it finds wrong door and can't plot route it hogs the pathing 2022-11-03 21:34:14 +00:00
ancientmarinerdev ac45dec544 Villager should find the closest bed to claim 2022-11-03 21:34:14 +00:00
ancientmarinerdev 5866983bf5 Villager will try to take the job block closest to them 2022-11-03 21:34:14 +00:00
TheOnlyJoeEnderman 126de74904 add axolotl to language template 2022-11-02 22:54:21 +00:00
ancientmarinerdev 2f4622909e Right click shouldn't stop work and allow a reset of trades 2022-11-02 22:09:35 +01:00
ancientmarinerdev 5ff4ce7116 Less verbose logging 2022-11-02 22:09:35 +01:00
ancientmarinerdev 7f33287e18 Reset trade counter when unlocking trades 2022-11-02 22:09:35 +01:00
ancientmarinerdev a01c3d1342 Pumkin price unreasonable and fix logging. 2022-11-02 22:09:35 +01:00
ancientmarinerdev cabe299456 Villager fixes 2022-11-02 22:09:35 +01:00
ancientmarinerdev bf491c35a1 Fix bug 2022-11-02 22:09:35 +01:00
ancientmarinerdev 04cac7156e Villagers gather at lunch time, reset trade when they get to work. 2022-11-02 22:09:35 +01:00
Johannes Fritz 963547a0ca Fix axolotl model 2022-11-02 12:45:12 -05:00
TheOnlyJoeEnderman d5ca4fca9b fix constant need to run for the hills, restore ability to jump 
previous commit just added comments.
 2022-11-02 04:30:09 +00:00
TheOnlyJoeEnderman 3bdd1ea160 Update 'mods/ENTITIES/mobs_mc/axolotl.lua' 2022-11-02 04:15:40 +00:00
TheOnlyJoeEnderman 5cc835df93 fix indentation ln 53, 72, 73; change list on ln 50 to seperate lines 2022-11-02 03:25:10 +00:00
cora 646a341f52 Fix mob api can_spawn callback 2022-11-02 03:47:23 +01:00
cora 3629f88dc0 Make strider usable 2022-11-01 04:52:17 +01:00
cora 21f5586669 Fix strider spawning 2022-11-01 04:52:17 +01:00
cora fb67bc74ba Fix strider riding 2022-11-01 04:52:17 +01:00
cora fb1c1a483e Add strider 2022-11-01 04:52:17 +01:00
cora d1f0ade2e8 Grow wither rose when wither kills mob 2022-11-01 04:52:17 +01:00
cora eef4b52ce4 Remove "wild" nether wart, remove natural wither skelly spawning 
wither skellys spawn on bridges now, enough wart in outposts
and bulwarks
 2022-11-01 04:52:17 +01:00
TheOnlyJoeEnderman 88d02da047 Update 'mods/ENTITIES/mobs_mc/init.lua' 2022-10-31 18:17:14 +00:00
TheOnlyJoeEnderman 7aafb67923 fix flipped UVs 2022-10-31 00:07:30 +00:00
TheOnlyJoeEnderman e7bcc89e65 Merge branch 'master' into Axolotl 2022-10-30 21:14:49 +00:00
TheOnlyJoeEnderman 1e003a2571 Remove cold and non-water biomes from spawn list, add "LushCaves" to biome list 
I will change it to only Lush Caves if/when they are added.
 2022-10-29 22:29:09 +00:00
TheOnlyJoeEnderman 3001832b8f Update 'mods/ENTITIES/mobs_mc/init.lua' 2022-10-29 21:44:39 +00:00
epCode 2b2c2cf9cc remove debug and remove resetting value 20 times per second 2022-10-29 12:08:06 +02:00
epCode 5378d8eba7 add random horse speed per mc wiki 2022-10-29 12:08:06 +02:00
epCode de73129c2b Make skeleton strafe and avoid enemies 2022-10-29 12:08:06 +02:00
TheOnlyJoeEnderman e2107601f4 move axolotl from MCL to voxelgoodenough 2022-10-29 05:40:13 +00:00
TheOnlyJoeEnderman 35ac5c75f5 Update 'mods/ENTITIES/mobs_mc/init.lua' 2022-10-29 03:52:38 +00:00
TheOnlyJoeEnderman b1355513dd Merge branch 'master' into Axolotl 2022-10-28 07:18:37 +00:00
TheOnlyJoeEnderman 77bf8e0fb0 add axolotl 2022-10-28 07:15:49 +00:00
TheOnlyJoeEnderman 92d4e4f1e1 add axolotl to mob list 2022-10-27 04:39:22 +00:00
TheOnlyJoeEnderman ca0786f549 add animations to axolotl 
they do not appear in-game. If you can fix it, please do.
 2022-10-27 04:33:38 +00:00
TheOnlyJoeEnderman 7f291aa109 add animations to axolotl 
They should appear in game, but they don't.
 2022-10-27 04:32:17 +00:00
TheOnlyJoeEnderman 4683384da1 add animations to axolotl 
They don't appear in game for some reason. I did everything correctly to my knowledge.
 2022-10-27 04:31:00 +00:00
epCode ef923deff1 Merge branch 'master' into mob_head_code_improvments 2022-10-27 01:34:39 +00:00
epCode ee9301467c give zombie's the ability to wear armor. 2022-10-27 01:32:40 +00:00
TheOnlyJoeEnderman d34710be85 add axolotl blender file so others can edit 2022-10-26 21:45:40 +00:00
TheOnlyJoeEnderman e01f103723 add axolotl sounds 2022-10-26 21:37:11 +00:00
TheOnlyJoeEnderman 109d162bca add temporary axolotl model witn no animations 2022-10-26 21:15:19 +00:00
TheOnlyJoeEnderman d89c1c0e5e change axolotl texture name 2022-10-26 21:09:57 +00:00
TheOnlyJoeEnderman 1efacd5a1b change axolotl texture name 2022-10-26 21:09:17 +00:00
TheOnlyJoeEnderman 5abf7d187c Delete 'mods/ENTITIES/mobs_mc/textures/extra_mobs_spawn_icon_axolotl.png' 2022-10-26 21:06:19 +00:00
TheOnlyJoeEnderman 2f975f2155 Delete 'mods/ENTITIES/mobs_mc/textures/extra_mobs_axolotl_white.png' 2022-10-26 21:06:02 +00:00
TheOnlyJoeEnderman fbb1aaf29f Delete 'mods/ENTITIES/mobs_mc/textures/extra_mobs_axolotl_purple.png' 2022-10-26 21:05:49 +00:00
TheOnlyJoeEnderman 4bee5268cd Delete 'mods/ENTITIES/mobs_mc/textures/extra_mobs_axolotl_pink.png' 2022-10-26 21:05:36 +00:00
TheOnlyJoeEnderman d575e8394d Delete 'mods/ENTITIES/mobs_mc/textures/extra_mobs_axolotl_green.png' 2022-10-26 21:05:22 +00:00
TheOnlyJoeEnderman a8250e2544 Delete 'mods/ENTITIES/mobs_mc/textures/extra_mobs_axolotl_brown.png' 2022-10-26 21:05:08 +00:00
TheOnlyJoeEnderman 7e54597a25 Delete 'mods/ENTITIES/mobs_mc/textures/extra_mobs_axolotl_yellow.png' 2022-10-26 21:04:46 +00:00
TheOnlyJoeEnderman a47df3dcdc Delete 'mods/ENTITIES/mobs_mc/textures/extra_mobs_axolotl_black.png' 2022-10-26 21:04:20 +00:00
TheOnlyJoeEnderman eaa397a7da add new advancement, remove ability to jump 2022-10-26 20:27:14 +00:00
TheOnlyJoeEnderman e4995524de change axolotl model, texture, sound names 2022-10-26 20:24:48 +00:00
ancientmarinerdev f8ee473383 Fix villager work times 2022-10-26 00:17:29 +01:00
ancientmarinerdev eebea4a7a9 Clean up and add pathfinding constant 2022-10-26 00:11:55 +01:00
ancientmarinerdev 37e4dd5556 Villagers will now path through doors. Villagers don't stand around whne not working. 2022-10-26 00:11:55 +01:00
epCode 97c062a1ef fix cave spiders not the correct size/eyes being damageable 2022-10-24 20:14:37 +00:00
cora ae0b5381e4 Merge pull request 'Villagers - Work, sleep and wander. Check and claim beds etc.' (#2816) from ancientmarinerdev/MineClone2:feature/villager_improvement_rb into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2816
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-10-23 23:36:49 +00:00
ancientmarinerdev b9d58c2f79 Cows and villagers can go into attack state and become non-functional 2022-10-23 22:16:35 +01:00
cora ddb64421d0 Add missing texture for zombie horse 
the one in pixelperfection seems to be the mc one - this one is
made from horse_grey and horse_skeleton by me, cora, cc0
 2022-10-23 18:46:02 +02:00
ancientmarinerdev ccf7b54481 Fix work times 2022-10-23 01:17:51 +01:00
ancientmarinerdev e1b685429d Texture now changes when villager loses job. 2022-10-23 01:12:19 +01:00
ancientmarinerdev a8b336381d Villagers - On die, clear job and bed. Get same job if already traded. Thunderstorms go to bed 2022-10-22 01:28:45 +01:00
TheOnlyJoeEnderman 0589816c75 fix missing parts of textures 2022-10-21 01:10:55 +00:00
TheOnlyJoeEnderman 162fe3bc1c fix missing parts of textures 2022-10-21 01:10:35 +00:00
TheOnlyJoeEnderman 05329c908f add axolotl spawn icon 2022-10-21 00:41:27 +00:00
TheOnlyJoeEnderman f8fe943fa6 add axolotl skin 2022-10-21 00:40:34 +00:00
TheOnlyJoeEnderman 6ee8e98ae3 add axolotl skin 2022-10-21 00:40:12 +00:00
TheOnlyJoeEnderman 65c7b741bb Add axolotl bucket texture 2022-10-21 00:39:15 +00:00
TheOnlyJoeEnderman 8001a1ea07 add axolotl lua file 2022-10-21 00:38:24 +00:00
cora 9245c85296 Fix crash when golem tries to pickup item 2022-10-21 01:40:37 +02:00
epCode 18283fb593 fix zpigmen textures 2022-10-19 11:02:20 -07:00
ancientmarinerdev d148e6d4ba Villagers - Work, sleep and wander. Check and claim beds etc. 2022-10-19 01:10:16 +01:00
cora 663900bee3 Add hoglin to piglin attack list 
doesn't appear to work though
 2022-10-17 13:57:42 -06:00
cora 88de3656b1 Fix possible crash when spawning piglin 2022-10-17 13:57:42 -06:00
cora d13d50333f Don't drop trades inside nodes 2022-10-17 13:57:42 -06:00
cora bb640b4f1c make villager item pickup use new api feature 2022-10-17 13:57:42 -06:00
cora efb3072458 Add spawn egg colors, fix translator 2022-10-17 13:57:41 -06:00
cora 4570226536 De-spaghettify piglin code a bit 2022-10-17 13:57:41 -06:00
cora 71ad3b91db Add hoglin and zoglin 2022-10-17 13:57:41 -06:00
cora f7703c2889 Fix piglins taking whole stacks 2022-10-17 13:57:41 -06:00
cora 79265a596b enable zombie piglin transformation 2022-10-17 13:57:41 -06:00
cora eed7c67f60 Fix piglin arrows 2022-10-17 13:57:41 -06:00
cora f8777220a3 trade on item pickup instead of on_rightclick 2022-10-17 13:57:41 -06:00
cora 5b3480860a Add piglin from mcl5 2022-10-17 13:57:41 -06:00
epCode 22e6731261 various mob improvments 2022-10-15 11:25:26 -07:00
cora ea48be3f4c Add global and per-player mob caps 2022-10-14 02:31:23 +02:00
cora effac327f5 Fix baby Z-pigman visual size 2022-10-14 02:31:23 +02:00
cora 83f17fd9a7 Cats keep their color 2022-10-14 02:31:23 +02:00
cora 976b1eb153 don't despawn pillager, evoker and witch 2022-10-14 02:31:23 +02:00
cora 80ff5f1207 Fix enderpos global warning 2022-10-14 00:24:44 +02:00
cora fb07fee7f0 Glow squid spawn egg colors 2022-10-13 21:48:05 +00:00
cora 11742b61b2 Make Endermen also use the api instead of the old method 2022-10-13 21:48:05 +00:00
cora 063102cc1e Make glow squids use the particlespawner api 2022-10-13 21:48:05 +00:00
cora dc873f4de2 Fix crash when deleting particlespawners 2022-10-13 21:48:05 +00:00
cora 438d22e52e Fix glow inksac itemstring 2022-10-13 21:48:05 +00:00
cora 26ba771a02 Fix translator to use mobs_mc instead of extra_mobs 2022-10-13 21:48:05 +00:00
cora ddd39b553d Fix indentation 2022-10-13 21:48:05 +00:00
cora af8b1baba5 Do not spam the network with individual particles 2022-10-13 21:48:05 +00:00
cora 1daed62d12 Fix glow squid rotation / swimming direction 2022-10-13 21:48:05 +00:00
cora a599f66360 move ink sac to mcl_mobitems 2022-10-13 21:48:05 +00:00
Faerraven e2fd8b804c Add glow squids from mcl5 2022-10-13 21:48:05 +00:00