summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--graphics/items/equipment/head/witch-doctor-mask.pngbin1683 -> 842 bytes
-rw-r--r--graphics/items/generic/carrot-legendary.pngbin0 -> 425 bytes
-rw-r--r--graphics/items/generic/legendary-carrot.pngbin697 -> 0 bytes
-rw-r--r--graphics/items/use/others/shovel-legendary.pngbin0 -> 485 bytes
-rw-r--r--graphics/items/use/others/treasuremap-legendary.pngbin0 -> 1671 bytes
-rw-r--r--graphics/sprites/icons/spell-cooldown-cg.pngbin0 -> 1128 bytes
-rw-r--r--graphics/sprites/icons/spell-cooldown-cg.xml9
-rw-r--r--items/generic/item5279_LegendaryCarrot.xml2
-rw-r--r--items/usable/_include.xml2
-rw-r--r--items/usable/item5405_LegendaryShovel.xml25
-rw-r--r--items/usable/item5406_LegendaryTreasureMap.xml11
-rw-r--r--license.md6
-rw-r--r--status-effects.xml1
14 files changed, 54 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b33ddcf3..3bc728a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,8 +54,6 @@ licensecheck:
testxml:
stage: test
image: ubuntu:18.04
- tags:
- - glados
script:
- ./.tools/testxml.sh
- pwd
diff --git a/graphics/items/equipment/head/witch-doctor-mask.png b/graphics/items/equipment/head/witch-doctor-mask.png
index f2a641d1..fd3ea418 100644
--- a/graphics/items/equipment/head/witch-doctor-mask.png
+++ b/graphics/items/equipment/head/witch-doctor-mask.png
Binary files differ
diff --git a/graphics/items/generic/carrot-legendary.png b/graphics/items/generic/carrot-legendary.png
new file mode 100644
index 00000000..dd054770
--- /dev/null
+++ b/graphics/items/generic/carrot-legendary.png
Binary files differ
diff --git a/graphics/items/generic/legendary-carrot.png b/graphics/items/generic/legendary-carrot.png
deleted file mode 100644
index c61f58f7..00000000
--- a/graphics/items/generic/legendary-carrot.png
+++ /dev/null
Binary files differ
diff --git a/graphics/items/use/others/shovel-legendary.png b/graphics/items/use/others/shovel-legendary.png
new file mode 100644
index 00000000..3c63ecf4
--- /dev/null
+++ b/graphics/items/use/others/shovel-legendary.png
Binary files differ
diff --git a/graphics/items/use/others/treasuremap-legendary.png b/graphics/items/use/others/treasuremap-legendary.png
new file mode 100644
index 00000000..04c54567
--- /dev/null
+++ b/graphics/items/use/others/treasuremap-legendary.png
Binary files differ
diff --git a/graphics/sprites/icons/spell-cooldown-cg.png b/graphics/sprites/icons/spell-cooldown-cg.png
new file mode 100644
index 00000000..f72a4675
--- /dev/null
+++ b/graphics/sprites/icons/spell-cooldown-cg.png
Binary files differ
diff --git a/graphics/sprites/icons/spell-cooldown-cg.xml b/graphics/sprites/icons/spell-cooldown-cg.xml
new file mode 100644
index 00000000..3d5a827b
--- /dev/null
+++ b/graphics/sprites/icons/spell-cooldown-cg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/icons/spell-cooldown-cg.png" width="18" height="21"/>
+ <action name="default" imageset="base">
+ <animation direction="default">
+ <frame index="0" offsetX="3" offsetY="-8" delay="100"/>
+ </animation>
+ </action>
+</sprite>
diff --git a/items/generic/item5279_LegendaryCarrot.xml b/items/generic/item5279_LegendaryCarrot.xml
index c5ef1bd0..78abefa3 100644
--- a/items/generic/item5279_LegendaryCarrot.xml
+++ b/items/generic/item5279_LegendaryCarrot.xml
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<items>
- <item id="5279" image="generic/legendary-carrot.png" name="Legendary Carrot" description="Extra healthy, a gift from Santa for helping Gak to reunite with Alissa." effect="Inedible, Christmas 2021 Reward" type="generic" weight="1"/>
+ <item id="5279" image="generic/carrot-legendary.png" name="Legendary Carrot" description="Extra healthy, a gift from Santa for helping Gak to reunite with Alissa." effect="Inedible, Christmas 2021 Reward" type="generic" weight="1"/>
</items>
diff --git a/items/usable/_include.xml b/items/usable/_include.xml
index b9f9ad26..2dbb0bc4 100644
--- a/items/usable/_include.xml
+++ b/items/usable/_include.xml
@@ -140,4 +140,6 @@
<include name="items/usable/item5379_Sauerkraut.xml"/>
<include name="items/usable/item5382_AnchorStone.xml"/>
<include name="items/usable/item5383_AnchoredAnchorStone.xml"/>
+ <include name="items/usable/item5405_LegendaryShovel.xml"/>
+ <include name="items/usable/item5406_LegendaryTreasureMap.xml"/>
</items>
diff --git a/items/usable/item5405_LegendaryShovel.xml b/items/usable/item5405_LegendaryShovel.xml
new file mode 100644
index 00000000..5861ee4d
--- /dev/null
+++ b/items/usable/item5405_LegendaryShovel.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<items>
+ <item id="5405"
+ image="use/others/shovel-legendary.png"
+ name="Legendary Shovel"
+ useButton="Dig"
+ description="Discover treasures, dungeons and raw materials."
+ effect="Dig holes"
+ type="usable"
+ weight="210"
+ sellProtected="true">
+ <inventory>
+ <menu
+ name1="Dig"
+ command1="useinv 'INVINDEX'"
+ name2="Dig"
+ />
+ <menu
+ name1="Bury"
+ command1="useinv 'INVINDEX' 1"
+ name2="Bury"
+ />
+ </inventory>
+ </item>
+</items>
diff --git a/items/usable/item5406_LegendaryTreasureMap.xml b/items/usable/item5406_LegendaryTreasureMap.xml
new file mode 100644
index 00000000..d4c9a076
--- /dev/null
+++ b/items/usable/item5406_LegendaryTreasureMap.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<items>
+ <item id="5406"
+ image="use/others/treasuremap-legendary.png"
+ name="Legendary Treasure Map"
+ description="The X marks the spot!"
+ useButton="Read"
+ effect="Acquire treasures! Maybe. You must have a shovel to retrieve the treasure."
+ type="usable"
+ weight="14"/>
+</items>
diff --git a/license.md b/license.md
index 4a1d095a..25030b75 100644
--- a/license.md
+++ b/license.md
@@ -299,7 +299,7 @@ File | Artists | Licenses
`graphics/items/equipment/head/tophat.png` | QOAL | GPLv2
`graphics/items/equipment/head/warlordhelm.png` | Black Don | GPLv2
`graphics/items/equipment/head/wickedmushroomhat.png` | Cassy, Yuuki, HoraK-FDF | GPLv2
-`graphics/items/equipment/head/witch-doctor-mask.png` | Black Don | GPLv2
+`graphics/items/equipment/head/witch-doctor-mask.png` | Black Don, Hello=) | GPLv2
`graphics/items/equipment/head/witch-hat.png` | Meway | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/head/wizard-hat.png` | Crush, Hal9000 | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/head/yeti-mask.png` | Skipy | GPLv2
@@ -410,6 +410,7 @@ File | Artists | Licenses
`graphics/items/generic/bromenal-droplet.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/items/generic/bugleg.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/generic/butterfly.png` | Meway, Saulc | GPL 3.0/CC BY-SA 3.0
+`graphics/items/generic/carrot-legendary.png` | Enchilado, Reid, ? | CC BY-SA 3.0
`graphics/items/generic/casinocoins.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/generic/cavesnakelamp.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/generic/charcoal.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
@@ -636,8 +637,10 @@ File | Artists | Licenses
`graphics/items/use/others/croconut.png` | Hal9000 | CC BY-SA 3.0
`graphics/items/use/others/rubberducky.png` | Salmondine, dangerDuck | GPLv2
`graphics/items/use/others/shovel.png` | Alige, Reid | CC BY-SA 3.0
+`graphics/items/use/others/shovel-legendary.png` | Alige, Reid, ?, HoraK-FDF | CC BY-SA 3.0
`graphics/items/use/others/treasuremap.png` | Diego, TMW-Br | GPLv2
`graphics/items/use/others/treasuremap2.png` | Salmondine | GPLv2
+`graphics/items/use/others/treasuremap-legendary.png` | Salmondine, ?, HoraK-FDF | GPLv2
`graphics/items/use/others/warp-towel.png` | Bjorn, ChefChelios | GPLv2, CC BY-SA 3.0
#### Potions
@@ -754,6 +757,7 @@ File | Artists | Licenses
`graphics/sprites/icons/slow-move.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/sprites/icons/weight-big.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/sprites/icons/weight-small.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
+`graphics/sprites/icons/spell-cooldown-cg.png` | Hocus, HoraK-FDF | MIT, GPLv2, CC BY-SA 3.0
`graphics/sprites/icons/spell-cooldown-mg.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/sprites/icons/spell-cooldown-mt.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/sprites/icons/spell-cooldown-ench.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
diff --git a/status-effects.xml b/status-effects.xml
index bfc1c69b..6b96def5 100644
--- a/status-effects.xml
+++ b/status-effects.xml
@@ -29,6 +29,7 @@
<status-effect name="spell-cooldown-koy" id="77" icon="icons/spell-cooldown-koy.xml"/>
<status-effect name="spell-cooldown-upmarmu" id="78" icon="icons/spell-cooldown-upmarmu.xml"/>
<status-effect name="spell-cooldown-sg" id="79" icon="icons/spell-cooldown-sg.xml"/>
+ <status-effect name="spell-cooldown-cg" id="80" icon="icons/spell-cooldown-cg.xml"/>
<status-effect name="slow-move" id="133" icon="icons/slow-move.xml"/>
<status-effect name="cant-move" id="134" icon="icons/cant-move.xml"/>
</status-effects>