diff options
| author | Led Mitz <smoothshifter@tuta.io> | 2023-08-02 16:38:27 +0000 |
|---|---|---|
| committer | Led Mitz <smoothshifter@tuta.io> | 2023-08-02 16:38:27 +0000 |
| commit | 2505b2769205474ecb8f6aef05122ee2086760d9 (patch) | |
| tree | 5faf21c72e23b3f81822fd11b801fde0bdb0f1f8 | |
| parent | fab3f9f454606d9c5c0cd32541054f714e391435 (diff) | |
| parent | 598e8715817d844bee7d19045b41781f55246b76 (diff) | |
| download | clientdata-stable.tar.gz clientdata-stable.tar.bz2 clientdata-stable.tar.xz clientdata-stable.zip | |
Merge branch 'gun_misses' into 'master'stable
gun misses make ricochets
See merge request legacy/clientdata!545
| -rw-r--r-- | items/equip-1hand/item5284_Revolver.xml | 6 | ||||
| -rw-r--r-- | license.md | 5 | ||||
| -rw-r--r-- | sfx/weapons/gun/gun-hit1.ogg (renamed from sfx/weapons/gun/shot.ogg) | bin | 6049 -> 6049 bytes | |||
| -rw-r--r-- | sfx/weapons/gun/gun-miss1.ogg | bin | 0 -> 7486 bytes | |||
| -rw-r--r-- | sfx/weapons/gun/gun-miss2.ogg | bin | 0 -> 7653 bytes | |||
| -rw-r--r-- | sfx/weapons/gun/gun-miss3.ogg | bin | 0 -> 7215 bytes |
6 files changed, 8 insertions, 3 deletions
diff --git a/items/equip-1hand/item5284_Revolver.xml b/items/equip-1hand/item5284_Revolver.xml index 9789f779..cd555faa 100644 --- a/items/equip-1hand/item5284_Revolver.xml +++ b/items/equip-1hand/item5284_Revolver.xml @@ -17,7 +17,9 @@ sellProtected="true" weight="3000"> <sprite>equipment/weapons/gun.xml</sprite> - <sound event="hit">weapons/gun/shot.ogg</sound> - <sound event="miss">weapons/gun/shot.ogg</sound> + <sound event="hit">weapons/gun/gun-hit1.ogg</sound> + <sound event="miss">weapons/gun/gun-miss1.ogg</sound> + <sound event="miss">weapons/gun/gun-miss2.ogg</sound> + <sound event="miss">weapons/gun/gun-miss3.ogg</sound> </item> </items> @@ -1412,7 +1412,10 @@ File | Artists | Licenses `sfx/weapons/bows/short/short-miss1.ogg` | Ledmitz (arrow_whoosh.ogg / smcameron / CC BY 3.0) | GPLv2, CC BY-SA 3.0 `sfx/weapons/bows/bow-hit1.ogg` | Ledmitz (arrow_whoosh.ogg / smcameron / CC BY 3.0) | GPLv2, CC BY-SA 3.0 `sfx/weapons/bows/bow-miss1.ogg` | Ledmitz (arrow_whoosh.ogg / smcameron / CC BY 3.0) | GPLv2, CC BY-SA 3.0 -`sfx/weapons/gunstaff/shot.ogg` | Bird-Man, Freesound.org, Jesusalva | CC 0 +`sfx/weapons/gun/gun-hit1.ogg` | Bird-Man, Freesound.org(shot), Jesusalva | CC 0 +`sfx/weapons/gun/gun-miss1.ogg` | Bird-Man, Freesound.org(shot), craigsmith, Freesound.org(Rifle ricochets), Jesusalva, Ledmitz | CC 0 +`sfx/weapons/gun/gun-miss2.ogg` | Bird-Man, Freesound.org(shot), craigsmith, Freesound.org(Rifle ricochets), Jesusalva, Ledmitz | CC 0 +`sfx/weapons/gun/gun-miss3.ogg` | Bird-Man, Freesound.org(shot), craigsmith, Freesound.org(Rifle ricochets), Jesusalva, Ledmitz | CC 0 `sfx/weapons/knives/knife-hit1.ogg` | Cosmostrator | GPLv2 `sfx/weapons/knives/knife-miss1.ogg` | Cosmostrator | GPLv2 `sfx/weapons/knives/rock/rock-hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 diff --git a/sfx/weapons/gun/shot.ogg b/sfx/weapons/gun/gun-hit1.ogg Binary files differindex 70f7c6ed..70f7c6ed 100644 --- a/sfx/weapons/gun/shot.ogg +++ b/sfx/weapons/gun/gun-hit1.ogg diff --git a/sfx/weapons/gun/gun-miss1.ogg b/sfx/weapons/gun/gun-miss1.ogg Binary files differnew file mode 100644 index 00000000..da792609 --- /dev/null +++ b/sfx/weapons/gun/gun-miss1.ogg diff --git a/sfx/weapons/gun/gun-miss2.ogg b/sfx/weapons/gun/gun-miss2.ogg Binary files differnew file mode 100644 index 00000000..b3d5aaaa --- /dev/null +++ b/sfx/weapons/gun/gun-miss2.ogg diff --git a/sfx/weapons/gun/gun-miss3.ogg b/sfx/weapons/gun/gun-miss3.ogg Binary files differnew file mode 100644 index 00000000..7dcb6fa8 --- /dev/null +++ b/sfx/weapons/gun/gun-miss3.ogg |