testing last-played-stone smoke effect, based on experimental function added to nodecore

- edgy etching looks less bad on the sides of a raised goban with this orientation
- if digging out an area for your goban, you can now place edgy from inside the playable area, instead of having to dig out extra space to place it from

rules.lua

@@ -11,6 +11,8 @@ local modname = minetest.get_current_modname()
 
 local cache = {}
 
+local global_search_maximum = 361
+
 local directions = { [0] =
     vector.new(0, 0, -1),
     vector.new(-1, 0, 0),
@@ -58,9 +60,9 @@ local function _check_position_uncached(pos)
 
     if reg_item.pattern_def then
         if reg_item.pattern_def.name == "edgy" then
-            return "WE" .. node.param2
+            return "WE" .. ((node.param2+2)%4)
         elseif reg_item.pattern_def.name == "corny" then
-            return "WC" .. node.param2
+            return "WC" .. ((node.param2+2)%4)
         elseif reg_item.pattern_def.name == "crossy" then
             return "WB"
         elseif reg_item.pattern_def.name == "starcrossy" then
@@ -143,18 +145,20 @@ local function connected_search(pos, final_result, early_termination_filter)
             if (not stones[newhash]) and (not checked[newhash]) then
                 local newnode = check_position(newpos)
 
+                if newnode == piece then
+                    stones[newhash] = newpos
+                    group[#group+1] = newpos
+                else
+                    checked[newhash] = true
+                end
+
                 local filter_result
                 if early_termination_filter then
-                    filter_result = early_termination_filter(newnode)
+                    filter_result = early_termination_filter(newnode, #group)
                 end
                 if filter_result then
                     filter_result.stones = stones
                     return filter_result
-                elseif newnode == piece then
-                    stones[newhash] = newpos
-                    group[#group+1] = newpos
-                else
-                    checked[newhash] = true
                 end
             end
         end
@@ -165,8 +169,8 @@ local function connected_search(pos, final_result, early_termination_filter)
     return final_result
 end
 
-local function _check_captures_filter(node)
-    if node:sub(1, 1) == "E" then
+local function _check_captures_filter(node, count)
+    if (count > global_search_maximum) or (node:sub(1, 1) == "E") then
         return {capture = false}
     end
 end
@@ -180,11 +184,22 @@ local function check_captures(pos)
 end
 
 local function _connected_group_final()
-    return {}
+    return {complete = true}
+end
+
+local function _connected_group_filter(node, count)
+    if (count > global_search_maximum) then
+        return {}
+    end
 end
 
 local function connected_group(pos)
-    return connected_search(pos, _connected_group_final)
+    local search = connected_search(pos, _connected_group_final, _connected_group_filter)
+    if search.complete then
+        return search.stones
+    else
+        return {pos}
+    end
 end
 
 local function territory_search(pos, max)
@@ -197,13 +212,12 @@ local function territory_search(pos, max)
             function()
                 return {team = team}
             end,
-            function(node)
-                if node == "E" then
-                    max = max - 1
-                    if max <= 0 then
-                        return {}
-                    end
-                elseif node ~= "E_" and ((node:sub(1, 1) == "E") or (node:sub(1, 1) == "S")) and node:len() > 1 then
+            function(node, count)
+                if (count > max) then
+                    return {}
+                end
+
+                if node ~= "E_" and ((node:sub(1, 1) == "E") or (node:sub(1, 1) == "S")) and node:len() > 1 then
                     node = node:sub(2, -1)
                     if team then
                         if team ~= node then
@@ -290,18 +304,31 @@ function lc_liberties.handle_placement(pos)
             local stone = minetest.get_node(pos).name
             nodecore.set_loud(pos, {name = "air"})
             nodecore.item_eject(pos, stone, 5)
+        else
+            for x=pos.x-18, pos.x+18 do
+                for z=pos.z-18, pos.z+18 do
+                    if (x ~= pos.x) or (z ~= pos.z) then
+                        nodecore.smokequell({x = x, y = pos.y, z = z})
+                    end
+                end
+            end
+
+            nodecore.smokefx(pos, 300, 2)
         end
     end
 end
 
 function lc_liberties.handle_territory_fill(itemstack, placer, pointed_thing)
-    cache = {}
-
-    if placer.get_player_control and placer:get_player_control().aux1 then
+    if (placer.get_player_control and placer:get_player_control().aux1)
+            or
+        (pointed_thing and pointed_thing.under and minetest.get_node(pointed_thing.under).name == "nc_items:stack")
+            then
         return minetest.item_place(itemstack, placer, pointed_thing)
     end
 
     if pointed_thing and pointed_thing.above then
+        cache = {}
+
         local territories = territory_search(pointed_thing.above, itemstack:get_count())
         if territories.team then
             local piece = modname .. ":territory_" .. territories.team
@@ -320,8 +347,11 @@ end
 function lc_liberties.handle_dig(pos, node, digger)
     cache = {}
 
-    if digger.get_player_control and digger:get_player_control().aux1 then
-        for i, v in pairs(connected_group(pos).stones) do
+    if (digger.get_player_control and digger:get_player_control().aux1)
+                ~=
+            (minetest.registered_items[node.name].groups.go_territory_marker ~= nil)
+                then
+        for i, v in pairs(connected_group(pos)) do
             minetest.node_dig(v, node, digger)
         end
 

stones.lua

@@ -9,6 +9,23 @@ include("rules")
 
 local modname = minetest.get_current_modname()
 
+local function reg_stone_craft(name, pattern)
+    local piecename = modname .. ":stone_" .. string_lower(name)
+
+    nodecore.register_craft({
+        label = "Chop scored cement into go stones",
+        action = "pummel",
+        toolgroups = {choppy = 3},
+        nodes = {
+            {
+                match = "nc_concrete:" .. name .. "_" .. pattern .. "_ply",
+                replace = "air"
+            }
+        },
+        items = {{name = piecename, count = 3, scatter = 4}},
+    })
+end
+
 local function reg(name, basename, basedef)
     local piecename = modname .. ":stone_" .. string_lower(name)
     if minetest.registered_nodes[piecename] then return end
@@ -33,13 +50,38 @@ local function reg(name, basename, basedef)
         node_box = {
             type = "fixed",
             fixed = {
-                {-3/16, -8/16, -3/16, 3/16, -7/16, 3/16},
-                {-5/16, -7/16, -5/16, 5/16, -6/16, 5/16},
-                {-6/16, -6/16, -6/16, 6/16, -4/16, 6/16},
-                {-7/16, -4/16, -7/16, 7/16, -2/16, 7/16},
-                {-6/16, -2/16, -6/16, 6/16, 0/16, 6/16},
-                {-5/16, 0/16, -5/16, 5/16, 1/16, 5/16},
-                {-3/16, 1/16, -3/16, 3/16, 2/16, 3/16},
+                {-2/16, -8/16, -2/16, 2/16, -0/16, 2/16},
+                {-4/16, -7/16, -5/16, 4/16, -1/16, 5/16},
+                {-5/16, -7/16, -4/16, 5/16, -1/16, 4/16},
+                {-5/16, -6/16, -6/16, 5/16, -2/16, 6/16},
+                {-6/16, -6/16, -5/16, 6/16, -2/16, 5/16},
+                {-3/16, -5/16, -7/16, 3/16, -3/16, 7/16},
+                {-7/16, -5/16, -3/16, 7/16, -3/16, 3/16},
+
+
+                -- wolfie model high-detail-ified:
+                --{-3/16, -8/16, -2/16, 3/16, -0/16, 2/16},
+                --{-2/16, -8/16, -3/16, 2/16, -0/16, 3/16},
+                --{-4/16, -7/16, -5/16, 4/16, -1/16, 5/16},
+                --{-5/16, -7/16, -4/16, 5/16, -1/16, 4/16},
+                --{-5/16, -5/16, -6/16, 5/16, -3/16, 6/16},
+                --{-6/16, -5/16, -5/16, 6/16, -3/16, 5/16},
+                --{-4/16, -6/16, -6/16, 4/16, -2/16, 6/16},
+                --{-6/16, -6/16, -4/16, 6/16, -2/16, 4/16},
+                --{-5/16, -6/16, -5/16, 5/16, -2/16, 5/16},
+                --{-3/16, -5/16, -7/16, 3/16, -3/16, 7/16},
+                --{-7/16, -5/16, -3/16, 7/16, -3/16, 3/16},
+
+
+                -- lizzie's pre-wolfie model:
+                --{-2/16, -8/16, -2/16, 2/16, -0/16, 2/16},
+                --{-4/16, -7/16, -5/16, 4/16, -1/16, 5/16},
+                --{-5/16, -7/16, -4/16, 5/16, -1/16, 4/16},
+                --{-5/16, -6/16, -6/16, 5/16, -2/16, 6/16},
+                --{-6/16, -6/16, -5/16, 6/16, -2/16, 5/16},
+                --{-5/16, -5/16, -7/16, 5/16, -3/16, 7/16},
+                --{-7/16, -5/16, -5/16, 7/16, -3/16, 5/16},
+                --{-6/16, -5/16, -6/16, 6/16, -3/16, 6/16},
             }
         },
 
@@ -48,7 +90,6 @@ local function reg(name, basename, basedef)
             fixed = {-7/16, -8/16, -7/16, 7/16, 2/16, 7/16}
         },
 
-
         tiles = {
             basedef.tiles[1]
         },
@@ -61,6 +102,7 @@ local function reg(name, basename, basedef)
             snappy = 1,
             falling_node = 1,
             falling_repose = 1,
+            optic_opaque = 1,
             go_stone = 1
         },
 
@@ -81,9 +123,8 @@ local function reg(name, basename, basedef)
         node_box = {
             type = "fixed",
             fixed = {
-                {-2/16, -8/16, -2/16, 2/16, -7/16, 2/16},
+                {-2/16, -8/16, -2/16, 2/16, -5/16, 2/16},
                 {-3/16, -7/16, -3/16, 3/16, -6/16, 3/16},
-                {-2/16, -6/16, -2/16, 2/16, -5/16, 2/16},
             }
         },
 
@@ -92,6 +133,7 @@ local function reg(name, basename, basedef)
             fixed = {-6/16, -8/16, -6/16, 6/16, 0/16, 6/16}
         },
 
+        node_placement_prediction = "",
 
         tiles = {
             basedef.tiles[1]
@@ -106,6 +148,7 @@ local function reg(name, basename, basedef)
             falling_node = 1,
             falling_repose = 1,
             go_territory_marker = 1,
+            stack_as_node = 1,
         },
 
         go_team = name,
@@ -117,18 +160,8 @@ local function reg(name, basename, basedef)
         on_dig = lc_liberties.handle_dig,
     })
 
-    nodecore.register_craft({
-        label = "Chop scored cement into go stones",
-        action = "pummel",
-        toolgroups = {choppy = 3},
-        nodes = {
-            {
-                match = "nc_concrete:" .. name .. "_starcrossy_ply",
-                replace = "air"
-            }
-        },
-        items = {{name = piecename, count = 3, scatter = 4}},
-    })
+    reg_stone_craft(name, "crossy")
+    reg_stone_craft(name, "starcrossy")
 
     nodecore.register_craft({
         label = "Smash go stones into territory markers",