Floyd needed his own style

21 files changed, 72 insertions, 5 deletions

diff --git a/effects.xml b/effects.xml
index 82a60d71..59f5df5a 100644
--- a/effects.xml
+++ b/effects.xml
@@ -110,7 +110,8 @@
   <!-- Add the data needed for the electricity boss battle. -->
   <effect id="402" audio="system/ship-bell2.ogg"/>
   <effect id="403" audio="monsters/bat/bat-hit1.ogg"/>
-  <effect id="404" audio="sfx/env/tiny_bell.ogg"/>
+  <effect id="404" audio="env/tiny_bell.ogg"/>
+  <effect id="405" audio="weapons/beam/beam-crit.ogg" particle="graphics/particles/beam-crit.xml"/>
   <!-- magic v3 spells -->
   <!-- #discharge -->
   <effect id="500" audio="magic/discharge.ogg" particle="graphics/particles/fire-burst.xml"/>
diff --git a/graphics/particles/beam-crit.png b/graphics/particles/beam-crit.png
new file mode 100644
index 00000000..8f64643d
--- /dev/null
+++ b/graphics/particles/beam-crit.png
diff --git a/graphics/particles/beam-crit.xml b/graphics/particles/beam-crit.xml
new file mode 100644
index 00000000..1d5ba245
--- /dev/null
+++ b/graphics/particles/beam-crit.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!-- Author: Ledmitz -->
+<effect>
+  <particle position-x="0" position-y="0" position-z="48" lifetime="100">
+    <emitter>
+      <property name="lifetime" min="3" max="33"/>
+      <property name="output" value="1"/>
+      <property name="gravity" value="0.1"/>
+      <property name="fade-out" value="7"/>
+      <animation imageset="graphics/particles/beam-crit.png|W:#ffff00" width="64" height="64">
+        <sequence start="0" end="3" delay="3"/>
+      </animation>
+      <animation imageset="graphics/particles/beam-crit.png|W:#0000ff" width="64" height="64">
+        <sequence start="0" end="3" delay="7"/>
+      </animation>
+      <animation imageset="graphics/particles/beam-crit.png|W:#00ff00" width="64" height="64">
+        <sequence start="0" end="3" delay="11"/>
+      </animation>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/particles/beam.png b/graphics/particles/beam.png
new file mode 100644
index 00000000..f340a61c
--- /dev/null
+++ b/graphics/particles/beam.png
diff --git a/graphics/particles/beam.xml b/graphics/particles/beam.xml
new file mode 100644
index 00000000..e05bc34c
--- /dev/null
+++ b/graphics/particles/beam.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!-- Author: Ledmitz -->
+<effect>
+  <particle position-x="0" position-y="0" position-z="32" lifetime="128">
+    <emitter>
+      <property name="image" value="graphics/particles/beam.png"/>
+      <property name="output" value="1"/>
+      <property name="lifetime" value="16"/>
+    </emitter>
+  </particle>
+</effect>
diff --git a/items/racesprite/item99054_Troll.xml b/items/racesprite/item99054_Troll.xml
index 767539d7..0ead1330 100644
--- a/items/racesprite/item99054_Troll.xml
+++ b/items/racesprite/item99054_Troll.xml
@@ -2,8 +2,7 @@
 <items>
   <item id="-99054" type="racesprite" name="Troll">
     <sprite>monsters/troll-race.xml|#FFDEC2;#FF4D4D;#FF99FF;#FFC88A</sprite>
-  </item>
-  <item id="-99168" type="racesprite" name="Floyd">
-    <sprite>monsters/floyd.xml</sprite>
+    <sound event="hit">env/flame.ogg</sound>
+    <sound event="strike">monsters/fire-goblin/fire-goblin-hit1.ogg</sound>
   </item>
 </items>
