Fix implementation of XML save.

diff --git a/Deeangband/GameWorld.cpp b/Deeangband/GameWorld.cpp
index 266f87a..91f2414 100644 (file)
--- a/Deeangband/GameWorld.cpp
+++ b/Deeangband/GameWorld.cpp
@@ -29,7 +29,7 @@ namespace Deeangband
                std::ofstream ofs("lib-Vanilla\\Authority.xml");
                assert(ofs);
                boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Authority", this->authorityList);
+               oa << boost::serialization::make_nvp("Authorities", this->authorityList);
                ofs.close();
        }
 
@@ -38,7 +38,7 @@ namespace Deeangband
                std::ofstream ofs("lib-Vanilla\\Building.xml");
                assert(ofs);
                boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Buildings", this->featureList);
+               oa << boost::serialization::make_nvp("Buildings", this->buildingList);
                ofs.close();
        }
 
@@ -47,7 +47,7 @@ namespace Deeangband
                std::ofstream ofs("lib-Vanilla\\Camp.xml");
                assert(ofs);
                boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Camps", this->featureList);
+               oa << boost::serialization::make_nvp("Camps", this->campList);
                ofs.close();
        }
 
@@ -56,7 +56,7 @@ namespace Deeangband
                std::ofstream ofs("lib-Vanilla\\Dungeon.xml");
                assert(ofs);
                boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Dungeons", this->featureList);
+               oa << boost::serialization::make_nvp("Dungeons", this->dungeonList);
                ofs.close();
        }
 
@@ -65,7 +65,7 @@ namespace Deeangband
                std::ofstream ofs("lib-Vanilla\\Effect.xml");
                assert(ofs);
                boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Effects", this->featureList);
+               oa << boost::serialization::make_nvp("Effects", this->effectList);
                ofs.close();
        }
 
@@ -83,7 +83,7 @@ namespace Deeangband
                std::ofstream ofs("lib-Vanilla\\FixedArtifact.xml");
                assert(ofs);
                boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("FixedArtifacts", this->featureList);
+               oa << boost::serialization::make_nvp("FixedArtifacts", this->fixedArtifactList);
                ofs.close();
        }
 
@@ -92,7 +92,7 @@ namespace Deeangband
                std::ofstream ofs("lib-Vanilla\\ItemBase.xml");
                assert(ofs);
                boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("ItemBases", this->featureList);
+               oa << boost::serialization::make_nvp("ItemBases", this->itemBaseList);
                ofs.close();
        }
 
@@ -101,7 +101,7 @@ namespace Deeangband
                std::ofstream ofs("lib-Vanilla\\ItemEgo.xml");
                assert(ofs);
                boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("ItemEgos", this->featureList);
+               oa << boost::serialization::make_nvp("ItemEgos", this->itemEgoList);
                ofs.close();
        }
 
@@ -110,7 +110,7 @@ namespace Deeangband
                std::ofstream ofs("lib-Vanilla\\ItemTrait.xml");
                assert(ofs);
                boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("ItemTraits", this->featureList);
+               oa << boost::serialization::make_nvp("ItemTraits", this->itemTraitList);
                ofs.close();
        }
 
@@ -119,7 +119,7 @@ namespace Deeangband
                std::ofstream ofs("lib-Vanilla\\Karma.xml");
                assert(ofs);
                boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Karmas", this->featureList);
+               oa << boost::serialization::make_nvp("Karmas", this->karmaList);
                ofs.close();
        }
 
@@ -128,7 +128,7 @@ namespace Deeangband
                std::ofstream ofs("lib-Vanilla\\Quest.xml");
                assert(ofs);
                boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Quests", this->featureList);
+               oa << boost::serialization::make_nvp("Quests", this->questList);
                ofs.close();
        }
 
@@ -137,7 +137,7 @@ namespace Deeangband
                std::ofstream ofs("lib-Vanilla\\Skill.xml");
                assert(ofs);
                boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Skils", this->featureList);
+               oa << boost::serialization::make_nvp("Skils", this->skillList);
                ofs.close();
        }
 
@@ -146,15 +146,19 @@ namespace Deeangband
                std::ofstream ofs("lib-Vanilla\\Specie.xml");
                assert(ofs);
                boost::archive::xml_oarchive oa(ofs);
-               oa << boost::serialization::make_nvp("Species", this->featureList);
+               oa << boost::serialization::make_nvp("Species", this->speciesList);
                ofs.close();
        }
 
        void GameWorld::xmlSaveTrap(void)
        {
+               std::ofstream ofs("lib-Vanilla\\Trap.xml");
+               assert(ofs);
+               boost::archive::xml_oarchive oa(ofs);
+               oa << boost::serialization::make_nvp("Trap", this->trapList);
+               ofs.close();
        }
 
