Mercurial Mercurial > sheepy-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge 3 new sound effects added by Wuzzy
authorsheepluva
Thu, 28 Apr 2016 21:15:08 +0200
changeset 11771 abcdb7bc2620
parent 11769 54a1ac4123cd (current diff)
parent 11770 10860d4bca22 (diff)
child 11773 b58dd09ea950
merge 3 new sound effects added by Wuzzy
CREDITS file | annotate | diff | comparison | revisions
hedgewars/uGearsHandlersMess.pas file | annotate | diff | comparison | revisions
hedgewars/uSound.pas file | annotate | diff | comparison | revisions
hedgewars/uTypes.pas file | annotate | diff | comparison | revisions 
--- a/CREDITS	Thu Apr 28 20:28:53 2016 +0200
+++ b/CREDITS	Thu Apr 28 21:15:08 2016 +0200
@@ -73,6 +73,11 @@
      http://www.freesound.org/people/Edgar/sounds/162/
      http://www.freesound.org/people/Ionizing/sounds/22033/
      http://www.freesound.org/people/Jovica/sounds/38317/
-
+- Cleaver impact sound remixed from
+     http://www.freesound.org/people/sethlind/sounds/265021/
+- Extra Time sound originally by uair01 (CC-BY), remixed from
+     http://www.freesound.org/people/uair01/sounds/65291/
+- Air mine impact sound by Wuzzy (WTFPL), based on
+     http://www.freesound.org/people/batchku/sounds/10479/
 
 ALL OTHER CONTENT IS PROPERTY OF Andrey Korotaev <unC0Rr@gmail.com> UNLESS OTHERWISE SPECIFIED
--- a/hedgewars/uGearsHandlersMess.pas	Thu Apr 28 20:28:53 2016 +0200
+++ b/hedgewars/uGearsHandlersMess.pas	Thu Apr 28 21:15:08 2016 +0200
@@ -6244,8 +6244,6 @@
         if TestCollisionXwithGear(Gear, 1)  <> 0 then ox:=  1;
         if TestCollisionXwithGear(Gear, -1) <> 0 then ox:= -1;
         if TestCollisionYwithGear(Gear, 1)  <> 0 then oy:=  1;
-        if Gear^.Health > 0 then
-            PlaySound(sndRopeAttach);
 
         la:= _10000;
         if (ox <> 0) or (oy <> 0) then
@@ -6255,6 +6253,9 @@
             // debug for when we couldn't get an angle
             //AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeWhite);
 *)
+        if Gear^.Health > 0 then
+            PlaySound(Gear^.ImpactSound);
+
             Gear^.DirAngle:= DxDy2Angle(Gear^.dX, Gear^.dY) + (random(30)-15);
             if (Gear^.dX.isNegative and Gear^.dY.isNegative) or
              ((not Gear^.dX.isNegative) and (not Gear^.dY.isNegative)) then Gear^.DirAngle:= Gear^.DirAngle-90;
--- a/hedgewars/uGearsHedgehog.pas	Thu Apr 28 20:28:53 2016 +0200
+++ b/hedgewars/uGearsHedgehog.pas	Thu Apr 28 21:15:08 2016 +0200
@@ -386,7 +386,7 @@
                                  end;
                  amInvulnerable: Effects[heInvulnerable]:= 1;
                     amExtraTime: begin
-                                 PlaySound(sndSwitchHog);
+                                 PlaySound(sndExtraTime);
                                  TurnTimeLeft:= TurnTimeLeft + 30000
                                  end;
                    amLaserSight: cLaserSighting:= true;
--- a/hedgewars/uGearsList.pas	Thu Apr 28 20:28:53 2016 +0200
+++ b/hedgewars/uGearsList.pas	Thu Apr 28 21:15:08 2016 +0200
@@ -427,7 +427,7 @@
                     end
                 end;
      gtAirMine: begin
-                gear^.ImpactSound:= sndDenied;
+                gear^.ImpactSound:= sndAirMineImpact;
                 gear^.nImpactSounds:= 1;
                 gear^.Health:= 30;
                 gear^.State:= gear^.State or gstMoving or gstNoGravity or gstSubmersible;
@@ -459,6 +459,7 @@
                 if gear^.Timer = 0 then gear^.Timer:= 500;
                 end;
        gtKnife: begin
+                gear^.ImpactSound:= sndKnifeImpact;
                 gear^.AdvBounce:= 1;
                 gear^.Elasticity:= _0_8;
                 gear^.Friction:= _0_8;
--- a/hedgewars/uSound.pas	Thu Apr 28 20:28:53 2016 +0200
+++ b/hedgewars/uSound.pas	Thu Apr 28 21:15:08 2016 +0200
@@ -252,7 +252,10 @@
             (FileName:               'TARDIS.ogg'; Path: ptSounds),// sndTardis
             (FileName:    'frozen_hog_impact.ogg'; Path: ptSounds),// sndFrozenHogImpact
             (FileName:             'ice_beam.ogg'; Path: ptSounds),// sndIceBeam
-            (FileName:           'hog_freeze.ogg'; Path: ptSounds) // sndHogFreeze
+            (FileName:           'hog_freeze.ogg'; Path: ptSounds),// sndHogFreeze
+            (FileName:       'airmine_impact.ogg'; Path: ptSounds),// sndAirMineImpact
+            (FileName:         'knife_impact.ogg'; Path: ptSounds),// sndKnifeImpact
+            (FileName:            'extratime.ogg'; Path: ptSounds) // sndExtraTime
             );
 
 
--- a/hedgewars/uTypes.pas	Thu Apr 28 20:28:53 2016 +0200
+++ b/hedgewars/uTypes.pas	Thu Apr 28 21:15:08 2016 +0200
@@ -145,7 +145,7 @@
             sndPiano0, sndPiano1, sndPiano2, sndPiano3, sndPiano4, sndPiano5, sndPiano6, sndPiano7,
             sndPiano8, sndSkip, sndSineGun, sndOoff1, sndOoff2, sndOoff3, sndWhack,
             sndComeonthen, sndParachute, sndBump, sndResurrector, sndPlane, sndTardis, sndFrozenHogImpact,
-            sndIceBeam, sndHogFreeze
+            sndIceBeam, sndHogFreeze, sndAirMineImpact, sndKnifeImpact, sndExtraTime
             );
 
     // Available ammo types to be used by hedgehogs
Binary file share/hedgewars/Data/Sounds/airmine_impact.ogg has changed
Binary file share/hedgewars/Data/Sounds/extratime.ogg has changed
Binary file share/hedgewars/Data/Sounds/knife_impact.ogg has changed
sheepy-clone