SFTtech · brisvag · Aug 29, 2019 · Aug 30, 2019 · Sep 1, 2019 · Sep 2, 2019
diff --git a/doc/nyan/aoe2_nyan_tree.uxf b/doc/nyan/aoe2_nyan_tree.uxf
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><diagram program="umlet" version="13.3">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<diagram program="umlet" version="13.3">
   <help_text>// Uncomment the following line to change the fontsize and font:
 // fontsize=10
 // fontfamily=SansSerif //possible: SansSerif,Serif,Monospaced
@@ -2737,7 +2738,7 @@ bg=blue</panel_attributes>
       <x>3260</x>
       <y>3490</y>
       <w>240</w>
-      <h>90</h>
+      <h>80</h>
     </coordinates>
     <panel_attributes>*Progress*
 bg=pink
@@ -2801,12 +2802,12 @@ bg=pink</panel_attributes>
     <id>Relation</id>
     <coordinates>
       <x>3370</x>
-      <y>3570</y>
+      <y>3560</y>
       <w>30</w>
-      <h>450</h>
+      <h>460</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
-    <additional_attributes>10.0;10.0;10.0;430.0</additional_attributes>
+    <additional_attributes>10.0;10.0;10.0;440.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
@@ -5734,7 +5735,7 @@ markup_file : file</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1850</x>
+      <x>1840</x>
       <y>1370</y>
       <w>180</w>
       <h>80</h>
@@ -5756,7 +5757,7 @@ sound : Sound</panel_attributes>
       <h>80</h>
     </coordinates>
     <panel_attributes>lt=&lt;.</panel_attributes>
-    <additional_attributes>10.0;60.0;10.0;10.0</additional_attributes>
+    <additional_attributes>10.0;10.0;10.0;60.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
@@ -5767,7 +5768,7 @@ sound : Sound</panel_attributes>
       <h>80</h>
     </coordinates>
     <panel_attributes>lt=&lt;.</panel_attributes>
-    <additional_attributes>10.0;60.0;10.0;10.0</additional_attributes>
+    <additional_attributes>10.0;10.0;10.0;60.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
@@ -5778,7 +5779,7 @@ sound : Sound</panel_attributes>
       <h>80</h>
     </coordinates>
     <panel_attributes>lt=&lt;.</panel_attributes>
-    <additional_attributes>10.0;60.0;10.0;10.0</additional_attributes>
+    <additional_attributes>10.0;10.0;10.0;60.0</additional_attributes>
   </element>
   <element>
     <id>UMLClass</id>

diff --git a/doc/nyan/api_reference/reference_ability.md b/doc/nyan/api_reference/reference_ability.md
@@ -6,6 +6,7 @@ Reference documentation of the `engine.ability` module of the openage modding AP
 
 ```python
 Ability(Entity):
+    pass
 ```
 
 Generalization object for all abilities. Abilities define what game entities can *do* and what they *are*, respectively. They can be considered passive and active traits.
@@ -116,7 +117,7 @@ Blacklist for specific game entities that would be covered by `allowed_types`, b
 
 ```python
 ApplyDiscreteEffect(Ability):
-    effects                   : set(ContinuousEffect)
+    effects                   : set(DiscreteEffect)
     reload_time               : float
     application_delay         : float
     allowed_types             : set(GameEntityType)
@@ -220,6 +221,7 @@ A set of `DamageProgress` objects that can activate state changes and animation
 
 ```python
 Deletable(Ability):
+    pass
 ```
 
 Makes the game entity deletable via manual command. This will trigger the currently active `Die` ability without the need to fulfill the conditions for death. If the game entity does not have an active `Die` ability, the engine will try to trigger `Despawn` instead. If this ability is also not present, the game entity is instantly removed from the game.

diff --git a/doc/nyan/api_reference/reference_aux.md b/doc/nyan/api_reference/reference_aux.md
@@ -6,14 +6,14 @@ Reference documentation of the `engine.aux` module of the openage modding API.
 
 ```python
 Accuracy(Entity):
-    accuracy : float
-    accuracy_dispersion : float
-    dispersion_dropoff : DropOffType
-    target_types : set(GameEntityType)
+    accuracy             : float
+    accuracy_dispersion  : float
+    dispersion_dropoff   : DropOffType
+    target_types         : set(GameEntityType)
     blacklisted_entities : set(GameEntity)
 ```
 
-Stores information for the accuracy calculation of a game entity with `Projectile` ability.
+<!-- Stores information for the accuracy calculation of a game entity with `Projectile` ability. -->
 
 **accuracy**
 The chance for the projectile to land at the "perfect" position to hit its target as a value between 0 and 1.
@@ -582,7 +582,7 @@ Subdivision of a formation. It defines the structure and placement of game entit
 ## aux.formation.PrecedingSubformation
 
 ```python