diff --git a/items/racesprite/item99168_Floyd.xml b/items/racesprite/item99168_Floyd.xml
new file mode 100644
index 00000000..87583793
--- /dev/null
+++ b/items/racesprite/item99168_Floyd.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<items>
+  <item id="-99168" type="racesprite" name="Floyd">
+    <sprite>monsters/floyd.xml</sprite>
+    <sound event="hit">weapons/beam/beam-hit.ogg</sound>
+    <sound event="strike">weapons/beam/beam-miss.ogg</sound>
+  </item>
+</items>
diff --git a/license.md b/license.md
index 994a5c35..d7bd84e7 100644
--- a/license.md
+++ b/license.md
@@ -599,6 +599,8 @@ File | Artists | Licenses
 `graphics/particles/bubble_8px.png` | Crush | GPLv2, CC BY-SA 3.0
 `graphics/particles/anibubble_8px.png` | Crush,wushin | GPLv2, CC BY-SA 3.0
 `graphics/particles/anibubble_8px_green.png` | Crush,wushin | GPLv2, CC BY-SA 3.0
+`graphics/particles/beam.png` | Ledmitz | GPLv2, CC BY-SA 3.0
+`graphics/particles/beam-crit.png` | Ledmitz | GPLv2, CC BY-SA 3.0
 `graphics/particles/bubble_12px.png` | Crush | GPLv2, CC BY-SA 3.0
 `graphics/particles/bubble_32px.png` | Crush | GPLv2, CC BY-SA 3.0
 `graphics/particles/casket-trap_96x96.png` | Skipy | GPLv2
@@ -1283,6 +1285,15 @@ File | Artists | Licenses
 `sfx/monsters/flower/flower-hit1.ogg` | Cosmostrator | GPLv2
 `sfx/monsters/flower/flower-hit2.ogg` | Cosmostrator | GPLv2
 `sfx/monsters/flower/flower-miss1.ogg` | Cosmostrator | GPLv2
+`sfx/monsters/floyd/floyd-die1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/floyd/floyd-hurt1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/floyd/floyd-hurt2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/floyd/floyd-hurt3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/floyd/floyd-move1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/floyd/floyd-move2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/floyd/floyd-move3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/floyd/floyd-move4.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/floyd/floyd-move5.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/monsters/fluffy/fluffy-hit1.ogg` | Cosmostrator | GPLv2
 `sfx/monsters/fluffy/fluffy-hit2.ogg` | Cosmostrator | GPLv2
 `sfx/monsters/fluffy/fluffy-hit3.ogg` | Cosmostrator | GPLv2
@@ -1460,6 +1471,9 @@ File | Artists | Licenses
 `sfx/weapons/miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/weapons/miss2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/weapons/miss3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/beam/beam-crit.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/beam/beam-hit.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/beam/beam-miss.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/weapons/bows/bow_shoot_1.ogg` | Cosmostrator | GPLv2
 `sfx/weapons/bows/banshee/banshee-hit1.ogg` | Ledmitz (rocket-shots.mp3 / Audionautics / CC BY 3.0) | GPLv2, CC BY-SA 3.0
 `sfx/weapons/bows/banshee/banshee-hit2.ogg` | Ledmitz (rocket-shots.mp3 / Audionautics / CC BY 3.0) | GPLv2, CC BY-SA 3.0
diff --git a/monsters.xml b/monsters.xml
index 522a0570..8d87c80c 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -1543,7 +1543,20 @@
 
     <monster id="1168" name="Floyd">
         <sprite>monsters/floyd.xml</sprite>
