X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FInterpreter.cpp;h=a3d382ceba7618f9f1782bf718c1cf49293753be;hb=4bc70f5311dcbcca4e6b9e852bbcb19602f50eeb;hp=0ff877688d1231c8794b371319444547234f629c;hpb=4634bd26d24a163b7128df7dd5183fcb2cdc8031;p=l2e.git

diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp
index 0ff8776..a3d382c 100644
--- a/src/loader/Interpreter.cpp
+++ b/src/loader/Interpreter.cpp
@@ -10,23 +10,43 @@
 #include "ParsedSource.h"
 #include "../battle/Hero.h"
 #include "../battle/Monster.h"
+#include "../battle/PartyLayout.h"
+#include "../battle/Resources.h"
+#include "../common/Ikari.h"
+#include "../common/Item.h"
+#include "../common/Spell.h"
+#include "../common/Stats.h"
+#include "../common/TargetingMode.h"
 #include "../graphics/ComplexAnimation.h"
+#include "../graphics/Font.h"
+#include "../graphics/Frame.h"
+#include "../graphics/Gauge.h"
+#include "../graphics/Menu.h"
 #include "../graphics/SimpleAnimation.h"
 #include "../graphics/Sprite.h"
 
 #include <algorithm>
+#include <cstring>
 #include <SDL_image.h>
 
 using battle::Hero;
 using battle::Monster;
-using battle::Stats;
+using battle::PartyLayout;
+using common::Ikari;
+using common::Item;
+using common::Spell;
+using common::Stats;
+using common::TargetingMode;
 using graphics::Animation;
+using graphics::Color;
+using graphics::Font;
+using graphics::Frame;
+using graphics::Gauge;
 using graphics::ComplexAnimation;
 using graphics::SimpleAnimation;
 using graphics::Sprite;
 using geometry::Vector;
 using std::make_pair;
-using std::map;
 using std::set;
 using std::string;
 using std::vector;
