Commit graph

9830 commits

Author SHA1 Message Date
cora
4c94bee22f Merge pull request 'Add mason profession for villagers' (#2910) from add_villager_mason into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2910
2022-11-05 02:26:10 +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
f7ac679c0f Merge pull request 'Add Missing Crafting Recipes to Warped and Crimson Doors' (#2908) from warped_crimson_doors into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2908
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-11-05 01:28:35 +00:00
PrairieWind
6f8d854f8a Fix texture issue and capitalization in Stripped Warped Hyphae Bark 2022-11-04 19:17:39 -06:00
PrairieWind
92723cab9f Add Crafting Recipes for the crimson and warped (trap)doors, fences, and gates 2022-11-04 19:17:39 -06:00
cora
8db3071c2d Merge pull request 'Add crimson and warped doors, trapdoors and fences' (#2901) from warped_crimson_doors into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2901
2022-11-05 00:50:24 +00:00
Nicu
8162a4af2d Add custom door and trapdoor textures for mcl_crimson 2022-11-05 01:47:35 +01:00
Nicu
30d2022b4a Optimize textures in mcl_crimson 2022-11-05 01:47:35 +01:00
cora
df216cb847 Add crimson fence and gate 2022-11-05 01:47:35 +01:00
cora
4dec3e1382 Add warped fence and gate 2022-11-05 01:47:35 +01:00
cora
43425279a3 Add crimson and warped doors and trapdoors 2022-11-05 01:47:35 +01:00
cora
faf75a3ce5 Merge pull request 'mcl_itemframes_rewrite' (#2897) from mcl_itemframes_rewrite into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2897
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-11-05 00:28:45 +00:00
Michieal
b62f61db10 Added in the API Doc file, and adjusted the created items' names.
Added the ":" to the front of the item creation so that it can be called from an external mod.
Put in an optional inventory and wield image parameter to add in colorized inventory / wield images.
2022-11-05 01:26:15 +01:00
Michieal
c4981d894c Removed the local cached copy of the built in TGA encoder. 2022-11-05 01:26:15 +01:00
Michieal
93913ed780 Fix accidental conversion of tabs to spaces. 2022-11-05 01:26:15 +01:00
Michieal
3409c5a220 Prereview code, but with the spaces converted to tabs.
* Cleaned up all of the code, checked to make sure that there were no erraneous debug logging.
* To enable debugging, turn it on in the api by changing the following line in item_frames_api.lua:
mcl_itemframes.DEBUG = false -- set to true to see debug output.
* Made the standard Item Frame and the new Glow Frame use the frames API. 
Added in backwards compatibility mode.
* Made frames pop out items into the world on the old frames' entities when they are a hidden / broken entity. (Part of the backwards compatibility.)

* Tested locally.

* *Converted the spaces to tabs!*

Should be fully functional and ready for review.
2022-11-05 01:26:15 +01:00
Michieal
76991fcba9 Pre-review Item frames code
* Cleaned up all of the code, checked to make sure that there were no erraneous debug logging.
* To enable debugging, turn it on in the api by changing the following line in item_frames_api.lua:
mcl_itemframes.DEBUG = false -- set to true to see debug output.
* Made the standard Item Frame and the new Glow Frame use the frames API. 
Added in backwards compatibility mode.
* Made frames pop out items into the world on the old frames' entities when they are a hidden / broken entity. (Part of the backwards compatibility.)

* Tested locally.

Should be fully functional and ready for review.
2022-11-05 01:26:14 +01:00
Michieal
61df48e46e Translations for the Item Frames. 2022-11-05 01:26:14 +01:00
Michieal
18e83e5763 Added in display item rotation
Updated the Readme. Added in the ability to rotate the displayed item with a screwdriver. Made the Screwdriver mod required, due to rotating the item being fundamental behavoir.

Finalized a few bug fixes... still have to remove the all of the forced debug code, and move the item frames and glow frames over to the new api, and do a final test.
2022-11-05 01:26:14 +01:00
Michieal
8a21b9e99c Changed detection code custom frames.
todo: figure out why the standard item frame is using the wrong item entities.
todo: fix screwdriver rotating the item displayed.
2022-11-05 01:26:14 +01:00
Michieal
6d1b1b3c74 Added a return code to load_maps
Added a return code to load_maps to check for if dynamic_add_media registers a fail.
Used by mcl_itemframes when reloading a map placed into an itemframe.
2022-11-05 01:26:14 +01:00
Michieal
1f5b92f7bf code clean up. testing & debugging custom frames.
cleaned up a LOT of duplicate code. Added in the custom frames, and a couple of calls in init.lua to begin testing custom frames out.

to do: fix the freaking maps. (It looks like it's client side that is failing, to be honest.)
2022-11-05 01:26:14 +01:00
Michieal
4d74e4d9c1 update the translation template 2022-11-05 01:26:14 +01:00
Michieal
ef504e90c1 glowframe model commit 2022-11-05 01:26:14 +01:00
Michieal
09d452667b glowframe textures commit 2022-11-05 01:26:14 +01:00
Michieal
9b37ca460e Initial code comit 2022-11-05 01:26:14 +01:00
cora
ffc5fe06ed Merge pull request 'Add second pillager outpost schematic' (#2905) from 2nd_pillager_outpost_schem into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2905
Reviewed-by: epCode <epcode@noreply.git.minetest.land>
2022-11-05 00:23:48 +00:00
cora
e146b173b3 Replace "oning" with cages 2022-11-05 01:18:03 +01:00
cora
51d34c9f3d Add second pillager outpost schematic 2022-11-05 01:18:03 +01:00
cora
0d19a66bdd Merge pull request 'Mob lightning transformation / fix on_lightning_strike api' (#2904) from mob_lighting_transforms_2 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2904
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
2022-11-05 00:17:26 +00:00
MysticTempest
15542d4878 Fix player not getting damage from lightning 2022-11-05 01:16:27 +01:00
cora
fcba67b7e7 Make on_lightning_strike available to non-mob entities 2022-11-05 01:16:27 +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
21f3782439 Fix lightning on_strike api + rename to on_lightning_strike 2022-11-05 01:16:27 +01:00
cora
d18f55aa48 Merge pull request 'Villager tries to get closest bed and jobsite. Villager will wait if failed to path recently' (#2898) from feature/villagers_pt4 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2898
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-11-05 00:15:46 +00:00
cora
32e4a122a1 Comment out stray debug lines 2022-11-05 01:14:54 +01:00
TheOnlyJoeEnderman
8e74209c9b add axolotl to translation template 2022-11-04 02:32:59 +00:00
TheOnlyJoeEnderman
faa7ca1f68 Change axolotl spawn egg to palette instead of texture 2022-11-04 02:21:58 +00:00
TheOnlyJoeEnderman
7e3d5f3553 add axolotl to bucket translation template 2022-11-04 01:58:04 +00:00
ancientmarinerdev
8b0c4c17ad Slightly more frequent failed pathing attempts for villagers 2022-11-03 21:34:15 +00:00
ancientmarinerdev
2d0ea5e205 Enable concurrent pathing so pathing orders aren't queued 2022-11-03 21:34:14 +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
ea9c9e74b0 Failed check should come before last pathed check to avoid a failed check taking up a good opportunity to path 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