diff options
| author | HoraK-FDF <horak-fdf@web.de> | 2022-11-28 18:30:55 +0000 |
|---|---|---|
| committer | HoraK-FDF <horak-fdf@web.de> | 2022-11-28 18:30:55 +0000 |
| commit | a3336f514bdc945f7da9266eac4f3641c03b9552 (patch) | |
| tree | e255f0eb08ba041419740007a96b3fff1ac4dd2c | |
| parent | 0e476d50428e2d575725e0c84cf228b9d2095513 (diff) | |
| parent | 6551c9ce3880c2bcc1c1d7692b7ddfe7bff2874f (diff) | |
| download | clientdata-a3336f514bdc945f7da9266eac4f3641c03b9552.tar.gz clientdata-a3336f514bdc945f7da9266eac4f3641c03b9552.tar.bz2 clientdata-a3336f514bdc945f7da9266eac4f3641c03b9552.tar.xz clientdata-a3336f514bdc945f7da9266eac4f3641c03b9552.zip | |
Merge branch 'darktalisman' into 'master'
darktalisman
See merge request legacy/clientdata!480
| -rw-r--r-- | graphics/items/equipment/charms/darktalisman.png | bin | 0 -> 1628 bytes | |||
| -rw-r--r-- | items/equip-charm/_include.xml | 1 | ||||
| -rw-r--r-- | items/equip-charm/item1244_DarkTalisman.xml (renamed from items/equip-torso/item1244_DarkTalisman.xml) | 2 | ||||
| -rw-r--r-- | items/equip-torso/_include.xml | 1 |
4 files changed, 2 insertions, 2 deletions
diff --git a/graphics/items/equipment/charms/darktalisman.png b/graphics/items/equipment/charms/darktalisman.png Binary files differnew file mode 100644 index 00000000..908839d5 --- /dev/null +++ b/graphics/items/equipment/charms/darktalisman.png diff --git a/items/equip-charm/_include.xml b/items/equip-charm/_include.xml index eb5bd1ca..cbd85844 100644 --- a/items/equip-charm/_include.xml +++ b/items/equip-charm/_include.xml @@ -16,6 +16,7 @@ <include name="items/equip-charm/item865_Grimoire.xml"/> <include name="items/equip-charm/item879_HeartofIsis.xml"/> <include name="items/equip-charm/item1227_EnchantersAmulet.xml"/> + <include name="items/equip-charm/item1244_DarkTalisman.xml"/> <include name="items/equip-charm/item5269_AssassinAmulet.xml"/> <include name="items/equip-charm/item5270_ManaPearl.xml"/> </items> diff --git a/items/equip-torso/item1244_DarkTalisman.xml b/items/equip-charm/item1244_DarkTalisman.xml index 450a65a9..58fea93a 100644 --- a/items/equip-torso/item1244_DarkTalisman.xml +++ b/items/equip-charm/item1244_DarkTalisman.xml @@ -6,7 +6,7 @@ <its:translateRule selector="//item/@effect" translate="yes"/> <its:translateRule selector="//*" translate="no"/> </its:rules> - <item id="1244" image="generic/iten.png" name="Dark Talisman" description="A small cube. It radiates unimaginable power, and is quite dizzying to look at." mattack="100" type="equip-torso" mdefense="30" sellProtected="true"> + <item id="1244" image="equipment/charms/darktalisman.png" name="Dark Talisman" description="A small cube. It radiates unimaginable power, and is quite dizzying to look at." mattack="100" type="equip-torso" mdefense="30" sellProtected="true"> <particlefx>graphics/particles/dark-talisman.xml</particlefx> </item> </items> diff --git a/items/equip-torso/_include.xml b/items/equip-torso/_include.xml index 2d71215b..1baed29d 100644 --- a/items/equip-torso/_include.xml +++ b/items/equip-torso/_include.xml @@ -40,7 +40,6 @@ <include name="items/equip-torso/item1186_DarkChristmasSweater.xml"/> <include name="items/equip-torso/item1187_BlueChristmasSweater.xml"/> <include name="items/equip-torso/item1202_CottonShirt.xml"/> - <include name="items/equip-torso/item1244_DarkTalisman.xml"/> <include name="items/equip-torso/item2050_RedCottonShirt.xml"/> <include name="items/equip-torso/item2051_GreenCottonShirt.xml"/> <include name="items/equip-torso/item2052_DarkBlueCottonShirt.xml"/> |
