From f57cbcb0a0b4d801cb2b70047dbed8aa2803576b Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Sun, 29 May 2022 17:32:47 -0600 Subject: [PATCH 01/11] Postmortal Advancement --- mods/HUD/mcl_achievements/init.lua | 7 +++++++ mods/ITEMS/mcl_totems/init.lua | 1 + 2 files changed, 8 insertions(+) diff --git a/mods/HUD/mcl_achievements/init.lua b/mods/HUD/mcl_achievements/init.lua index b1c59fe54..c6aa0e38d 100644 --- a/mods/HUD/mcl_achievements/init.lua +++ b/mods/HUD/mcl_achievements/init.lua @@ -199,6 +199,13 @@ awards.register_achievement("mcl:enterEndPortal", { icon = "mcl_end_end_stone.png", }) +-- Triggered in mcl_totems +awards.register_achievement("mcl:postMortal", { + title = S("Postmortal"), + description = S("Use a Totem of Undying to cheat death."), + icon = "mcl_totems_totem.png", +}) + -- NON-PC ACHIEVEMENTS (XBox, Pocket Edition, etc.) if non_pc_achievements then diff --git a/mods/ITEMS/mcl_totems/init.lua b/mods/ITEMS/mcl_totems/init.lua index 7a45ea58f..6b6fce7f1 100644 --- a/mods/ITEMS/mcl_totems/init.lua +++ b/mods/ITEMS/mcl_totems/init.lua @@ -43,6 +43,7 @@ mcl_damage.register_modifier(function(obj, damage, reason) obj:set_wielded_item(wield) end end + awards.unlock(obj:get_player_name(), "mcl:postMortal") -- Effects minetest.sound_play({name = "mcl_totems_totem", gain = 1}, {pos=ppos, max_hear_distance = 16}, true) From 80416fef712fbee5a765f1c882c126c682223d3c Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Sun, 29 May 2022 18:28:34 -0600 Subject: [PATCH 02/11] Cartography Table --- mods/ITEMS/mcl_cartography_table/README.md | 13 +++++++++ mods/ITEMS/mcl_cartography_table/init.lua | 27 ++++++++++++++++++ mods/ITEMS/mcl_cartography_table/mod.conf | 3 ++ .../textures/cartography_table_side1.png | Bin 0 -> 610 bytes .../textures/cartography_table_side2.png | Bin 0 -> 680 bytes .../textures/cartography_table_side3.png | Bin 0 -> 466 bytes .../textures/cartography_table_top.png | Bin 0 -> 499 bytes 7 files changed, 43 insertions(+) create mode 100644 mods/ITEMS/mcl_cartography_table/README.md create mode 100644 mods/ITEMS/mcl_cartography_table/init.lua create mode 100644 mods/ITEMS/mcl_cartography_table/mod.conf create mode 100644 mods/ITEMS/mcl_cartography_table/textures/cartography_table_side1.png create mode 100644 mods/ITEMS/mcl_cartography_table/textures/cartography_table_side2.png create mode 100644 mods/ITEMS/mcl_cartography_table/textures/cartography_table_side3.png create mode 100644 mods/ITEMS/mcl_cartography_table/textures/cartography_table_top.png diff --git a/mods/ITEMS/mcl_cartography_table/README.md b/mods/ITEMS/mcl_cartography_table/README.md new file mode 100644 index 000000000..4818b6784 --- /dev/null +++ b/mods/ITEMS/mcl_cartography_table/README.md @@ -0,0 +1,13 @@ +mcl_cartography_table +------------------- +Cartography Tables, by PrairieWind + +Adds Cartography Tables to MineClone 2/5. + +License of source code +---------------------- +LGPLv2.1 + +License of media +---------------- +See the main MineClone 2 README.md file. \ No newline at end of file diff --git a/mods/ITEMS/mcl_cartography_table/init.lua b/mods/ITEMS/mcl_cartography_table/init.lua new file mode 100644 index 000000000..a7c66b4e2 --- /dev/null +++ b/mods/ITEMS/mcl_cartography_table/init.lua @@ -0,0 +1,27 @@ +local S = minetest.get_translator(minetest.get_current_modname()) +-- Cartography Table Code. Used to create and copy maps. Needs a GUI still. + +minetest.register_node("mcl_cartography_table:cartography_table", { + description = S("Cartography Table"), + _tt_help = S("Used to create or copy maps"), + _doc_items_longdesc = S("Is used to create or copy maps for use.."), + tiles = { + "cartography_table_top.png", "cartography_table_side3.png", + "cartography_table_side3.png", "cartography_table_side2.png", + "cartography_table_side3.png", "cartography_table_side1.png" + }, + paramtype2 = "facedir", + groups = { axey = 2, handy = 1, deco_block = 1, material_wood = 1, flammable = 1 }, + _mcl_blast_resistance = 2.5, + _mcl_hardness = 2.5 + }) + + +minetest.register_craft({ + output = "mcl_cartography_table:cartography_table", + recipe = { + { "mcl_core:paper", "mcl_core:paper", "" }, + { "group:wood", "group:wood", "" }, + { "group:wood", "group:wood", "" }, + } +}) \ No newline at end of file diff --git a/mods/ITEMS/mcl_cartography_table/mod.conf b/mods/ITEMS/mcl_cartography_table/mod.conf new file mode 100644 index 000000000..ebea16197 --- /dev/null +++ b/mods/ITEMS/mcl_cartography_table/mod.conf @@ -0,0 +1,3 @@ +name = mcl_cartography_table +author = PrairieWind +description = Adds the cartography table villager workstation to MineClone 2/5. Used to copy and create maps. \ No newline at end of file diff --git a/mods/ITEMS/mcl_cartography_table/textures/cartography_table_side1.png b/mods/ITEMS/mcl_cartography_table/textures/cartography_table_side1.png new file mode 100644 index 0000000000000000000000000000000000000000..7573d6b9893166260bf52f252d20d333010b2c41 GIT binary patch literal 610 zcmV-o0-gPdP)*$Jg$spk{@=g2aEC85i1=ei=5Myq+2ycdudl@TJ z{cTV-`~R7l)#fzwWG3*aqN*sk~~z1!$|`qp&|)Yx4uvjcoHo~Ovm1yexPHpG&SSc z8))_eo1Q0wspeThRyb_a?s-CKC77J}Lvm?EM{m;(R_-P2BKM5lV2J!Y@kO^e8G{ywGvFzklE$gu#IUNGCA>?U7j8P3qAVM w)O_1vGtUb0(z3CRyle8UU#B=}v0yRlQ zK~y-)g_6H()LEbB5y7>o)i<=;hQV>@= zI13JfOF@)s9V%EwTTHK)Cb{Izn{$Xs@2KE+N*>Z`j-``HMVKh!kz|xBqEsT) zxLK?b|1JSA>OsfS`4=*&@Lj>KDJYX1fHKJ$y0;jnpaV!Xrq{NKvWnFd+7wBYm1I(( zyRAk=ndFp7UJ*<#Sf-$3>Fmd&LxQxxG6l2FD&6E+L!!H_%0lh2MwqB+LdPIVCE9Dj z+JiQJ{~a4|zi{_)iD8-Ii0@j_2r!K*o1kZ73XPTfDM4==Q@ETzrK4TFaCY2r%xXa@ zWKr@z)TFj4DhqZ?;Jbn_Q4Hdom7CY`Je!5SO}Jk$hzqV=InB#gA9?;_jbrT=zAK2b z^03Cb0f4y~4}cRVJM_Ga_01u-?>u5YXdh`w2N=Y86XZcE8N>yC&*0PNJuJ^+p>Ol_ z$vw_px{NH!shcrOLnr83&2aZ`sP8ui%*}Z0{EP_q3m#4=m{hD!4ti~yOjZ?oo{ir# znha_MHEPA$^3vis=vqiMWt5myPd3 zqEyoNohn@4W&P{k)cfWV2XW5UguLxAAxb5gR77ck-4bkvNpso&A@Bzmm-z0hlRfnS O0000Y? zD0jZgw<^t88^$Ax33N5&Js@~w~HyWNb&md!}I+TfUGo# z-@=eq4JsHBhl0vjbZ*H?L%Fl0g~8aCMCbdM+2`KZTeew=FUGRH5T%>by#NHJg;(z3b#UbyGVfW`aI%C4gH%WMpJ(V_s-zXuMNJg>E)-d2X9=TZDdh zvW97%i+Gcch^m)>&Xy;l0(zET=qwCcV`=)d>z-u(RX+{}I200001VoOIv0Eh)0NB{r; z32;bRa{vGf6951U69E94oEQKA00(qQO+^Re2L%;0E7XC6f&c&jxk*GpR2b7OPr<4K zAq>pPLZp~r7qv?%lwLfUgDeD>{{Lq+>3ee!8E3{BsM%3#Wkb#cduAg3v38*ZJDulo z&>zX1AjR`~8Hh0=`e};e@)-7ByLb{*KE@bk=~IQ6fHQG2f1mTVx@TYr!Mw6`>68GJ ze&{#-sOlSGw Date: Sun, 29 May 2022 18:29:33 -0600 Subject: [PATCH 03/11] Fletching Table --- mods/ITEMS/mcl_fletching_table/README.md | 13 +++++++++ mods/ITEMS/mcl_fletching_table/init.lua | 25 ++++++++++++++++++ mods/ITEMS/mcl_fletching_table/mod.conf | 3 +++ .../textures/fletching_table_front.png | Bin 0 -> 720 bytes .../textures/fletching_table_side.png | Bin 0 -> 745 bytes .../textures/fletching_table_top.png | Bin 0 -> 630 bytes 6 files changed, 41 insertions(+) create mode 100644 mods/ITEMS/mcl_fletching_table/README.md create mode 100644 mods/ITEMS/mcl_fletching_table/init.lua create mode 100644 mods/ITEMS/mcl_fletching_table/mod.conf create mode 100644 mods/ITEMS/mcl_fletching_table/textures/fletching_table_front.png create mode 100644 mods/ITEMS/mcl_fletching_table/textures/fletching_table_side.png create mode 100644 mods/ITEMS/mcl_fletching_table/textures/fletching_table_top.png diff --git a/mods/ITEMS/mcl_fletching_table/README.md b/mods/ITEMS/mcl_fletching_table/README.md new file mode 100644 index 000000000..af0b88185 --- /dev/null +++ b/mods/ITEMS/mcl_fletching_table/README.md @@ -0,0 +1,13 @@ +mcl_fletching_table +------------------- +Fletching Tables, by PrairieWind + +Adds Fletching Tables to MineClone 2/5. + +License of source code +---------------------- +LGPLv2.1 + +License of media +---------------- +See the main MineClone 2 README.md file. \ No newline at end of file diff --git a/mods/ITEMS/mcl_fletching_table/init.lua b/mods/ITEMS/mcl_fletching_table/init.lua new file mode 100644 index 000000000..5fc7556b8 --- /dev/null +++ b/mods/ITEMS/mcl_fletching_table/init.lua @@ -0,0 +1,25 @@ +local S = minetest.get_translator(minetest.get_current_modname()) +-- Fletching Table Code. No use as of current Minecraft Updates. Basically a decor block. As of now, this is complete. +minetest.register_node("mcl_fletching_table:fletching_table", { + description = S("Fletching Table"), + _tt_help = S("A fletching table"), + _doc_items_longdesc = S("This is the fletcher villager's work station. It currently has no use beyond decoration."), + tiles = { + "fletching_table_top.png", "fletching_table_top.png", + "fletching_table_side.png", "fletching_table_side.png", + "fletching_table_front.png", "fletching_table_front.png" + }, + paramtype2 = "facedir", + groups = { axey = 2, handy = 1, deco_block = 1, material_wood = 1, flammable = 1 }, + _mcl_blast_resistance = 2.5, + _mcl_hardness = 2.5 + }) + +minetest.register_craft({ + output = "mcl_fletching_table:fletching_table", + recipe = { + { "mcl_core:flint", "mcl_core:flint", "" }, + { "group:wood", "group:wood", "" }, + { "group:wood", "group:wood", "" }, + } +}) \ No newline at end of file diff --git a/mods/ITEMS/mcl_fletching_table/mod.conf b/mods/ITEMS/mcl_fletching_table/mod.conf new file mode 100644 index 000000000..5a4e9a900 --- /dev/null +++ b/mods/ITEMS/mcl_fletching_table/mod.conf @@ -0,0 +1,3 @@ +name = mcl_fletching_table +author = PrairieWind +description = Adds the fletching table villager workstation to MineClone 2/5. diff --git a/mods/ITEMS/mcl_fletching_table/textures/fletching_table_front.png b/mods/ITEMS/mcl_fletching_table/textures/fletching_table_front.png new file mode 100644 index 0000000000000000000000000000000000000000..da2eb35193f1d423dd04bb0b9c2a0b4b12baf65b GIT binary patch literal 720 zcmV;>0x$iEP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2jU9_ z5Cj;!a4#qT00K}+L_t(I%Z-xDPZLoT#(xZ@orlnIn83ueCC>O*m?$B!F~P79qV7-@ z%7TqMH?sF1aO1*-OBXIAF|ZJfF>DNpBxoWr5+WuL+VW@!g(*<5Gt zpXO57*Lv6~dUV};Al6z;!8B#gojpT$hfORIXK3`jK!97x^EG*O^d-NHRPa4fK~Uaj zVPd%A{>V##>#oPwcdr3hm>8zymvP;Ih!Uo5Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2jU9_ z5DE}1D2kK-00L=AL_t(I%WacgNK;`LfFJd+?VRN{=4?yW#GfmJ=q4!eCbEm@56v6J z2=6jsU5FCH{)C1p!=i$^ux=#i#t{97!tszj4%f{{4Es4DWp za+qKwPS4{PEG&m{IxPIzhFX^u$t)|FOh*7{aMzX z2f!>VNF^C2vx2+rDpR*SxQ;mlpwo9B@4zEmKv(M}+B$A%L`o&QE$3U9@r-iil~=Qa z`Mx1Mz6ZP+8O35$$S!`N&RK)1hKmmLvX1%&t47jP=WXWuhBP(*^c;~;2>5>5~Vb-to7^hg4ED z{#;FAF)E}py8x(ap5u-}5l|ea5M9F~Oxzt1FE!blIOpx>neR0K$xK$vOX&y#u(-U+ zxPO+R;Sm8aS6Aclz9g1N0Wk4?ik|Lv&hCpBf5B!m&{$W4RKClnna>z>g3GB!J7DKR zYcBu~?>%AV`$utKq>Wrw>|keS2Y~o`K{MI__WA~5OF=^47TDe{psINq>vWWxWd&6& zHm5VYLXuH7Xx7(BKa&&B0a%Hu0Q^oQDf7A8_ey{t;o@)@4f=zNli$K<(38n;iP{OL bQ;7TvjnM`J?k&@Q00000NkvXXu0mjfB@|2; literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_fletching_table/textures/fletching_table_top.png b/mods/ITEMS/mcl_fletching_table/textures/fletching_table_top.png new file mode 100644 index 0000000000000000000000000000000000000000..0ecead69655c753c1cd50f4d624a174e937379bf GIT binary patch literal 630 zcmV-+0*U>JP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2jU9_ z5DhM(2m$y200H(%L_t(I%axN)YZFlv#eZ$mWbRDEz{E6Rh>3p!BSA}$x(MRJjfh}Z zZd{663GUtb1>EUU{QxeCP!M-!F*ah!s!~aiXdGIj(ICl84Mi96O)?EGJiGVqyXW5X z&bp4;=WvBIo$*<-i|>0e^HDc_?~pE|yEDCIkRUNw6Y`X@>Rh4orc)Z$C*& zVoCt8wqE1W{ks4R{UDNPhz5Z7^*dKDo(stqVZx?x>&`ujg-Q9cV^el)4AEG1@)Qde zrXdkYi|VkpUZd04LbEcMqK6d~2L1?B^vGQ(L4C@8*CSi%;Wk?sqOr5_T-NKWdX^WpJA<216gW*$O4N+igrkFhrwx`6fkR@Ab1OLD263&}nQ@ zc5HTbJ<5&^fVS6VA(7b zl+IUgUa+)un$E|5SXnu-S${{vb$R~y;ruT6qeD!AYNf<@+~z{%ROHc<4VPs}QdscF z{+&YQMqF7kJB_oGW{S?TB)NX+EMNLR<`ylk?3taeqquS9JV3Z?2Qr<5KQ+X_jeU#* Q*8l(j07*qoM6N<$f*PI_wg3PC literal 0 HcmV?d00001 From 2a08c60602759b940f8198d2b54a49734fe4ccee Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Sun, 29 May 2022 18:30:27 -0600 Subject: [PATCH 04/11] Loom --- mods/ITEMS/mcl_loom/README.md | 13 +++++++++ mods/ITEMS/mcl_loom/init.lua | 27 ++++++++++++++++++ mods/ITEMS/mcl_loom/mod.conf | 3 ++ mods/ITEMS/mcl_loom/textures/loom_bottom.png | Bin 0 -> 315 bytes mods/ITEMS/mcl_loom/textures/loom_bottom1.png | Bin 0 -> 395 bytes mods/ITEMS/mcl_loom/textures/loom_front.png | Bin 0 -> 339 bytes mods/ITEMS/mcl_loom/textures/loom_front1.png | Bin 0 -> 615 bytes mods/ITEMS/mcl_loom/textures/loom_side.png | Bin 0 -> 360 bytes mods/ITEMS/mcl_loom/textures/loom_side1.png | Bin 0 -> 639 bytes mods/ITEMS/mcl_loom/textures/loom_top.png | Bin 0 -> 358 bytes mods/ITEMS/mcl_loom/textures/loom_top1.png | Bin 0 -> 468 bytes 11 files changed, 43 insertions(+) create mode 100644 mods/ITEMS/mcl_loom/README.md create mode 100644 mods/ITEMS/mcl_loom/init.lua create mode 100644 mods/ITEMS/mcl_loom/mod.conf create mode 100644 mods/ITEMS/mcl_loom/textures/loom_bottom.png create mode 100644 mods/ITEMS/mcl_loom/textures/loom_bottom1.png create mode 100644 mods/ITEMS/mcl_loom/textures/loom_front.png create mode 100644 mods/ITEMS/mcl_loom/textures/loom_front1.png create mode 100644 mods/ITEMS/mcl_loom/textures/loom_side.png create mode 100644 mods/ITEMS/mcl_loom/textures/loom_side1.png create mode 100644 mods/ITEMS/mcl_loom/textures/loom_top.png create mode 100644 mods/ITEMS/mcl_loom/textures/loom_top1.png diff --git a/mods/ITEMS/mcl_loom/README.md b/mods/ITEMS/mcl_loom/README.md new file mode 100644 index 000000000..08ee0dea3 --- /dev/null +++ b/mods/ITEMS/mcl_loom/README.md @@ -0,0 +1,13 @@ +mcl_loom +-------- +Looms, by PrairieWind + +Adds Looms to MineClone 2/5. Used to add patterns to banners. + +License of source code +---------------------- +LGPLv2.1 + +License of media +---------------- +See the main MineClone 2 README.md file. \ No newline at end of file diff --git a/mods/ITEMS/mcl_loom/init.lua b/mods/ITEMS/mcl_loom/init.lua new file mode 100644 index 000000000..89960e133 --- /dev/null +++ b/mods/ITEMS/mcl_loom/init.lua @@ -0,0 +1,27 @@ +local S = minetest.get_translator(minetest.get_current_modname()) +-- Loom Code. Used to craft banner designs easier. Still needs a GUI. https://minecraft.fandom.com/wiki/Loom + +minetest.register_node("mcl_loom:loom", { + description = S("Loom"), + _tt_help = S("Used to create banner designs"), + _doc_items_longdesc = S("This is the shepherd villager's work station. It is used to create banner designs."), + tiles = { + "loom_top.png", "loom_bottom.png", + "loom_side.png", "loom_side.png", + "loom_front.png", "loom_front.png" + }, + paramtype2 = "facedir", + groups = { axey = 2, handy = 1, deco_block = 1, material_wood = 1, flammable = 1 }, + _mcl_blast_resistance = 2.5, + _mcl_hardness = 2.5 + }) + + +minetest.register_craft({ + output = "mcl_loom:loom", + recipe = { + { "", "", "" }, + { "mcl_mobitems:string", "mcl_mobitems:string", "" }, + { "group:wood", "group:wood", "" }, + } +}) diff --git a/mods/ITEMS/mcl_loom/mod.conf b/mods/ITEMS/mcl_loom/mod.conf new file mode 100644 index 000000000..9ebb10ff3 --- /dev/null +++ b/mods/ITEMS/mcl_loom/mod.conf @@ -0,0 +1,3 @@ +name = mcl_loom +author = PrairieWind +description = Adds the loom villager workstation to MineClone 2/5. Used to add patterns to banners. \ No newline at end of file diff --git a/mods/ITEMS/mcl_loom/textures/loom_bottom.png b/mods/ITEMS/mcl_loom/textures/loom_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..835d36fca7aa16e68498091a669d81d146a57bef GIT binary patch literal 315 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 Z=np@M?QWykI+y?e002ovPDHLkV1hJO9kKub literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_loom/textures/loom_top.png b/mods/ITEMS/mcl_loom/textures/loom_top.png new file mode 100644 index 0000000000000000000000000000000000000000..af980f3c197345ab395ecc23d813aa969294820c GIT binary patch literal 358 zcmV-s0h#`ZP)ZNoW>YUE#sn-A+5G?`ZnME%<#|u z<_&{>PhVb~>ifG}XAb&3En-y=O+EnloPGmXUB_4z2!P$Dq*|q}BQQ4rczk+Y;D1Z3 z+E_MRb%6j#^8#0vMgpL_*J2Y|gP_$QRmobG=c=>@WA#NHQBN};TQ^td+H3CEuL%(P(&}>kS7rGWkr$fbC?T2!j9xNy`(Qywv%uPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2jc_- z4>AQUcP(K600C4fF~b7^o9B=eU`p~c=amc z#Y3S&O-aNAC$>fEA)RqIX~DTnvYYwlo9~-6X4A@8E)y*xQ9`4Z} zkMQ-8V)6VaC1?S_y4U~!+NTEONV7zqXZp+;W0~XtfMH~DA{SlL!S=fV0L=o#X{-R` z2*b!~jRHskXRKL^dV?TKtcy(vAe7o#PNZ;RZC|0j8fye;Rm`x|U z`6AKv6n~F}bYCVphLJ_fKk!4W6^DGL{@%3Yuli5-fh>^u)8H4V-=_Xy7F+570000< KMNUMnLSTXd7{@{Y literal 0 HcmV?d00001 From d4828f89934c83247d9566aea32decc1b00c7164 Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Sun, 29 May 2022 19:11:21 -0600 Subject: [PATCH 05/11] Sweet Dreams Advancement --- mods/HUD/mcl_achievements/init.lua | 7 +++++++ mods/ITEMS/mcl_beds/functions.lua | 1 + 2 files changed, 8 insertions(+) diff --git a/mods/HUD/mcl_achievements/init.lua b/mods/HUD/mcl_achievements/init.lua index c6aa0e38d..998ce42a7 100644 --- a/mods/HUD/mcl_achievements/init.lua +++ b/mods/HUD/mcl_achievements/init.lua @@ -206,6 +206,13 @@ awards.register_achievement("mcl:postMortal", { icon = "mcl_totems_totem.png", }) +-- Triggered in mcl_beds +awards.register_achievement("mcl:sweetDreams", { + title = S("Sweet Dreams"), + description = S("Sleep in a bed to change your respawn point."), + icon = "mcl_beds_bed_red.png", +}) + -- NON-PC ACHIEVEMENTS (XBox, Pocket Edition, etc.) if non_pc_achievements then diff --git a/mods/ITEMS/mcl_beds/functions.lua b/mods/ITEMS/mcl_beds/functions.lua index b8478fc1f..1909c7cb2 100644 --- a/mods/ITEMS/mcl_beds/functions.lua +++ b/mods/ITEMS/mcl_beds/functions.lua @@ -76,6 +76,7 @@ local function lay_down(player, pos, bed_pos, state, skip) -- save respawn position when entering bed if spawn_mod and mcl_spawn.set_spawn_pos(player, bed_pos, nil) then minetest.chat_send_player(name, S("New respawn position set!")) + awards.unlock(player:get_player_name(), "mcl:sweetDreams") end -- No sleeping if too far away From 3a12b9f6c6186b3a073e037323c2ed64edad35b4 Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Sun, 29 May 2022 21:06:48 -0600 Subject: [PATCH 06/11] Serious Dedication Advancement --- mods/HUD/mcl_achievements/init.lua | 7 +++++++ mods/ITEMS/mcl_smithing_table/init.lua | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/mods/HUD/mcl_achievements/init.lua b/mods/HUD/mcl_achievements/init.lua index 998ce42a7..580644b6d 100644 --- a/mods/HUD/mcl_achievements/init.lua +++ b/mods/HUD/mcl_achievements/init.lua @@ -213,6 +213,13 @@ awards.register_achievement("mcl:sweetDreams", { icon = "mcl_beds_bed_red.png", }) +-- Triggered in mcl_smithing_table +awards.register_achievement("mcl:seriousDedication", { + title = S("Serious Dedication"), + description = S("Use a Netherite Ingot to upgrade a hoe, and then completely reevaluate your life choices"), + icon = "farming_tool_netheritehoe.png", +}) + -- NON-PC ACHIEVEMENTS (XBox, Pocket Edition, etc.) if non_pc_achievements then diff --git a/mods/ITEMS/mcl_smithing_table/init.lua b/mods/ITEMS/mcl_smithing_table/init.lua index 5e0610f44..1f2e2fbc6 100644 --- a/mods/ITEMS/mcl_smithing_table/init.lua +++ b/mods/ITEMS/mcl_smithing_table/init.lua @@ -125,6 +125,11 @@ minetest.register_node("mcl_smithing_table:table", { -- ToDo: make epic sound minetest.sound_play("mcl_smithing_table_upgrade", {pos = pos, max_hear_distance = 16}) end + if listname == "upgraded_item" then + if stack:get_name() == "mcl_farming:hoe_netherite" then + awards.unlock(player:get_player_name(), "mcl:seriousDedication") + end + end reset_upgraded_item(pos) end, @@ -133,6 +138,7 @@ minetest.register_node("mcl_smithing_table:table", { _mcl_hardness = 2.5 }) + minetest.register_craft({ output = "mcl_smithing_table:table", recipe = { From 4abc8181f77055fdbee96f5fd531f296b231e8b3 Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Tue, 31 May 2022 19:46:04 -0600 Subject: [PATCH 07/11] What A Deal! Advancement --- mods/ENTITIES/mobs_mc/villager.lua | 5 +++++ mods/HUD/mcl_achievements/init.lua | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua index 423f6c392..f038fc751 100644 --- a/mods/ENTITIES/mobs_mc/villager.lua +++ b/mods/ENTITIES/mobs_mc/villager.lua @@ -712,6 +712,11 @@ local trade_inventory = { elseif listname == "output" then if not trader_exists(player:get_player_name()) then return 0 + -- Begin Award Code + -- May need to be moved if award gets unlocked in the wrong cases. + elseif trader_exists(player:get_player_name()) then + awards.unlock(player:get_player_name(), "mcl:whatAdeal") + -- End Award Code end -- Only allow taking full stack local count = stack:get_count() diff --git a/mods/HUD/mcl_achievements/init.lua b/mods/HUD/mcl_achievements/init.lua index 580644b6d..42ff2387c 100644 --- a/mods/HUD/mcl_achievements/init.lua +++ b/mods/HUD/mcl_achievements/init.lua @@ -216,10 +216,17 @@ awards.register_achievement("mcl:sweetDreams", { -- Triggered in mcl_smithing_table awards.register_achievement("mcl:seriousDedication", { title = S("Serious Dedication"), - description = S("Use a Netherite Ingot to upgrade a hoe, and then completely reevaluate your life choices"), + description = S("Use a Netherite Ingot to upgrade a hoe, and then completely reevaluate your life choices."), icon = "farming_tool_netheritehoe.png", }) +-- Triggered in mobs_mc +awards.register_achievement("mcl:whatAdeal", { + title = S("What A Deal!"), + description = S("Successfully trade with a Villager."), + icon = "mcl_core_emerald.png", +}) + -- NON-PC ACHIEVEMENTS (XBox, Pocket Edition, etc.) if non_pc_achievements then From 6c9fc8c96333f4370866529496e41af2a55196ed Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Wed, 1 Jun 2022 10:22:10 -0600 Subject: [PATCH 08/11] Fishy Business Advancement --- mods/HUD/mcl_achievements/init.lua | 7 +++++++ mods/ITEMS/mcl_fishing/init.lua | 1 + 2 files changed, 8 insertions(+) diff --git a/mods/HUD/mcl_achievements/init.lua b/mods/HUD/mcl_achievements/init.lua index 42ff2387c..72d6aa47f 100644 --- a/mods/HUD/mcl_achievements/init.lua +++ b/mods/HUD/mcl_achievements/init.lua @@ -227,6 +227,13 @@ awards.register_achievement("mcl:whatAdeal", { icon = "mcl_core_emerald.png", }) +-- Triggered in mcl_fishing +awards.register_achievement("mcl:fishyBusiness", { + title = S("Fishy Business"), + description = S("Catch a fish. \nHint: Catch a fish, salmon, clownfish, or pufferfish."), + icon = "mcl_fishing_fishing_rod.png", +}) + -- NON-PC ACHIEVEMENTS (XBox, Pocket Edition, etc.) if non_pc_achievements then diff --git a/mods/ITEMS/mcl_fishing/init.lua b/mods/ITEMS/mcl_fishing/init.lua index d779a2a98..2c2ba6982 100644 --- a/mods/ITEMS/mcl_fishing/init.lua +++ b/mods/ITEMS/mcl_fishing/init.lua @@ -75,6 +75,7 @@ local fish = function(itemstack, player, pointed_thing) stacks_min = 1, stacks_max = 1, }, pr) + awards.unlock(player:get_player_name(), "mcl:fishyBusiness") elseif r <= junk_value then -- Junk items = mcl_loot.get_loot({ From cd75d6ffd21089403d0e8d3879373f7a43df86bd Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Fri, 3 Jun 2022 10:38:51 -0600 Subject: [PATCH 09/11] Armor Advancement Definitions (Commented out, but ready for me to use later) --- mods/HUD/mcl_achievements/init.lua | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/mods/HUD/mcl_achievements/init.lua b/mods/HUD/mcl_achievements/init.lua index 72d6aa47f..2c8c62139 100644 --- a/mods/HUD/mcl_achievements/init.lua +++ b/mods/HUD/mcl_achievements/init.lua @@ -234,6 +234,25 @@ awards.register_achievement("mcl:fishyBusiness", { icon = "mcl_fishing_fishing_rod.png", }) +-- Armor Advancements +--[[awards.register_achievement("mcl:suitUp", { + title = S("Suit Up"), + description = S("Protect yourself with a piece of iron armor."), + icon = "mcl_armor_inv_chestplate_iron.png", +})]]-- + +--[[awards.register_achievement("mcl:coverMeDiamonds", { + title = S("Cover Me with Diamonds"), + description = S("Diamond armor saves lives."), + icon = "mcl_armor_inv_chestplate_diamond.png", +})]]-- + +--[[awards.register_achievement("mcl:coverMeDebris", { + title = S("Cover Me in Debris"), + description = S("Get a full suit of Netherite armor."), + icon = "mcl_armor_inv_chestplate_netherite.png", +})]]-- + -- NON-PC ACHIEVEMENTS (XBox, Pocket Edition, etc.) if non_pc_achievements then From 6ff27c02475aa04038ab6857ef523044d5212c07 Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Tue, 7 Jun 2022 16:01:12 -0600 Subject: [PATCH 10/11] Fixed formatting in advancement definitions and in the award unlock code in the mcl_totem mod --- mods/HUD/mcl_achievements/init.lua | 48 +++++++++++++++--------------- mods/ITEMS/mcl_totems/init.lua | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/mods/HUD/mcl_achievements/init.lua b/mods/HUD/mcl_achievements/init.lua index 2c8c62139..7b3b2fc1c 100644 --- a/mods/HUD/mcl_achievements/init.lua +++ b/mods/HUD/mcl_achievements/init.lua @@ -201,56 +201,56 @@ awards.register_achievement("mcl:enterEndPortal", { -- Triggered in mcl_totems awards.register_achievement("mcl:postMortal", { - title = S("Postmortal"), - description = S("Use a Totem of Undying to cheat death."), - icon = "mcl_totems_totem.png", + title = S("Postmortal"), + description = S("Use a Totem of Undying to cheat death."), + icon = "mcl_totems_totem.png", }) -- Triggered in mcl_beds awards.register_achievement("mcl:sweetDreams", { - title = S("Sweet Dreams"), - description = S("Sleep in a bed to change your respawn point."), - icon = "mcl_beds_bed_red.png", + title = S("Sweet Dreams"), + description = S("Sleep in a bed to change your respawn point."), + icon = "mcl_beds_bed_red.png", }) -- Triggered in mcl_smithing_table awards.register_achievement("mcl:seriousDedication", { - title = S("Serious Dedication"), - description = S("Use a Netherite Ingot to upgrade a hoe, and then completely reevaluate your life choices."), - icon = "farming_tool_netheritehoe.png", + title = S("Serious Dedication"), + description = S("Use a Netherite Ingot to upgrade a hoe, and then completely reevaluate your life choices."), + icon = "farming_tool_netheritehoe.png", }) -- Triggered in mobs_mc awards.register_achievement("mcl:whatAdeal", { - title = S("What A Deal!"), - description = S("Successfully trade with a Villager."), - icon = "mcl_core_emerald.png", + title = S("What A Deal!"), + description = S("Successfully trade with a Villager."), + icon = "mcl_core_emerald.png", }) -- Triggered in mcl_fishing awards.register_achievement("mcl:fishyBusiness", { - title = S("Fishy Business"), - description = S("Catch a fish. \nHint: Catch a fish, salmon, clownfish, or pufferfish."), - icon = "mcl_fishing_fishing_rod.png", + title = S("Fishy Business"), + description = S("Catch a fish. \nHint: Catch a fish, salmon, clownfish, or pufferfish."), + icon = "mcl_fishing_fishing_rod.png", }) -- Armor Advancements --[[awards.register_achievement("mcl:suitUp", { - title = S("Suit Up"), - description = S("Protect yourself with a piece of iron armor."), - icon = "mcl_armor_inv_chestplate_iron.png", + title = S("Suit Up"), + description = S("Protect yourself with a piece of iron armor."), + icon = "mcl_armor_inv_chestplate_iron.png", })]]-- --[[awards.register_achievement("mcl:coverMeDiamonds", { - title = S("Cover Me with Diamonds"), - description = S("Diamond armor saves lives."), - icon = "mcl_armor_inv_chestplate_diamond.png", + title = S("Cover Me with Diamonds"), + description = S("Diamond armor saves lives."), + icon = "mcl_armor_inv_chestplate_diamond.png", })]]-- --[[awards.register_achievement("mcl:coverMeDebris", { - title = S("Cover Me in Debris"), - description = S("Get a full suit of Netherite armor."), - icon = "mcl_armor_inv_chestplate_netherite.png", + title = S("Cover Me in Debris"), + description = S("Get a full suit of Netherite armor."), + icon = "mcl_armor_inv_chestplate_netherite.png", })]]-- -- NON-PC ACHIEVEMENTS (XBox, Pocket Edition, etc.) diff --git a/mods/ITEMS/mcl_totems/init.lua b/mods/ITEMS/mcl_totems/init.lua index 6b6fce7f1..5cf5f27a3 100644 --- a/mods/ITEMS/mcl_totems/init.lua +++ b/mods/ITEMS/mcl_totems/init.lua @@ -43,7 +43,7 @@ mcl_damage.register_modifier(function(obj, damage, reason) obj:set_wielded_item(wield) end end - awards.unlock(obj:get_player_name(), "mcl:postMortal") + awards.unlock(obj:get_player_name(), "mcl:postMortal") -- Effects minetest.sound_play({name = "mcl_totems_totem", gain = 1}, {pos=ppos, max_hear_distance = 16}, true) From 6cca004dbe7e55f78f77f759dce32bc2eea99c00 Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Wed, 8 Jun 2022 10:54:36 -0600 Subject: [PATCH 11/11] Fixed whitespace in Sweet Dreams activation point --- mods/ITEMS/mcl_beds/functions.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_beds/functions.lua b/mods/ITEMS/mcl_beds/functions.lua index 1909c7cb2..820c3c4d0 100644 --- a/mods/ITEMS/mcl_beds/functions.lua +++ b/mods/ITEMS/mcl_beds/functions.lua @@ -76,7 +76,7 @@ local function lay_down(player, pos, bed_pos, state, skip) -- save respawn position when entering bed if spawn_mod and mcl_spawn.set_spawn_pos(player, bed_pos, nil) then minetest.chat_send_player(name, S("New respawn position set!")) - awards.unlock(player:get_player_name(), "mcl:sweetDreams") + awards.unlock(player:get_player_name(), "mcl:sweetDreams") end -- No sleeping if too far away