xmas update v2

Author: Wokzy

README.md

@@ -4,6 +4,7 @@ A simple autoclicker for blum drop mini-game on python (autoclicker collects **$
 
 ### Christmas mode:
  - run `main.py --xmas` to enable christmas mode
+ - Unfortunately after the last update of christmas event (bombs were added) I faced performance troubles. Some stuff may not be collected, but neither should bombs.
 
 ## Usage
  - Start tg app, then `main.py` and press play

constants.py

@@ -7,7 +7,7 @@
 HALLOWEEN_MODE = '--halloween' in sys.argv
 ELECTIONS_MODE = '--elections' in sys.argv
 FOOTBALL_MODE = '--football' in sys.argv
-DOGS_DROP_TOGGLE = '--disable-dogs' not in sys.argv
+DOGS_DROP_TOGGLE = '--enable-dogs' in sys.argv
 
 CLICK_LIMIT = 1.0
 for arg in sys.argv:
@@ -24,7 +24,7 @@
 					"blue":{"min":5, "max":55}}
 APPLICATION_TRIGGER = {"color":(234, 212, 12), "positions":[(60/402, 112/712), (43/402, 110/712), 
 															(102/402, 113/712), (61/402, 106/712)]}
-PIXELS_PER_ITERATION = 10
+PIXELS_PER_ITERATION = 10 + 5*CHRISTMAS_MODE
 
 NEW_GAME_TRIGGER_POS = (210/402, 615/712)
 AVG_GAME_DURATION = 30 + 6*HALLOWEEN_MODE # seconds
@@ -33,30 +33,6 @@
 #Dogs drop
 DOGS_WHITE_COLOR_RANGE = (238, 256)
 
-# Halloween
-HALLOWEEN_COLOR_TRIGGER = {
-					"red":{"min":220, "max":240},
-					"green":{"min":95, "max":130},
-					"blue":{"min":35, "max":55}}
-BOMB_COLOR_TRIGGER = {
-					"red":{"min":125, "max":140},
-					"green":{"min":125, "max":135},
-					"blue":{"min":125, "max":135}}
-
-#Election
-ELECTIONS_COLOR_TRIGGERS = [
-					{
-					"red":{"min":250, "max":255},
-					"green":{"min":130, "max":140},
-					"blue":{"min":90, "max":105}
-					},
-					{
-					"red":{"min":220, "max":230},
-					"green":{"min":160, "max":175},
-					"blue":{"min":125, "max":135}
-					}
-]
-
 # X-mas update
 CHRISTMAS_COLOR_TRIGGERS = [
 					{
@@ -65,27 +41,39 @@
 					"blue":{"min":120, "max":200}
 					},
 					{
-					"red":{"min":50, "max":120},
-					"green":{"min":100, "max":210},
-					"blue":{"min":5, "max":40}
-					},
-					{
 					"red":{"min":130, "max":180},
 					"green":{"min":50, "max":80},
 					"blue":{"min":0, "max":20}
 					},
 					{
-					"red":{"min":250, "max":255},
-					"green":{"min":150, "max":190},
-					"blue":{"min":0, "max":20}
-					},
-					{
 					"red":{"min":230, "max":240},
 					"green":{"min":85, "max":160},
 					"blue":{"min":70, "max":140}
+					},
+					{
+					"red":{"min":90, "max":120},
+					"green":{"min":35, "max":50},
+					"blue":{"min":0, "max":5}
 					}
+					# ,
+					# {
+					# "red":{"min":250, "max":255},
+					# "green":{"min":130, "max":150},
+					# "blue":{"min":0, "max":5}
+					# },
+					# {
+					# "red":{"min":50, "max":120},
+					# "green":{"min":100, "max":210},
+					# "blue":{"min":5, "max":40}
+					# },
 ]
 
