Mirrored_Repos/houdini
1
0
Fork 0
mirror of https://github.com/solero/houdini.git synced 2024-11-08 20:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Redemption handler corrections

Browse Source
This commit is contained in:
rsakeys 2020-04-07 20:31:55 +01:00
parent 30d36157eb
commit 79abdf863a
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
houdini/handlers/redemption/__init__.py
View File

@ -3,7 +3,7 @@ from houdini.constants import ClientType
from houdini.data.item import Item from houdini.data.item import Item
from houdini.data.igloo import Furniture, Igloo from houdini.data.igloo import Furniture, Igloo
from houdini.data import db from houdini.data import db
from houdini.data.redemption import PenguinRedemptionBook, PenguinRedemptionCode, RedemptionAwardCard, \ from houdini.data.redemption import RedemptionBook, RedemptionBookWord,PenguinRedemptionBook, PenguinRedemptionCode, RedemptionAwardCard, \
RedemptionAwardFlooring, RedemptionAwardFurniture, RedemptionAwardIgloo, RedemptionAwardItem, \ RedemptionAwardFlooring, RedemptionAwardFurniture, RedemptionAwardIgloo, RedemptionAwardItem, \
RedemptionAwardLocation, RedemptionAwardPuffle, RedemptionAwardPuffleItem, RedemptionCode RedemptionAwardLocation, RedemptionAwardPuffle, RedemptionAwardPuffleItem, RedemptionCode
from houdini.handlers import XTPacket from houdini.handlers import XTPacket
@ -41,7 +41,8 @@ async def handle_join_redemption_server_legacy(p, penguin_id: int, login_key: st
tr.setex(f'{p.username}.lkey', p.server.config.auth_ttl, login_key) tr.setex(f'{p.username}.lkey', p.server.config.auth_ttl, login_key)
await tr.execute() await tr.execute()
await p.send_xt('rjs', '', 1) redeemed_books = await PenguinRedemptionBook.query.where(PenguinRedemptionBook.penguin_id == p.id).gino.all()
await p.send_xt('rjs', ','.join(str(redeemed_book.book_id) for redeemed_book in redeemed_books), 'houdini', int(p.is_member))
@handlers.handler(XTPacket('rsc', ext='red'), pre_login=True, client=ClientType.Legacy) @handlers.handler(XTPacket('rsc', ext='red'), pre_login=True, client=ClientType.Legacy)
@ -275,29 +276,26 @@ async def handle_send_cart(p, redemption_code: str, choice: str, super_exclusive
) \ ) \
.query.where(RedemptionCode.code == redemption_code) .query.where(RedemptionCode.code == redemption_code)
codes = await query.gino.all() codes = await query.gino.all()
if len(codes) == 0:
return await p.close()
code = codes[0] code = codes[0]
coins = 0 coins = 0
if choice is None: if choice is None:
return await p.close() return await p.close()
choices = choice.split(',') choices = choice.split(',')
print(choices)
for choice in choices: for choice in choices:
if choice[:2] == 'c0': if choice[:2] == 'c0':
coins += 500 coins += 500
elif choice[:1] != 'p': elif choice[:1] != 'p':
if int(choice) not in p.server.items: if p.server.items[int(choice)] not in p.server.items.treasure:
return await p.close() return await p.close()
else: else:
print('Adding', int(choice))
await p.add_inventory(p.server.items[int(choice)], notify=False) await p.add_inventory(p.server.items[int(choice)], notify=False)
# if int(choice) not in p.server.items.treasure:
# return await p.close()
# else:
# await p.add_inventory(p.server.items[choice], notify=False)
while 'c0' in choices: while 'c0' in choices:
choices.remove('c0') choices.remove('c0')