Merge branch 'Critical_redo' into 'master'

critical.ogg redone as requested. Lower volume than original too.

See merge request TMW2/clientdata!88

5 files changed, 15 insertions, 1 deletions

diff --git a/LICENSE b/LICENSE
index d6e592b5..df77d318 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2595,7 +2595,8 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
 	sfx/special/fart.ogg (LEGACY)                                           (GUMI)                  (The Mana World)
 
 ## System
-	sfx/system/critical.ogg (Kenny690)                                      (CC BY-SA 3.0)          (-)
+	sfx/system/critical.ogg (Ledmitz)                                       (CC BY-SA 3.0)          (-)
+	sfx/system/critical2.ogg (Kenny690)                                     (CC BY-SA 3.0)          (-)
 	sfx/system/esperin.ogg (Kenny690)                                       (CC BY-SA 3.0)          (-)
 	sfx/system/event-fail.ogg (Ledmitz)                                     (CC BY-SA 3.0)          (CaptainSiberia)
 	sfx/system/event-success.ogg (Ledmitz)                                  (CC BY-SA 3.0)          (adriann)
diff --git a/effects.xml b/effects.xml
index 6a761020..9921714a 100644
--- a/effects.xml
+++ b/effects.xml
@@ -40,6 +40,7 @@ Copyright (C) 2018 TMW2: Moubootaur Legends
     <effect id="30" audio="npcs/fishing-bite.ogg"/> <!-- Fish biting the bait, in the fishing script. -->
     <effect id="33" audio="monsters/piou/hit1.ogg"/> <!-- when clicking the flying piou -->
     <effect id="34" particle="graphics/particles/python.xml" audio="special/fart.ogg"/> <!-- Gumi's foot -->
+    <effect id="35" audio="system/critical2.ogg" particle="graphics/particles/critical.xml"/> <!-- Critical hit's explosion particle effect. (alt) -->
 
     <!-- known server special effects
         162 - snow
diff --git a/items.xml b/items.xml
index f577536a..fcf06f49 100644
--- a/items.xml
+++ b/items.xml
@@ -6477,6 +6477,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="equip-1hand"
 		attack-action="attack"
 		hit-effect-id="813"
+		critical-hit-effect-id="35"
 		weight="1400">
 		<sprite>equipment/weapons/knife.xml</sprite>
 		<sound event="hit">weapons/knife/hit1.ogg</sound>
@@ -6508,6 +6509,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="equip-1hand"
 		attack-action="attack"
 		hit-effect-id="813"
+		critical-hit-effect-id="35"
 		weight="1500">
 		<sprite>equipment/weapons/jackal.xml</sprite>
 		<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
@@ -6881,6 +6883,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="equip-2hand"
 		attack-action="attack"
 		hit-effect-id="813"
+		critical-hit-effect-id="35"
 		weight="1600">
 		<sprite>equipment/weapons/heavyaxe.xml</sprite>
 		<sound event="hit">weapons/knife/hit1.ogg</sound>
@@ -7012,6 +7015,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="equip-2hand"
 		attack-action="attack"
 		hit-effect-id="801"
+		critical-hit-effect-id="35"
 		weight="3000">
 		<sprite>equipment/weapons/heavyaxe.xml</sprite>
 		<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
@@ -7029,6 +7033,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="equip-2hand"
 		attack-action="attack"
 		hit-effect-id="801"
+		critical-hit-effect-id="35"
 		weight="3000">
 		<sprite>equipment/weapons/bow.xml</sprite>
 		<sound event="hit">weapons/bow/shoot.ogg</sound>
@@ -7045,6 +7050,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		level="255"
 		type="equip-2hand"
 		hit-effect-id="801"
+		critical-hit-effect-id="35"
 		weight="3000">
 	</item>
 	<item id="3604"
@@ -7645,6 +7651,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		level="100"
 		type="equip-2hand"
 		attack-action="attack_bow"
+		critical-hit-effect-id="35"
 		weight="890">
 		<sprite>equipment/weapons/bow.xml</sprite>
 		<sound event="hit">weapons/bow/shoot.ogg</sound>
@@ -7667,6 +7674,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		level="60"
 		type="equip-2hand"
 		attack-action="attack_bow"
+		critical-hit-effect-id="35"
 		weight="9000">
 		<sprite>equipment/weapons/bow.xml</sprite>
 		<sound event="hit">weapons/gunstaff/shot.ogg</sound>
@@ -7687,6 +7695,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		level="60"
 		type="equip-2hand"
 		attack-action="attack_bow"
+		critical-hit-effect-id="35"
 		weight="12000">
 		<sprite>equipment/weapons/bow.xml</sprite>
 		<sound event="hit">weapons/gunstaff/shot.ogg</sound>
@@ -7707,6 +7716,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		level="60"
 		type="equip-2hand"
 		attack-action="attack_bow"
+		critical-hit-effect-id="35"
 		weight="10000">
 		<sprite>equipment/weapons/bow.xml</sprite>
 		<sound event="hit">weapons/gunstaff/shot.ogg</sound>
@@ -7727,6 +7737,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		level="60"
 		type="equip-1hand"
 		attack-action="attack_bow"
+		critical-hit-effect-id="35"
 		weight="7000">
 		<sprite>equipment/weapons/gun.xml</sprite>
 		<sound event="hit">weapons/gunstaff/shot.ogg</sound>
@@ -7747,6 +7758,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		level="70"
 		type="equip-2hand"
 		attack-action="attack_bow"
+		critical-hit-effect-id="35"
 		weight="6000">
 		<sprite>equipment/weapons/bow.xml</sprite>
 		<sound event="hit">weapons/gunstaff/shot.ogg</sound>
diff --git a/sfx/system/critical.ogg b/sfx/system/critical.ogg
index 6968a8aa..e735f622 100644
--- a/sfx/system/critical.ogg
+++ b/sfx/system/critical.ogg
diff --git a/sfx/system/critical2.ogg b/sfx/system/critical2.ogg
new file mode 100644
index 00000000..6968a8aa
--- /dev/null
+++ b/sfx/system/critical2.ogg