diff --git a/src/sound/s_advsound.cpp b/src/sound/s_advsound.cpp index 55377525d..4678f5cf1 100644 --- a/src/sound/s_advsound.cpp +++ b/src/sound/s_advsound.cpp @@ -146,6 +146,8 @@ enum SICommands SI_Attenuation, SI_PitchSet, SI_ModPlayer, + SI_RumbleDef, + SI_Rumble, }; // Blood was a cool game. If Monolith ever releases the source for it, @@ -236,6 +238,8 @@ static const char *SICommandStrings[] = "$attenuation", "$pitchset", "$modplayer", + "$rumbledef", + "$rumble", nullptr }; @@ -345,6 +349,8 @@ void S_CheckIntegrity() sfx.link = NO_SOUND; // link to the empty sound. } } + + // Joy_ReadyRumbleMapping(); } //========================================================================== @@ -571,6 +577,8 @@ void S_ClearSoundData() MidiDevices.Clear(); HexenMusic.Clear(); ModPlayers.Clear(); + + // Joy_ResetRumbleMapping(); } //========================================================================== @@ -1133,6 +1141,63 @@ static void S_AddSNDINFO (int lump) case SI_IfHexen: skipToEndIf = !CheckGame(sc.String+3, true); break; + + case SI_RumbleDef: { + // $rumbledef + // $rumbledef + + sc.MustGetString(); + FString identifier (sc.String); + + sc.GetToken(); + bool isAlias = sc.TokenType == TK_Identifier; + sc.UnGet(); + + if (isAlias) + { + sc.MustGetString(); + // Joy_AddRumbleAlias(identifier, FName(sc.String)); + } + else + { + sc.MustGetNumber(); + int duration = sc.Number; + sc.MustGetFloat(); + double low_freq = sc.Float; + sc.MustGetFloat(); + double high_freq = sc.Float; + sc.MustGetFloat(); + double left_trig = sc.Float; + sc.MustGetFloat(); + double right_trig = sc.Float; + + // Joy_AddRumbleType( + // identifier, + // { duration, low_freq, high_freq, left_trig, right_trig, } + // ); + } + + // if (sc.CheckToken(TK_IntConst)) + // { + // } + // else + // { + // Printf("Alias: %s\n", identifier.GetChars()); + // } + } + break; + + case SI_Rumble: { + // $rumble + + sc.MustGetString(); + FString sound (sc.String); + sc.MustGetString(); + FString mapping (sc.String); + + // Joy_MapRumbleType(sound, mapping); + } + break; } } else diff --git a/wadsrc/static/filter/game-doomchex/sndinfo.txt b/wadsrc/static/filter/game-doomchex/sndinfo.txt index 4ecddbe6b..de76f3ee4 100644 --- a/wadsrc/static/filter/game-doomchex/sndinfo.txt +++ b/wadsrc/static/filter/game-doomchex/sndinfo.txt @@ -121,6 +121,24 @@ $playercompat player other *jump player/cyborg/jump1 $playercompat player other *gibbed player/cyborg/gibbed $playercompat player other *fist player/cyborg/fist +$rumble *death P_DEATH +$rumble *xdeath P_DEATH +$rumble *pain100 P_HURT +$rumble *pain75 P_HURT +$rumble *pain50 P_HURT +$rumble *pain25 P_HURT +$rumble *grunt P_GRUNT +$rumble *land P_GRUNT +$rumble *jump NONE +$rumble *gibbed P_DEATH +$rumble *fist P_FIST +$rumble *usefail P_GRUNT + +$rumbledef P_DEATH INTENSE +$rumbledef P_HURT HEAVY +$rumbledef P_GRUNT 2 .3 .6 .3 .3 +$rumbledef P_FIST 3 .6 .6 .6 .6 + // // Weapons // @@ -151,6 +169,34 @@ weapons/grbnce dsbounce weapons/grenlx dsgrnexp weapons/grenlf dsglaunc +$rumble weapons/sawup LIGHT +$rumble weapons/sawidle W_SAW_IDLE +$rumble weapons/sawfull W_SAW_FULL +$rumble weapons/sawhit W_SAW_FULL +$rumble weapons/pistol W_BULLET +$rumble weapons/shotgf W_SHELL +$rumble weapons/shotgr W_RELOAD // is this ever used? +$rumble weapons/sshotf W_SHELL +$rumble weapons/sshoto W_RELOAD +$rumble weapons/sshotc W_RELOAD +$rumble weapons/sshotl W_RELOAD +$rumble weapons/chngun W_BULLET +$rumble weapons/rocklx NONE +$rumble weapons/rocklf W_ROCKET +$rumble weapons/plasmaf W_ENERGY +$rumble weapons/plasmax NONE +$rumble weapons/bfgf W_BFG +$rumble weapons/bfgx NONE + +$rumbledef W_SAW_IDLE 1 0 .6 0 0 +$rumbledef W_SAW_FULL 4 .6 .6 .6 .6 +$rumbledef W_BULLET 3 .6 .6 .6 .6 +$rumbledef W_SHELL 6 .6 .6 .6 .6 +$rumbledef W_RELOAD 1 .3 .6 0 0 +$rumbledef W_ROCKET 6 .6 .6 .6 .6 +$rumbledef W_ENERGY 2 .6 .6 .6 .6 +$rumbledef W_BFG 35 .6 .6 .6 .6 + // Problem: weapons/rocklx needs to be unlimited but // is also used for the MAP30 brain explosion. // This alias remaps to the original but has its own limit @@ -436,6 +482,16 @@ switches/exitbutn dsswtchx misc/teleport dstelept +$rumble misc/secret SECRET +$rumble misc/w_pkup LIGHT +$rumble misc/p_pkup LIGHT +$rumble misc/i_pkup LIGHT +$rumble misc/k_pkup LIGHT +$rumble misc/teleport TELEPORT + +$rumbledef TELEPORT 35 .3 .6 0 0 +$rumbledef SECRET 35 .3 .6 0 0 + menu/activate dsswtchn // Activate a new menu menu/backup dsswtchn // Backup to previous menu menu/prompt dsswtchn // Activate a prompt "menu" @@ -450,6 +506,19 @@ $alias menu/advance menu/choose // Open a submenu $random menu/quit1 { player/male/death1 demon/pain grunt/pain misc/gibbed misc/teleport grunt/sight1 grunt/sight3 demon/melee } $random menu/quit2 { vile/active misc/p_pkup brain/cube misc/gibbed skeleton/swing knight/death baby/active demon/melee } +$rumble menu/activate HEAVY +$rumble menu/backup MEDIUM +$rumble menu/prompt MEDIUM +$rumble menu/cursor LIGHT +$rumble menu/change LIGHT +$rumble menu/invalid MEDIUM +$rumble menu/dismiss MEDIUM +$rumble menu/choose HEAVY +$rumble menu/clear MEDIUM +$rumble menu/advance HEAVY +$rumble menu/quit1 MEDIUM +$rumble menu/quit2 MEDIUM + $alias intermission/tick weapons/pistol $alias intermission/cooptotal *death $alias intermission/nextstage weapons/rocklx @@ -457,6 +526,12 @@ $alias intermission/paststats weapons/shotgr $alias intermission/pastcoopstats weapons/shotgr $alias intermission/pastdmstats *gibbed +$rumble intermission/tick LIGHT +$rumble intermission/cooptotal LIGHT +$rumble intermission/nextstage MEDIUM +$rumble intermission/paststats MEDIUM +$rumble intermission/pastcoopstats MEDIUM +$rumble intermission/pastdmstats MEDIUM // id24 sounds @@ -517,3 +592,17 @@ weapons/incinerator/hot3 dsincht3 weapons/calamityblade/charge dshetchg weapons/calamityblade/shoot dshetsht weapons/calamityblade/explode dshetxpl + +$rumble weapons/incinerator/fire1 W_FIRE_FIRE +$rumble weapons/incinerator/fire2 W_FIRE_FIRE +$rumble weapons/incinerator/burn NONE +$rumble weapons/incinerator/hot1 NONE +$rumble weapons/incinerator/hot2 NONE +$rumble weapons/incinerator/hot3 NONE +$rumble weapons/calamityblade/charge W_FIRE_CHARGE +$rumble weapons/calamityblade/shoot W_FIRE_FIRE +$rumble weapons/calamityblade/explode NONE +$rumble weapons/unmaker W_ENERGY // from Doom64CE + +$rumbledef W_FIRE_CHARGE 2 .4 .4 .4 .4 +$rumbledef W_FIRE_FIRE 4 .6 .6 .6 .6 diff --git a/wadsrc/static/filter/game-heretic/sndinfo.txt b/wadsrc/static/filter/game-heretic/sndinfo.txt index 60a0cda6f..fea8cad22 100644 --- a/wadsrc/static/filter/game-heretic/sndinfo.txt +++ b/wadsrc/static/filter/game-heretic/sndinfo.txt @@ -38,6 +38,26 @@ chicken/attack chicatk misc/burn hedat1 +$rumble *wimpydeath P_DEATH +$rumble *death P_DEATH +$rumble *crazydeath P_DEATH +$rumble *gibbed P_DEATH +$rumble *pain100 P_HURT +$rumble *pain75 P_HURT +$rumble *pain50 P_HURT +$rumble *pain25 P_HURT +$rumble *weaponlaugh LIGHT +$rumble *evillaugh LIGHT +$rumble *grunt P_GRUNT +$rumble *usefail P_GRUNT +$rumble *land P_GRUNT +$rumble *jump NONE +$rumble *burndeath P_DEATH + +$rumbledef P_DEATH INTENSE +$rumbledef P_HURT HEAVY +$rumbledef P_GRUNT 2 .3 .6 .3 .3 + weapons/staffhit stfhit weapons/staffpowerhit stfpow weapons/staffcrackle stfcrk @@ -80,6 +100,43 @@ $limit weapons/hornrodshoot 0 $limit weapons/hornrodhit 0 $limit weapons/maceshoot 0 +$rumble weapons/staffhit W_STAFF +$rumble weapons/staffpowerhit W_STAFF +$rumble weapons/staffcrackle NONE +$rumble weapons/wandhit W_CRYSTAL +$rumble weapons/bowshoot W_ARROW +$rumble weapons/bowhit NONE +$rumble weapons/gauntletsactivate NONE +$rumble weapons/gauntletsuse NONE +$rumble weapons/gauntletson W_GAUNTLET_IDLE +$rumble weapons/gauntletshit W_GAUNTLET_FULL +$rumble weapons/gauntletspowhit W_GAUNTLET_FULL +$rumble weapons/maceshoot W_SPHERE +$rumble weapons/macebounce NONE +$rumble weapons/macehit NONE +$rumble weapons/macestop NONE +$rumble weapons/maceexplode NONE +$rumble weapons/blasterhit NONE +$rumble weapons/blasterpowhit NONE +$rumble weapons/blastershoot W_ENERGY_ORB +$rumble weapons/hornrodshoot W_RUNE +$rumble weapons/hornrodhit NONE +$rumble weapons/hornrodpowshoot W_RUNE +$rumble weapons/hornrodpowhit NONE +$rumble weapons/phoenixhit NONE +$rumble weapons/phoenixshoot W_INFERNO_ORB +$rumble weapons/phoenixpowshoot W_INFERNO_ORB + +$rumbledef W_STAFF 2 .6 .6 .6 .6 +$rumbledef W_GAUNTLET_IDLE 1 0 .6 0 0 +$rumbledef W_GAUNTLET_FULL 4 .6 .6 .6 .6 +$rumbledef W_CRYSTAL 2 .6 .6 .6 .6 +$rumbledef W_ARROW 2 .6 .6 .6 .6 +$rumbledef W_SPHERE 3 .6 .6 .6 .6 +$rumbledef W_ENERGY_ORB 3 .6 .6 .6 .6 +$rumbledef W_RUNE 3 .6 .6 .6 .6 +$rumbledef W_INFERNO_ORB 3 .6 .6 .6 .6 + himp/sight impsit himp/attack impat1 himp/pain imppai @@ -91,6 +148,8 @@ misc/invuse artiuse $limit misc/invuse 1 +$rumble misc/invuse LIGHT + world/podexplode podexp world/podgrow newpod world/wind wind @@ -110,6 +169,11 @@ misc/spawn respawn $limit misc/spawn 1 +$rumble misc/i_pkup LIGHT +$rumble misc/k_pkup LIGHT +$rumble misc/p_pkup LIGHT +$rumble misc/w_pkup LIGHT + // // Minotaur sounds // @@ -197,6 +261,10 @@ misc/ripslop ripslop $limit misc/chat 1 +$rumble misc/teleport TELEPORT + +$rumbledef TELEPORT 35 .3 .6 0 0 + world/drip gloop world/watersplash gloop world/lavasizzle burn @@ -285,10 +353,31 @@ menu/dismiss dorcls menu/clear dorcls $alias menu/advance menu/choose +$rumble menu/activate HEAVY +$rumble menu/backup MEDIUM +$rumble menu/prompt MEDIUM +$rumble menu/choose HEAVY +$rumble menu/cursor LIGHT +$rumble menu/change LIGHT +$rumble menu/invalid MEDIUM +$rumble menu/dismiss MEDIUM +$rumble menu/clear MEDIUM +$rumble menu/advance HEAVY + misc/secret dssecret +$rumble misc/secret SECRET + +$rumbledef SECRET 35 .3 .6 0 0 + $alias intermission/cooptotal *death $alias intermission/nextstage doors/dr1_clos $alias intermission/paststats plats/pt1_stop $alias intermission/pastcoopstats plats/pt1_stop $alias intermission/pastdmstats *gibbed + +$rumble intermission/cooptotal LIGHT +$rumble intermission/nextstage MEDIUM +$rumble intermission/paststats MEDIUM +$rumble intermission/pastcoopstats MEDIUM +$rumble intermission/pastdmstats MEDIUM diff --git a/wadsrc/static/filter/game-hexen/sndinfo.txt b/wadsrc/static/filter/game-hexen/sndinfo.txt index 06598288c..b6d92439d 100644 --- a/wadsrc/static/filter/game-hexen/sndinfo.txt +++ b/wadsrc/static/filter/game-hexen/sndinfo.txt @@ -82,6 +82,46 @@ $playeralias pig male *poison PigActive2 $playeralias pig male *falling PigPain $playeralias pig male *splat PigDeath +$playeralias fighter male *death PlayerFighterNormalDeath +$playeralias fighter male *crazydeath PlayerFighterCrazyDeath +$playeralias fighter male *burndeath PlayerFighterBurnDeath +$playeralias fighter male *xdeath PlayerFighterExtremeDeathPicker +$playeralias fighter male *pain100 PlayerFighterPain +$playersounddup fighter male *pain75 *pain100 +$playersounddup fighter male *pain50 *pain100 +$playersounddup fighter male *pain25 *pain100 +$playeralias fighter male *grunt PlayerFighterGrunt +$playeralias fighter male *land PlayerLand +$playeralias fighter male *poison PlayerPoisonCough +$playeralias fighter male *falling PlayerFighterFallingScream +$playeralias fighter male *splat PlayerFallingSplat +$playeralias fighter male *usefail PlayerFighterFailedUse +$playeralias fighter male *puzzfail PuzzleFailFighter +$playersound fighter male *jump fgtjump +$playeralias fighter male *fistgrunt FighterGrunt + +$rumble *death P_DEATH +$rumble *crazydeath P_DEATH +$rumble *burndeath P_DEATH +$rumble *xdeath P_DEATH +$rumble *pain100 P_HURT +$rumble *pain75 P_HURT +$rumble *pain50 P_HURT +$rumble *pain25 P_HURT +$rumble *grunt P_GRUNT +$rumble *land P_GRUNT +$rumble *poison P_GRUNT +$rumble *falling P_GRUNT +$rumble *splat P_GRUNT +$rumble *usefail P_GRUNT +$rumble *puzzfail P_GRUNT +$rumble *jump NONE +$rumble *fistgrunt P_GRUNT + +$rumbledef P_DEATH INTENSE +$rumbledef P_HURT HEAVY +$rumbledef P_GRUNT 2 .3 .6 .3 .3 + $alias world/drip Ambient10 $alias world/watersplash WaterSplash $alias world/lavasizzle LavaSizzle @@ -90,6 +130,10 @@ $alias world/wind Wind $alias world/quake Earthquake $alias world/thunder ThunderCrash +$rumble world/quake QUAKE + +$rumbledef QUAKE 2 1 1 0 0 + $alias misc/w_pkup PickupWeapon $alias misc/p_pkup PickupArtifact $alias misc/k_pkup PickupKey @@ -101,6 +145,16 @@ $alias misc/invuse UseArtifact $alias misc/freeze FreezeDeath $alias misc/icebreak FreezeShatter +$rumble misc/w_pkup LIGHT +$rumble misc/p_pkup LIGHT +$rumble misc/k_pkup LIGHT +$rumble misc/i_pkup LIGHT +$rumble misc/teleport TELEPORT +$rumble misc/keytry LIGHT +$rumble misc/invuse LIGHT + +$rumbledef TELEPORT 35 .3 .6 0 0 + $alias misc/chat Chat $alias misc/chat2 Chat @@ -156,6 +210,10 @@ $pitchshift PickupPiece 0 $pitchshift WeaponBuild 0 $pitchshift BellRing 0 +$rumble MysticIncant HEAVY +$rumble WeaponBuild LIGHT +$rumble BlastRadius NONE + $alias menu/activate DoorCloseLight $alias menu/backup PickupKey $alias menu/prompt Chat @@ -167,17 +225,39 @@ $alias menu/choose DoorCloseLight $alias menu/clear PlatformStop $alias menu/advance menu/choose +$rumble menu/activate HEAVY +$rumble menu/backup MEDIUM +$rumble menu/prompt MEDIUM +$rumble menu/cursor LIGHT +$rumble menu/change LIGHT +$rumble menu/invalid MEDIUM +$rumble menu/dismiss MEDIUM +$rumble menu/choose HEAVY +$rumble menu/clear MEDIUM +$rumble menu/advance HEAVY + // Hexen does not have ripslop sound like Heretic misc/ripslop dsempty misc/netnotch blddrp1 misc/secret dssecret +$rumble misc/ripslop NONE +$rumble misc/secret SECRET + +$rumbledef SECRET 35 .3 .6 0 0 + $alias intermission/cooptotal *death $alias intermission/nextstage DoorCloseLight $alias intermission/paststats PlatformStop $alias intermission/pastcoopstats PlatformStop $alias intermission/pastdmstats *gibbed +$rumble intermission/cooptotal LIGHT +$rumble intermission/nextstage MEDIUM +$rumble intermission/paststats MEDIUM +$rumble intermission/pastcoopstats MEDIUM +$rumble intermission/pastdmstats MEDIUM + $limit DoorCloseLight 4 $limit PuppyBeat 0 @@ -191,3 +271,53 @@ $limit EttinPain 0 $limit FireDemonPain 0 $limit SorcererPain 0 $limit DragonPain 0 + +$rumble FighterPunchMiss NONE +$rumble FighterPunchHitWall W_F_PUNCH +$rumble FighterPunchHitThing W_F_PUNCH +$rumble FighterAxeHitThing W_F_AXE +$rumble FighterHammerMiss W_F_HAMMER +$rumble FighterHammerHitWall W_F_HAMMER +$rumble FighterHammerHitThing W_F_HAMMER +$rumble FighterHammerContinuous NONE +$rumble FighterHammerExplode NONE +$rumble FighterSwordFire W_F_SWORD +$rumble FighterSwordExplode NONE + +$rumble ClericCStaffFire W_C_STAFF +$rumble ClericCStaffExplode W_C_STAFF +$rumble ClericCStaffHitThing W_C_MELEE +$rumble ClericFlameFire W_C_FLAME +$rumble ClericFlameExplode W_C_FLAME +$rumble ClericFlameCircle NONE +$rumble HolySymbolFire W_C_SYMBOL +$rumble SpiritActive NONE +$rumble SpiritAttack NONE +$rumble SpiritDie NONE + +$rumble MageWandFire W_M_WAND +$rumble MageLightningFire W_M_LIGHTNING +$rumble MageLightningContinuous NONE +$rumble MageLightningReady NONE +$rumble MageLightningZap NONE +$rumble MageShardsFire W_M_SHARD +$rumble MageShardsExplode NONE +$rumble MageStaffFire W_M_STAFF +$rumble MageStaffExplode NONE + +$rumble PigActive W_P_BITE +$rumble PigAttack W_P_BITE + +$rumbledef W_F_PUNCH 2 .6 .6 .6 .6 +$rumbledef W_F_AXE 3 .6 .6 .6 .6 +$rumbledef W_F_HAMMER 4 .6 .6 .6 .6 +$rumbledef W_F_SWORD 2 .6 .6 .6 .6 +$rumbledef W_C_MELEE 2 .6 .6 .6 .6 +$rumbledef W_C_STAFF 3 .6 .6 .6 .6 +$rumbledef W_C_FLAME 3 .6 .6 .6 .6 +$rumbledef W_C_SYMBOL 4 .6 .6 .6 .6 +$rumbledef W_M_WAND 2 .6 .6 .6 .6 +$rumbledef W_M_LIGHTNING 4 .6 .6 .6 .6 +$rumbledef W_M_SHARD 2 .6 .6 .6 .6 +$rumbledef W_M_STAFF 4 .6 .6 .6 .6 +$rumbledef W_P_BITE 2 .6 .6 .6 .6 diff --git a/wadsrc/static/filter/game-strife/sndinfo.txt b/wadsrc/static/filter/game-strife/sndinfo.txt index f029373dd..e59a7db67 100644 --- a/wadsrc/static/filter/game-strife/sndinfo.txt +++ b/wadsrc/static/filter/game-strife/sndinfo.txt @@ -46,6 +46,24 @@ $playersound player other *jump dscjump $playersound player other *fist dspunch $playersound player other *usefail dscnoway +$rumble *death P_DEATH +$rumble *xdeath P_DEATH +$rumble *gibbed P_DEATH +$rumble *pain100 P_HURT +$rumble *pain75 P_HURT +$rumble *pain50 P_HURT +$rumble *pain25 P_HURT +$rumble *grunt P_GRUNT +$rumble *land P_GRUNT +$rumble *jump NONE +$rumble *fist P_FIST +$rumble *usefail P_GRUNT + +$rumbledef P_DEATH INTENSE +$rumbledef P_HURT HEAVY +$rumbledef P_GRUNT 2 .3 .6 .3 .3 +$rumbledef P_FIST 3 .6 .6 .6 .6 + weapons/xbowshoot dsxbow weapons/xbowhit dsfirxpl weapons/assaultgun dsrifle @@ -65,6 +83,37 @@ weapons/sigil dssigil weapons/sigilhit dssglhit weapons/sigilcharge dssiglup +$rumble weapons/xbowshoot W_BOLT +$rumble weapons/xbowhit NONE +$rumble weapons/assaultgun W_BULLET +$rumble weapons/minimissile W_ROCKET +$rumble weapons/minimissilehit NONE +$rumble weapons/flamethrower W_FLAME +$rumble weapons/flameidle W_FLAME_IDLE +$rumble weapons/mauler1 W_MAULER +$rumble weapons/mauler2charge W_MAULER_CHARGE +$rumble weapons/mauler2fire W_MAULER_ALT +$rumble weapons/mauler2hit NONE +$rumble weapons/hegrenadeshoot W_GRENADE +$rumble weapons/hegrenadebang NONE +$rumble weapons/phgrenadeshoot W_GRENADE +$rumble weapons/phgrenadebang NONE +$rumble weapons/sigil W_SIGIL +$rumble weapons/sigilhit NONE +$rumble weapons/sigilcharge W_SIGIL_CHARGE + +$rumbledef W_BULLET 3 .6 .6 .6 .6 +$rumbledef W_BOLT 6 .2 .4 .4 .4 +$rumbledef W_GRENADE 6 .2 .4 0 .4 +$rumbledef W_FLAME_IDLE 1 0 .3 0 0 +$rumbledef W_FLAME 6 .4 .6 .6 .6 +$rumbledef W_MAULER_CHARGE 3 .3 .3 .3 .3 +$rumbledef W_MAULER_ALT 6 .6 .6 .6 .6 +$rumbledef W_MAULER 6 .6 .6 .6 .6 +$rumbledef W_SIGIL 18 .6 .6 .6 .6 +$rumbledef W_SIGIL_CHARGE 4 .6 .6 .6 .6 +$rumbledef W_ROCKET 6 .6 .6 .6 .6 + monsters/rifle dsrifle switches/normbutn dsswtchn @@ -109,6 +158,17 @@ menu/choose dsrifl // Choose a menu item menu/clear dsmtalht // Close top menu $alias menu/advance menu/choose +$rumble menu/activate HEAVY +$rumble menu/backup MEDIUM +$rumble menu/prompt MEDIUM +$rumble menu/cursor LIGHT +$rumble menu/change LIGHT +$rumble menu/invalid MEDIUM +$rumble menu/dismiss MEDIUM +$rumble menu/choose HEAVY +$rumble menu/clear MEDIUM +$rumble menu/advance HEAVY + misc/startupdone dspsdtha misc/teleport dstelept misc/swish dsswish @@ -135,6 +195,25 @@ misc/chat dsradio misc/invuse dsitemup misc/mask dsmask +$rumble misc/startupdone MEDIUM +$rumble misc/teleport TELEPORT +$rumble misc/swish LIGHT +$rumble misc/meathit W_MELEE +$rumble misc/metalhit W_MELEE +$rumble misc/missileinflight NONE +$rumble misc/disruptordeath NONE +$rumble misc/secret SECRET +$rumble misc/w_pkup LIGHT +$rumble misc/p_pkup LIGHT +$rumble misc/i_pkup LIGHT +$rumble misc/k_pkup LIGHT +$rumble misc/invuse LIGHT +$rumble misc/mask NONE + +$rumbledef W_MELEE 3 .6 .6 .6 .6 +$rumbledef TELEPORT 35 .3 .6 0 0 +$rumbledef SECRET 35 .3 .6 0 0 + plats/pt1_strt dspstart plats/pt1_stop dspstop plats/pt1_mid dsstnmov @@ -314,3 +393,10 @@ $alias intermission/nextstage misc/explosion $alias intermission/paststats world/barrelx $alias intermission/pastcoopstats world/barrelx $alias intermission/pastdmstats *gibbed + +$rumble intermission/tick LIGHT +$rumble intermission/cooptotal LIGHT +$rumble intermission/nextstage MEDIUM +$rumble intermission/paststats MEDIUM +$rumble intermission/pastcoopstats MEDIUM +$rumble intermission/pastdmstats MEDIUM diff --git a/wadsrc/static/sndinfo.txt b/wadsrc/static/sndinfo.txt index c680201d6..cc2a9ff7e 100644 --- a/wadsrc/static/sndinfo.txt +++ b/wadsrc/static/sndinfo.txt @@ -258,3 +258,36 @@ dehextra/sound196 dsfre196 dehextra/sound197 dsfre197 dehextra/sound198 dsfre198 dehextra/sound199 dsfre199 + +// define set of rumble routines to be mapped later +$rumbledef INTENSE 35 .6 .6 .6 .6 +$rumbledef HEAVY 4 .6 .6 .6 .6 +$rumbledef MEDIUM 3 .4 .5 .4 .4 +$rumbledef LIGHT 2 .2 .4 .3 .3 +$rumbledef SUBTLE 2 .1 .3 0 0 +$rumbledef NONE 0 0 0 0 0 +$rumbledef QUAKE 2 1 1 0 0 +$rumbledef SECRET 35 .3 .6 0 0 + +// these exist hard-coded +// if the corresponding sounds also exist in game specific +// sndinfo files, they are overwritten there +$rumble world/quake QUAKE +$rumble misc/teleport SECRET +$rumble misc/startupdone MEDIUM +$rumble misc/push SUBTLE +$rumble misc/pushed SUBTLE +$rumble misc/i_pkup LIGHT +$rumble menu/activate HEAVY +$rumble menu/invalid MEDIUM +$rumble menu/dismiss MEDIUM +$rumble menu/choose HEAVY +$rumble menu/change LIGHT +$rumble menu/cursor LIGHT +$rumble misc/secret SECRET +$rumble menu/cursor LIGHT +$rumble *death INTENSE +$rumble *usesuccess MEDIUM +$rumble *grunt MEDIUM +$rumble *land MEDIUM +$rumble *pain HEAVY