X-mas update

Author: Wokzy

README.md

@@ -3,7 +3,7 @@ ___
 A simple autoclicker for blum drop mini-game on python (autoclicker collects **$dogs**)
 
 ### Football mode:
- - run `main.py --football` to enable football mode
+ - run `main.py --xmas` to enable christmas mode
 
 ## Usage
  - Start tg app, then `main.py` and press play

constants.py

@@ -3,6 +3,7 @@
 """On different devices app size is also different, 
 	so i located triggers on mine and devided it by window size on my pc,
 	in game this coefficients are multiplied by actual window size to get correct coordinates"""
+CHRISTMAS_MODE = '--xmas' in sys.argv
 HALLOWEEN_MODE = '--halloween' in sys.argv
 ELECTIONS_MODE = '--elections' in sys.argv
 FOOTBALL_MODE = '--football' in sys.argv
@@ -56,15 +57,45 @@
 					}
 ]
 
+# X-mas update
+CHRISTMAS_COLOR_TRIGGERS = [
+					{
+					"red":{"min":240, "max":255},
+					"green":{"min":0, "max":15},
+					"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}
+					}
+]
+
 
 HELP_STRING = \
 """
 Usage: main.py [AMOUNT OF GAMES] [OPTIONS]
 
 Options:
 	--help           - show this string
+	--xmas           - enable christmas mode
 	--halloween      - enable halloween mode
-	--football      - enable football mode
+	--football       - enable football mode
 	--elections      - enable elections mode
 	--disable-dogs   - don't collect dogs
 	--click-limit=n  - limit clicks (Example: --click-limit=0.05, only 5% of clicks)

main.py

@@ -17,6 +17,7 @@
 	HELP_STRING,
 	FOOTBALL_MODE,
 	ELECTIONS_MODE,
+	CHRISTMAS_MODE,
 	HALLOWEEN_MODE,
 	DOGS_DROP_TOGGLE,
 	AVG_GAME_DURATION,
@@ -27,6 +28,7 @@
 	DEFAULT_COLOR_TRIGGER,
 	DOGS_WHITE_COLOR_RANGE,
 	HALLOWEEN_COLOR_TRIGGER,
+	CHRISTMAS_COLOR_TRIGGERS,
 	ELECTIONS_COLOR_TRIGGERS,
 )
 
@@ -57,7 +59,7 @@ def check_object(frame, x:int, y:int) -> bool:
 	""" Finding dropping objects by color """
 
 	def _check_color_trigger(color_trigger, limit:bool=True):
-		if not limit and random.random() > CLICK_LIMIT:
+		if limit and random.random() > CLICK_LIMIT:
 			return False
 
 		if color_trigger['red']['min'] <= frame[y][x][0] <= color_trigger['red']['max']:
@@ -70,6 +72,11 @@ def _check_color_trigger(color_trigger, limit:bool=True):
 	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 _check_color_trigger(trigger):
+				return True
+		return False
 	else:
 		if _check_color_trigger(DEFAULT_COLOR_TRIGGER):
 			return True
@@ -165,7 +172,7 @@ def main():
 						mouse.move(x, y, absolute=True)
 						mouse.click(button='left')
 
-			time.sleep(0.3)
+			time.sleep(0.28)
 			frame = camera.get_latest_frame()
 		else:
 			print('Finished')