diff options
| author | Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com> | 2024-09-03 13:41:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-03 14:41:31 -0300 |
| commit | 1edac37ac37dfbfdc5f4d1ba36140dc077f06236 (patch) | |
| tree | 3fcc7413a65a54e9e9508388a1b2991484c14d4f /apps | |
| parent | e3e4133e883f13a880a7281b66488ee529cf392e (diff) | |
refactor(Core): Make more use of helpers. (#19835)
* Init.
* Reword.
* Update codestyle script.
Co-Authored-By: Kitzunu <24550914+Kitzunu@users.noreply.github.com>
* Add gameobject type ID check, reorder checks.
* Add helper/codestyle check for unit type.
* `IsUnit()` -> `IsCreature()`
* Add `IsUnit()` method.
* Use type mask.
https: //github.com/TrinityCore/TrinityCore/commit/cc71da35b5dc74abf71f8691161525a23d870bb5
Co-Authored-By: Giacomo Pozzoni <giacomopoz@gmail.com>
Co-Authored-By: Ovahlord <18347559+Ovahlord@users.noreply.github.com>
* Replace instances of `isType` with `IsUnit`.
---------
Co-authored-by: Kitzunu <24550914+Kitzunu@users.noreply.github.com>
Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
Co-authored-by: Ovahlord <18347559+Ovahlord@users.noreply.github.com>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/codestyle/codestyle.py | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/apps/codestyle/codestyle.py b/apps/codestyle/codestyle.py index ac5af08a53..bad3aee1f6 100644 --- a/apps/codestyle/codestyle.py +++ b/apps/codestyle/codestyle.py @@ -108,14 +108,20 @@ def get_typeid_check(file: io, file_path: str) -> None: check_failed = False # Parse all the file for line_number, line in enumerate(file, start = 1): - if 'GetTypeId() == TYPEID_PLAYER' in line: - print(f"Please use IsPlayer() instead GetTypeId(): {file_path} at line {line_number}") + if 'GetTypeId() == TYPEID_ITEM' in line or 'GetTypeId() != TYPEID_ITEM' in line: + print(f"Please use IsItem() instead of GetTypeId(): {file_path} at line {line_number}") check_failed = True - if 'GetTypeId() == TYPEID_ITEM' in line: - print(f"Please use IsItem() instead GetTypeId(): {file_path} at line {line_number}") + if 'GetTypeId() == TYPEID_UNIT' in line or 'GetTypeId() != TYPEID_UNIT' in line: + print(f"Please use IsCreature() instead of GetTypeId(): {file_path} at line {line_number}") check_failed = True - if 'GetTypeId() == TYPEID_DYNOBJECT' in line: - print(f"Please use IsDynamicObject() instead GetTypeId(): {file_path} at line {line_number}") + if 'GetTypeId() == TYPEID_PLAYER' in line or 'GetTypeId() != TYPEID_PLAYER' in line: + print(f"Please use IsPlayer() instead of GetTypeId(): {file_path} at line {line_number}") + check_failed = True + if 'GetTypeId() == TYPEID_GAMEOBJECT' in line or 'GetTypeId() != TYPEID_GAMEOBJECT' in line: + print(f"Please use IsGameObject() instead of GetTypeId(): {file_path} at line {line_number}") + check_failed = True + if 'GetTypeId() == TYPEID_DYNOBJECT' in line or 'GetTypeId() != TYPEID_DYNOBJECT' in line: + print(f"Please use IsDynamicObject() instead of GetTypeId(): {file_path} at line {line_number}") check_failed = True # Handle the script error and update the result output if check_failed: |