Skip to content

Commit cdfee3f

Browse files
asdawejasdawej
authored
Merge pull request #162 from asdawej/dev-pyapi
fix(PyAPI): 🐛 fix mismatch with proto
2 parents 2964748 + f777891 commit cdfee3f

2 files changed

Lines changed: 70 additions & 70 deletions

File tree

‎CAPI/python/PyAPI/API.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def __init__(self, logic: ILogic) -> None:
1111
self.__pool = ThreadPoolExecutor(20)
1212

1313
def Move(self, timeInMilliseconds: int, angle: float) -> Future[bool]:
14-
return self.__pool.submit(self.__logic.move, timeInMilliseconds, angle)
14+
return self.__pool.submit(self.__logic.Move, timeInMilliseconds, angle)
1515

1616
def MoveRight(self, timeInMilliseconds: int) -> Future[bool]:
1717
return self.Move(timeInMilliseconds, pi * 0.5)

‎CAPI/python/PyAPI/logic.py‎

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -407,120 +407,120 @@ def __LoadBufferCase(self, item: Message2Clients.MessageOfObj) -> None:
407407
)
408408
self.__logger.debug("Load Bullet!")
409409

410-
elif item.WhichOneof("message_of_obj") == "recycleBank_message":
411-
if item.recycleBank_message.team_id == self.__teamID:
410+
elif item.WhichOneof("message_of_obj") == "recyclebank_message":
411+
if item.recyclebank_message.team_id == self.__teamID:
412412
pos = (
413-
AssistFunction.GridToCell(item.recycleBank_message.x),
414-
AssistFunction.GridToCell(item.recycleBank_message.y),
413+
AssistFunction.GridToCell(item.recyclebank_message.x),
414+
AssistFunction.GridToCell(item.recyclebank_message.y),
415415
)
416416
if pos not in self.__bufferState.mapInfo.recycleBankState:
417417
self.__bufferState.mapInfo.recycleBankState[pos] = (
418-
item.recycleBank_message.hp
418+
item.recyclebank_message.hp
419419
)
420420
self.__logger.debug("New RecycleBank")
421421
else:
422422
self.__bufferState.mapInfo.recycleBankState[pos] = (
423-
item.recycleBank_message.hp
423+
item.recyclebank_message.hp
424424
)
425425
self.__logger.debug("Update RecycleBank")
426426
elif AssistFunction.HaveView(
427427
self.__bufferState.self.viewRange,
428428
self.__bufferState.self.x,
429429
self.__bufferState.self.y,
430-
item.recycleBank_message.x,
431-
item.recycleBank_message.y,
430+
item.recyclebank_message.x,
431+
item.recyclebank_message.y,
432432
self.__bufferState.gameMap,
433433
):
434434
pos = (
435-
AssistFunction.GridToCell(item.recycleBank_message.x),
436-
AssistFunction.GridToCell(item.recycleBank_message.y),
435+
AssistFunction.GridToCell(item.recyclebank_message.x),
436+
AssistFunction.GridToCell(item.recyclebank_message.y),
437437
)
438438
if pos not in self.__bufferState.mapInfo.recycleBankState:
439439
self.__bufferState.mapInfo.recycleBankState[pos] = (
440-
item.recycleBank_message.hp
440+
item.recyclebank_message.hp
441441
)
442442
self.__logger.debug("New RecycleBank")
443443
else:
444444
self.__bufferState.mapInfo.recycleBankState[pos] = (
445-
item.recycleBank_message.hp
445+
item.recyclebank_message.hp
446446
)
447447
self.__logger.debug("Update RecycleBank")
448448

449-
elif item.WhichOneof("message_of_obj") == "chargeStation_message":
450-
if item.chargeStation_message.team_id == self.__teamID:
449+
elif item.WhichOneof("message_of_obj") == "chargestation_message":
450+
if item.chargestation_message.team_id == self.__teamID:
451451
pos = (
452-
AssistFunction.GridToCell(item.chargeStation_message.x),
453-
AssistFunction.GridToCell(item.chargeStation_message.y),
452+
AssistFunction.GridToCell(item.chargestation_message.x),
453+
AssistFunction.GridToCell(item.chargestation_message.y),
454454
)
455455
if pos not in self.__bufferState.mapInfo.chargeStationState:
456456
self.__bufferState.mapInfo.chargeStationState[pos] = (
457-
item.chargeStation_message.hp
457+
item.chargestation_message.hp
458458
)
459459
self.__logger.debug("New ChargeStation")
460460
else:
461461
self.__bufferState.mapInfo.chargeStationState[pos] = (
462-
item.chargeStation_message.hp
462+
item.chargestation_message.hp
463463
)
464464
self.__logger.debug("Update ChargeStation")
465465
elif AssistFunction.HaveView(
466466
self.__bufferState.self.viewRange,
467467
self.__bufferState.self.x,
468468
self.__bufferState.self.y,
469-
item.chargeStation_message.x,
470-
item.chargeStation_message.y,
469+
item.chargestation_message.x,
470+
item.chargestation_message.y,
471471
self.__bufferState.gameMap,
472472
):
473473
pos = (
474-
AssistFunction.GridToCell(item.chargeStation_message.x),
475-
AssistFunction.GridToCell(item.chargeStation_message.y),
474+
AssistFunction.GridToCell(item.chargestation_message.x),
475+
AssistFunction.GridToCell(item.chargestation_message.y),
476476
)
477477
if pos not in self.__bufferState.mapInfo.chargeStationState:
478478
self.__bufferState.mapInfo.chargeStationState[pos] = (
479-
item.chargeStation_message.hp
479+
item.chargestation_message.hp
480480
)
481481
self.__logger.debug("New ChargeStation")
482482
else:
483483
self.__bufferState.mapInfo.chargeStationState[pos] = (
484-
item.chargeStation_message.hp
484+
item.chargestation_message.hp
485485
)
486486
self.__logger.debug("Update ChargeStation")
487487

