SantaSpeen/KuiToi-Server
1
0
Fork 0
mirror of https://github.com/kuitoi/kuitoi-Server.git synced 2025-08-17 16:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add snowman support (Only one per player);

Browse Source 
Optimize getting car_id;
Minor fixes;
This commit is contained in:
Maxim Khomutov 2023-07-20 04:07:39 +03:00
parent 158599dfc5
commit eec7c8129d
2 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/core/Client.py
View File

@ -33,9 +33,9 @@ class Client:
self.roles = None self.roles = None
self._guest = True self._guest = True
self._ready = False self._ready = False
self._cars = [None, None, None, None, None, None, None, None, None, None] # Max 10 cars self._cars = [None] * 21 # Max 20 cars per player + 1 snowman
self._unicycle = None self._snowman = {"id": -1, "packet": ""}
self._connect_time: float = 0 self._connect_time = 0
@property @property
def _writer(self): def _writer(self):
@ -193,7 +193,7 @@ class Client:
abg = b"ABG:" abg = b"ABG:"
if len(data) > len(abg) and data.startswith(abg): if len(data) > len(abg) and data.startswith(abg):
data = zlib.decompress(data[len(abg):]) data = zlib.decompress(data[len(abg):])
self.log.debug(f"ABG Packet: {len(data)}") # self.log.debug(f"ABG Packet: {len(data)}")
if one: if one:
return data return data
@ -336,18 +336,18 @@ class Client:
async def _spawn_car(self, data): async def _spawn_car(self, data):
car_data = data[2:] car_data = data[2:]
car_id = 0 car_id = next((i for i, car in enumerate(self.cars) if car is None), len(self.cars))
for car in self.cars: cars_count = len(self.cars) - self.cars.count(None)
if not car: if self._snowman['id'] != -1:
break cars_count -= 1 # -1 for unicycle
car_id += 1 self.log.debug(f"car_id={car_id}, cars_count={cars_count}")
self.log.debug(f"Created a car: car_id={car_id}")
car_json = {} car_json = {}
try: try:
car_json = json.loads(car_data[car_data.find("{"):]) car_json = json.loads(car_data[car_data.find("{"):])
except Exception as e: except Exception as e:
self.log.debug(f"Invalid car_json: Error: {e}; Data: {car_data}") self.log.debug(f"Invalid car_json: Error: {e}; Data: {car_data}")
allow = True allow = True
allow_snowman = True
over_spawn = False over_spawn = False
ev_data_list = ev.call_event("onCarSpawn", car=car_json, car_id=car_id, player=self) ev_data_list = ev.call_event("onCarSpawn", car=car_json, car_id=car_id, player=self)
d2 = await ev.call_async_event("onCarSpawn", car=car_json, car_id=car_id, player=self) d2 = await ev.call_async_event("onCarSpawn", car=car_json, car_id=car_id, player=self)
@ -356,17 +356,24 @@ class Client:
# TODO: handle event onCarSpawn # TODO: handle event onCarSpawn
pass pass
pkt = f"Os:{self.roles}:{self.nick}:{self.cid}-{car_id}:{car_data}" pkt = f"Os:{self.roles}:{self.nick}:{self.cid}-{car_id}:{car_data}"
unicycle = car_json.get("jbm") == "unicycle" snowman = car_json.get("jbm") == "unicycle"
# FIXME: unicycle if allow and config.Game['max_cars'] > cars_count or (snowman and allow_snowman) or over_spawn:
# if (allow and (config.Game['max_cars'] > car_id or unicycle)) or over_spawn: if snowman:
if (allow and config.Game['max_cars'] > car_id and not unicycle) or over_spawn: unicycle_id = self._snowman['id']
self.log.debug(f"Car spawn accepted.") if unicycle_id != -1:
self.log.debug(f"Delete old unicycle: unicycle_id={unicycle_id}")
self._cars[unicycle_id] = None
await self._send(f"Od:{self.cid}-{unicycle_id}", to_all=True, to_self=True)
self._snowman = {"id": car_id, "packet": pkt}
self.log.debug(f"Unicycle spawn accepted: car_id={car_id}")
else:
self.log.debug(f"Car spawn accepted: car_id={car_id}")
self._cars[car_id] = { self._cars[car_id] = {
"packet": pkt, "packet": pkt,
"json": car_json, "json": car_json,
"json_ok": bool(car_json), "json_ok": bool(car_json),
"unicycle": unicycle, "snowman": snowman,
"over_spawn": over_spawn or unicycle "over_spawn": (snowman and allow_snowman) or over_spawn
} }
await self._send(pkt, to_all=True, to_self=True) await self._send(pkt, to_all=True, to_self=True)
else: else:
@ -390,11 +397,13 @@ class Client:
if cid == self.cid or admin_allow: if cid == self.cid or admin_allow:
await self._send(raw_data, to_all=True, to_self=True) await self._send(raw_data, to_all=True, to_self=True)
car = self.cars[car_id] car = self.cars[car_id]
if car['unicycle']: if car['snowman']:
self._cars.pop(car_id) self.log.debug(f"Snowman found")
else: unicycle_id = self._snowman['id']
self._cars[car_id] = None self._snowman['id'] = -1
await self._send(f"Od:{self.cid}-{car_id}") self._cars[unicycle_id] = None
self._cars[car_id] = None
await self._send(f"Od:{self.cid}-{car_id}", to_all=True, to_self=True)
self.log.debug(f"Deleted car: car_id={car_id}") self.log.debug(f"Deleted car: car_id={car_id}")
else: else:
@ -422,9 +431,12 @@ class Client:
pass pass
if cid == self.cid or allow or admin_allow: if cid == self.cid or allow or admin_allow:
if car['unicycle']: if car['snowman']:
self._cars.pop(car_id) unicycle_id = self._snowman['id']
await self._send(f"Od:{cid}-{car_id}", to_all=True, to_self=True) self._snowman['id'] = -1
self.log.debug(f"Delete snowman")
await self._send(f"Od:{self.cid}-{unicycle_id}", to_all=True, to_self=True)
self._cars[unicycle_id] = None
else: else:
await self._send(raw_data, to_all=True, to_self=False) await self._send(raw_data, to_all=True, to_self=False)
if car['json_ok']: if car['json_ok']:
@ -458,7 +470,7 @@ class Client:
case "d": # Delete car case "d": # Delete car
self.log.debug("Trying to delete car") self.log.debug("Trying to delete car")
await self._delete_car(data) await self._delete_car(raw_data)
case "c": # Edit car case "c": # Edit car
self.log.debug("Trying to edit car") self.log.debug("Trying to edit car")
@ -469,7 +481,7 @@ class Client:
await self._reset_car(raw_data) await self._reset_car(raw_data)
case "t": # Broken details case "t": # Broken details
self.log.debug(f"Something broken: {raw_data}") self.log.debug(f"Something changed/broken: {raw_data}")
await self._send(raw_data, to_all=True, to_self=False) await self._send(raw_data, to_all=True, to_self=False)
case "m": # Move focus cat case "m": # Move focus cat