+BOMB_COLOR_TRIGGER = {
+					"red":{"min":240, "max":255},
+					"green":{"min":170, "max":200},
+					"blue":{"min":20, "max":80}
+					}
+
 
 HELP_STRING = \
 """
@@ -94,10 +82,7 @@
 Options:
 	--help           - show this string
 	--xmas           - enable christmas mode
-	--halloween      - enable halloween mode
-	--football       - enable football mode
-	--elections      - enable elections mode
-	--disable-dogs   - don't collect dogs
+	--enable-dogs    - collect dogs
 	--click-limit=n  - limit clicks (Example: --click-limit=0.05, only 5% of clicks)
 
 Keybidings:

main.py

@@ -15,10 +15,7 @@
 from constants import (
 	CLICK_LIMIT,
 	HELP_STRING,
-	FOOTBALL_MODE,
-	ELECTIONS_MODE,
 	CHRISTMAS_MODE,
-	HALLOWEEN_MODE,
 	DOGS_DROP_TOGGLE,
 	AVG_GAME_DURATION,
 	BOMB_COLOR_TRIGGER,
@@ -27,9 +24,7 @@
 	PIXELS_PER_ITERATION,
 	DEFAULT_COLOR_TRIGGER,
 	DOGS_WHITE_COLOR_RANGE,
-	HALLOWEEN_COLOR_TRIGGER,
 	CHRISTMAS_COLOR_TRIGGERS,
-	ELECTIONS_COLOR_TRIGGERS,
 )
 
 
@@ -58,47 +53,31 @@ def check_running(frame, application_bbox) -> bool:
 def check_object(frame, x:int, y:int) -> bool:
 	""" Finding dropping objects by color """
 
-	def _check_color_trigger(color_trigger, limit:bool=True):
+	def _check_color_trigger(color_trigger, check_x=x, check_y=y, limit:bool=True):
 		if limit and random.random() > CLICK_LIMIT:
 			return False
 
-		if color_trigger['red']['min'] <= frame[y][x][0] <= color_trigger['red']['max']:
-			if color_trigger['green']['min'] <= frame[y][x][1] <= color_trigger['green']['max']:
-				# print(frame[y][x])
-				if color_trigger['blue']['min'] <= frame[y][x][2] <= color_trigger['blue']['max']:
+		if color_trigger['red']['min'] <= frame[check_y][check_x][0] <= color_trigger['red']['max']:
+			if color_trigger['green']['min'] <= frame[check_y][check_x][1] <= color_trigger['green']['max']:
+				# print(frame[check_y][check_x])
+				if color_trigger['blue']['min'] <= frame[check_y][check_x][2] <= color_trigger['blue']['max']:
 					return True
 		return False
 
-	if HALLOWEEN_MODE:
-		if _check_color_trigger(HALLOWEEN_COLOR_TRIGGER) or _check_color_trigger(BOMB_COLOR_TRIGGER):
-			return True
-	elif CHRISTMAS_MODE:
-		for trigger in CHRISTMAS_COLOR_TRIGGERS:
+	if CHRISTMAS_MODE:
+		for i in range(len(CHRISTMAS_COLOR_TRIGGERS)):
+			trigger = CHRISTMAS_COLOR_TRIGGERS[i]
 			if _check_color_trigger(trigger):
+				for lc_x in range(-45, 50, 3):
+					for lc_y in range(-50, 25, 3):
+						if _check_color_trigger(BOMB_COLOR_TRIGGER, x + lc_x, y + lc_y, limit=False):
+							return False
 				return True
 		return False
 	else:
 		if _check_color_trigger(DEFAULT_COLOR_TRIGGER):
 			return True
 
-	if ELECTIONS_MODE:
-		for color_trigger in ELECTIONS_COLOR_TRIGGERS:
-			if _check_color_trigger(color_trigger, False):
-				return True
-
-	if FOOTBALL_MODE:
-		if frame[y][x][0] == frame[y][x][1] == frame[y][x][2] == 255:
-			for i in range(-10, 10):
-				if 0 > (x + i) >= len(frame[0]):
-					continue
-
-				for j in range(-10, 10):
-					if 0 > (y + j) >= len(frame):
-						continue
-
-					if frame[y + j][x + i][0] < 40 and (frame[y + j][x + i][0] == frame[y + j][x + i][1] == frame[y + j][x + i][1]):
-						return True
-
 	#DOGS DROP
 	if DOGS_DROP_TOGGLE:
 		if frame[y][x][0] == frame[y][x][1] == frame[y][x][2] and DOGS_WHITE_COLOR_RANGE[0] <= frame[y][x][0] <= DOGS_WHITE_COLOR_RANGE[1]:
@@ -147,8 +126,8 @@ def main():
 	# time.sleep(2)
 
 	x_shift = 20
-	y_shift_top = 150
-	y_shift_bot = 250 + 150*FOOTBALL_MODE
+	y_shift_top = 150 + 50*CHRISTMAS_MODE
+	y_shift_bot = 250
 
 	game_counter = 0
 
@@ -172,7 +151,7 @@ def main():
 						mouse.move(x, y, absolute=True)
 						mouse.click(button='left')
 
-			time.sleep(0.28)
+			time.sleep(0.28 - .1*CHRISTMAS_MODE)
 			frame = camera.get_latest_frame()
 		else:
 			print('Finished')