-
        void GameWorld::XMLSave(void)
        {
                this->xmlSaveAuthority();
@@ -172,7 +176,6 @@ namespace Deeangband
                this->xmlSaveSkill();
                this->xmlSaveSpecie();
                this->xmlSaveTrap();
-
        }
 
        void GameWorld::XMLLoad(void)

diff --git a/lib-Vanilla/Authority.xml b/lib-Vanilla/Authority.xml
index c672efc..31bfddb 100644 (file)
--- a/lib-Vanilla/Authority.xml
+++ b/lib-Vanilla/Authority.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <!DOCTYPE boost_serialization>
 <boost_serialization signature="serialization::archive" version="10">
-<Authority class_id="0" tracking_level="0" version="0">
+<Authorities class_id="0" tracking_level="0" version="0">
        <count>1</count>
        <item_version>0</item_version>
        <item class_id="1" tracking_level="0" version="0">
@@ -12,4 +12,4 @@
                        </px>
                </second>
        </item>
-</Authority>
+</Authorities>

diff --git a/lib-Vanilla/Building.xml b/lib-Vanilla/Building.xml
index d9e5719..cdd4754 100644 (file)
--- a/lib-Vanilla/Building.xml
+++ b/lib-Vanilla/Building.xml
@@ -7,9 +7,8 @@
        <item class_id="1" tracking_level="0" version="0">
                <first>XXX_UNKNOWN</first>
                <second class_id="2" tracking_level="0" version="1">
-                       <px class_id="3" tracking_level="1" version="0" object_id="_0">
-                               <name>\96¢\92m\82Ì\92n\8c`</name>
-                               <tileID>-842150451</tileID>
+                       <px class_id="3" tracking_level="1" version="10" object_id="_0">
+                               <BuildingName></BuildingName>
                        </px>
                </second>
        </item>

diff --git a/lib-Vanilla/Camp.xml b/lib-Vanilla/Camp.xml
index 9d32e21..cfbd339 100644 (file)
--- a/lib-Vanilla/Camp.xml
+++ b/lib-Vanilla/Camp.xml
@@ -8,8 +8,7 @@
                <first>XXX_UNKNOWN</first>
                <second class_id="2" tracking_level="0" version="1">
                        <px class_id="3" tracking_level="1" version="0" object_id="_0">
-                               <name>\96¢\92m\82Ì\92n\8c`</name>
-                               <tileID>-842150451</tileID>
+                               <Name>\96¢\92è\8b`</Name>
                        </px>
                </second>
        </item>

diff --git a/lib-Vanilla/Dungeon.xml b/lib-Vanilla/Dungeon.xml
index f0254d9..0596485 100644 (file)
--- a/lib-Vanilla/Dungeon.xml
+++ b/lib-Vanilla/Dungeon.xml
@@ -7,9 +7,14 @@
        <item class_id="1" tracking_level="0" version="0">
                <first>XXX_UNKNOWN</first>
                <second class_id="2" tracking_level="0" version="1">
-                       <px class_id="3" tracking_level="1" version="0" object_id="_0">
-                               <name>\96¢\92m\82Ì\92n\8c`</name>
-                               <tileID>-842150451</tileID>
+                       <px class_id="3" tracking_level="1" version="10" object_id="_0">
+                               <Name>UNKNOWN</Name>
+                               <MinDepth>1</MinDepth>
+                               <MaxDepth>50</MaxDepth>
+                               <OuterWallFeature>XXX_UNKNOWN</OuterWallFeature>
+                               <InnerWallFeature>XXX_UNKNOWN</InnerWallFeature>
+                               <ControllCamp></ControllCamp>
+                               <GuardianSpecies></GuardianSpecies>
                        </px>
                </second>
        </item>

diff --git a/lib-Vanilla/Effect.xml b/lib-Vanilla/Effect.xml
index 4d2d961..432bbe9 100644 (file)
--- a/lib-Vanilla/Effect.xml
+++ b/lib-Vanilla/Effect.xml
@@ -8,8 +8,7 @@
                <first>XXX_UNKNOWN</first>
                <second class_id="2" tracking_level="0" version="1">
                        <px class_id="3" tracking_level="1" version="0" object_id="_0">
