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

Add reset and edit for cars

Browse Source
This commit is contained in:
Maxim Khomutov 2023-07-17 21:23:40 +03:00
parent 6dedf518e2
commit eb88af247c
1 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/core/Client.py
View File

@ -276,10 +276,10 @@ class Client:
return return
def _get_cid_vid(self, data: str): def _get_cid_vid(self, data: str):
s = data[data.find(":", 1) + 1:] s = data[:data.find(":", 1)]
id_sep = s.find('-') id_sep = s.find('-')
if id_sep == -1: if id_sep == -1:
self.log.debug(f"Invalid packet: Could not parse pid/vid from packet, as there is no '-' separator: '{s}'") self.log.debug(f"Invalid packet: Could not parse pid/vid from packet, as there is no '-' separator: '{data}'")
return -1, -1 return -1, -1
cid = s[:id_sep] cid = s[:id_sep]
vid = s[id_sep + 1:] vid = s[id_sep + 1:]
@ -292,7 +292,7 @@ class Client:
self.log.debug(f"Invalid packet: Could not parse cid/vid from packet, as one or both are not valid " self.log.debug(f"Invalid packet: Could not parse cid/vid from packet, as one or both are not valid "
f"numbers: '{s}'") f"numbers: '{s}'")
return -1, -1 return -1, -1
self.log.debug(f"Invalid packet: Could not parse pid/vid from packet: '{s}'") self.log.debug(f"Invalid packet: Could not parse pid/vid from packet: '{data}'")
return -1, -1 return -1, -1
async def _handle_vehicle_codes(self, data): async def _handle_vehicle_codes(self, data):
@ -309,19 +309,19 @@ class Client:
if c is None: if c is None:
break break
car_id += 1 car_id += 1
self.log.debug(f"Created a car with ID {car_id}") self.log.debug(f"Created a car: car_id={car_id}")
car_data = data[2:] car_data = data[2:]
car_json = {} car_json = {}
try: try:
car_json = json.loads(data[5:]) car_json = json.loads(data[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}")
# TODO: Call event onCarSpawn allow = True
allow_spawn = True
over_spawn = False over_spawn = False
# TODO: Call event onCarSpawn
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" unicycle = car_json.get("jbm") == "unicycle"
if (allow_spawn and (config.Game['max_cars'] > car_id or unicycle)) or over_spawn: if (allow and (config.Game['max_cars'] > car_id or unicycle)) or over_spawn:
self.log.debug(f"Car spawn accepted.") self.log.debug(f"Car spawn accepted.")
self._cars[car_id] = { self._cars[car_id] = {
"packet": pkt, "packet": pkt,
@ -330,7 +330,7 @@ class Client:
"unicycle": unicycle, "unicycle": unicycle,
"over_spawn": over_spawn or unicycle "over_spawn": over_spawn or unicycle
} }
await self._send(pkt, to_all=True) await self._send(pkt, to_all=True, to_self=True)
else: else:
await self._send(pkt) await self._send(pkt)
des = f"Od:{self.cid}-{car_id}" des = f"Od:{self.cid}-{car_id}"
@ -342,27 +342,52 @@ class Client:
# TODO: Call event onCarDelete # TODO: Call event onCarDelete
await self._send(data, to_all=True, to_self=True) await self._send(data, to_all=True, to_self=True)
try: try:
self._cars[car_id] = None car = self.cars[car_id]
if car['unicycle']:
self._cars.pop(car_id)
else:
self._cars[car_id] = None
await self._send(f"Od:{self.cid}-{car_id}") await self._send(f"Od:{self.cid}-{car_id}")
self.log.debug(f"Deleted car with car_id: {car_id}") self.log.debug(f"Deleted car: car_id={car_id}")
except IndexError: except IndexError:
self.log.debug(f"Unknown car: car_id={car_id}") self.log.debug(f"Unknown car: car_id={car_id}")
case "c": # Edit car case "c": # Edit car
self.log.debug("Trying to edit car") self.log.debug("Trying to edit car")
# TODO: edit car allow = True
# TODO: Call event onCarEdited
cid, car_id = self._get_cid_vid(data) cid, car_id = self._get_cid_vid(data)
if car_id != -1 and cid == self.cid: if car_id != -1 and cid == self.cid:
car = self.cars[car_id] try:
if car['unicycle']: car = self.cars[car_id]
pass if car['unicycle']:
self._cars.pop(car_id)
await self._send(f"Od:{self.cid}-{car_id}", to_all=True, to_self=True)
elif allow:
await self._send(data, to_all=True, to_self=False)
if car['json_ok']:
old_car_json = car['json']
try:
new_car_json = json.loads(data[data.find("{"):])
old_car_json.update(new_car_json)
car['json'] = new_car_json
self.log.debug(f"Updated car: car_id={car_id}")
except Exception as e:
self.log.debug(f"Invalid new_car_json: Error: {e}; Data: {data}")
except IndexError:
self.log.debug(f"Unknown car: car_id={car_id}")
case "r": # Reset car case "r": # Reset car
self.log.debug("Trying to reset car") self.log.debug("Trying to reset car")
# TODO: reset car
cid, car_id = self._get_cid_vid(data) cid, car_id = self._get_cid_vid(data)
if car_id != -1 and cid == self.cid: if car_id != -1 and cid == self.cid:
pass # TODO: Call event onCarReset
case "t" | "m": await self._send(data, to_all=True, to_self=False)
pass self.log.debug(f"Car reset: car_id={car_id}")
case "t":
self.log.debug(f"Received 'Ot' packet: {data}")
await self._send(data, to_all=True, to_self=False)
case "m":
await self._send(data, to_all=True, to_self=True)
async def _handle_codes(self, data): async def _handle_codes(self, data):
if not data: if not data: