summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE2
-rw-r--r--graphics/particles/hexagon.png (renamed from graphics/particles/hex-facet-50.png)bin651 -> 651 bytes
-rw-r--r--graphics/particles/magic-shield-end.xml (renamed from graphics/particles/magic.shield-ends.xml)0
-rw-r--r--graphics/particles/magic-shield.xml (renamed from graphics/particles/magic.shield.xml)0
-rw-r--r--graphics/sprites/icons/spell-protection.png (renamed from graphics/sprites/icons/spell-protection-generic.png)bin1089 -> 1089 bytes
-rw-r--r--graphics/sprites/icons/spell-protection.xml (renamed from graphics/sprites/icons/spell-protection-generic.xml)0
-rw-r--r--status-effects.xml8
7 files changed, 6 insertions, 4 deletions
diff --git a/LICENSE b/LICENSE
index b018071f..2c771f56 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,6 +199,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/particles/gloworb.png (Crush) (CC BY-SA 3.0) (-)
graphics/particles/gloworb-medium.png (Crush) (CC BY-SA 3.0) (-)
graphics/particles/heart.png (Coolkid782, Reid) (CC BY-SA 3.0) (-)
+ graphics/particles/hexagon.png (Crush) (CC BY-SA 3.0) (-)
graphics/particles/orb-large.png (Reid) (CC BY-SA 3.0) (-)
graphics/particles/orb-large2.png (Reid) (CC BY-SA 3.0) (-)
graphics/particles/orb-medium.png (Crush) (CC BY-SA 3.0) (-)
@@ -309,6 +310,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/sprites/icons/hide.png (Fate) (CC BY-SA 3.0) (-)
graphics/sprites/icons/invisible.png (Fate) (CC BY-SA 3.0) (-)
graphics/sprites/icons/poison.png (FotherJ) (CC BY-SA 3.0) (-)
+ graphics/sprites/icons/spell-protection.png (Alige) (CC BY-SA 3.0) (-)
## Monsters
graphics/sprites/monsters/blub.png (Reid) (CC BY-SA 3.0) (-)
graphics/sprites/monsters/blub-little.png (Coolkid782) (CC BY-SA 3.0) (Reid)
diff --git a/graphics/particles/hex-facet-50.png b/graphics/particles/hexagon.png
index 310304dd..310304dd 100644
--- a/graphics/particles/hex-facet-50.png
+++ b/graphics/particles/hexagon.png
Binary files differ
diff --git a/graphics/particles/magic.shield-ends.xml b/graphics/particles/magic-shield-end.xml
index 41d83e73..41d83e73 100644
--- a/graphics/particles/magic.shield-ends.xml
+++ b/graphics/particles/magic-shield-end.xml
diff --git a/graphics/particles/magic.shield.xml b/graphics/particles/magic-shield.xml
index b964298b..b964298b 100644
--- a/graphics/particles/magic.shield.xml
+++ b/graphics/particles/magic-shield.xml
diff --git a/graphics/sprites/icons/spell-protection-generic.png b/graphics/sprites/icons/spell-protection.png
index c7ddff6f..c7ddff6f 100644
--- a/graphics/sprites/icons/spell-protection-generic.png
+++ b/graphics/sprites/icons/spell-protection.png
Binary files differ
diff --git a/graphics/sprites/icons/spell-protection-generic.xml b/graphics/sprites/icons/spell-protection.xml
index 6bb0501c..6bb0501c 100644
--- a/graphics/sprites/icons/spell-protection-generic.xml
+++ b/graphics/sprites/icons/spell-protection.xml
diff --git a/status-effects.xml b/status-effects.xml
index 0cea3ded..93c0b242 100644
--- a/status-effects.xml
+++ b/status-effects.xml
@@ -235,11 +235,11 @@ end-message: Displays a message when the effect end.
/>
<status-effect
- name="spell-protection-generic"
+ name="spell-protection"
id="966"
- icon="icons/spell-protection-generic.xml"
- start-particle="graphics/particles/magic.shield.xml"
- end-particle="graphics/particles/magic.shield-ends.xml"
+ icon="icons/spell-protection.xml"
+ start-particle="graphics/particles/magic-shield.xml"
+ end-particle="graphics/particles/magic-shield-end.xml"
/>
<!-- OPTION_SIGHT -->