Lightsaber SFX, as I've promised @dangerDuck

8 files changed, 18 insertions, 4 deletions

diff --git a/LICENSE b/LICENSE
index 40a66841..e7b23115 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2484,6 +2484,12 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
 	sfx/weapons/piouslayer/miss1.ogg (Cosmostrator)                         (CC BY-SA 3.0)          (Socapex)
 ### Gunstaff
 	sfx/weapons/gunstaff/shot.ogg (Bird-Man)                                (CC 0)                  (Freesound.org, Jesusalva)
+### Lightsaber
+	sfx/weapons/lightsaber/critical.ogg (?)                                 (GPL v2)                (FreedroidRPG)
+	sfx/weapons/lightsaber/hit1.ogg (skytheguy)                             (CC BY 3.0)             (Freesound.org, Jesusalva)
+	sfx/weapons/lightsaber/hit2.ogg (skytheguy)                             (CC BY 3.0)             (Freesound.org, Jesusalva)
+	sfx/weapons/lightsaber/hit3.ogg (skytheguy)                             (CC BY 3.0)             (Freesound.org, Jesusalva)
+	sfx/weapons/lightsaber/miss.ogg (skytheguy)                             (CC BY 3.0)             (Freesound.org, Jesusalva)
 
 ## Voice
 	sfx/voice/candor01.ogg (Jesusalva)                                     (CC BY-SA 3.0)          (Festival/Festivox)
diff --git a/effects.xml b/effects.xml
index ac7055ae..3f773d24 100644
--- a/effects.xml
+++ b/effects.xml
@@ -137,6 +137,8 @@ Copyright (C) 2018 TMW2: Moubootaur Legends
     <effect id="812" particle="graphics/particles/hit.strong.xml"/>
     <effect id="813" particle="graphics/particles/hit.verystrong.xml"/>
 
+    <effect id="820" particle="graphics/particles/hit.verystrong.xml" audio="weapons/lightsaber/crit.ogg"/>
+
     <!--+++++++++++++++++++++++-->
     <!-- id 5000+: Voicing Sys -->
     <!--+++++++++++++++++++++++-->
diff --git a/items.xml b/items.xml
index 5a022098..3c2afd78 100644
--- a/items.xml
+++ b/items.xml
@@ -6646,10 +6646,13 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		level="60"
 		type="equip-1hand"
 		attack-action="attack"
+		critical-hit-effect-id="820"
 		weight="360">
 		<sprite>equipment/weapons/weapon-staff-blue.xml</sprite>
-		<sound event="hit">weapons/axe/hit.ogg</sound>
-		<sound event="miss">weapons/axe/miss.ogg</sound>
+		<sound event="hit">weapons/lightsaber/hit1.ogg</sound>
+		<sound event="hit">weapons/lightsaber/hit2.ogg</sound>
+		<sound event="hit">weapons/lightsaber/hit3.ogg</sound>
+		<sound event="miss">weapons/lightsaber/miss.ogg</sound>
 	</item>
 	<item id="3537"
 		image="equipment/weapons/redlightsaber.png"
@@ -6661,10 +6664,13 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		level="60"
 		type="equip-2hand"
 		attack-action="attack"
+		critical-hit-effect-id="820"
 		weight="380">
 		<sprite>equipment/weapons/weapon-staff-red.xml</sprite>
-		<sound event="hit">weapons/axe/hit.ogg</sound>
-		<sound event="miss">weapons/axe/miss.ogg</sound>
+		<sound event="hit">weapons/lightsaber/hit1.ogg</sound>
+		<sound event="hit">weapons/lightsaber/hit2.ogg</sound>
+		<sound event="hit">weapons/lightsaber/hit3.ogg</sound>
+		<sound event="miss">weapons/lightsaber/miss.ogg</sound>
 	</item>
 	<!-- Fill new weapons HERE -->
 	<item id="3600"
diff --git a/sfx/weapons/lightsaber/crit.ogg b/sfx/weapons/lightsaber/crit.ogg
new file mode 100644
index 00000000..5a629089
--- /dev/null
+++ b/sfx/weapons/lightsaber/crit.ogg
diff --git a/sfx/weapons/lightsaber/hit1.ogg b/sfx/weapons/lightsaber/hit1.ogg
new file mode 100644
index 00000000..d4b04290
--- /dev/null
+++ b/sfx/weapons/lightsaber/hit1.ogg
diff --git a/sfx/weapons/lightsaber/hit2.ogg b/sfx/weapons/lightsaber/hit2.ogg
new file mode 100644
index 00000000..ab892334
--- /dev/null
+++ b/sfx/weapons/lightsaber/hit2.ogg
diff --git a/sfx/weapons/lightsaber/hit3.ogg b/sfx/weapons/lightsaber/hit3.ogg
new file mode 100644
index 00000000..5a2bb7c5
--- /dev/null
+++ b/sfx/weapons/lightsaber/hit3.ogg
diff --git a/sfx/weapons/lightsaber/miss.ogg b/sfx/weapons/lightsaber/miss.ogg
new file mode 100644
index 00000000..01d95700
--- /dev/null
+++ b/sfx/weapons/lightsaber/miss.ogg