488-
elif item.WhichOneof("message_of_obj") == "signalTower_message":
489-
if item.signalTower_message.team_id == self.__teamID:
488+
elif item.WhichOneof("message_of_obj") == "signaltower_message":
489+
if item.signaltower_message.team_id == self.__teamID:
490490
pos = (
491-
AssistFunction.GridToCell(item.signalTower_message.x),
492-
AssistFunction.GridToCell(item.signalTower_message.y),
491+
AssistFunction.GridToCell(item.signaltower_message.x),
492+
AssistFunction.GridToCell(item.signaltower_message.y),
493493
)
494494
if pos not in self.__bufferState.mapInfo.signalTowerState:
495495
self.__bufferState.mapInfo.signalTowerState[pos] = (
496-
item.signalTower_message.hp
496+
item.signaltower_message.hp
497497
)
498498
self.__logger.debug("New SignalTower")
499499
else:
500500
self.__bufferState.mapInfo.signalTowerState[pos] = (
501-
item.signalTower_message.hp
501+
item.signaltower_message.hp
502502
)
503503
self.__logger.debug("Update SignalTower")
504504
elif AssistFunction.HaveView(
505505
self.__bufferState.self.viewRange,
506506
self.__bufferState.self.x,
507507
self.__bufferState.self.y,
508-
item.signalTower_message.x,
509-
item.signalTower_message.y,
508+
item.signaltower_message.x,
509+
item.signaltower_message.y,
510510
self.__bufferState.gameMap,
511511
):
512512
pos = (
513-
AssistFunction.GridToCell(item.signalTower_message.x),
514-
AssistFunction.GridToCell(item.signalTower_message.y),
513+
AssistFunction.GridToCell(item.signaltower_message.x),
514+
AssistFunction.GridToCell(item.signaltower_message.y),
515515
)
516516
if pos not in self.__bufferState.mapInfo.signalTowerState:
517517
self.__bufferState.mapInfo.signalTowerState[pos] = (
518-
item.signalTower_message.hp
518+
item.signaltower_message.hp
519519
)
520520
self.__logger.debug("New SignalTower")
521521
else:
522522
self.__bufferState.mapInfo.signalTowerState[pos] = (
523-
item.signalTower_message.hp
523+
item.signaltower_message.hp
524524
)
525525
self.__logger.debug("Update SignalTower")
526526

@@ -634,105 +634,105 @@ def HaveOverView(targetX: int, targetY: int):
634634
)
635635
self.__logger.debug("Load enemy sweeper")
636636

637-
elif item.WhichOneof("message_of_obj") == "recycleBank_message":
638-
if item.recycleBank_message.team_id == self.__teamID:
637+
elif item.WhichOneof("message_of_obj") == "recyclebank_message":
638+
if item.recyclebank_message.team_id == self.__teamID:
639639
pos = (
640-
AssistFunction.GridToCell(item.recycleBank_message.x),
641-
AssistFunction.GridToCell(item.recycleBank_message.y),
640+
AssistFunction.GridToCell(item.recyclebank_message.x),
641+
AssistFunction.GridToCell(item.recyclebank_message.y),
642642
)
643643
if pos not in self.__bufferState.mapInfo.recycleBankState:
644644
self.__bufferState.mapInfo.recycleBankState[pos] = (
645-
item.recycleBank_message.hp
645+
item.recyclebank_message.hp
646646
)
647647
self.__logger.debug("New RecycleBank")
648648
else:
649649
self.__bufferState.mapInfo.recycleBankState[pos] = (
650-
item.recycleBank_message.hp
650+
item.recyclebank_message.hp
651651
)
652652
self.__logger.debug("Update RecycleBank")
653653
elif HaveOverView(
654-
item.recycleBank_message.x, item.recycleBank_message.y
654+
item.recyclebank_message.x, item.recyclebank_message.y
655655
):
656656
pos = (
657-
AssistFunction.GridToCell(item.recycleBank_message.x),
658-
AssistFunction.GridToCell(item.recycleBank_message.y),
657+
AssistFunction.GridToCell(item.recyclebank_message.x),
658+
AssistFunction.GridToCell(item.recyclebank_message.y),
659659
)
660660
if pos not in self.__bufferState.mapInfo.recycleBankState:
661661
self.__bufferState.mapInfo.recycleBankState[pos] = (
662-
item.recycleBank_message.hp
662+
item.recyclebank_message.hp
663663
)
664664
self.__logger.debug("New RecycleBank")
665665
else:
666666
self.__bufferState.mapInfo.recycleBankState[pos] = (
667-
item.recycleBank_message.hp
667+
item.recyclebank_message.hp
668668
)
669669
self.__logger.debug("Update RecycleBank")
670670

