From 32be49517984befd2f8bc4b8f7edc2fec963a1da Mon Sep 17 00:00:00 2001 From: Daniel Karbach Date: Sat, 1 Sep 2012 20:01:11 +0200 Subject: [PATCH] moved Maxim's and Selan's equipment to items.l2s --- src/main.cpp | 119 +++++-------------------------------------- test-data/ikaris.l2s | 91 ++++++++++++++++++++++++++++++++- test-data/items.l2s | 54 ++++++++++++++++++++ 3 files changed, 158 insertions(+), 106 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 00c07c5..84fb710 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -191,108 +191,17 @@ int main(int argc, char **argv) { maxim.SetWeapon(intp.GetItem("zircoSwordItem")); maxim.SetArmor(intp.GetItem("zirconArmorItem")); - Item holyShield; - holyShield.SetName("Holy shield"); - holyShield.SetMenuIcon(intp.GetSprite("shieldIcon")); - Ikari lightGuard; - lightGuard.SetName("Light guard"); - lightGuard.SetCost(128); - lightGuard.GetTargetingMode().TargetAllAllies(); // actually only targets self - lightGuard.SetMagical(); - holyShield.SetIkari(&lightGuard); - maxim.SetShield(&holyShield); - Item legendHelm; - legendHelm.SetName("Legend helm"); - legendHelm.SetMenuIcon(intp.GetSprite("helmetIcon")); - Ikari boomerang; - boomerang.SetName("Boomerang"); - boomerang.SetCost(164); - boomerang.GetTargetingMode().TargetAllAllies(); // actually only targets self - boomerang.SetMagical(); - legendHelm.SetIkari(&boomerang); - maxim.SetHelmet(&legendHelm); - Item sProRing; - sProRing.SetName("S-pro ring"); - sProRing.SetMenuIcon(intp.GetSprite("ringIcon")); - Ikari courage; - courage.SetName("Courage"); - courage.SetCost(64); - courage.GetTargetingMode().TargetMultipleAllies(); - courage.SetMagical(); - sProRing.SetIkari(&courage); - maxim.SetRing(&sProRing); - Item evilJewel; - evilJewel.SetName("Evil jewel"); - evilJewel.SetMenuIcon(intp.GetSprite("jewelIcon")); - Ikari gloomy; - gloomy.SetName("Gloomy"); - gloomy.SetCost(164); - gloomy.GetTargetingMode().TargetAllEnemies(); - gloomy.SetMagical(); - evilJewel.SetIkari(&gloomy); - maxim.SetJewel(&evilJewel); - - Item zircoWhip; - zircoWhip.SetName("Zirco whip"); - zircoWhip.SetMenuIcon(intp.GetSprite("rodIcon")); - zircoWhip.GetTargetingMode().TargetSingleEnemy(); - Ikari thundershriek; - thundershriek.SetName("Thundershriek"); - thundershriek.SetCost(224); - thundershriek.GetTargetingMode().TargetAllEnemies(); - thundershriek.SetPhysical(); - zircoWhip.SetIkari(&thundershriek); -// selan.SetWeapon(&zircoWhip); - Item zirconPlate; - zirconPlate.SetName("Zircon plate"); - zirconPlate.SetMenuIcon(intp.GetSprite("armorIcon")); - Ikari suddenCure; - suddenCure.SetName("Sudden cure"); - suddenCure.SetCost(96); - suddenCure.GetTargetingMode().TargetAllAllies(); - suddenCure.SetMagical(); - zirconPlate.SetIkari(&suddenCure); - selan.SetArmor(&zirconPlate); - Item zircoGloves; - zircoGloves.SetName("Zirco gloves"); - zircoGloves.SetMenuIcon(intp.GetSprite("shieldIcon")); - Ikari forcefield; - forcefield.SetName("Forcefield"); - forcefield.SetCost(64); - forcefield.GetTargetingMode().TargetAllAllies(); - forcefield.SetMagical(); - zircoGloves.SetIkari(&forcefield); - selan.SetShield(&zircoGloves); - Item holyCap; - holyCap.SetName("Holy cap"); - holyCap.SetMenuIcon(intp.GetSprite("helmetIcon")); - Ikari vulnerable; - vulnerable.SetName("Vulnerable"); - vulnerable.SetCost(196); - vulnerable.GetTargetingMode().TargetAllEnemies(); - vulnerable.SetPhysical(); - holyCap.SetIkari(&vulnerable); - selan.SetHelmet(&holyCap); - Item ghostRing; - ghostRing.SetName("Ghost ring"); - ghostRing.SetMenuIcon(intp.GetSprite("ringIcon")); - Ikari destroy; - destroy.SetName("Destroy"); - destroy.SetCost(128); - destroy.GetTargetingMode().TargetMultipleEnemies(); - destroy.SetMagical(); - ghostRing.SetIkari(&destroy); - selan.SetRing(&ghostRing); - Item eagleRock; - eagleRock.SetName("Eagle rock"); - eagleRock.SetMenuIcon(intp.GetSprite("jewelIcon")); - Ikari dive; - dive.SetName("Dive"); - dive.SetCost(128); - dive.GetTargetingMode().TargetSingleEnemy(); - dive.SetPhysical(); - eagleRock.SetIkari(&dive); - selan.SetJewel(&eagleRock); + maxim.SetShield(intp.GetItem("holyShieldItem")); + maxim.SetHelmet(intp.GetItem("legendHelmItem")); + maxim.SetRing(intp.GetItem("sProRingItem")); + maxim.SetJewel(intp.GetItem("evilJewelItem")); + +// selan.SetWeapon(intp.GetItem("zircoWhipItem")); + selan.SetArmor(intp.GetItem("zirconPlateItem")); + selan.SetShield(intp.GetItem("zircoGlovesItem")); + selan.SetHelmet(intp.GetItem("holyCapItem")); + selan.SetRing(intp.GetItem("ghostRingItem")); + selan.SetJewel(intp.GetItem("eagleRockItem")); Item zircoAx; zircoAx.SetName("Zirco ax"); @@ -336,7 +245,7 @@ int main(int argc, char **argv) { trick.SetMagical(); zircoHelmet.SetIkari(&trick); guy.SetRing(&powerRing); - guy.SetJewel(&evilJewel); + guy.SetJewel(intp.GetItem("evilJewelItem")); // NOTE: this is actually Artea equipment Item lizardBlow; @@ -360,8 +269,8 @@ int main(int argc, char **argv) { crisisCure.SetMagical(); holyRobe.SetIkari(&crisisCure); dekar.SetArmor(&holyRobe); - dekar.SetShield(&zircoGloves); - dekar.SetHelmet(&holyCap); + dekar.SetShield(intp.GetItem("zircoGlovesItem")); + dekar.SetHelmet(intp.GetItem("holyCapItem")); Item rocketRing; rocketRing.SetName("Rocket ring"); rocketRing.SetMenuIcon(intp.GetSprite("ringIcon")); diff --git a/test-data/ikaris.l2s b/test-data/ikaris.l2s index 99f343a..ada9165 100644 --- a/test-data/ikaris.l2s +++ b/test-data/ikaris.l2s @@ -1,3 +1,39 @@ +export Ikari boomerangIkari { + name: "Boomerang", + cost: 164, + targets: TargetingMode { + ally: true, + all: true + }, + magical: true +} +export Ikari courageIkari { + name: "Courage", + cost: 64, + targets: TargetingMode { + ally: true, + multiple: true + }, + magical: true +} +export Ikari destroyIkari { + name: "Destroy", + cost: 128, + targets: TargetingMode { + enemy: true, + multiple: true + }, + magical: true +} +export Ikari diveIkari { + name: "Dive", + cost: 128, + targets: TargetingMode { + enemy: true, + single: true + }, + physical: true +} export Ikari firestormIkari { name: "Firestorm", cost: 224, @@ -7,7 +43,33 @@ export Ikari firestormIkari { }, physical: true } - +export Ikari forcefieldIkari { + name: "Forcefield", + cost: 64, + targets: TargetingMode { + ally: true, + all: true + }, + magical: true +} +export Ikari gloomyIkari { + name: "Gloomy", + cost: 164, + targets: TargetingMode { + enemy: true, + all: true + }, + magical: true +} +export Ikari lightGuardIkari { + name: "Light guard", + cost: 128, + targets: TargetingMode { + ally: true, + all: true + }, + magical: true +} export Ikari magicCureIkari { name: "Magic cure", cost: 128, @@ -17,3 +79,30 @@ export Ikari magicCureIkari { }, magical: true } +export Ikari suddenCureIkari { + name: "Sudden cure", + cost: 96, + targets: TargetingMode { + ally: true, + all: true + }, + magical: true +} +export Ikari thundershriekIkari { + name: "Thundershriek", + cost: 224, + targets: TargetingMode { + enemy: true, + all: true + }, + physical: true +} +export Ikari vulnerableIkari { + name: "Vulnerable", + cost: 196, + targets: TargetingMode { + enemy: true, + all: true + }, + physical: true +} diff --git a/test-data/items.l2s b/test-data/items.l2s index ac45d2a..4db8515 100644 --- a/test-data/items.l2s +++ b/test-data/items.l2s @@ -77,10 +77,25 @@ export Item antidoteItem { single: true } } +export Item eagleRockItem { + name: "Eagle rock", + menuicon: jewelIcon, + ikari: diveIkari +} export Item escapeItem { name: "Escape", battle: false } +export Item evilJewelItem { + name: "Evil jewel", + menuicon: jewelIcon, + ikari: gloomyIkari +} +export Item ghostRingItem { + name: "Ghost ring", + menuicon: ringIcon, + ikari: destroyIkari +} export Item hiPotionItem { name: "Hi-Potion", menuicon: potionIcon, @@ -90,6 +105,16 @@ export Item hiPotionItem { single: true } } +export Item holyCapItem { + name: "Holy cap", + menuicon: helmetIcon, + ikari: vulnerableIkari +} +export Item holyShieldItem { + name: "Holy shield", + menuicon: shieldIcon, + ikari: lightGuardIkari +} export Item magicJarItem { name: "Magic jar", menuicon: potionIcon, @@ -99,6 +124,11 @@ export Item magicJarItem { single: true } } +export Item legendHelmItem { + name: "Legend helm", + menuicon: helmetIcon, + ikari: boomerangIkari +} export Item powerPotionItem { name: "Power potion", menuicon: potionIcon, @@ -113,12 +143,27 @@ export Item sleepBallItem { single: true } } +export Item sProRingItem { + name: "S-pro ring", + menuicon: ringIcon, + ikari: courageIkari +} +export Item zircoGlovesItem { + name: "Zirco gloves", + menuicon: shieldIcon, + ikari: forcefieldIkari +} export Item zirconArmorItem { name: "Zircon armor", menuicon: armorIcon, battle: false, ikari: magicCureIkari } +export Item zirconPlateItem { + name: "Zircon plate", + menuicon: armorIcon, + ikari: suddenCureIkari +} export Item zircoSwordItem { name: "Zirco sword", menuicon: swordIcon, @@ -130,3 +175,12 @@ export Item zircoSwordItem { ikari: firestormIkari, attackanimation: swordAttackAnimation } +export Item zircoWhipItem { + name: "Zirco whip", + menuicon: rodIcon, + targets: TargetingMode { + enemy: true, + single: true + }, + ikari: thundershriekIkari +} -- 2.39.2