X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FInterpreter.cpp;h=d5a61a669a9bd177c023325cfec12031664395d1;hb=8f54789ae7d974035b9103982c38e1714a15728b;hp=268fab9379954f35cad3e5abdaa99fa6578215ac;hpb=107b78b720db69ad402c09c0b1d9beb3b88a1952;p=l2e.git

diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp
index 268fab9..d5a61a6 100644
--- a/src/loader/Interpreter.cpp
+++ b/src/loader/Interpreter.cpp
@@ -8,75 +8,655 @@
 #include "Interpreter.h"
 
 #include "ParsedSource.h"
+#include "../battle/Hero.h"
 #include "../battle/Monster.h"
+#include "../battle/PartyLayout.h"
+#include "../graphics/ComplexAnimation.h"
+#include "../graphics/Font.h"
+#include "../graphics/Frame.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::PartyLayout;
+using battle::Stats;
+using graphics::Animation;
+using graphics::Font;
+using graphics::Frame;
+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;
 
 namespace loader {
 
-void Interpreter::ReadSource() {
-	for (set<string>::const_iterator i(source.Exports().begin()), end(source.Exports().end()); i != end; ++i) {
-		const Definition &dfn(source.GetDefinition(*i));
-		if (dfn.HasLiteralValue()) {
-			ReadLiteral(dfn);
+Interpreter::~Interpreter() {
+	for (vector<ComplexAnimation *>::const_iterator i(complexAnimations.begin()), end(complexAnimations.end()); i != end; ++i) {
+		delete *i;
+	}
+	for (vector<Hero *>::const_iterator i(heroes.begin()), end(heroes.end()); i != end; ++i) {
+		delete *i;
+	}
+	for (vector<Font *>::const_iterator i(fonts.begin()), end(fonts.end()); i != end; ++i) {
+		delete *i;
+	}
+	for (vector<Frame *>::const_iterator i(frames.begin()), end(frames.end()); i != end; ++i) {
+		delete *i;
+	}
+	for (vector<SDL_Surface *>::const_iterator i(images.begin()), end(images.end()); i != end; ++i) {
+		SDL_FreeSurface(*i);
+	}
+	for (vector<Monster *>::const_iterator i(monsters.begin()), end(monsters.end()); i != end; ++i) {
+		delete *i;
+	}
+	for (vector<PartyLayout *>::const_iterator i(partyLayouts.begin()), end(partyLayouts.end()); i != end; ++i) {
+		delete *i;
+	}
+	for (vector<SimpleAnimation *>::const_iterator i(simpleAnimations.begin()), end(simpleAnimations.end()); i != end; ++i) {
+		delete *i;
+	}
+	for (vector<Sprite *>::const_iterator i(sprites.begin()), end(sprites.end()); i != end; ++i) {
+		delete *i;
+	}
+	for (vector<const char *>::const_iterator i(strings.begin()), end(strings.end()); i != end; ++i) {
+		delete *i;
+	}
+}
+
+
+Animation *Interpreter::GetAnimation(const std::string &name) {
+	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		if (i->second.type == COMPLEX_ANIMATION) {
+			return complexAnimations[i->second.index];
+		} else if (i->second.type == SIMPLE_ANIMATION) {
+			return simpleAnimations[i->second.index];
 		} else {
-			ReadObject(dfn);
+			throw Error("cannot cast " + i->second.dfn->TypeName() + " to Animation");
+		}
+	} else {
+		throw Error("access to undefined Animation " + name);
+	}
+}
+
+bool Interpreter::GetBoolean(const std::string &name) const {
+	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		if (i->second.type == BOOLEAN) {
+			return booleans[i->second.index];
+		} else {
+			throw Error("cannot cast " + i->second.dfn->TypeName() + " to Boolean");
+		}
+	} else {
+		throw Error("access to undefined Boolean " + name);
+	}
+}
+
+Font *Interpreter::GetFont(const std::string &name) {
+	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		if (i->second.type == FONT) {
+			return fonts[i->second.index];
+		} else {
+			throw Error("cannot cast " + i->second.dfn->TypeName() + " to Font");
+		}
+	} else {
+		throw Error("access to undefined Font " + name);
+	}
+}
+
+Frame *Interpreter::GetFrame(const std::string &name) {
+	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		if (i->second.type == FRAME) {
+			return frames[i->second.index];
+		} else {
+			throw Error("cannot cast " + i->second.dfn->TypeName() + " to Frame");
+		}
+	} else {
+		throw Error("access to undefined Frame " + name);
+	}
+}
+
+Hero *Interpreter::GetHero(const std::string &name) {
+	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		if (i->second.type == 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.type == 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);
+	}
+}
+
+int Interpreter::GetNumber(const std::string &name) const {
+	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		if (i->second.type == 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);
+	}
+}
+
+PartyLayout *Interpreter::GetPartyLayout(const std::string &name) {
+	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		if (i->second.type == PARTY_LAYOUT) {
+			return partyLayouts[i->second.index];
+		} else {
+			throw Error("cannot cast " + i->second.dfn->TypeName() + " to PartyLayout");
+		}
+	} else {
+		throw Error("access to undefined PartyLayout " + name);
+	}
+}
+
+Sprite *Interpreter::GetSprite(const std::string &name) {
+	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		if (i->second.type == SPRITE) {
+			return sprites[i->second.index];
+		} else {
+			throw Error("cannot cast " + i->second.dfn->TypeName() + " to Sprite");
+		}
+	} else {
+		throw Error("access to undefined Sprite " + name);
+	}
+}
+
+const char *Interpreter::GetString(const std::string &name) const {
+	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		if (i->second.type == STRING) {
+			return strings[i->second.index];
+		} else {
+			throw Error("cannot cast " + i->second.dfn->TypeName() + " to String");
+		}
+	} else {
+		throw Error("access to undefined String " + name);
+	}
+}
+
+Vector<int> Interpreter::GetVector(const std::string &name) const {
+	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		if (i->second.type == VECTOR) {
+			return vectors[i->second.index];
+		} else {
+			throw Error("cannot cast " + i->second.dfn->TypeName() + " to Vector");
 		}
+	} else {
+		throw Error("access to undefined Vector " + name);
+	}
+}
+
+
+void Interpreter::ReadSource() {
+	for (set<string>::const_iterator i(source.Exports().begin()), end(source.Exports().end()); i != end; ++i) {
+		ReadDefinition(source.GetDefinition(*i));
+	}
+}
+
+void Interpreter::ReadDefinition(const Definition &dfn) {
+	if (parsedDefinitions.find(dfn.Identifier()) != parsedDefinitions.end()) {
+		return;
+	}
+	if (dfn.HasLiteralValue()) {
+		ReadLiteral(dfn);
+	} else {
+		ReadObject(dfn);
 	}
 }
 
 void Interpreter::ReadLiteral(const Definition &dfn) {
 	switch (dfn.GetLiteral()->GetType()) {
 		case Literal::ARRAY_VALUES:
-			throw Error("unhandled literal: array of values");
+			valueArrays.push_back(dfn.GetLiteral()->GetValues());
+			parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, VALUE_ARRAY, valueArrays.size() - 1)));
 			break;
 		case Literal::ARRAY_PROPS:
-			throw Error("unhandled literal: array of values");
+			propertyListArrays.push_back(dfn.GetLiteral()->GetPropertyLists());
+			parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, PROPERTY_LIST_ARRAY, propertyListArrays.size() - 1)));
 			break;
 		case Literal::BOOLEAN:
-			throw Error("unhandled literal: array of values");
+			booleans.push_back(dfn.GetLiteral()->GetBoolean());
+			parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, BOOLEAN, booleans.size() - 1)));
 			break;
 		case Literal::COLOR:
-			throw Error("unhandled literal: array of values");
+			throw Error("unhandled literal: color");
 			break;
 		case Literal::NUMBER:
-			throw Error("unhandled literal: array of values");
+			numbers.push_back(dfn.GetLiteral()->GetNumber());
+			parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, NUMBER, numbers.size() - 1)));
 			break;
 		case Literal::STRING:
-			throw Error("unhandled literal: array of values");
+			{
+				char *str(new char[dfn.GetLiteral()->GetString().size() + 1]);
+				std::memcpy(str, dfn.GetLiteral()->GetString().c_str(), dfn.GetLiteral()->GetString().size());
+				str[dfn.GetLiteral()->GetString().size()] = '\0';
+				strings.push_back(str);
+			}
+			parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, STRING, strings.size() - 1)));
 			break;
 		case Literal::VECTOR:
-			throw Error("unhandled literal: array of values");
+			vectors.push_back(Vector<int>(dfn.GetLiteral()->GetX(), dfn.GetLiteral()->GetY()));
+			parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, VECTOR, vectors.size() - 1)));
 			break;
 		case Literal::OBJECT:
-			throw Error("unhandled literal: array of values");
+			ReadObject(dfn);
 			break;
 	}
 }
 
+Animation *Interpreter::GetAnimation(const Value &v) {
+	if (v.IsLiteral()) {
+		if (v.GetLiteral().GetTypeName() == "ComplexAnimation") {
+			ComplexAnimation *a(new ComplexAnimation);
+			ReadComplexAnimation(*a, *v.GetLiteral().GetProperties());
+			complexAnimations.push_back(a);
+			return a;
+		} else {
+			SimpleAnimation *a(new SimpleAnimation);
+			ReadSimpleAnimation(*a, *v.GetLiteral().GetProperties());
+			simpleAnimations.push_back(a);
+			return a;
+		}
+	} else {
+		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+		return GetAnimation(v.GetIdentifier());
+	}
+}
+
+bool Interpreter::GetBoolean(const Value &v) {
+	if (v.IsLiteral()) {
+		return v.GetLiteral().GetBoolean();
+	} else {
+		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+		return GetBoolean(v.GetIdentifier());
+	}
+}
+
+Font *Interpreter::GetFont(const Value &v) {
+	if (v.IsLiteral()) {
+		Font *f(new Font);
+		ReadFont(*f, *v.GetLiteral().GetProperties());
+		return f;
+	} else {
+		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+		return GetFont(v.GetIdentifier());
+	}
+}
+
+Frame *Interpreter::GetFrame(const Value &v) {
+	if (v.IsLiteral()) {
+		Frame *f(new Frame);
+		ReadFrame(*f, *v.GetLiteral().GetProperties());
+		return f;
+	} else {
+		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+		return GetFrame(v.GetIdentifier());
+	}
+}
+
+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());
+	}
+}
+
+PartyLayout *Interpreter::GetPartyLayout(const Value &v) {
+	if (v.IsLiteral()) {
+		PartyLayout *l(new PartyLayout);
+		ReadPartyLayout(*l, *v.GetLiteral().GetProperties());
+		return l;
+	} else {
+		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+		return GetPartyLayout(v.GetIdentifier());
+	}
+}
+
+const PropertyList *Interpreter::GetPropertyList(const Value &v) {
+	if (v.IsLiteral()) {
+		return v.GetLiteral().GetProperties();
+	} else {
+		throw Error("cannot reference property lists");
+	}
+}
+
+const vector<PropertyList *> &Interpreter::GetPropertyListArray(const Value &v) {
+	if (v.IsLiteral()) {
+		return v.GetLiteral().GetPropertyLists();
+	} else {
+		throw Error("cannot reference property list arrays");
+	}
+}
+
+Sprite *Interpreter::GetSprite(const Value &v) {
+	if (v.IsLiteral()) {
+		Sprite *s(new Sprite);
+		ReadSprite(*s, *v.GetLiteral().GetProperties());
+		return s;
+	} else {
+		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+		return GetSprite(v.GetIdentifier());
+	}
+}
+
+const char *Interpreter::GetString(const Value &v) {
+	if (v.IsLiteral()) {
+		return v.GetLiteral().GetString().c_str();
+	} else {
+		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+		return GetString(v.GetIdentifier());
+	}
+}
+
+Vector<int> Interpreter::GetVector(const Value &v) {
+	if (v.IsLiteral()) {
+		return Vector<int>(v.GetLiteral().GetX(), v.GetLiteral().GetY());
+	} else {
+		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+		return GetVector(v.GetIdentifier());
+	}
+}
+
+const vector<Value *> &Interpreter::GetValueArray(const Value &v) {
+	if (v.IsLiteral()) {
+		return v.GetLiteral().GetValues();
+	} else {
+		throw Error("cannot reference value arrays");
+	}
+}
+
+
 void Interpreter::ReadObject(const Definition &dfn) {
-	if (dfn.TypeName() == "Monster") {
-		monsters.resize(monsters.size() + 1);
-		ReadMonster(monsters.back(), *dfn.GetProperties());
+	if (dfn.TypeName() == "ComplexAnimation") {
+		ComplexAnimation *animation(new ComplexAnimation);
+		int index(complexAnimations.size());
+		complexAnimations.push_back(animation);
+		ReadComplexAnimation(*animation, *dfn.GetProperties());
+		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, COMPLEX_ANIMATION, index)));
+	} else if (dfn.TypeName() == "Font") {
+		Font *font(new Font);
+		int index(fonts.size());
+		fonts.push_back(font);
+		ReadFont(*font, *dfn.GetProperties());
+		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, FONT, index)));
+	} else if (dfn.TypeName() == "Frame") {
+		Frame *frame(new Frame);
+		int index(frames.size());
+		frames.push_back(frame);
+		ReadFrame(*frame, *dfn.GetProperties());
+		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, FRAME, index)));
+	} else if (dfn.TypeName() == "Hero") {
+		Hero *hero(new Hero);
+		int index(heroes.size());
+		heroes.push_back(hero);
+		ReadHero(*hero, *dfn.GetProperties());
+		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, HERO, index)));
+	} else if (dfn.TypeName() == "Monster") {
+		Monster *monster(new Monster);
+		int index(monsters.size());
+		monsters.push_back(monster);
+		ReadMonster(*monster, *dfn.GetProperties());
+		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, MONSTER, index)));
+	} else if (dfn.TypeName() == "PartyLayout") {
+		PartyLayout *layout(new PartyLayout);
+		int index(partyLayouts.size());
+		partyLayouts.push_back(layout);
+		ReadPartyLayout(*layout, *dfn.GetProperties());
+		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, PARTY_LAYOUT, index)));
+	} else if (dfn.TypeName() == "SimpleAnimation") {
+		SimpleAnimation *animation(new SimpleAnimation);
+		int index(simpleAnimations.size());
+		simpleAnimations.push_back(animation);
+		ReadSimpleAnimation(*animation, *dfn.GetProperties());
+		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, SIMPLE_ANIMATION, index)));
+	} else if (dfn.TypeName() == "Sprite") {
+		Sprite *sprite(new Sprite);
+		int index(sprites.size());
+		sprites.push_back(sprite);
+		ReadSprite(*sprite, *dfn.GetProperties());
+		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, SPRITE, index)));
 	} else {
-		throw Error("unhandled object: " + dfn.TypeName());
+		throw Error("unhandled object type: " + dfn.TypeName());
+	}
+}
+
+
+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::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);
+		}
+	}
+}
+
+void Interpreter::ReadFont(Font &f, const PropertyList &props) {
+	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
+		if (i->first == "sprite") {
+			f.SetSprite(GetSprite(*i->second));
+		} else if (i->first == "columnoffset") {
+			f.SetColOffset(GetNumber(*i->second));
+		} else if (i->first == "rowoffset") {
+			f.SetRowOffset(GetNumber(*i->second));
+		} else {
+			throw Error("unknown Font property: " + i->first);
+		}
+	}
+}
+
+void Interpreter::ReadFrame(Frame &f, const PropertyList &props) {
+	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
+		if (i->first == "image") {
+			f.SetSurface(GetImage(*i->second));
+		} else if (i->first == "border") {
+			f.SetBorderSize(GetVector(*i->second));
+		} else if (i->first == "repeat") {
+			f.SetRepeatSize(GetVector(*i->second));
+		} else if (i->first == "offset") {
+			f.SetOffset(GetVector(*i->second));
+		} else {
+			throw Error("unknown Frame property: " + i->first);
+		}
+	}
+}
+
+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);
+		}
+	}
+}
 
 void Interpreter::ReadMonster(Monster &m, const PropertyList &props) {
 	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
 		if (i->first == "name") {
-			if (i->second->IsLiteral()) {
-				m.SetName(i->second->GetLiteral().GetString().c_str());
-			} else {
-				throw Error("identifier resolution not implemented");
+			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 if (i->first == "meleeAnimation") {
+			m.SetMeleeAnimation(GetAnimation(*i->second));
+		} else {
+			throw Error("unknown Monster property: " + i->first);
+		}
+	}
+}
+
+void Interpreter::ReadPartyLayout(PartyLayout &p, const PropertyList &props) {
+	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
+		if (i->first == "positions") {
+			const vector<Value *> &positions(GetValueArray(*i->second));
+			for (vector<Value *>::const_iterator j(positions.begin()), end(positions.end()); j != end; ++j) {
+				p.AddPosition(GetVector(**j));
 			}
 		} else {
-			throw Error("unknown monster property: " + i->first);
+			throw Error("unknown PartyLayout property: " + i->first);
+		}
+	}
+}
+
+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);
+		}
+	}
+}
+
+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);
+		}
+	}
+}
+
+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);
 		}
 	}
 }