671-
elif item.WhichOneof("message_of_obj") == "chargeStation_message":
672-
if item.chargeStation_message.team_id == self.__teamID:
671+
elif item.WhichOneof("message_of_obj") == "chargestation_message":
672+
if item.chargestation_message.team_id == self.__teamID:
673673
pos = (
674-
AssistFunction.GridToCell(item.chargeStation_message.x),
675-
AssistFunction.GridToCell(item.chargeStation_message.y),
674+
AssistFunction.GridToCell(item.chargestation_message.x),
675+
AssistFunction.GridToCell(item.chargestation_message.y),
676676
)
677677
if pos not in self.__bufferState.mapInfo.chargeStationState:
678678
self.__bufferState.mapInfo.chargeStationState[pos] = (
679-
item.chargeStation_message.hp
679+
item.chargestation_message.hp
680680
)
681681
self.__logger.debug("New ChargeStation")
682682
else:
683683
self.__bufferState.mapInfo.chargeStationState[pos] = (
684-
item.chargeStation_message.hp
684+
item.chargestation_message.hp
685685
)
686686
self.__logger.debug("Update ChargeStation")
687687
elif HaveOverView(
688-
item.chargeStation_message.x, item.chargeStation_message.y
688+
item.chargestation_message.x, item.chargestation_message.y
689689
):
690690
pos = (
691-
AssistFunction.GridToCell(item.chargeStation_message.x),
692-
AssistFunction.GridToCell(item.chargeStation_message.y),
691+
AssistFunction.GridToCell(item.chargestation_message.x),
692+
AssistFunction.GridToCell(item.chargestation_message.y),
693693
)
694694
if pos not in self.__bufferState.mapInfo.chargeStationState:
695695
self.__bufferState.mapInfo.chargeStationState[pos] = (
696-
item.chargeStation_message.hp
696+
item.chargestation_message.hp
697697
)
698698
self.__logger.debug("New ChargeStation")
699699
else:
700700
self.__bufferState.mapInfo.chargeStationState[pos] = (
701-
item.chargeStation_message.hp
701+
item.chargestation_message.hp
702702
)
703703
self.__logger.debug("Update ChargeStation")
704704

705-
elif item.WhichOneof("message_of_obj") == "signalTower_message":
706-
if item.signalTower_message.team_id == self.__teamID:
705+
elif item.WhichOneof("message_of_obj") == "signaltower_message":
706+
if item.signaltower_message.team_id == self.__teamID:
707707
pos = (
708-
AssistFunction.GridToCell(item.signalTower_message.x),
709-
AssistFunction.GridToCell(item.signalTower_message.y),
708+
AssistFunction.GridToCell(item.signaltower_message.x),
709+
AssistFunction.GridToCell(item.signaltower_message.y),
710710
)
711711
if pos not in self.__bufferState.mapInfo.signalTowerState:
712712
self.__bufferState.mapInfo.signalTowerState[pos] = (
713-
item.signalTower_message.hp
713+
item.signaltower_message.hp
714714
)
715715
self.__logger.debug("New SignalTower")
716716
else:
717717
self.__bufferState.mapInfo.signalTowerState[pos] = (
718-
item.signalTower_message.hp
718+
item.signaltower_message.hp
719719
)
720720
self.__logger.debug("Update SignalTower")
721721
elif HaveOverView(
722-
item.signalTower_message.x, item.signalTower_message.y
722+
item.signaltower_message.x, item.signaltower_message.y
723723
):
724724
pos = (
725-
AssistFunction.GridToCell(item.signalTower_message.x),
726-
AssistFunction.GridToCell(item.signalTower_message.y),
725+
AssistFunction.GridToCell(item.signaltower_message.x),
726+
AssistFunction.GridToCell(item.signaltower_message.y),
727727
)
728728
if pos not in self.__bufferState.mapInfo.signalTowerState:
729729
self.__bufferState.mapInfo.signalTowerState[pos] = (
730-
item.signalTower_message.hp
730+
item.signaltower_message.hp
731731
)
732732
self.__logger.debug("New SignalTower")
733733
else:
734734
self.__bufferState.mapInfo.signalTowerState[pos] = (
735-
item.signalTower_message.hp
735+
item.signaltower_message.hp
736736
)
737737
self.__logger.debug("Update SignalTower")
738738

0 commit comments

Comments
 (0)