From a55d4589da1a0cdec73c0bcf69a2af6bccf868cb Mon Sep 17 00:00:00 2001 From: Daniel Karbach Date: Sun, 2 Sep 2012 19:20:16 +0200 Subject: [PATCH] split headers off of ikaris, items, and spells --- src/main.cpp | 6 ++++-- test-data/ikaris.l2h | 20 ++++++++++++++++++++ test-data/items.l2h | 39 +++++++++++++++++++++++++++++++++++++++ test-data/items.l2s | 2 ++ test-data/spells.l2h | 7 +++++++ test-data/test.l2s | 6 +++--- 6 files changed, 75 insertions(+), 5 deletions(-) create mode 100644 test-data/ikaris.l2h create mode 100644 test-data/items.l2h create mode 100644 test-data/spells.l2h diff --git a/src/main.cpp b/src/main.cpp index 9d8e8d6..4280985 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -81,8 +81,10 @@ int main(int argc, char **argv) { InitImage image(IMG_INIT_PNG); ParsedSource source; - Parser parser("test-data/test.l2s", source); - parser.Parse(); + Parser("test-data/test.l2s", source).Parse(); + Parser("test-data/ikaris.l2s", source).Parse(); + Parser("test-data/items.l2s", source).Parse(); + Parser("test-data/spells.l2s", source).Parse(); Interpreter intp(source); intp.ReadSource(); diff --git a/test-data/ikaris.l2h b/test-data/ikaris.l2h new file mode 100644 index 0000000..f55cc91 --- /dev/null +++ b/test-data/ikaris.l2h @@ -0,0 +1,20 @@ +Ikari boomerangIkari +Ikari courageIkari +Ikari crisisCureIkari +Ikari destroyIkari +Ikari diveIkari +Ikari dragonRushIkari +Ikari fakeIkari +Ikari firestormIkari +Ikari forcefieldIkari +Ikari gloomyIkari +Ikari ironBarrierIkari +Ikari lightGuardIkari +Ikari magicCureIkari +Ikari slowIkari +Ikari suddenCureIkari +Ikari tenLeggerIkari +Ikari thundershriekIkari +Ikari torrentIkari +Ikari trickIkari +Ikari vulnerableIkari diff --git a/test-data/items.l2h b/test-data/items.l2h new file mode 100644 index 0000000..c2461ec --- /dev/null +++ b/test-data/items.l2h @@ -0,0 +1,39 @@ +Item antidoteItem +Sprite armorIcon +Sprite axIcon +Sprite ballIcon +Sprite crankIcon +Item eagleRockItem +Item escapeItem +Item evilJewelItem +Item ghostRingItem +Sprite helmetIcon +Item hiPotionItem +Item holyCapItem +Item holyRobeItem +Item holyShieldItem +Sprite jewelIcon +Item krakenRockItem +Item legendHelmItem +Item lizardBlowItem +Item magicJarItem +Item megaShieldItem +Sprite potionIcon +Item powerPotionItem +Item powerRingItem +Sprite ringIcon +Item rocketRingItem +Sprite rodIcon +Item sProRingItem +Sprite shieldIcon +Item sleepBallItem +Sprite spearIcon +SimpleAnimation swordAttackAnimation +Sprite swordIcon +Item zircoAxItem +Item zircoGlovesItem +Item zircoHelmetItem +Item zircoSwordItem +Item zircoWhipItem +Item zirconArmorItem +Item zirconPlateItem diff --git a/test-data/items.l2s b/test-data/items.l2s index e3eadbf..76dd5aa 100644 --- a/test-data/items.l2s +++ b/test-data/items.l2s @@ -1,3 +1,5 @@ +include "ikaris.l2h" + export Sprite potionIcon { image: :"item-icons.png", size: <16,16> diff --git a/test-data/spells.l2h b/test-data/spells.l2h new file mode 100644 index 0000000..2da4057 --- /dev/null +++ b/test-data/spells.l2h @@ -0,0 +1,7 @@ +Spell championSpell +Spell escapeSpell +Spell rallySpell +Spell resetSpell +Spell strongSpell +Spell strongerSpell +Spell valorSpell diff --git a/test-data/test.l2s b/test-data/test.l2s index 098e0b2..48817f4 100644 --- a/test-data/test.l2s +++ b/test-data/test.l2s @@ -1,6 +1,6 @@ -include "ikaris.l2s" -include "items.l2s" -include "spells.l2s" +include "ikaris.l2h" +include "items.l2h" +include "spells.l2h" Number frameTime 33 Number twoFramesTime 66 -- 2.39.2