convert: Bunch of codestyle fixes.

libopenage/gamestate/game_spec.cpp

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 the openage authors. See copying.md for legal info.
+// Copyright 2015-2020 the openage authors. See copying.md for legal info.
 
 #include "game_spec.h"
 

libopenage/unit/producer.cpp

@@ -1,4 +1,4 @@
-// Copyright 2014-2019 the openage authors. See copying.md for legal info.
+// Copyright 2014-2020 the openage authors. See copying.md for legal info.
 
 #include <initializer_list>
 

libopenage/unit/unit_texture.cpp

@@ -1,4 +1,4 @@
-// Copyright 2015-2018 the openage authors. See copying.md for legal info.
+// Copyright 2015-2020 the openage authors. See copying.md for legal info.
 
 #include "unit_texture.h"
 

openage/convert/blendomatic.py

@@ -1,4 +1,4 @@
-# Copyright 2013-2019 the openage authors. See copying.md for legal info.
+# Copyright 2013-2020 the openage authors. See copying.md for legal info.
 
 """
 Conversion for the terrain blending masks.
@@ -11,7 +11,7 @@
 from struct import Struct, unpack_from
 
 from ..log import dbg
-from openage.convert.dataformat.genie_structure import GenieStructure
+from .dataformat.genie_structure import GenieStructure
 from .dataformat.data_definition import DataDefinition
 from .dataformat.struct_definition import StructDefinition
 

openage/convert/dataformat/aoc/expected_pointer.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2019 the openage authors. See copying.md for legal info.
+# Copyright 2019-2020 the openage authors. See copying.md for legal info.
 
 """
 Expected pointers reference an object that is not created yet.

openage/convert/dataformat/aoc/genie_civ.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2019 the openage authors. See copying.md for legal info.
+# Copyright 2019-2020 the openage authors. See copying.md for legal info.
 
 from ...dataformat.converter_object import ConverterObject,\
     ConverterObjectGroup
@@ -25,6 +25,9 @@ def __init__(self, civ_id, full_data_set, members=None):
 
         self.data = full_data_set
 
+    def __repr__(self):
+        return "GenieCivilizationObject<%s>" % (self.get_id())
+
 
 class GenieCivilizationGroup(ConverterObjectGroup):
     """
@@ -60,3 +63,6 @@ def __init__(self, civ_id, full_data_set):
 
         tech_tree_id = self.civ.get_member("tech_tree_id").get_value()
         self.disabled_techs = self.data.genie_effect_bundles[tech_tree_id]
+
+    def __repr__(self):
+        return "GenieCivilizationGroup<%s>" % (self.get_id())

openage/convert/dataformat/aoc/genie_connection.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2019 the openage authors. See copying.md for legal info.
+# Copyright 2019-2020 the openage authors. See copying.md for legal info.
 
 
 from ...dataformat.converter_object import ConverterObject
@@ -24,6 +24,9 @@ def __init__(self, age_id, full_data_set, members=None):
 
         self.data = full_data_set
 
+    def __repr__(self):
+        return "GenieAgeConnection<%s>" % (self.get_id())
+
 
 class GenieBuildingConnection(ConverterObject):
     """
@@ -45,6 +48,9 @@ def __init__(self, building_id, full_data_set, members=None):
 
         self.data = full_data_set
 
+    def __repr__(self):
+        return "GenieBuildingConnection<%s>" % (self.get_id())
+
 
 class GenieTechConnection(ConverterObject):
     """
@@ -66,6 +72,9 @@ def __init__(self, tech_id, full_data_set, members=None):
 
         self.data = full_data_set
 
+    def __repr__(self):
+        return "GenieTechConnection<%s>" % (self.get_id())
+
 
 class GenieUnitConnection(ConverterObject):
     """
@@ -86,3 +95,6 @@ def __init__(self, unit_id, full_data_set, members=None):
         super().__init__(unit_id, members=members)
 
         self.data = full_data_set
+
+    def __repr__(self):
+        return "GenieUnitConnection<%s>" % (self.get_id())

openage/convert/dataformat/aoc/genie_effect.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2019 the openage authors. See copying.md for legal info.
+# Copyright 2019-2020 the openage authors. See copying.md for legal info.
 
 from ...dataformat.converter_object import ConverterObject
 
@@ -32,6 +32,9 @@ def get_type(self):
         """
         return self.get_member("type_id").get_value()
 
+    def __repr__(self):
+        return "GenieEffectObject<%s>" % (self.get_id())
+
 
 class GenieEffectBundle(ConverterObject):
     """