@@ -34,84 +54,42 @@ using std::vector;
 namespace loader {
 
 Interpreter::~Interpreter() {
-	for (vector<Animation *>::const_iterator i(animations.begin()), end(animations.end()); i != end; ++i) {
-		delete *i;
+	for (vector<PostponedDefinition>::const_iterator i(postponedDefinitions.begin()), end(postponedDefinitions.end()); i != end; ++i) {
+		delete i->identifier;
 	}
-	for (vector<SDL_Surface *>::const_iterator i(images.begin()), end(images.end()); i != end; ++i) {
-		SDL_FreeSurface(*i);
+	for (std::map<string, SDL_Surface *>::const_iterator i(imageCache.begin()), end(imageCache.end()); i != end; ++i) {
+		SDL_FreeSurface(i->second);
 	}
-}
-
-
-bool Interpreter::ParsedDefinition::IsCompatible(DynamicType with) const {
-	return type == with
-			|| (with == ANIMATION
-					&& (type == COMPLEX_ANIMATION || type == SIMPLE_ANIMATION));
-}
-
-
-Animation *Interpreter::GetAnimation(const std::string &name) {
-	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
-	if (i != parsedDefinitions.end()) {
-		if (i->second.IsCompatible(ANIMATION)) {
-			return animations[i->second.index];
-		} else {
-			throw Error("cannot cast " + i->second.dfn->TypeName() + " to Animation");
+	// TODO: maybe need to reverse the array deletion check if most objects turn out to be arrays (of char)
+	for (std::map<int, vector<void *> >::const_iterator i(values.begin()), end(values.end()); i != end; ++i) {
+		for (vector<void *>::const_iterator j(i->second.begin()), end(i->second.end()); j != end; ++j) {
+			delete[] reinterpret_cast<char *>(*j);
 		}
-	} else {
-		throw Error("access to undefined Animation " + name);
 	}
 }
 
-Hero *Interpreter::GetHero(const std::string &name) {
-	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
-	if (i != parsedDefinitions.end()) {
-		if (i->second.IsCompatible(HERO)) {
-			return &heroes[i->second.index];
-		} else {
-			throw Error("cannot cast " + i->second.dfn->TypeName() + " to Hero");
-		}
-	} else {
-		throw Error("access to undefined Hero " + name);
-	}
-}
 
-Monster *Interpreter::GetMonster(const std::string &name) {
-	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
-	if (i != parsedDefinitions.end()) {
-		if (i->second.IsCompatible(MONSTER)) {
-			return &monsters[i->second.index];
-		} else {
-			throw Error("cannot cast " + i->second.dfn->TypeName() + " to Monster");
-		}
-	} else {
-		throw Error("access to undefined Monster " + name);
-	}
+const Interpreter::ParsedDefinition &Interpreter::GetDefinition(const string &identifier) const {
+	return parsedDefinitions.at(identifier);
 }
 
-int Interpreter::GetNumber(const std::string &name) const {
-	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
-	if (i != parsedDefinitions.end()) {
-		if (i->second.IsCompatible(NUMBER)) {
-			return numbers[i->second.index];
-		} else {
-			throw Error("cannot cast " + i->second.dfn->TypeName() + " to Number");
-		}
-	} else {
-		throw Error("access to undefined Number " + name);
-	}
-}
 
-Sprite *Interpreter::GetSprite(const std::string &name) {
-	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+void *Interpreter::GetObject(int typeId, const std::string &name) {
+	std::map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
 	if (i != parsedDefinitions.end()) {
-		if (i->second.IsCompatible(SPRITE)) {
-			return &sprites[i->second.index];
+		const TypeDescription &requested(TypeDescription::Get(typeId));
+		const TypeDescription &actual(TypeDescription::Get(i->second.type));
+		if (requested.TypeId() == actual.TypeId()) {
+			return values[actual.TypeId()][i->second.id];
+		} else if (actual.IsSubtypeOf(requested)) {
+			char *sub(reinterpret_cast<char *>(values[actual.TypeId()][i->second.id]));
+			std::ptrdiff_t offset(actual.SupertypeOffset(requested));
+			return sub - offset;
 		} else {
-			throw Error("cannot cast " + i->second.dfn->TypeName() + " to Sprite");
+			throw Error("cannot cast " + actual.TypeName() + " to " + requested.TypeName());
 		}
 	} else {
-		throw Error("access to undefined Sprite " + name);
+		throw Error("access to undefined object " + name);
 	}
 }
 
@@ -134,299 +112,281 @@ void Interpreter::ReadDefinition(const Definition &dfn) {
 }
 
 void Interpreter::ReadLiteral(const Definition &dfn) {
-	switch (dfn.GetLiteral()->GetType()) {
+	const string &typeName(dfn.GetLiteral()->IsArray() ? "Array" : dfn.GetLiteral()->GetTypeName());
+	int typeId(TypeDescription::GetTypeId(typeName));
+	int id(values[typeId].size());
+	const TypeDescription &td(TypeDescription::Get(typeId));
+	int size(
+			(dfn.GetLiteral()->GetType() == Literal::PATH
+					|| dfn.GetLiteral()->GetType() == Literal::STRING)
+			? dfn.GetLiteral()->GetString().size() : td.Size());
+	char *object(new char[size]);
+	if (dfn.GetLiteral()->GetType() == Literal::OBJECT) {
+		ReadObject(typeId, id, object, *dfn.GetLiteral()->GetProperties());
+	} else {
+		ReadLiteral(typeId, id, object, *dfn.GetLiteral());
+	}
+	values[typeId].push_back(object);
+	parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, typeId, id)));
+}
+
+void Interpreter::ReadLiteral(int typeId, int id, char *object, const Literal &literal) {
+	switch (literal.GetType()) {
 		case Literal::ARRAY_VALUES:
-			throw Error("unhandled literal: array of values");
+			throw Error("named value arrays are not supported, sorry");
 			break;
 		case Literal::ARRAY_PROPS:
-			throw Error("unhandled literal: array of properties");
+			throw Error("named property list arrays are not supported, sorry");
 			break;
 		case Literal::BOOLEAN:
-			throw Error("unhandled literal: boolean");
+			new (object) bool(literal.GetBoolean());
 			break;
 		case Literal::COLOR:
-			throw Error("unhandled literal: color");
+			new (object) Color(literal.GetRed(), literal.GetGreen(), literal.GetBlue(), literal.GetAlpha());
 			break;
 		case Literal::NUMBER:
-			numbers.push_back(dfn.GetLiteral()->GetNumber());
-			parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, NUMBER, numbers.size() - 1)));
+			new (object) int(literal.GetNumber());
+			break;
+		case Literal::PATH:
+			std::memcpy(object, literal.GetString().c_str(), literal.GetString().size());
+			object[literal.GetString().size()] = '\0';
 			break;
 		case Literal::STRING:
-			throw Error("unhandled literal: string");
+			std::memcpy(object, literal.GetString().c_str(), literal.GetString().size());
+			object[literal.GetString().size()] = '\0';
 			break;
 		case Literal::VECTOR:
-			throw Error("unhandled literal: vector");
+			new (object) Vector<int>(literal.GetX(), literal.GetY());
 			break;
 		case Literal::OBJECT:
-			throw Error("unhandled literal: object");
+			throw Error("illogical branch: read literal object as non-object literal");
 			break;
 	}
 }
 
-Animation *Interpreter::GetAnimation(const Value &v) {
+
+void *Interpreter::GetObject(int typeId, const Value &v) {
 	if (v.IsLiteral()) {
-		if (v.GetLiteral().GetTypeName() == "ComplexAnimation") {
-			ComplexAnimation *a(new ComplexAnimation);
-			ReadComplexAnimation(*a, *v.GetLiteral().GetProperties());
-			animations.push_back(a);
-			return a;
+		if (v.GetLiteral().IsObject()) {
+			int typeId(TypeDescription::GetTypeId(v.GetLiteral().GetTypeName()));
+			const TypeDescription &td(TypeDescription::Get(typeId));
+			char *object(new char[td.Size()]);
+			td.Construct(object);
+			int id(values[typeId].size());
+			values[typeId].push_back(object);
+			ReadObject(typeId, id, object, *v.GetLiteral().GetProperties());
+			return object;
 		} else {
-			SimpleAnimation *a(new SimpleAnimation);
-			ReadSimpleAnimation(*a, *v.GetLiteral().GetProperties());
-			animations.push_back(a);
-			return a;
+			int typeId(0), id(0);
+			switch (v.GetLiteral().GetType()) {
+				case Literal::ARRAY_VALUES:
+					throw Error("cannot copy value arrays, sorry");
+					break;
+				case Literal::ARRAY_PROPS:
+					throw Error("cannot copy property list arrays, sorry");
+					break;
+				case Literal::BOOLEAN:
+					{
+						typeId = TypeDescription::GetTypeId("Boolean");
+						id = values[typeId].size();
+						const TypeDescription &td(TypeDescription::Get(typeId));
+						char *object(new char[td.Size()]);
+						values[typeId].push_back(new (object) bool(v.GetLiteral().GetBoolean()));
+					}
+					break;
+				case Literal::COLOR:
+					{
+						typeId = TypeDescription::GetTypeId("Color");
+						id = values[typeId].size();
+						const TypeDescription &td(TypeDescription::Get(typeId));
+						char *object(new char[td.Size()]);
+						values[typeId].push_back(new (object) Color(v.GetLiteral().GetRed(), v.GetLiteral().GetGreen(), v.GetLiteral().GetBlue(), v.GetLiteral().GetAlpha()));
+					}
+					break;
+				case Literal::NUMBER:
+					{
+						typeId = TypeDescription::GetTypeId("Number");
+						id = values[typeId].size();
+						const TypeDescription &td(TypeDescription::Get(typeId));
+						char *object(new char[td.Size()]);
+						values[typeId].push_back(new (object) int(v.GetLiteral().GetNumber()));
+					}
+					break;
+				case Literal::PATH:
+					{
+						typeId = TypeDescription::GetTypeId("Path");
+						id = values[typeId].size();
+						char *str(new char[v.GetLiteral().GetString().size() + 1]);
+						std::memcpy(str, v.GetLiteral().GetString().c_str(), v.GetLiteral().GetString().size());
+						str[v.GetLiteral().GetString().size()] = '\0';
+						values[typeId].push_back(str);
+					}
+					break;
+				case Literal::STRING:
+					{
+						typeId = TypeDescription::GetTypeId("String");
+						id = values[typeId].size();
+						char *str(new char[v.GetLiteral().GetString().size() + 1]);
+						std::memcpy(str, v.GetLiteral().GetString().c_str(), v.GetLiteral().GetString().size());
+						str[v.GetLiteral().GetString().size()] = '\0';
+						values[typeId].push_back(str);
+					}
+					break;
+				case Literal::VECTOR:
+					{
+						typeId = TypeDescription::GetTypeId("Vector");
+						id = values[typeId].size();
+						const TypeDescription &td(TypeDescription::Get(typeId));
+						char *object(new char[td.Size()]);
+						values[typeId].push_back(new (object) Vector<int>(v.GetLiteral().GetX(), v.GetLiteral().GetY()));
+					}
+					break;
+				case Literal::OBJECT:
+					{
+						typeId = TypeDescription::GetTypeId(v.GetLiteral().GetTypeName());
+						const TypeDescription &td(TypeDescription::Get(typeId));
+						id = values[typeId].size();
+						char *object(new char[td.Size()]);
+						td.Construct(object);
+						ReadObject(typeId, id, object, *v.GetLiteral().GetProperties());
+					}
+					break;
+			}
+			return values[typeId][id];
 		}
 	} else {
 		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-		return GetAnimation(v.GetIdentifier());
+		return GetObject(typeId, v.GetIdentifier());
 	}
 }
 
-const vector<Value *> &Interpreter::GetValueArray(const Value &v) {
-	if (v.IsLiteral()) {
-		return v.GetLiteral().GetValues();
-	} else {
-		throw Error("identifier resolution not implemented for arrays of values");
-	}
-}
-
-const vector<PropertyList *> &Interpreter::GetPropertyListArray(const Value &v) {
-	if (v.IsLiteral()) {
-		return v.GetLiteral().GetPropertyLists();
-	} else {
-		throw Error("identifier resolution not implemented for arrays of property lists");
-	}
-}
 
-bool Interpreter::GetBoolean(const Value &v) {
-	if (v.IsLiteral()) {
-		return v.GetLiteral().GetBoolean();
-	} else {
-		throw Error("identifier resolution not implemented for booleans");
-	}
+void Interpreter::ReadObject(const Definition &dfn) {
+	int typeId(TypeDescription::GetTypeId(dfn.TypeName()));
+	const TypeDescription &td(TypeDescription::Get(typeId));
+	int id(values[typeId].size());
+	char *object(new char[td.Size()]);
+	td.Construct(object);
+	values[typeId].push_back(object);
+	ReadObject(typeId, id, object, *dfn.GetProperties());
+	parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, typeId, id)));
 }
 
-SDL_Surface *Interpreter::GetImage(const Value &v) {
-	const char *file(GetString(v));
-	SDL_Surface *image(IMG_Load(file));
-	images.push_back(image);
-	return image;
-}
 
-int Interpreter::GetNumber(const Value &v) {
-	if (v.IsLiteral()) {
-		return v.GetLiteral().GetNumber();
-	} else {
-		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-		return GetNumber(v.GetIdentifier());
+void Interpreter::ReadObject(int typeId, int id, char *object, const PropertyList &props) {
+	const TypeDescription &td(TypeDescription::Get(typeId));
+	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
+		const FieldDescription &fd(td.GetField(i->first));
+		const TypeDescription &fieldType(TypeDescription::Get(fd.TypeId()));
+		if (CanLink(*i->second)) {
+			char *dest(object + fd.Offset());
+			if (fd.IsAggregate()) {
+				int arraySize(i->second->GetLiteral().ArraySize());
+				char *aggregate(new char[fieldType.Size() * arraySize]);
+				char *iter(aggregate);
+				if (i->second->GetLiteral().GetType() == Literal::ARRAY_PROPS) {
+					const vector<PropertyList *> &list(i->second->GetLiteral().GetPropertyLists());
+					for (vector<PropertyList *>::const_iterator j(list.begin()), end(list.end()); j != end; ++j, iter += fieldType.Size()) {
+						fieldType.Construct(iter);
+						ReadObject(fieldType.TypeId(), -1, iter, **j);
+					}
+				} else {
+					const vector<Value *> &list(i->second->GetLiteral().GetValues());
+					for (vector<Value *>::const_iterator j(list.begin()), end(list.end()); j != end; ++j, iter += fieldType.Size()) {
+						fieldType.Construct(iter);
+						ReadLiteral(fieldType.TypeId(), -1, iter, (*j)->GetLiteral());
+					}
+				}
+				if (fd.IsReferenced()) {
+					std::memcpy(dest, &aggregate, sizeof(char *));
+					dest += sizeof(char *);
+					std::memcpy(dest, &arraySize, sizeof(int));
+				} else {
+					throw Error("aggregate type fields must be referenced");
+				}
+			} else {
+				char *src(reinterpret_cast<char *>(GetObject(fd.TypeId(), *i->second)));
+				if (fd.TypeId() == TypeDescription::GetTypeId("Image")) {
+					src = reinterpret_cast<char *>(GetImage(src));
+				}
+				if (fd.IsReferenced()) {
+					std::memcpy(dest, &src, sizeof(char *));
+				} else {
+					std::memcpy(dest, src, fieldType.Size());
+				}
+			}
+		} else {
+			Postpone(typeId, id, fd.Offset(), i->second->GetIdentifier(), fd.TypeId(), !fd.IsReferenced());
+		}
 	}
+	td.Load(object);
 }
 
-const PropertyList *Interpreter::GetPropertyList(const Value &v) {
-	if (v.IsLiteral()) {
-		return v.GetLiteral().GetProperties();
-	} else {
-		throw Error("identifier resolution not implemented for property lists");
-	}
-}
 
-Sprite *Interpreter::GetSprite(const Value &v) {
-	if (v.IsLiteral()) {
-		Sprite *s(new Sprite);
-		ReadSprite(*s, *v.GetLiteral().GetProperties());
-		return s;
+SDL_Surface *Interpreter::GetImage(const string &path) {
+	std::map<string, SDL_Surface *>::const_iterator result(imageCache.find(path));
+	if (result != imageCache.end()) {
+		return result->second;
 	} else {
-		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-		return GetSprite(v.GetIdentifier());
+		SDL_Surface *image(IMG_Load(path.c_str()));
+		imageCache.insert(make_pair(path, image));
+		return image;
 	}
 }
 
-const char *Interpreter::GetString(const Value &v) {
-	if (v.IsLiteral()) {
-		return v.GetLiteral().GetString().c_str();
-	} else {
-		throw Error("identifier resolution not implemented for strings");
-	}
-}
 
-Vector<int> Interpreter::GetVector(const Value &v) {
-	if (v.IsLiteral()) {
-		return Vector<int>(v.GetLiteral().GetX(), v.GetLiteral().GetY());
-	} else {
-		throw Error("identifier resolution not implemented for vectors");
-	}
+bool Interpreter::CanLink(const Value &v) const {
+	return v.IsLiteral() || source.IsDefined(v.GetIdentifier());
 }
 
-
-void Interpreter::ReadObject(const Definition &dfn) {
-	if (dfn.TypeName() == "Hero") {
-		heroes.push_back(Hero());
-		ReadHero(heroes.back(), *dfn.GetProperties());
-		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, HERO, heroes.size() - 1)));
-	} else if (dfn.TypeName() == "Monster") {
-		monsters.push_back(Monster());
-		ReadMonster(monsters.back(), *dfn.GetProperties());
-		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, MONSTER, monsters.size() - 1)));
-	} else if (dfn.TypeName() == "Sprite") {
-		sprites.push_back(Sprite());
-		ReadSprite(sprites.back(), *dfn.GetProperties());
-		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, SPRITE, sprites.size() - 1)));
-	} else {
-		throw Error("unhandled object type: " + dfn.TypeName());
-	}
+void Interpreter::Postpone(int type, int id, std::ptrdiff_t offset, const std::string &identifier, int linkedType, bool inlined) {
+	char *str(new char[identifier.size() + 1]);
+	std::memcpy(str, identifier.c_str(), identifier.size());
+	str[identifier.size()] = '\0';
+	postponedDefinitions.push_back(PostponedDefinition(type, id, offset, str, linkedType, inlined));
 }
 
 