-PrecedingSubformation(Entity):
+PrecedingSubformation(Subformation):
     precedes : Subformation
 ```
 
@@ -723,6 +723,14 @@ Defensive(GameEntityStance):
 
 The game entity will use ranged abilities or move to the nearest target in its line of sight to use other abilities. If the target gets out of range or the line of sight, the game entity searches for a new target. When no new target can be found, the game entity returns to its original position and returns to an idle state.
 
+## aux.game_entity_stance.type.Passive
+
+```python
+Passive(GameEntityStance):
+```
+
+The game entity will stay at its current position and only reacts to manual commands given by players. Abilities in `ability_preference` will be ignored.
+
 ## aux.game_entity_stance.type.StandGround
 
 ```python
@@ -731,13 +739,13 @@ StandGround(GameEntityStance):
 
 The game entity will stay at its current position.
 
-## aux.game_entity_stance.type.Passive
+## aux.game_entity_type.GameEntityType
 
 ```python
-Passive(GameEntityStance):
+GameEntityType(Entity):
 ```
 
-The game entity will stay at its current position and only reacts to manual commands given by players. Abilities in `ability_preference` will be ignored.
+Classification for a game entity.
 
 ## aux.graphics.Animation
 

diff --git a/libopenage/gamestate/game_spec.cpp b/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"
 