-                               <name>\96¢\92m\82Ì\92n\8c`</name>
-                               <tileID>-842150451</tileID>
+                               <Name></Name>
                        </px>
                </second>
        </item>

diff --git a/lib-Vanilla/FixedArtifact.xml b/lib-Vanilla/FixedArtifact.xml
index 61a9a9b..f2b6438 100644 (file)
--- a/lib-Vanilla/FixedArtifact.xml
+++ b/lib-Vanilla/FixedArtifact.xml
@@ -7,9 +7,23 @@
        <item class_id="1" tracking_level="0" version="0">
                <first>XXX_UNKNOWN</first>
                <second class_id="2" tracking_level="0" version="1">
-                       <px class_id="3" tracking_level="1" version="0" object_id="_0">
-                               <name>\96¢\92m\82Ì\92n\8c`</name>
-                               <tileID>-842150451</tileID>
+                       <px class_id="3" tracking_level="1" version="10" object_id="_0">
+                               <name>\82Ê\82¼\82Õ\82è</name>
+                               <baseDamage class_id="4" tracking_level="0" version="10">
+                                       <Num>0</Num>
+                                       <Side>0</Side>
+                               </baseDamage>
+                               <weight>0</weight>
+                               <baseSaving class_id="5" tracking_level="0" version="0">
+                                       <armor>0</armor>
+                                       <evasion>0</evasion>
+                                       <volition>0</volition>
+                               </baseSaving>
+                               <plusSaving>
+                                       <armor>0</armor>
+                                       <evasion>0</evasion>
+                                       <volition>0</volition>
+                               </plusSaving>
                        </px>
                </second>
        </item>

diff --git a/lib-Vanilla/ItemBase.xml b/lib-Vanilla/ItemBase.xml
index 442476c..09bc02f 100644 (file)
--- a/lib-Vanilla/ItemBase.xml
+++ b/lib-Vanilla/ItemBase.xml
@@ -8,8 +8,22 @@
                <first>XXX_UNKNOWN</first>
                <second class_id="2" tracking_level="0" version="1">
                        <px class_id="3" tracking_level="1" version="0" object_id="_0">
-                               <name>\96¢\92m\82Ì\92n\8c`</name>
-                               <tileID>-842150451</tileID>
+                               <name>\89½\82©\96ó\82Ì\95ª\82©\82ç\82È\82¢\82à\82Ì</name>
+                               <baseDamage class_id="4" tracking_level="0" version="10">
+                                       <Num>0</Num>
+                                       <Side>0</Side>
+                               </baseDamage>
+                               <weight>0</weight>
+                               <baseSaving class_id="5" tracking_level="0" version="0">
+                                       <armor>0</armor>
+                                       <evasion>0</evasion>
+                                       <volition>0</volition>
+                               </baseSaving>
+                               <plusSaving>
+                                       <armor>0</armor>
+                                       <evasion>0</evasion>
+                                       <volition>0</volition>
+                               </plusSaving>
                        </px>
                </second>
        </item>

diff --git a/lib-Vanilla/ItemEgo.xml b/lib-Vanilla/ItemEgo.xml
index 85f2e63..92b6ab0 100644 (file)
--- a/lib-Vanilla/ItemEgo.xml
+++ b/lib-Vanilla/ItemEgo.xml
@@ -8,8 +8,22 @@
                <first>XXX_UNKNOWN</first>
                <second class_id="2" tracking_level="0" version="1">
                        <px class_id="3" tracking_level="1" version="0" object_id="_0">
-                               <name>\96¢\92m\82Ì\92n\8c`</name>
-                               <tileID>-842150451</tileID>
+                               <name></name>
+                               <baseDamage class_id="4" tracking_level="0" version="10">
+                                       <Num>0</Num>
+                                       <Side>0</Side>
+                               </baseDamage>
+                               <weight>0</weight>
+                               <baseSaving class_id="5" tracking_level="0" version="0">
+                                       <armor>0</armor>
+                                       <evasion>0</evasion>
+                                       <volition>0</volition>
+                               </baseSaving>
+                               <plusSaving>
+                                       <armor>0</armor>
+                                       <evasion>0</evasion>
+                                       <volition>0</volition>
+                               </plusSaving>
                        </px>
                </second>
        </item>

diff --git a/lib-Vanilla/ItemTrait.xml b/lib-Vanilla/ItemTrait.xml
index 6019009..9cbca52 100644 (file)
--- a/lib-Vanilla/ItemTrait.xml
+++ b/lib-Vanilla/ItemTrait.xml
@@ -8,8 +8,7 @@
                <first>XXX_UNKNOWN</first>
                <second class_id="2" tracking_level="0" version="1">
                        <px class_id="3" tracking_level="1" version="0" object_id="_0">
-                               <name>\96¢\92m\82Ì\92n\8c`</name>
-                               <tileID>-842150451</tileID>
+                               <Name>\96¢\92è\8b`</Name>
                        </px>
                </second>
        </item>

diff --git a/lib-Vanilla/Karma.xml b/lib-Vanilla/Karma.xml
index 2d1ace2..4496d79 100644 (file)
--- a/lib-Vanilla/Karma.xml
+++ b/lib-Vanilla/Karma.xml
@@ -8,8 +8,16 @@
                <first>XXX_UNKNOWN</first>
                <second class_id="2" tracking_level="0" version="1">
                        <px class_id="3" tracking_level="1" version="0" object_id="_0">