@@ -89,3 +92,6 @@ def is_sanitized(self):
         Returns whether the effect bundle has been sanitized.
         """
         return self.sanitized
+
+    def __repr__(self):
+        return "GenieEffectBundle<%s>" % (self.get_id())

openage/convert/dataformat/aoc/genie_graphic.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2019 the openage authors. See copying.md for legal info.
+# Copyright 2019-2020 the openage authors. See copying.md for legal info.
 
 from ...dataformat.converter_object import ConverterObject
 
@@ -25,3 +25,6 @@ def __init__(self, graphic_id, full_data_set, members=None):
         super().__init__(graphic_id, members=members)
 
         self.data = full_data_set
+
+    def __repr__(self):
+        return "GenieGraphic<%s>" % (self.get_id())

openage/convert/dataformat/aoc/genie_object_container.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2019 the openage authors. See copying.md for legal info.
+# Copyright 2019-2020 the openage authors. See copying.md for legal info.
 
 from ...dataformat.converter_object import ConverterObjectContainer
 
@@ -57,3 +57,6 @@ def __init__(self):
         self.nyan_files = []
         self.sprite_files = []
         self.terrain_files = []
+
+    def __repr__(self):
+        return "GenieObjectContainer"

openage/convert/dataformat/aoc/genie_sound.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2019 the openage authors. See copying.md for legal info.
+# Copyright 2019-2020 the openage authors. See copying.md for legal info.
 
 from ...dataformat.converter_object import ConverterObject
 
@@ -22,3 +22,6 @@ def __init__(self, sound_id, full_data_set, members=None):
         super().__init__(sound_id, members=members)
 
         self.data = full_data_set
+
+    def __repr__(self):
+        return "GenieSound<%s>" % (self.get_id())

openage/convert/dataformat/aoc/genie_tech.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2019 the openage authors. See copying.md for legal info.
+# Copyright 2019-2020 the openage authors. See copying.md for legal info.
 
 
 from ...dataformat.converter_object import ConverterObject,\
@@ -29,6 +29,9 @@ def __init__(self, tech_id, full_data_set, members=None):
 
         self.data = full_data_set
 
+    def __repr__(self):
+        return "GenieTechObject<%s>" % (self.get_id())
+
 
 class GenieTechEffectBundleGroup(ConverterObjectGroup):
     """
@@ -94,6 +97,9 @@ def has_effect(self):
         else:
             return False
 
+    def __repr__(self):
+        return "GenieTechEffectBundleGroup<%s>" % (self.get_id())
+
 
 class AgeUpgrade(GenieTechEffectBundleGroup):
     """
@@ -120,6 +126,9 @@ def __init__(self, tech_id, age_id, full_data_set):
 
         self.age_id = age_id
 
+    def __repr__(self):
+        return "AgeUpgrade<%s>" % (self.get_id())
+
 
 class UnitLineUpgrade(GenieTechEffectBundleGroup):
     """
@@ -145,6 +154,9 @@ def __init__(self, tech_id, unit_line_id, upgrade_target_id, full_data_set):
         self.unit_line_id = unit_line_id
         self.upgrade_target_id = upgrade_target_id
 
+    def __repr__(self):
+        return "UnitLineUpgrade<%s>" % (self.get_id())
+
 
 class BuildingLineUpgrade(GenieTechEffectBundleGroup):
     """
@@ -170,6 +182,9 @@ def __init__(self, tech_id, building_line_id, upgrade_target_id, full_data_set):
         self.building_line_id = building_line_id
         self.upgrade_target_id = upgrade_target_id
 
+    def __repr__(self):
+        return "BuildingLineUpgrade<%s>" % (self.get_id())
+
 
 class UnitUnlock(GenieTechEffectBundleGroup):
     """
@@ -196,6 +211,9 @@ def __init__(self, tech_id, line_id, full_data_set):
 
         self.line_id = line_id
 
+    def __repr__(self):
+        return "UnitUnlock<%s>" % (self.get_id())
+
 
 class CivBonus(GenieTechEffectBundleGroup):
     """
@@ -219,3 +237,6 @@ def __init__(self, tech_id, civ_id, full_data_set):
         super().__init__(tech_id, full_data_set)
 
         self.civ_id = civ_id
+
+    def __repr__(self):
+        return "CivBonus<%s>" % (self.get_id())

openage/convert/dataformat/aoc/genie_terrain.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2019 the openage authors. See copying.md for legal info.
+# Copyright 2019-2020 the openage authors. See copying.md for legal info.
 
 
 from ...dataformat.converter_object import ConverterObject
@@ -24,3 +24,6 @@ def __init__(self, terrain_id, full_data_set, members=None):
         super().__init__(terrain_id, members=members)
 
         self.data = full_data_set
+
+    def __repr__(self):
+        return "GenieTerrainObject<%s>" % (self.get_id())