Skip to content
This repository was archived by the owner on Jan 17, 2025. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
066181e
Initial trade functionality added
krofty Apr 25, 2023
6b7a990
added basic chat functionality
krofty Apr 25, 2023
278363e
Refactor plus additional chat features added
krofty Apr 25, 2023
76bbe4d
Added exit function
krofty Apr 25, 2023
f1be65c
Implemented User(), Party(), users are now able to join parties
Snaacky Apr 26, 2023
da00eb4
Merge remote-tracking branch 'origin/master' into trade-krofty
Snaacky Apr 26, 2023
e295206
Merge remote-tracking branch 'origin/party' into trade-krofty
Snaacky Apr 26, 2023
8ba9587
Merge branch 'master' into trade-krofty
krofty Apr 27, 2023
e19d362
Merge branch 'master' into trade-krofty
krofty Apr 27, 2023
237468a
Return fix
krofty Apr 28, 2023
51256af
Merge branch 'trade-krofty' of https://github.com/Snaacky/dndserver i…
itzandroidtab May 12, 2023
e04784c
added requirements for trade membership
itzandroidtab May 12, 2023
1b5c952
bugfix merge with map select
itzandroidtab May 12, 2023
1d24b9d
Merge branch 'master' into trade-krofty
itzandroidtab May 16, 2023
afa2ed0
added basic trader support
itzandroidtab May 16, 2023
c55d7f0
added alembic file
itzandroidtab May 16, 2023
aebd4b0
added missing docstring
itzandroidtab May 16, 2023
01cfe64
reordered the party packets in protocol
itzandroidtab May 16, 2023
33fd520
cleanup get_empty_slot function
itzandroidtab May 16, 2023
d3a924d
Merge branch 'master' into trade-krofty
itzandroidtab May 17, 2023
3f85616
Merge branch 'master' into trade-krofty
itzandroidtab May 18, 2023
d187c5d
Merge branch 'master' into trade-krofty
Snaacky May 18, 2023
0395dbc
bugfix skipping the first slot
itzandroidtab May 18, 2023
a78a042
Merge branch 'master' into trade-krofty
Snaacky May 20, 2023
91a988e
Merge branch 'master' into trade-krofty
itzandroidtab May 22, 2023
eac13fd
reworked the trade id and added type hinting
itzandroidtab May 23, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
"""Added flag for if the user is a trader

Revision ID: 5f041eb74995
Revises: b53c793562c7
Create Date: 2023-05-16 21:27:28.795934

"""
from alembic import op
import sqlalchemy as sa
import sqlalchemy_utils


# revision identifiers, used by Alembic.
revision = "5f041eb74995"
down_revision = "b53c793562c7"
branch_labels = None
depends_on = None


def upgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table("characters", schema=None) as batch_op:
batch_op.add_column(sa.Column("is_trader", sa.Boolean(), nullable=True, server_default="0"))

# ### end Alembic commands ###


def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table("characters", schema=None) as batch_op:
batch_op.drop_column("is_trader")

# ### end Alembic commands ###
1 change: 1 addition & 0 deletions dndserver/handlers/lobby.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,6 @@ def open_map_select(ctx, msg: bytes) -> SS2C_OPEN_LOBBY_MAP_RES:
"""Occurs when client opens the map selector."""
req = SC2S_OPEN_LOBBY_MAP_REQ()
req.ParseFromString(msg)

res = SS2C_OPEN_LOBBY_MAP_RES()
return res
Loading