-void Interpreter::ReadComplexAnimation(ComplexAnimation &a, const PropertyList &props) {
-	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-		if (i->first == "sprite") {
-			a.SetSprite(GetSprite(*i->second));
-		} else if (i->first == "frametime") {
-			a.SetFrameTime(GetNumber(*i->second));
-		} else if (i->first == "repeat") {
-			a.SetRepeat(GetBoolean(*i->second));
-		} else if (i->first == "frames") {
-			const vector<PropertyList *> &values(GetPropertyListArray(*i->second));
-			for (vector<PropertyList *>::const_iterator i(values.begin()), end(values.end()); i != end; ++i) {
-				ComplexAnimation::FrameProp frame;
-				ReadComplexAnimationFrame(frame, **i);
-				a.AddFrame(frame);
-			}
-		} else {
-			throw Error("unknown ComplexAnimation property: " + i->first);
-		}
+void Interpreter::CreateTypeDescriptions() {
+	{
+		TypeDescription &td(TypeDescription::CreateOrGet("Boolean"));
+		td.SetDescription("Logical value which can be either true or false.");
+		td.SetSize(sizeof(bool));
 	}
-}
-
-void Interpreter::ReadComplexAnimationFrame(ComplexAnimation::FrameProp &f, const PropertyList &props) {
-	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-		if (i->first == "column") {
-			f.col = GetNumber(*i->second);
-		} else if (i->first == "row") {
-			f.row = GetNumber(*i->second);
-		} else if (i->first == "disposition") {
-			f.disposition = GetVector(*i->second);
-		} else {
-			throw Error("unknown ComplexAnimationFrame property: " + i->first);
-		}
+	{
+		TypeDescription &td(TypeDescription::CreateOrGet("Color"));
+		td.SetDescription(
+				"A color in RGB format with an optional alpha channel.\n"
+				"Components range from 0 to 255.\n"
+				"Alpha defaults to 255 if omitted.");
+		td.SetSize(sizeof(Color));
 	}
-}
-
-void Interpreter::ReadHero(Hero &h, const PropertyList &props) {
-	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-		if (i->first == "name") {
-			h.SetName(GetString(*i->second));
-		} else if (i->first == "sprite") {
-			h.SetSprite(GetSprite(*i->second));
-		} else if (i->first == "level") {
-			h.SetLevel(GetNumber(*i->second));
-		} else if (i->first == "maxHealth") {
-			h.SetMaxHealth(GetNumber(*i->second));
-		} else if (i->first == "health") {
-			h.SetHealth(GetNumber(*i->second));
-		} else if (i->first == "maxMana") {
-			h.SetMaxMana(GetNumber(*i->second));
-		} else if (i->first == "mana") {
-			h.SetMana(GetNumber(*i->second));
-		} else if (i->first == "ip") {
-			h.SetIP(GetNumber(*i->second));
-		} else if (i->first == "stats") {
-			battle::Stats stats;
-			ReadStats(stats, *GetPropertyList(*i->second));
-			h.SetStats(stats);
-		} else if (i->first == "attackAnimation") {
-			h.SetAttackAnimation(GetAnimation(*i->second));
-		} else if (i->first == "spellAnimation") {
-			h.SetSpellAnimation(GetAnimation(*i->second));
-		} else if (i->first == "meleeAnimation") {
-			h.SetMeleeAnimation(GetAnimation(*i->second));
-		} else {
-			throw Error("unknown Hero property: " + i->first);
-		}
+	{
+		TypeDescription &td(TypeDescription::CreateOrGet("Image"));
+		td.SetDescription("Path to a PNG file with image data.");
+		td.SetSize(sizeof(SDL_Surface));
 	}
-}
-
-void Interpreter::ReadMonster(Monster &m, const PropertyList &props) {
-	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-		if (i->first == "name") {
-			m.SetName(GetString(*i->second));
-		} else if (i->first == "sprite") {
-			m.SetSprite(GetSprite(*i->second));
-		} else if (i->first == "level") {
-			m.SetLevel(GetNumber(*i->second));
-		} else if (i->first == "maxHealth") {
-			m.SetMaxHealth(GetNumber(*i->second));
-		} else if (i->first == "health") {
-			m.SetHealth(GetNumber(*i->second));
-		} else if (i->first == "maxMana") {
-			m.SetMaxMana(GetNumber(*i->second));
-		} else if (i->first == "mana") {
-			m.SetMana(GetNumber(*i->second));
-		} else if (i->first == "stats") {
-			battle::Stats stats;
-			ReadStats(stats, *GetPropertyList(*i->second));
-			m.SetStats(stats);
-		} else if (i->first == "attackAnimation") {
-			m.SetAttackAnimation(GetAnimation(*i->second));
-		} else {
-			throw Error("unknown Monster property: " + i->first);
-		}
+	{
+		TypeDescription &td(TypeDescription::CreateOrGet("Number"));
+		td.SetDescription("A signed integer.");
+		td.SetSize(sizeof(int));
 	}
-}
-
-void Interpreter::ReadSimpleAnimation(SimpleAnimation &a, const PropertyList &props) {
-	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-		if (i->first == "sprite") {
-			a.SetSprite(GetSprite(*i->second));
-		} else if (i->first == "frametime") {
-			a.SetFrameTime(GetNumber(*i->second));
-		} else if (i->first == "repeat") {
-			a.SetRepeat(GetBoolean(*i->second));
-		} else if (i->first == "framecount") {
-			a.SetNumFrames(GetNumber(*i->second));
-		} else if (i->first == "col") {
-			a.SetCol(GetNumber(*i->second));
-		} else if (i->first == "row") {
-			a.SetRow(GetNumber(*i->second));
-		} else {
-			throw Error("unknown SimpleAnimation property: " + i->first);
-		}
+	{
+		int stringId(TypeDescription::GetTypeId("String"));
+		TypeDescription &td(TypeDescription::CreateOrGet("Path"));
+		td.SetDescription("A path in the filesystem which is interpreted relative to the source file's location.");
+		td.SetSize(1);
+		td.AddSupertype(stringId, 0);
 	}
-}
-
-void Interpreter::ReadSprite(Sprite &s, const PropertyList &props) {
-	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-		if (i->first == "image") {
-			s.SetSurface(GetImage(*i->second));
-		} else if (i->first == "size") {
-			s.SetSize(GetVector(*i->second));
-		} else if (i->first == "offset") {
-			s.SetOffset(GetVector(*i->second));
-		} else {
-			throw Error("unknown Sprite property: " + i->first);
-		}
+	{
+		TypeDescription &td(TypeDescription::CreateOrGet("String"));
+		td.SetDescription("Some characters.");
+		td.SetSize(1);
 	}
-}
-
-void Interpreter::ReadStats(Stats &s, const PropertyList &props) {
-	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
-		if (i->first == "atp") {
-			s.SetAttack(GetNumber(*i->second));
-		} else if (i->first == "dfp") {
-			s.SetDefense(GetNumber(*i->second));
-		} else if (i->first == "str") {
-			s.SetStrength(GetNumber(*i->second));
-		} else if (i->first == "agl") {
-			s.SetAgility(GetNumber(*i->second));
-		} else if (i->first == "int") {
-			s.SetIntelligence(GetNumber(*i->second));
-		} else if (i->first == "gut") {
-			s.SetGut(GetNumber(*i->second));
-		} else if (i->first == "mgr") {
-			s.SetMagicResistance(GetNumber(*i->second));
-		} else {
-			throw Error("unknown Stats property: " + i->first);
-		}
+	{
+		TypeDescription &td(TypeDescription::CreateOrGet("Vector"));
+		td.SetDescription("A pair of numbers usually describing a 2D translation or offset.");
+		td.SetSize(sizeof(Vector<int>));
 	}
 }