-                               <name>\96¢\92m\82Ì\92n\8c`</name>
-                               <tileID>-842150451</tileID>
+                               <descipline_plus class_id="4" tracking_level="0" version="10">
+                                       <Point>
+                                               <count>5</count>
+                                               <item>0</item>
+                                               <item>0</item>
+                                               <item>0</item>
+                                               <item>0</item>
+                                               <item>0</item>
+                                       </Point>
+                               </descipline_plus>
                        </px>
                </second>
        </item>

diff --git a/lib-Vanilla/Quest.xml b/lib-Vanilla/Quest.xml
index 9873a29..0c813a5 100644 (file)
--- a/lib-Vanilla/Quest.xml
+++ b/lib-Vanilla/Quest.xml
@@ -2,15 +2,6 @@
 <!DOCTYPE boost_serialization>
 <boost_serialization signature="serialization::archive" version="10">
 <Quests class_id="0" tracking_level="0" version="0">
-       <count>1</count>
+       <count>0</count>
        <item_version>0</item_version>
-       <item class_id="1" tracking_level="0" version="0">
-               <first>XXX_UNKNOWN</first>
-               <second class_id="2" tracking_level="0" version="1">
-                       <px class_id="3" tracking_level="1" version="0" object_id="_0">
-                               <name>\96¢\92m\82Ì\92n\8c`</name>
-                               <tileID>-842150451</tileID>
-                       </px>
-               </second>
-       </item>
 </Quests>

diff --git a/lib-Vanilla/Skill.xml b/lib-Vanilla/Skill.xml
index c49c857..28c64fa 100644 (file)
--- a/lib-Vanilla/Skill.xml
+++ b/lib-Vanilla/Skill.xml
@@ -8,8 +8,8 @@
                <first>XXX_UNKNOWN</first>
                <second class_id="2" tracking_level="0" version="1">
                        <px class_id="3" tracking_level="1" version="0" object_id="_0">
-                               <name>\96¢\92m\82Ì\92n\8c`</name>
-                               <tileID>-842150451</tileID>
+                               <name>\83_\83~\81[</name>
+                               <details>()</details>
                        </px>
                </second>
        </item>

diff --git a/lib-Vanilla/Specie.xml b/lib-Vanilla/Specie.xml
index 2318d26..155f0c9 100644 (file)
--- a/lib-Vanilla/Specie.xml
+++ b/lib-Vanilla/Specie.xml
@@ -8,8 +8,24 @@
                <first>XXX_UNKNOWN</first>
                <second class_id="2" tracking_level="0" version="1">
                        <px class_id="3" tracking_level="1" version="0" object_id="_0">
-                               <name>\96¢\92m\82Ì\92n\8c`</name>
-                               <tileID>-842150451</tileID>
+                               <name></name>
+                               <baseSoul>-3617008641903833651</baseSoul>
+                               <averageHeight>-842150451</averageHeight>
+                               <averageWeight>-842150451</averageWeight>
+                               <baseFeed>-842150451</baseFeed>
+                               <divineLevel>-842150451</divineLevel>
+                               <baseCamp>-842150451</baseCamp>
+                               <baseStatus class_id="4" tracking_level="0" version="10">
+                                       <Status>
+                                               <count>6</count>
+                                               <item>0</item>
+                                               <item>0</item>
+                                               <item>0</item>
+                                               <item>0</item>
+                                               <item>0</item>
+                                               <item>0</item>
+                                       </Status>
+                               </baseStatus>
                        </px>
                </second>
        </item>

diff --git a/lib-Vanilla/Trap.xml b/lib-Vanilla/Trap.xml
new file mode 100644 (file)
index 0000000..8552637
--- /dev/null
+++ b/lib-Vanilla/Trap.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<!DOCTYPE boost_serialization>
+<boost_serialization signature="serialization::archive" version="10">
+<Trap class_id="0" tracking_level="0" version="0">
+       <count>1</count>
+       <item_version>0</item_version>
+       <item class_id="1" tracking_level="0" version="0">
+               <first>0</first>
+               <second class_id="2" tracking_level="0" version="1">
+                       <px class_id="3" tracking_level="1" version="10" object_id="_0">
+                               <FloorID>-842150451</FloorID>
+                               <Position class_id="4" tracking_level="0" version="0">
+                                       <X>0</X>
+                                       <Y>0</Y>
+                               </Position>
+                               <CurHP>-842150451</CurHP>
+                               <MaxHP>-842150451</MaxHP>
+                               <Difficulty>-842150451</Difficulty>
+                       </px>
+               </second>
+       </item>
+</Trap>