]> git.localhorst.tv Git - l2e.git/blobdiff - src/loader/Interpreter.cpp
added interpretation of Ikari and Item
[l2e.git] / src / loader / Interpreter.cpp
index 12dacb89cd8ab85fe92f3b6bf9f23e0df0a8180d..7c26aaafded4ae6ad86929521e1bc5ebc9fe3e26 100644 (file)
 #include "ParsedSource.h"
 #include "../battle/Hero.h"
 #include "../battle/Monster.h"
+#include "../battle/PartyLayout.h"
+#include "../common/Ikari.h"
+#include "../common/Item.h"
+#include "../common/Spell.h"
+#include "../common/TargetingMode.h"
 #include "../graphics/ComplexAnimation.h"
+#include "../graphics/Font.h"
+#include "../graphics/Frame.h"
+#include "../graphics/Gauge.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 common::Ikari;
+using common::Item;
+using common::Spell;
+using common::TargetingMode;
 using graphics::Animation;
+using graphics::Font;
+using graphics::Frame;
+using graphics::Gauge;
 using graphics::ComplexAnimation;
 using graphics::SimpleAnimation;
 using graphics::Sprite;
@@ -34,36 +51,61 @@ using std::vector;
 namespace loader {
 
 Interpreter::~Interpreter() {
-       for (vector<Animation *>::const_iterator i(animations.begin()), end(animations.end()); i != end; ++i) {
+       for (vector<ComplexAnimation *>::const_iterator i(complexAnimations.begin()), end(complexAnimations.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<Gauge *>::const_iterator i(gauges.begin()), end(gauges.end()); i != end; ++i) {
                delete *i;
        }
        for (vector<Hero *>::const_iterator i(heroes.begin()), end(heroes.end()); i != end; ++i) {
                delete *i;
        }
+       for (vector<Ikari *>::const_iterator i(ikaris.begin()), end(ikaris.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<Item *>::const_iterator i(items.begin()), end(items.end()); i != end; ++i) {
+               delete *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<Spell *>::const_iterator i(spells.begin()), end(spells.end()); i != end; ++i) {
+               delete *i;
+       }
        for (vector<Sprite *>::const_iterator i(sprites.begin()), end(sprites.end()); i != end; ++i) {
                delete *i;
        }
-}
-
-
-bool Interpreter::ParsedDefinition::IsCompatible(DynamicType with) const {
-       return type == with
-                       || (with == ANIMATION
-                                       && (type == COMPLEX_ANIMATION || type == SIMPLE_ANIMATION));
+       for (vector<const char *>::const_iterator i(strings.begin()), end(strings.end()); i != end; ++i) {
+               delete *i;
+       }
+       for (vector<TargetingMode *>::const_iterator i(targetingModes.begin()), end(targetingModes.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.IsCompatible(ANIMATION)) {
-                       return animations[i->second.index];
+               if (i->second.type == COMPLEX_ANIMATION) {
+                       return complexAnimations[i->second.index];
+               } else if (i->second.type == SIMPLE_ANIMATION) {
+                       return simpleAnimations[i->second.index];
                } else {
                        throw Error("cannot cast " + i->second.dfn->TypeName() + " to Animation");
                }
@@ -72,10 +114,62 @@ Animation *Interpreter::GetAnimation(const std::string &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);
+       }
+}
+
+Gauge *Interpreter::GetGauge(const std::string &name) {
+       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+       if (i != parsedDefinitions.end()) {
+               if (i->second.type == GAUGE) {
+                       return gauges[i->second.index];
+               } else {
+                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to Gauge");
+               }
+       } else {
+               throw Error("access to undefined Gauge " + 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)) {
+               if (i->second.type == HERO) {
                        return heroes[i->second.index];
                } else {
                        throw Error("cannot cast " + i->second.dfn->TypeName() + " to Hero");
@@ -85,10 +179,36 @@ Hero *Interpreter::GetHero(const std::string &name) {
        }
 }
 
+Ikari *Interpreter::GetIkari(const std::string &name) {
+       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+       if (i != parsedDefinitions.end()) {
+               if (i->second.type == IKARI) {
+                       return ikaris[i->second.index];
+               } else {
+                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to Ikari");
+               }
+       } else {
+               throw Error("access to undefined Ikari " + name);
+       }
+}
+
+Item *Interpreter::GetItem(const std::string &name) {
+       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+       if (i != parsedDefinitions.end()) {
+               if (i->second.type == ITEM) {
+                       return items[i->second.index];
+               } else {
+                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to Item");
+               }
+       } else {
+               throw Error("access to undefined Item " + 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)) {
+               if (i->second.type == MONSTER) {
                        return monsters[i->second.index];
                } else {
                        throw Error("cannot cast " + i->second.dfn->TypeName() + " to Monster");
@@ -101,7 +221,7 @@ Monster *Interpreter::GetMonster(const std::string &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.IsCompatible(NUMBER)) {
+               if (i->second.type == NUMBER) {
                        return numbers[i->second.index];
                } else {
                        throw Error("cannot cast " + i->second.dfn->TypeName() + " to Number");
@@ -111,10 +231,36 @@ int Interpreter::GetNumber(const std::string &name) const {
        }
 }
 
+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);
+       }
+}
+
+Spell *Interpreter::GetSpell(const std::string &name) {
+       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+       if (i != parsedDefinitions.end()) {
+               if (i->second.type == SPELL) {
+                       return spells[i->second.index];
+               } else {
+                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to Spell");
+               }
+       } else {
+               throw Error("access to undefined Spell " + name);
+       }
+}
+
 Sprite *Interpreter::GetSprite(const std::string &name) {
        map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
        if (i != parsedDefinitions.end()) {
-               if (i->second.IsCompatible(SPRITE)) {
+               if (i->second.type == SPRITE) {
                        return sprites[i->second.index];
                } else {
                        throw Error("cannot cast " + i->second.dfn->TypeName() + " to Sprite");
@@ -124,6 +270,45 @@ Sprite *Interpreter::GetSprite(const std::string &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);
+       }
+}
+
+TargetingMode *Interpreter::GetTargetingMode(const std::string &name) {
+       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+       if (i != parsedDefinitions.end()) {
+               if (i->second.type == TARGETING_MODE) {
+                       return targetingModes[i->second.index];
+               } else {
+                       throw Error("cannot cast " + i->second.dfn->TypeName() + " to TargetingMode");
+               }
+       } else {
+               throw Error("access to undefined TargetingMode " + 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) {
@@ -145,13 +330,16 @@ void Interpreter::ReadDefinition(const Definition &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 properties");
+                       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: boolean");
+                       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: color");
@@ -161,13 +349,20 @@ void Interpreter::ReadLiteral(const Definition &dfn) {
                        parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, NUMBER, numbers.size() - 1)));
                        break;
                case Literal::STRING:
-                       throw Error("unhandled literal: string");
+                       {
+                               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: vector");
+                       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: object");
+                       ReadObject(dfn);
                        break;
        }
 }
@@ -177,12 +372,12 @@ Animation *Interpreter::GetAnimation(const Value &v) {
                if (v.GetLiteral().GetTypeName() == "ComplexAnimation") {
                        ComplexAnimation *a(new ComplexAnimation);
                        ReadComplexAnimation(*a, *v.GetLiteral().GetProperties());
-                       animations.push_back(a);
+                       complexAnimations.push_back(a);
                        return a;
                } else {
                        SimpleAnimation *a(new SimpleAnimation);
                        ReadSimpleAnimation(*a, *v.GetLiteral().GetProperties());
-                       animations.push_back(a);
+                       simpleAnimations.push_back(a);
                        return a;
                }
        } else {
@@ -191,27 +386,67 @@ Animation *Interpreter::GetAnimation(const Value &v) {
        }
 }
 
-const vector<Value *> &Interpreter::GetValueArray(const Value &v) {
+bool Interpreter::GetBoolean(const Value &v) {
        if (v.IsLiteral()) {
-               return v.GetLiteral().GetValues();
+               return v.GetLiteral().GetBoolean();
        } else {
-               throw Error("identifier resolution not implemented for arrays of values");
+               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+               return GetBoolean(v.GetIdentifier());
        }
 }
 
-const vector<PropertyList *> &Interpreter::GetPropertyListArray(const Value &v) {
+Font *Interpreter::GetFont(const Value &v) {
        if (v.IsLiteral()) {
-               return v.GetLiteral().GetPropertyLists();
+               Font *f(new Font);
+               ReadFont(*f, *v.GetLiteral().GetProperties());
+               return f;
        } else {
-               throw Error("identifier resolution not implemented for arrays of property lists");
+               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+               return GetFont(v.GetIdentifier());
        }
 }
 
-bool Interpreter::GetBoolean(const Value &v) {
+Frame *Interpreter::GetFrame(const Value &v) {
        if (v.IsLiteral()) {
-               return v.GetLiteral().GetBoolean();
+               Frame *f(new Frame);
+               ReadFrame(*f, *v.GetLiteral().GetProperties());
+               return f;
        } else {
-               throw Error("identifier resolution not implemented for booleans");
+               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+               return GetFrame(v.GetIdentifier());
+       }
+}
+
+Gauge *Interpreter::GetGauge(const Value &v) {
+       if (v.IsLiteral()) {
+               Gauge *g(new Gauge);
+               ReadGauge(*g, *v.GetLiteral().GetProperties());
+               return g;
+       } else {
+               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+               return GetGauge(v.GetIdentifier());
+       }
+}
+
+Hero *Interpreter::GetHero(const Value &v) {
+       if (v.IsLiteral()) {
+               Hero *h(new Hero);
+               ReadHero(*h, *v.GetLiteral().GetProperties());
+               return h;
+       } else {
+               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+               return GetHero(v.GetIdentifier());
+       }
+}
+
+Ikari *Interpreter::GetIkari(const Value &v) {
+       if (v.IsLiteral()) {
+               Ikari *i(new Ikari);
+               ReadIkari(*i, *v.GetLiteral().GetProperties());
+               return i;
+       } else {
+               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+               return GetIkari(v.GetIdentifier());
        }
 }
 
@@ -222,6 +457,17 @@ SDL_Surface *Interpreter::GetImage(const Value &v) {
        return image;
 }
 
+Item *Interpreter::GetItem(const Value &v) {
+       if (v.IsLiteral()) {
+               Item *i(new Item);
+               ReadItem(*i, *v.GetLiteral().GetProperties());
+               return i;
+       } else {
+               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+               return GetItem(v.GetIdentifier());
+       }
+}
+
 int Interpreter::GetNumber(const Value &v) {
        if (v.IsLiteral()) {
                return v.GetLiteral().GetNumber();
@@ -231,11 +477,41 @@ int Interpreter::GetNumber(const Value &v) {
        }
 }
 
+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("identifier resolution not implemented for property lists");
+               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");
+       }
+}
+
+Spell *Interpreter::GetSpell(const Value &v) {
+       if (v.IsLiteral()) {
+               Spell *s(new Spell);
+               ReadSpell(*s, *v.GetLiteral().GetProperties());
+               return s;
+       } else {
+               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+               return GetSpell(v.GetIdentifier());
        }
 }
 
@@ -254,7 +530,19 @@ 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");
+               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+               return GetString(v.GetIdentifier());
+       }
+}
+
+TargetingMode *Interpreter::GetTargetingMode(const Value &v) {
+       if (v.IsLiteral()) {
+               TargetingMode *t(new TargetingMode);
+               ReadTargetingMode(*t, *v.GetLiteral().GetProperties());
+               return t;
+       } else {
+               ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+               return GetTargetingMode(v.GetIdentifier());
        }
 }
 
@@ -262,30 +550,99 @@ 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");
+               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() == "Hero") {
+       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() == "Gauge") {
+               Gauge *gauge(new Gauge);
+               int index(gauges.size());
+               gauges.push_back(gauge);
+               ReadGauge(*gauge, *dfn.GetProperties());
+               parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, GAUGE, 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() == "Ikari") {
+               Ikari *ikari(new Ikari);
+               int index(ikaris.size());
+               ikaris.push_back(ikari);
+               ReadIkari(*ikari, *dfn.GetProperties());
+               parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, IKARI, index)));
+       } else if (dfn.TypeName() == "Item") {
+               Item *item(new Item);
+               int index(items.size());
+               items.push_back(item);
+               ReadItem(*item, *dfn.GetProperties());
+               parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, ITEM, 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() == "Spell") {
+               Spell *spell(new Spell);
+               int index(spells.size());
+               spells.push_back(spell);
+               ReadSpell(*spell, *dfn.GetProperties());
+               parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, SPELL, 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 if (dfn.TypeName() == "TargetingMode") {
+               TargetingMode *mode(new TargetingMode);
+               int index(targetingModes.size());
+               targetingModes.push_back(mode);
+               ReadTargetingMode(*mode, *dfn.GetProperties());
+               parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, TARGETING_MODE, index)));
        } else {
                throw Error("unhandled object type: " + dfn.TypeName());
        }
@@ -327,6 +684,102 @@ void Interpreter::ReadComplexAnimationFrame(ComplexAnimation::FrameProp &f, cons
        }
 }
 
+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::ReadGauge(Gauge &g, const PropertyList &props) {
+       for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
+               if (i->first == "image") {
+                       g.SetSurface(GetImage(*i->second));
+               } else if (i->first == "full") {
+                       g.SetFullOffset(GetVector(*i->second));
+               } else if (i->first == "empty") {
+                       g.SetEmptyOffset(GetVector(*i->second));
+               } else if (i->first == "height") {
+                       g.SetHeight(GetNumber(*i->second));
+               } else if (i->first == "start") {
+                       g.SetStartWidth(GetNumber(*i->second));
+               } else if (i->first == "repeat") {
+                       g.SetRepeatWidth(GetNumber(*i->second));
+               } else if (i->first == "end") {
+                       g.SetEndWidth(GetNumber(*i->second));
+               } else {
+                       throw Error("unknown Gauge property: " + i->first);
+               }
+       }
+}
+
+void Interpreter::ReadIkari(Ikari &ikari, const PropertyList &props) {
+       for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
+               if (i->first == "name") {
+                       ikari.SetName(GetString(*i->second));
+               } else if (i->first == "cost") {
+                       ikari.SetCost(GetNumber(*i->second));
+               } else if (i->first == "targets") {
+                       ikari.GetTargetingMode() = *GetTargetingMode(*i->second);
+               } else if (i->first == "magical") {
+                       if (GetBoolean(*i->second)) {
+                               ikari.SetMagical();
+                       }
+               } else if (i->first == "physical") {
+                       if (GetBoolean(*i->second)) {
+                               ikari.SetPhysical();
+                       }
+               } else {
+                       throw Error("unknown Ikari property: " + i->first);
+               }
+       }
+}
+
+void Interpreter::ReadItem(Item &item, const PropertyList &props) {
+       for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
+               if (i->first == "name") {
+                       item.SetName(GetString(*i->second));
+               } else if (i->first == "menuicon") {
+                       item.SetMenuIcon(GetSprite(*i->second));
+               } else if (i->first == "battle") {
+                       if (GetBoolean(*i->second)) {
+                               item.SetUsableInBattle();
+                       }
+               } else if (i->first == "targets") {
+                       item.GetTargetingMode() = *GetTargetingMode(*i->second);
+               } else if (i->first == "ikari") {
+                       item.SetIkari(GetIkari(*i->second));
+               } else if (i->first == "attackanimation") {
+                       item.SetAttackAnimation(GetAnimation(*i->second));
+               } else {
+                       throw Error("unknown Item 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") {
@@ -391,6 +844,19 @@ void Interpreter::ReadMonster(Monster &m, const PropertyList &props) {
        }
 }
 
+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 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") {
@@ -411,6 +877,24 @@ void Interpreter::ReadSimpleAnimation(SimpleAnimation &a, const PropertyList &pr
        }
 }
 
+void Interpreter::ReadSpell(Spell &s, const PropertyList &props) {
+       for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
+               if (i->first == "name") {
+                       s.SetName(GetString(*i->second));
+               } else if (i->first == "cost") {
+                       s.SetCost(GetNumber(*i->second));
+               } else if (i->first == "battle") {
+                       if (GetBoolean(*i->second)) {
+                               s.SetUsableInBattle();
+                       }
+               } else if (i->first == "targets") {
+                       s.GetTargetingMode() = *GetTargetingMode(*i->second);
+               } else {
+                       throw Error("unknown Spell 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") {
@@ -447,4 +931,36 @@ void Interpreter::ReadStats(Stats &s, const PropertyList &props) {
        }
 }
 
+void Interpreter::ReadTargetingMode(TargetingMode &t, const PropertyList &props) {
+       for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
+               if (i->first == "ally") {
+                       if (GetBoolean(*i->second)) {
+                               t.TargetAlly();
+                       } else {
+                               t.TargetEnemy();
+                       }
+               } else if (i->first == "enemy") {
+                       if (GetBoolean(*i->second)) {
+                               t.TargetEnemy();
+                       } else {
+                               t.TargetAlly();
+                       }
+               } else if (i->first == "all") {
+                       if (GetBoolean(*i->second)) {
+                               t.TargetAll();
+                       }
+               } else if (i->first == "multiple") {
+                       if (GetBoolean(*i->second)) {
+                               t.TargetMultiple();
+                       }
+               } else if (i->first == "single") {
+                       if (GetBoolean(*i->second)) {
+                               t.TargetSingle();
+                       }
+               } else {
+                       throw Error("unknown TargetingMode property: " + i->first);
+               }
+       }
+}
+
 }