Add combo multiplier

Author: lulunac27a

app.py

@@ -48,6 +48,12 @@ class User(db.Model):
     days_completed: int = db.Column(
         db.Integer, default=0, nullable=False
     )  # user days completed with tasks
+    combo_multiplier: int = db.Column(
+        db.Integer, default=0, nullable=False
+    )  # user XP multiplier for combo
+    last_task_completed: int = db.Column(
+        db.Integer, default=-1, nullable=False
+    )  # user last task completion ID
 
     def add_xp(self, amount: float) -> None:  # add XP
         self.xp += amount  # add XP by amount
@@ -315,6 +321,15 @@ def complete_task(task_id) -> Response:  # complete task from task id
             user.last_completion_date = (
                 datetime.now()
             )  # set user last completion date to today
+            if (
+                task.id == user.last_completed_task
+            ):  # if the task is the last completed task
+                user.combo_multiplier += 1  # increase combo multipler by 1
+            else:
+                user.combo_multiplier = 0  # reset combo multiplier to 0
+            user.last_completed_task = (
+                task.id
+            )  # set user last completed task to task id
             user.add_xp(
                 round(
                     task.priority
@@ -329,7 +344,9 @@ def complete_task(task_id) -> Response:  # complete task from task id
                     * (1 + math.log(max(user.days_completed, 1)))
                     * (1 + task.streak / 10)
                     * due_multiplier
+                    * (1 + user.combo_multiplier / 10)
                 )
+                + user.combo_multiplier
             )  # add XP
             db.session.commit()  # commit database changes
     return redirect(url_for("index"))  # redirect to index page template

migrations/versions/28e53a4e60fe_add_combo_multipliers.py

@@ -0,0 +1,64 @@
+"""Add combo multipliers
+
+Revision ID: 28e53a4e60fe
+Revises: fa5ff0ea7eab
+Create Date: 2025-01-14 22:48:14.773004
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '28e53a4e60fe'
+down_revision = 'fa5ff0ea7eab'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('task', schema=None) as batch_op:
+        batch_op.alter_column('streak',
+               existing_type=sa.INTEGER(),
+               nullable=False,
+               existing_server_default=sa.text('0'))
+        batch_op.alter_column('completed',
+               existing_type=sa.INTEGER(),
+               type_=sa.Boolean(),
+               existing_nullable=False,
+               existing_server_default=sa.text('0'))
+
+    with op.batch_alter_table('user', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('combo_multiplier', sa.Integer(), nullable=False))
+        batch_op.add_column(sa.Column('last_task_completed', sa.Integer(), nullable=False))
+        batch_op.alter_column('tasks_completed',
+               existing_type=sa.INTEGER(),
+               nullable=False,
+               existing_server_default=sa.text('0'))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('user', schema=None) as batch_op:
+        batch_op.alter_column('tasks_completed',
+               existing_type=sa.INTEGER(),
+               nullable=True,
+               existing_server_default=sa.text('0'))
+        batch_op.drop_column('last_task_completed')
+        batch_op.drop_column('combo_multiplier')
+
+    with op.batch_alter_table('task', schema=None) as batch_op:
+        batch_op.alter_column('completed',
+               existing_type=sa.Boolean(),
+               type_=sa.INTEGER(),
+               existing_nullable=False,
+               existing_server_default=sa.text('0'))
+        batch_op.alter_column('streak',
+               existing_type=sa.INTEGER(),
+               nullable=True,
+               existing_server_default=sa.text('0'))
+
+    # ### end Alembic commands ###