gluehuffer/cromulant
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mods

Browse Source
This commit is contained in:
Auric Vente
2024-07-22 19:38:10 -06:00
parent 9fcc9d31f8
commit 2b9eb8a4fd
4 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cromulant/game.py
View File

@@ -270,11 +270,13 @@ class Game:
else:
return
Game.merge_charge += 1
if Game.merge_charge < Config.merge_goal:
Game.merge_charge += 1
if Game.merge_charge >= Config.merge_goal:
nums.insert(0, Method.merge)
weights.insert(0, 1)
if Settings.merge:
if Game.merge_charge >= Config.merge_goal:
nums.insert(0, Method.merge)
weights.insert(0, 1)
num = random.choices(nums, weights=weights, k=1)[0]
@@ -467,10 +469,19 @@ class Game:
menu = QMenu(Window.root.widget())
update = QAction("Update")
restart = QAction("Restart")
if Settings.merge:
merge = QAction("Merge: On")
else:
merge = QAction("Merge: Off")
update.triggered.connect(Game.force_update)
restart.triggered.connect(Game.restart)
merge.triggered.connect(Settings.toggle_merge)
menu.addAction(update)
menu.addAction(restart)
menu.addAction(merge)
menu.exec_(QCursor.pos())
@staticmethod