From 21c64d1d47d8be0e43fddc7ac2d455f0fd73a814 Mon Sep 17 00:00:00 2001 From: cale Date: Sat, 19 Nov 2016 13:21:34 +0100 Subject: [PATCH] fixed mob gravity --- mods/default/nodes.lua | 10 +++++- mods/fishing/init.lua | 36 +++++++++++++++++++--- mods/fishing/textures/fishing_fish_1.png | Bin 0 -> 251 bytes mods/fishing/textures/fishing_fish_2.png | Bin 0 -> 253 bytes mods/money/init.lua | 21 +++++++------ mods/money/textures/money_shop.png | Bin 363 -> 346 bytes mods/money/textures/money_shop_bottom.png | Bin 0 -> 248 bytes mods/money/textures/money_shop_top.png | Bin 252 -> 275 bytes mods/quests/init.lua | 3 +- 9 files changed, 54 insertions(+), 16 deletions(-) create mode 100644 mods/fishing/textures/fishing_fish_1.png create mode 100644 mods/fishing/textures/fishing_fish_2.png create mode 100644 mods/money/textures/money_shop_bottom.png diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 264f1d9..49b56d8 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -897,8 +897,16 @@ minetest.register_node("default:rail", { inventory_image = "default_rail.png", wield_image = "default_rail.png", paramtype = "light", - walkable = false, + walkable = true, groups = {choppy = 1, cracky= 1, attached_node = 1}, + collision_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, -7/16, 0.5} + }, + selection_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, -7/16, 0.5} + }, }) -- fences diff --git a/mods/fishing/init.lua b/mods/fishing/init.lua index 335e235..774eeed 100644 --- a/mods/fishing/init.lua +++ b/mods/fishing/init.lua @@ -1,3 +1,15 @@ +fishing = {} +fishing.fish = {} + +function fishing.register_fish(name, def) + minetest.register_craftitem(name, def) + table.insert(fishing.fish, name) +end + +function fishing.get_fish() + return fishing.fish[math.random(#fishing.fish)] +end + minetest.register_craftitem("fishing:fishing_rod", { description = "Fishing rod", inventory_image = "fishing_fishing_rod.png", @@ -7,13 +19,17 @@ minetest.register_craftitem("fishing:fishing_rod", { on_use = function(itemstack, user, pointed_thing) if pointed_thing.above then if minetest.get_node(pointed_thing.under).name == "default:water_source" then - if skills.lvls[user:get_player_name()] and skills.lvls[user:get_player_name()]["hunter"] and skills.lvls[user:get_player_name()]["hunter"] > 3 then + if skills.lvls[user:get_player_name()] and + (skills.lvls[user:get_player_name()]["hunter"] and + skills.lvls[user:get_player_name()]["hunter"] > 3) or + (skills.lvls[user:get_player_name()]["farmer"] and + skills.lvls[user:get_player_name()]["farmer"] > 3) then if math.random(6) == 2 then - user:get_inventory():add_item("main", "fishing:fish") + user:get_inventory():add_item("main", fishing.get_fish()) end else if math.random(10) == 2 then - user:get_inventory():add_item("main", "fishing:fish") + user:get_inventory():add_item("main", fishing.get_fish()) end end end @@ -31,8 +47,20 @@ minetest.register_craft({ } }) -minetest.register_craftitem("fishing:fish", { +fishing.register_fish("fishing:fish", { description = "Fish", inventory_image = "fishing_fish.png", on_use = minetest.item_eat(3), }) + +fishing.register_fish("fishing:fish_1", { + description = "Fish", + inventory_image = "fishing_fish_1.png", + on_use = minetest.item_eat(4), +}) + +fishing.register_fish("fishing:fish_2", { + description = "Fish", + inventory_image = "fishing_fish_2.png", + on_use = minetest.item_eat(2), +}) diff --git a/mods/fishing/textures/fishing_fish_1.png b/mods/fishing/textures/fishing_fish_1.png new file mode 100644 index 0000000000000000000000000000000000000000..92543cda93eb40b947d0caab4b12fe78b0121413 GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPNw=fU4j36`1BA}3DiEBiObAE1aYF-J0b5UwyNotBh zd1gt5g1e`0KzJjcI8aftr;B5V#p&b(3D%w?8oS;-`t;veTACRMns08))u@W#$V^E{ zNceH)*s+2~=jGYB#eAOnw3r-bFgwc<%TR2_v%p$@J$DDIPRpFW^JR154v0Rw!O$jd k^8HQXlfPfHO&WnN)-0F$J*n;gW1w{mp00i_>zopr0Q~AuEdT%j literal 0 HcmV?d00001 diff --git a/mods/fishing/textures/fishing_fish_2.png b/mods/fishing/textures/fishing_fish_2.png new file mode 100644 index 0000000000000000000000000000000000000000..2c480f1f82b905dd779661985575406ee095ef36 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPNw=fS6hsz8%kdS1FYeb22er|4RUI~M9QEFmIYKlU6 zW=V#EyQgnJcq5-UP*JLEr|n)}A98yY^bX`2V}#UIGNpByC&xB2jV4#Ky+P zhkuXD^Q^yLpDrN! #money.shop.offers then + money.shop.page[player:get_player_name()] = #money.shop.offers + end + minetest.show_formspec(player:get_player_name(), "money:shop", money.shop.get_formspec(money.shop.page[player:get_player_name()])) end if fields.btn_back then money.shop.page[player:get_player_name()] = money.shop.page[player:get_player_name()] - 1 + + if money.shop.page[player:get_player_name()] < 1 then + money.shop.page[player:get_player_name()] = 1 + end + minetest.show_formspec(player:get_player_name(), "money:shop", money.shop.get_formspec(money.shop.page[player:get_player_name()])) end if fields.btn_trade then @@ -67,18 +77,9 @@ end) minetest.register_node("money:shop", { description = "Shop", - tiles = {"money_shop_top.png","money_shop.png","money_shop.png"}, + tiles = {"money_shop_top.png", "money_shop_bottom.png", "money_shop.png","money_shop.png"}, groups = {choppy = 3}, - - paramtype = "light", paramtype2 = "facedir", - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-6/16, -0.5, -6/16, 6/16,4/16, 6/16}, - }, - }, on_rightclick = function(pos, node, player, pointed_thing) money.shop.page[player:get_player_name()] = 1 diff --git a/mods/money/textures/money_shop.png b/mods/money/textures/money_shop.png index f493f8bf5c9f3d9dd7ad536f6a6d05df4ea36a77..2667c98ce7a2e639575bbc5332957201a965fad2 100644 GIT binary patch delta 276 zcmV+v0qg$j0@?zQDlz{6{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G` z2jB}63oR{%Op!T}TPT0RNklzY4-I5QjfY2BkQ3sYAeL^m%*|pGPRvE*VNO zn=V>n{1e+s&*8Gx9QL~lLZfyb1JIql6a(2kIG(!Ml7_i@fbAxq4Is>w zAv_d7i_ie%tEGtjt-m#*+Q~H{1F)7cfYxgfY9sms0Q1cuTNYS-Ts00`7Eg1$AFhAm zK-IX9m&JRj#Df8BSv)8UFeX delta 293 zcmV+=0owlB0_y^hDlx49kpO7UOxyJU000SaNLh0L01FcU01FcV0GgZ_00007bV*G` z2jB=B2__dJBo`5pTPT0iNkl z*5Jwo^r)E7?Vx)I$jHbHtOEu-1keEsF^Z(c1mWzbuii6AiwS9B(CG5We4-N}di)@R zr?1}QH4I%2ms+yZfV7w(iqDYQghGwt$_Sh92?Z^o5F diff --git a/mods/money/textures/money_shop_bottom.png b/mods/money/textures/money_shop_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..a9d8e3bacaa074bbac089dc169f3b95a401bf4aa GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pIsTbNs4J61BR4=5yA;u=xnoS&PUnpeW$T$GwvlA5AW zo>`Ki;O^-g5Z=fq4pfxj>Eaj?aro`^g@OkZ1Y9n*9t?Dd$?~yXsq%G!!@?PJyhDsa z4$R#D>dwBIq2lX4S3H?=%hz+#vD`Seqwh6xb+qU1t~;>rX==kx?NgRO;}GCL_OvYX Z>zr|3`^DR}GCBl6GM=t}F6*2UngF7&PKN*h literal 0 HcmV?d00001 diff --git a/mods/money/textures/money_shop_top.png b/mods/money/textures/money_shop_top.png index 3275c0b2fddb60d2d57daa1172d7a042902ab563..4222e0b0dc17d0bd89cb0fbdf2f48350632c2df5 100644 GIT binary patch delta 165 zcmV;W09yb20h0odQV9za3otEtApIqgTPS~fNkl!1SvVaaC(cbZ2jDY{X`qqM6(MMoj0IcM ec@&HSdIA8kW*FyXqr`Fm0000 " .. (quest.title or "[NO TITLE]") .. "\n" for _, goal in pairs(quest.goals) do if (not goal.requires or goal.requires.done) and not(goal.done) then @@ -385,6 +385,7 @@ minetest.register_on_newplayer(function(player) q5.xp = xp.get_xp(5, 1) quest.xp = 0 + quest.hidden = true quests.add_quest(name, quest) end end)