Skip to content

Commit 1b763cc

Browse files
authored
Merge pull request #1716 from heinezen/fix/effect_apply_type
Change type of 'effect_apply_type' to 'uint8_t'
2 parents c4c75fe + f372a2b commit 1b763cc

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

openage/convert/value_object/read/media/datfile/lookup_dicts.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@
285285

286286
EFFECT_APPLY_TYPE = {
287287
# unused assignage: a = -1, b = -1, c = -1, d = 0
288-
-1: "DISABLED",
288+
255: "DISABLED",
289289
# if a != -1: a == unit_id, else b == unit_class_id; c =
290290
# attribute_id, d = new_value
291291
0: "ATTRIBUTE_ABSSET",
@@ -340,9 +340,10 @@
340340
102: "TECH_TOGGLE", # d == research_id
341341
103: "TECH_TIME_MODIFY", # a == research_id, if c == 0: d==absval else d==relval
342342

343-
-54: "UNKNOWN", # 199: "UNKNOWN",
344-
-55: "UNKNOWN", # 200: "UNKNOWN",
345-
-56: "UNKNOWN", # 201: "UNKNOWN",
343+
# unknown; used in DE2 BfG
344+
199: "UNKNOWN",
345+
200: "UNKNOWN",
346+
201: "UNKNOWN",
346347

347348
# attribute_id:
348349
# 0: hit points

openage/convert/value_object/read/media/datfile/tech.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2013-2023 the openage authors. See copying.md for legal info.
1+
# Copyright 2013-2024 the openage authors. See copying.md for legal info.
22

33
# TODO pylint: disable=C,R
44
from __future__ import annotations
@@ -31,7 +31,7 @@ def get_data_format_members(
3131
"""
3232
data_format = [
3333
(READ_GEN, "type_id", StorageType.ID_MEMBER, EnumLookupMember(
34-
raw_type="int8_t",
34+
raw_type="uint8_t",
3535
type_name="effect_apply_type",
3636
lookup_dict=EFFECT_APPLY_TYPE
3737
)),

0 commit comments

Comments
 (0)