-        <sound event="hit">env/zap.ogg</sound>
+        <attack id="1" critical-hit-effect-id="405" missile-particle="graphics/particles/beam.xml" action="attack"/>
+        <sound event="die">monsters/floyd/floyd-die1.ogg</sound>
+        <sound event="hit">weapons/beam/beam-hit.ogg</sound>
+        <sound event="hurt">monsters/floyd/floyd-hurt1.ogg</sound>
+        <sound event="hurt">monsters/floyd/floyd-hurt2.ogg</sound>
+        <sound event="hurt">monsters/floyd/floyd-hurt3.ogg</sound>
+        <sound event="miss">weapons/beam/beam-miss.ogg</sound>
+        <sound event="move">monsters/floyd/floyd-move1.ogg</sound>
+        <sound event="move">monsters/floyd/floyd-move1.ogg</sound>
+        <sound event="move">monsters/floyd/floyd-move1.ogg</sound>
+        <sound event="move">monsters/floyd/floyd-move2.ogg</sound>
+        <sound event="move">monsters/floyd/floyd-move3.ogg</sound>
+        <sound event="move">monsters/floyd/floyd-move4.ogg</sound>
+        <sound event="move">monsters/floyd/floyd-move5.ogg</sound>
     </monster>
 
     <monster id="1169" name="Crystal Spider">
diff --git a/sfx/monsters/floyd/floyd-die1.ogg b/sfx/monsters/floyd/floyd-die1.ogg
new file mode 100644
index 00000000..6e46869d
--- /dev/null
+++ b/sfx/monsters/floyd/floyd-die1.ogg
diff --git a/sfx/monsters/floyd/floyd-hurt1.ogg b/sfx/monsters/floyd/floyd-hurt1.ogg
new file mode 100644
index 00000000..529db61f
--- /dev/null
+++ b/sfx/monsters/floyd/floyd-hurt1.ogg
diff --git a/sfx/monsters/floyd/floyd-hurt2.ogg b/sfx/monsters/floyd/floyd-hurt2.ogg
new file mode 100644
index 00000000..d13d7e6c
--- /dev/null
+++ b/sfx/monsters/floyd/floyd-hurt2.ogg
diff --git a/sfx/monsters/floyd/floyd-hurt3.ogg b/sfx/monsters/floyd/floyd-hurt3.ogg
new file mode 100644
index 00000000..165c0962
--- /dev/null
+++ b/sfx/monsters/floyd/floyd-hurt3.ogg
diff --git a/sfx/monsters/floyd/floyd-move1.ogg b/sfx/monsters/floyd/floyd-move1.ogg
new file mode 100644
index 00000000..b5426f00
--- /dev/null
+++ b/sfx/monsters/floyd/floyd-move1.ogg
diff --git a/sfx/monsters/floyd/floyd-move2.ogg b/sfx/monsters/floyd/floyd-move2.ogg
new file mode 100644
index 00000000..eb1a6181
--- /dev/null
+++ b/sfx/monsters/floyd/floyd-move2.ogg
diff --git a/sfx/monsters/floyd/floyd-move3.ogg b/sfx/monsters/floyd/floyd-move3.ogg
new file mode 100644
index 00000000..12521635
--- /dev/null
+++ b/sfx/monsters/floyd/floyd-move3.ogg
diff --git a/sfx/monsters/floyd/floyd-move4.ogg b/sfx/monsters/floyd/floyd-move4.ogg
new file mode 100644
index 00000000..e7eb17ad
--- /dev/null
+++ b/sfx/monsters/floyd/floyd-move4.ogg
diff --git a/sfx/monsters/floyd/floyd-move5.ogg b/sfx/monsters/floyd/floyd-move5.ogg
new file mode 100644
index 00000000..f912990c
--- /dev/null
+++ b/sfx/monsters/floyd/floyd-move5.ogg
diff --git a/sfx/weapons/beam/beam-crit.ogg b/sfx/weapons/beam/beam-crit.ogg
new file mode 100644
index 00000000..8681bad5
--- /dev/null
+++ b/sfx/weapons/beam/beam-crit.ogg
diff --git a/sfx/weapons/beam/beam-hit.ogg b/sfx/weapons/beam/beam-hit.ogg
new file mode 100644
index 00000000..ebf6a6e6
--- /dev/null
+++ b/sfx/weapons/beam/beam-hit.ogg
diff --git a/sfx/weapons/beam/beam-miss.ogg b/sfx/weapons/beam/beam-miss.ogg
new file mode 100644
index 00000000..b49b4a02
--- /dev/null
+++ b/sfx/weapons/beam/beam-miss.ogg