@@ -195,8 +195,8 @@ void GameSpec::on_gamedata_loaded(const gamedata::empiresdat &gamedata) {
 
 	// create graphic id => graphic map
 	for (auto &graphic : gamedata.graphics.data) {
-		this->graphics[graphic.id] = &graphic;
-		this->slp_to_graphic[graphic.slp_id] = graphic.id;
+		this->graphics[graphic.graphic_id] = &graphic;
+		this->slp_to_graphic[graphic.slp_id] = graphic.graphic_id;
 	}
 
 	log::log(INFO << "Loading textures...");
@@ -249,7 +249,7 @@ void GameSpec::on_gamedata_loaded(const gamedata::empiresdat &gamedata) {
 
 		// create test sound objects that can be played later
 		this->available_sounds.insert({
-			sound.id,
+			sound.sound_id,
 			Sound{
 				this,
 				std::move(sound_items)
@@ -282,7 +282,7 @@ bool GameSpec::valid_graphic_id(index_t graphic_id) const {
 void GameSpec::load_building(const gamedata::building_unit &building, unit_meta_list &list) const {
 
 	// check graphics
-	if (this->valid_graphic_id(building.graphic_standing0)) {
+	if (this->valid_graphic_id(building.idle_graphic0)) {
 		auto meta_type = std::make_shared<UnitTypeMeta>("Building", building.id0, [this, &building](const Player &owner) {
 			return std::make_shared<BuildingProducer>(owner, *this, &building);
 		});
@@ -294,8 +294,8 @@ void GameSpec::load_living(const gamedata::living_unit &unit, unit_meta_list &li
 
 	// check graphics
 	if (this->valid_graphic_id(unit.dying_graphic) &&
-		this->valid_graphic_id(unit.graphic_standing0) &&
-		this->valid_graphic_id(unit.walking_graphics0)) {
+		this->valid_graphic_id(unit.idle_graphic0) &&
+		this->valid_graphic_id(unit.move_graphics)) {
 		auto meta_type = std::make_shared<UnitTypeMeta>("Living", unit.id0, [this, &unit](const Player &owner) {
 			return std::make_shared<LivingProducer>(owner, *this, &unit);
 		});
@@ -306,7 +306,7 @@ void GameSpec::load_living(const gamedata::living_unit &unit, unit_meta_list &li
 void GameSpec::load_object(const gamedata::unit_object &object, unit_meta_list &list) const {
 
 	// check graphics
-	if (this->valid_graphic_id(object.graphic_standing0)) {
+	if (this->valid_graphic_id(object.idle_graphic0)) {
 		auto meta_type = std::make_shared<UnitTypeMeta>("Object", object.id0, [this, &object](const Player &owner) {
 			return std::make_shared<ObjectProducer>(owner, *this, &object);
 		});
@@ -317,7 +317,7 @@ void GameSpec::load_object(const gamedata::unit_object &object, unit_meta_list &
 void GameSpec::load_missile(const gamedata::missile_unit &proj, unit_meta_list &list) const {
 
 	// check graphics
-	if (this->valid_graphic_id(proj.graphic_standing0)) {
+	if (this->valid_graphic_id(proj.idle_graphic0)) {
 		auto meta_type = std::make_shared<UnitTypeMeta>("Projectile", proj.id0, [this, &proj](const Player &owner) {
 			return std::make_shared<ProjectileProducer>(owner, *this, &proj);
 		});

diff --git a/libopenage/unit/producer.cpp b/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>
 
@@ -92,7 +92,7 @@ ObjectProducer::ObjectProducer(const Player &owner, const GameSpec &spec, const
 	dataspec(spec),
 	unit_data(*ud),
 	terrain_outline{nullptr},
-	default_tex{spec.get_unit_texture(ud->graphic_standing0)},
+	default_tex{spec.get_unit_texture(ud->idle_graphic0)},
 	dead_unit_id{ud->dead_unit_id} {
 
 	// copy the class type
@@ -124,15 +124,15 @@ ObjectProducer::ObjectProducer(const Player &owner, const GameSpec &spec, const
 	};
 
 	// shape of the outline
-	if (this->unit_data.selection_shape > 1) {
+	if (this->unit_data.obstruction_class > 1) {
 		this->terrain_outline = radial_outline(this->unit_data.radius_x);
 	}
 	else {
 		this->terrain_outline = square_outline(this->foundation_size);
 	}
 
 	// graphic set
-	auto standing = spec.get_unit_texture(this->unit_data.graphic_standing0);
+	auto standing = spec.get_unit_texture(this->unit_data.idle_graphic0);
 	if (!standing) {
 
 		// indicates problems with data converion
@@ -247,7 +247,7 @@ void ObjectProducer::initialise(Unit *unit, Player &player) {
 	else if (this->unit_data.unit_class == gamedata::unit_classes::PREY_ANIMAL) {
 		unit->add_attribute(std::make_shared<Attribute<attr_type::resource>>(game_resource::food, 140));
 	}
-	else if (this->unit_data.unit_class == gamedata::unit_classes::SHEEP) {
+	else if (this->unit_data.unit_class == gamedata::unit_classes::HERDABLE) {
 		unit->add_attribute(std::make_shared<Attribute<attr_type::resource>>(game_resource::food, 100, 0.1));
 	}
 	else if (this->unit_data.unit_class == gamedata::unit_classes::GOLD_MINE) {
@@ -295,7 +295,7 @@ void ObjectProducer::initialise(Unit *unit, Player &player) {
 TerrainObject *ObjectProducer::place(Unit *u, std::shared_ptr<Terrain> terrain, coord::phys3 init_pos) const {
 
 	// create new object with correct base shape
-	if (this->unit_data.selection_shape > 1) {
+	if (this->unit_data.obstruction_class > 1) {
 		u->make_location<RadialObject>(this->unit_data.radius_x, this->terrain_outline);
 	}
 	else {
@@ -372,7 +372,7 @@ MovableProducer::MovableProducer(const Player &owner, const GameSpec &spec, cons
 	// extra graphics if available
 	// villagers have invalid attack and walk graphics
 	// it seems these come from the command data instead
-	auto walk = spec.get_unit_texture(this->unit_data.walking_graphics0);
+	auto walk = spec.get_unit_texture(this->unit_data.move_graphics);
 	if (!walk) {
 
 		// use standing instead
@@ -455,7 +455,7 @@ void LivingProducer::initialise(Unit *unit, Player &player) {
 	MovableProducer::initialise(unit, player);
 
 	// population of 1 for all movable units
-	if (this->unit_data.unit_class != gamedata::unit_classes::SHEEP) {
+	if (this->unit_data.unit_class != gamedata::unit_classes::HERDABLE) {
 		unit->add_attribute(std::make_shared<Attribute<attr_type::population>>(1, 0));
 	}
 
@@ -482,7 +482,7 @@ void LivingProducer::initialise(Unit *unit, Player &player) {
 			multitype_attr.types[gamedata::unit_classes::CIVILIAN] = this->parent_type(); // get default villager
 			multitype_attr.types[gamedata::unit_classes::BUILDING] = this->owner.get_type(156); // builder 118
 			multitype_attr.types[gamedata::unit_classes::BERRY_BUSH] = this->owner.get_type(120); // forager
-			multitype_attr.types[gamedata::unit_classes::SHEEP] = this->owner.get_type(592); // sheperd
+			multitype_attr.types[gamedata::unit_classes::HERDABLE] = this->owner.get_type(592); // sheperd
 			multitype_attr.types[gamedata::unit_classes::TREES] = this->owner.get_type(123); // woodcutter
 			multitype_attr.types[gamedata::unit_classes::GOLD_MINE] = this->owner.get_type(579); // gold miner
 			multitype_attr.types[gamedata::unit_classes::STONE_MINE] = this->owner.get_type(124); // stone miner
@@ -494,7 +494,7 @@ void LivingProducer::initialise(Unit *unit, Player &player) {
 			multitype_attr.types[gamedata::unit_classes::CIVILIAN] = this->parent_type(); // get default villager
 			multitype_attr.types[gamedata::unit_classes::BUILDING] = this->owner.get_type(222); // builder 212
 			multitype_attr.types[gamedata::unit_classes::BERRY_BUSH] = this->owner.get_type(354); // forager
-			multitype_attr.types[gamedata::unit_classes::SHEEP] = this->owner.get_type(590); // sheperd
+			multitype_attr.types[gamedata::unit_classes::HERDABLE] = this->owner.get_type(590); // sheperd
 			multitype_attr.types[gamedata::unit_classes::TREES] = this->owner.get_type(218); // woodcutter
 			multitype_attr.types[gamedata::unit_classes::GOLD_MINE] = this->owner.get_type(581); // gold miner
 			multitype_attr.types[gamedata::unit_classes::STONE_MINE] = this->owner.get_type(220); // stone miner
@@ -524,7 +524,7 @@ BuildingProducer::BuildingProducer(const Player &owner, const GameSpec &spec, co
 	:
 	UnitType(owner),
 	unit_data{*ud},
-	texture{spec.get_unit_texture(ud->graphic_standing0)},
+	texture{spec.get_unit_texture(ud->idle_graphic0)},
 	destroyed{spec.get_unit_texture(ud->dying_graphic)},
 	projectile{this->unit_data.missile_unit_id},
 	foundation_terrain{ud->foundation_terrain_id},
@@ -557,8 +557,8 @@ BuildingProducer::BuildingProducer(const Player &owner, const GameSpec &spec, co
 
 	// graphic set
 	this->graphics[graphic_type::construct] = spec.get_unit_texture(ud->construction_graphic_id);
-	this->graphics[graphic_type::standing] = spec.get_unit_texture(ud->graphic_standing0);
-	this->graphics[graphic_type::attack] = spec.get_unit_texture(ud->graphic_standing0);
+	this->graphics[graphic_type::standing] = spec.get_unit_texture(ud->idle_graphic0);
+	this->graphics[graphic_type::attack] = spec.get_unit_texture(ud->idle_graphic0);
 	auto dying_tex = spec.get_unit_texture(ud->dying_graphic);
 	if (dying_tex) {
 		this->graphics[graphic_type::dying] = dying_tex;
@@ -793,7 +793,7 @@ ProjectileProducer::ProjectileProducer(const Player &owner, const GameSpec &spec
 	:
 	UnitType(owner),
 	unit_data{*pd},
-	tex{spec.get_unit_texture(this->unit_data.graphic_standing0)},
+	tex{spec.get_unit_texture(this->unit_data.idle_graphic0)},
 	sh{spec.get_unit_texture(3379)}, // 3379 = general arrow shadow
 	destroyed{spec.get_unit_texture(this->unit_data.dying_graphic)} {
 

diff --git a/libopenage/unit/unit_texture.cpp b/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"
 
@@ -22,7 +22,7 @@ UnitTexture::UnitTexture(GameSpec &spec, uint16_t graphic_id, bool delta)
 
 UnitTexture::UnitTexture(GameSpec &spec, const gamedata::graphic *graphic, bool delta)
 	:
-	id{graphic->id},
+	id{graphic->graphic_id},
 	sound_id{graphic->sound_id},
 	frame_count{graphic->frame_count},
 	angle_count{graphic->angle_count},

diff --git a/openage/CMakeLists.txt b/openage/CMakeLists.txt
@@ -24,6 +24,7 @@ add_subdirectory(cvar)
 add_subdirectory(event)
 add_subdirectory(game)
 add_subdirectory(log)
+add_subdirectory(nyan)
 add_subdirectory(util)
 add_subdirectory(renderer)
 add_subdirectory(testing)
diff --git a/openage/codegen/gamespec_structs.py b/openage/codegen/gamespec_structs.py
@@ -4,7 +4,7 @@
 gamespec struct code generation listing.
 """
 
-from ..convert.dataformat.data_formatter import DataFormatter
+from ..convert.export.data_formatter import DataFormatter
 
 from ..convert.dataformat.multisubtype_base import MultisubtypeBaseFile
 from ..convert.gamedata.empiresdat import EmpiresDat

diff --git a/openage/convert/CMakeLists.txt b/openage/convert/CMakeLists.txt
@@ -28,7 +28,10 @@ add_pxds(
 )
 
 add_subdirectory(dataformat)
+add_subdirectory(export)
 add_subdirectory(gamedata)
 add_subdirectory(hardcoded)
 add_subdirectory(interface)
+add_subdirectory(nyan)
 add_subdirectory(opus)
+add_subdirectory(processor)