6
src/core/Client.pyi
View File

@ -7,7 +7,7 @@
import asyncio import asyncio
from asyncio import StreamReader, StreamWriter, DatagramTransport from asyncio import StreamReader, StreamWriter, DatagramTransport
from logging import Logger from logging import Logger
from typing import Tuple, List, Dict, Optional from typing import Tuple, List, Dict, Optional, Union
from core import Core, utils from core import Core, utils
@ -15,7 +15,7 @@ from core import Core, utils
class Client: class Client:
def __init__(self, reader: StreamReader, writer: StreamWriter, core: Core) -> "Client": def __init__(self, reader: StreamReader, writer: StreamWriter, core: Core) -> "Client":
self._connect_time: float = None self._connect_time: float = 0.0
self.__tasks = [] self.__tasks = []
self.__reader = reader self.__reader = reader
self.__writer = writer self.__writer = writer
@ -34,6 +34,8 @@ class Client:
self.__alive = True self.__alive = True
self._ready = False self._ready = False
self._cars: List[Optional[Dict[str, int]]] = [] self._cars: List[Optional[Dict[str, int]]] = []
self._snowman: Dict[str, Union[int, str]] = {"id": -1, "packet": ""}
@property @property
def _writer(self) -> StreamWriter: ... def _writer(self) -> StreamWriter: ...
@property @property