diff --git a/digging_main2.py b/digging_main2.py index d26ae66..1c2bf2a 100644 --- a/digging_main2.py +++ b/digging_main2.py @@ -40,6 +40,7 @@ def run(): dig_point(290, 100, 200) level = 1 plot_size = 45 + DIG_TIME = 100 cv.waitKey(2000) runcounter = runcounter - 1 diff --git a/equip/rings/ring_6_32-mask.png b/equip/rings/ring_6_32-mask.png new file mode 100644 index 0000000..7366681 Binary files /dev/null and b/equip/rings/ring_6_32-mask.png differ diff --git a/equip/rings/ring_6_32.jpg b/equip/rings/ring_6_32.jpg new file mode 100644 index 0000000..ad98f81 Binary files /dev/null and b/equip/rings/ring_6_32.jpg differ diff --git a/equip/rings/ring_6_32.png b/equip/rings/ring_6_32.png new file mode 100644 index 0000000..29dc164 Binary files /dev/null and b/equip/rings/ring_6_32.png differ diff --git a/equip/rings/ring_7_32-mask.png b/equip/rings/ring_7_32-mask.png new file mode 100644 index 0000000..6feb697 Binary files /dev/null and b/equip/rings/ring_7_32-mask.png differ diff --git a/equip/rings/ring_7_32.jpg b/equip/rings/ring_7_32.jpg new file mode 100644 index 0000000..b4fb0eb Binary files /dev/null and b/equip/rings/ring_7_32.jpg differ diff --git a/equip/rings/ring_7_32.png b/equip/rings/ring_7_32.png new file mode 100644 index 0000000..2b3f162 Binary files /dev/null and b/equip/rings/ring_7_32.png differ diff --git a/equipment_main.py b/equipment_main.py index 647825e..010f990 100644 --- a/equipment_main.py +++ b/equipment_main.py @@ -666,6 +666,15 @@ def include_rings(needles, hsv, tresh, mask): tresh.append(0.93) mask.append(cv.imread("equip/rings/ring_5_32-mask.png", cv.IMREAD_COLOR)) + needles.append(cv.imread("equip/rings/ring_6_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/rings/ring_6_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/rings/ring_7_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/rings/ring_7_32-mask.png", cv.IMREAD_COLOR)) def include_wands(needles, hsv, tresh, mask): needles.append(cv.imread("equip/wands/wand_1_32.jpg", cv.IMREAD_UNCHANGED))