这是indexloc提供的服务，不要输入任何密码
Skip to content

Change type of 'effect_apply_type' to 'uint8_t' #1716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 25, 2024
Merged

Change type of 'effect_apply_type' to 'uint8_t' #1716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions openage/convert/value_object/read/media/datfile/lookup_dicts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@

EFFECT_APPLY_TYPE = {
# unused assignage: a = -1, b = -1, c = -1, d = 0
-1: "DISABLED",
255: "DISABLED",
# if a != -1: a == unit_id, else b == unit_class_id; c =
# attribute_id, d = new_value
0: "ATTRIBUTE_ABSSET",
Expand Down Expand Up @@ -340,9 +340,10 @@
102: "TECH_TOGGLE", # d == research_id
103: "TECH_TIME_MODIFY", # a == research_id, if c == 0: d==absval else d==relval

-54: "UNKNOWN", # 199: "UNKNOWN",
-55: "UNKNOWN", # 200: "UNKNOWN",
-56: "UNKNOWN", # 201: "UNKNOWN",
# unknown; used in DE2 BfG
199: "UNKNOWN",
200: "UNKNOWN",
201: "UNKNOWN",

# attribute_id:
# 0: hit points
Expand Down
4 changes: 2 additions & 2 deletions openage/convert/value_object/read/media/datfile/tech.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2013-2023 the openage authors. See copying.md for legal info.
# Copyright 2013-2024 the openage authors. See copying.md for legal info.

# TODO pylint: disable=C,R
from __future__ import annotations
Expand Down Expand Up @@ -31,7 +31,7 @@ def get_data_format_members(
"""
data_format = [
(READ_GEN, "type_id", StorageType.ID_MEMBER, EnumLookupMember(
raw_type="int8_t",
raw_type="uint8_t",
type_name="effect_apply_type",
lookup_dict=EFFECT_APPLY_TYPE
)),
Expand Down
Loading