justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Continue tweaking sounds

Browse Source
This commit is contained in:
justin
2025-06-22 14:32:53 +01:00
parent a109d54d96
commit 2553239882
5 changed files with 264 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
saveSlot/LevelStart0
+1 -1
View File
File diff suppressed because one or more lines are too long
src/Dodge/Creature/Damage.hs
+1 -1
View File
@@ -49,7 +49,7 @@ applyCreatureDamage dms cr w = foldl' (applyIndividualDamage cr) w dms
--p = _dmAt dm
applyIndividualDamage :: Creature -> World -> Damage -> World
applyIndividualDamage cr w dm = damageMaterial dm (crMaterial (_crType cr)) (Left cr) $
applyIndividualDamage cr w dm = damMatSideEffect dm (crMaterial (_crType cr)) (Left cr) $
case dm of
Piercing{} -> applyPiercingDamage cr dm w
_ -> w & damageHP cr (_dmAmount dm)
src/Dodge/Material/Damage.hs
+12 -9
View File
@@ -1,4 +1,4 @@
module Dodge.Material.Damage (damageMaterial) where
module Dodge.Material.Damage (damMatSideEffect) where
import Color
import Control.Lens
@@ -11,8 +11,8 @@ import RandomHelp
type ECW = Either Creature Wall
damageMaterial :: Damage -> Material -> ECW -> World -> World
damageMaterial dm mt = case mt of
damMatSideEffect :: Damage -> Material -> ECW -> World -> World
damMatSideEffect dm mt = case mt of
Stone -> damageStone dm
Metal -> damageMetal dm
Flesh -> damageFlesh dm
@@ -56,10 +56,10 @@ damageStone dm ecw w =
damageMetal :: Damage -> ECW -> World -> World
damageMetal dm ecw w =
w & case dm of
Lasering _ p t -> makeSpark FireSpark (outTo p t) (argV $ reflectIn v t)
Lasering _ p t -> makeSpark FireSpark (outTo p t) (rdir p t)
Piercing _ p t ->
makeSpark NormalSpark (outTo p t) (argV $ reflectIn v t)
. randsound p [tingS, ting1S, ting2S, ting3S]
makeSpark NormalSpark (outTo p t) (rdir p t)
. randsound p [tingS, ting1S, ting2S, ting3S, ting4S, ting5S]
Blunt _ p t -> id
Shattering _ p t -> id
Crushing{} -> id
@@ -71,9 +71,11 @@ damageMetal dm ecw w =
Enterrement{} -> id
Flashing{} -> id
where
v = case ecw of
Right wl -> uncurry (-) $ _wlLine wl
Left cr -> undefined
rdir p t = argV $ reflectIn v t
where
v = case ecw of
Right wl -> uncurry (-) $ _wlLine wl
Left cr -> vNormal (p - _crPos cr)
outTo x t = x -.- squashNormalizeV t
randsound p xs =
let (x, g) = runState (takeOne xs) $ _randGen w
@@ -95,6 +97,7 @@ damageFlesh dm ecw w = w & case dm of
, bloodShort7S
, bloodShort8S
]
. smokeCloudAt red 20 200 1 (addZ 20 (outTo p t))
Blunt _ p t -> id
Shattering _ p t -> id
Crushing{} -> id
src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs
+249 -239
View File
@@ -1,4 +1,4 @@
-- generated at 2025-06-22 08:15:19.247090086 UTC
-- generated at 2025-06-22 13:29:03.952552964 UTC
module Dodge.SoundLogic.ExternallyGeneratedSounds where
import Sound.Data
soundToVol :: SoundID -> Float
@@ -42,89 +42,91 @@ soundToVol v = case _getSoundID v of
36 -> 100
37 -> 100
38 -> 1000
39 -> 1000
40 -> 40
41 -> 400
42 -> 2000
43 -> 100
44 -> 300
45 -> 50
46 -> 2000
47 -> 50
48 -> 1000
49 -> 8000
50 -> 2000
39 -> 200
40 -> 1000
41 -> 40
42 -> 400
43 -> 2000
44 -> 100
45 -> 300
46 -> 50
47 -> 2000
48 -> 50
49 -> 1000
50 -> 8000
51 -> 2000
52 -> 1000
53 -> 200
54 -> 2000
55 -> 100
52 -> 2000
53 -> 1000
54 -> 200
55 -> 2000
56 -> 100
57 -> 40
58 -> 100
59 -> 40
60 -> 2000
61 -> 100
62 -> 500
63 -> 40
64 -> 100
65 -> 300
57 -> 100
58 -> 40
59 -> 100
60 -> 40
61 -> 2000
62 -> 100
63 -> 500
64 -> 40
65 -> 100
66 -> 300
67 -> 100
68 -> 2000
69 -> 1000
67 -> 300
68 -> 100
69 -> 2000
70 -> 1000
71 -> 1000
72 -> 100
72 -> 1000
73 -> 100
74 -> 1000
74 -> 100
75 -> 1000
76 -> 40
77 -> 50
78 -> 1000
79 -> 500
76 -> 1000
77 -> 40
78 -> 50
79 -> 1000
80 -> 500
81 -> 100
81 -> 500
82 -> 100
83 -> 1000
84 -> 20
85 -> 500
86 -> 300
87 -> 200
88 -> 500
89 -> 1000
90 -> 200
91 -> 1000
92 -> 2000
93 -> 500
94 -> 200
95 -> 100
96 -> 1000
97 -> 300
98 -> 2000
83 -> 100
84 -> 1000
85 -> 20
86 -> 500
87 -> 300
88 -> 200
89 -> 500
90 -> 1000
91 -> 200
92 -> 1000
93 -> 2000
94 -> 500
95 -> 200
96 -> 100
97 -> 1000
98 -> 300
99 -> 2000
100 -> 100
101 -> 500
102 -> 2000
103 -> 100
104 -> 300
105 -> 1000
106 -> 200
107 -> 100
108 -> 1000
109 -> 2000
110 -> 1000
111 -> 100
112 -> 200
113 -> 500
114 -> 100
115 -> 2000
116 -> 1000
117 -> 2000
118 -> 2000
119 -> 200
120 -> 100
100 -> 2000
101 -> 100
102 -> 500
103 -> 2000
104 -> 100
105 -> 300
106 -> 1000
107 -> 200
108 -> 100
109 -> 1000
110 -> 2000
111 -> 1000
112 -> 100
113 -> 200
114 -> 500
115 -> 100
116 -> 2000
117 -> 200
118 -> 1000
119 -> 2000
120 -> 2000
121 -> 200
122 -> 100
123 -> 200
_ -> 50
soundToOnomato :: SoundID -> String
soundToOnomato v = case _getSoundID v of
@@ -167,89 +169,91 @@ soundToOnomato v = case _getSoundID v of
36 -> "CLCLH"
37 -> "THUD"
38 -> "TRWNG"
39 -> "CRASH"
40 -> "TAPTIP"
41 -> "CRNKCRNKCRNK"
42 -> "CHUGUGUG"
43 -> "SKWLL"
44 -> "WRRR"
45 -> "HSSS"
46 -> "BOOM"
47 -> "HSS"
48 -> "TAKH"
49 -> "RINGGG"
50 -> "CRH"
51 -> "UGGAUGGA"
52 -> "CRUMPLE"
53 -> "TING"
54 -> "CREUH"
55 -> "KKSQWL"
56 -> "SMACK"
57 -> "CLICK"
58 -> "SPRT"
59 -> "TIPTOP"
60 -> "CRUH"
61 -> "CHNKCHNKCHUNK"
62 -> "CLKCLK"
63 -> "TIPTAP"
64 -> "SKWLCH"
65 -> "TNKTNKTNK"
66 -> "CHPCHPCHP"
67 -> "SLP"
68 -> "SCREE"
69 -> "DHDHL"
70 -> "BRAP"
71 -> "CRSK"
72 -> "SPLRT"
73 -> "SKWLL"
74 -> "CRNKL"
75 -> "TRNKL"
76 -> "TAPP"
77 -> "SHUHP"
78 -> "CRUMBL"
79 -> "DEDEDUM"
80 -> "TAK"
81 -> "SPLRT"
82 -> "SQLEE"
83 -> "CRISH"
84 -> "SWSH"
85 -> "BIPBIPBIP"
86 -> "BEP"
87 -> "CRSKRL"
88 -> "KRTNKL"
89 -> "CRSNK"
90 -> "SHTCK"
91 -> "TTRKL"
92 -> "UGGAUGGA"
93 -> "DUDURAH"
94 -> "TING"
95 -> "KKSQWL"
96 -> "CRMPL"
97 -> "BWEP"
98 -> "CHUGUGUG"
99 -> "BANG"
100 -> "SLPP"
101 -> "DEDA"
102 -> "WHSSH"
103 -> "HNH"
104 -> "BWAH"
105 -> "CRUNK"
106 -> "SQWLTCH"
107 -> "DRR"
108 -> "TRNKL"
109 -> "BRAP"
110 -> "BLPCHCH"
111 -> "SKLE"
112 -> "ZMM"
113 -> "WRRR"
114 -> "FWUMP"
115 -> "BRAHCHCH"
116 -> "BWMP"
117 -> "BRPBRPBRP"
118 -> "WE-OH"
119 -> "THCK"
120 -> "FHP"
121 -> "QWLPH"
39 -> "TING"
40 -> "CRASH"
41 -> "TAPTIP"
42 -> "CRNKCRNKCRNK"
43 -> "CHUGUGUG"
44 -> "SKWLL"
45 -> "WRRR"
46 -> "HSSS"
47 -> "BOOM"
48 -> "HSS"
49 -> "TAKH"
50 -> "RINGGG"
51 -> "CRH"
52 -> "UGGAUGGA"
53 -> "CRUMPLE"
54 -> "TING"
55 -> "CREUH"
56 -> "KKSQWL"
57 -> "SMACK"
58 -> "CLICK"
59 -> "SPRT"
60 -> "TIPTOP"
61 -> "CRUH"
62 -> "CHNKCHNKCHUNK"
63 -> "CLKCLK"
64 -> "TIPTAP"
65 -> "SKWLCH"
66 -> "TNKTNKTNK"
67 -> "CHPCHPCHP"
68 -> "SLP"
69 -> "SCREE"
70 -> "DHDHL"
71 -> "BRAP"
72 -> "CRSK"
73 -> "SPLRT"
74 -> "SKWLL"
75 -> "CRNKL"
76 -> "TRNKL"
77 -> "TAPP"
78 -> "SHUHP"
79 -> "CRUMBL"
80 -> "DEDEDUM"
81 -> "TAK"
82 -> "SPLRT"
83 -> "SQLEE"
84 -> "CRISH"
85 -> "SWSH"
86 -> "BIPBIPBIP"
87 -> "BEP"
88 -> "CRSKRL"
89 -> "KRTNKL"
90 -> "CRSNK"
91 -> "SHTCK"
92 -> "TTRKL"
93 -> "UGGAUGGA"
94 -> "DUDURAH"
95 -> "TING"
96 -> "KKSQWL"
97 -> "CRMPL"
98 -> "BWEP"
99 -> "CHUGUGUG"
100 -> "BANG"
101 -> "SLPP"
102 -> "DEDA"
103 -> "WHSSH"
104 -> "HNH"
105 -> "BWAH"
106 -> "CRUNK"
107 -> "SQWLTCH"
108 -> "DRR"
109 -> "TRNKL"
110 -> "BRAP"
111 -> "BLPCHCH"
112 -> "SKLE"
113 -> "ZMM"
114 -> "WRRR"
115 -> "FWUMP"
116 -> "BRAHCHCH"
117 -> "TING"
118 -> "BWMP"
119 -> "BRPBRPBRP"
120 -> "WE-OH"
121 -> "THCK"
122 -> "FHP"
123 -> "QWLPH"
_ -> error "unitialised sound"
soundPathList :: [String]
soundPathList =
@@ -292,6 +296,7 @@ soundPathList =
, "blood5.CLCLH.100.wav"
, "hit.THUD.100.wav"
, "metal7.TRWNG.1000.wav"
, "ting4.TING.200.wav"
, "stone1.CRASH.1000.wav"
, "twoStep1.TAPTIP.40.wav"
, "wrench1.CRNKCRNKCRNK.400.wav"
@@ -369,6 +374,7 @@ soundPathList =
, "fireLoud.WRRR.500.wav"
, "tap4.FWUMP.100.wav"
, "shotgun.BRAHCHCH.2000.wav"
, "ting5.TING.200.wav"
, "sawtoothFail.BWMP.1000.wav"
, "mini.BRPBRPBRP.2000.wav"
, "seagullWhistle.WE-OH.2000.wav"
@@ -454,169 +460,173 @@ hitS :: SoundID
hitS = SoundID 37
metal7S :: SoundID
metal7S = SoundID 38
ting4S :: SoundID
ting4S = SoundID 39
stone1S :: SoundID
stone1S = SoundID 39
stone1S = SoundID 40
twoStep1S :: SoundID
twoStep1S = SoundID 40
twoStep1S = SoundID 41
wrench1S :: SoundID
wrench1S = SoundID 41
wrench1S = SoundID 42
seagullChatterS :: SoundID
seagullChatterS = SoundID 42
seagullChatterS = SoundID 43
blood4S :: SoundID
blood4S = SoundID 43
blood4S = SoundID 44
fireFadeS :: SoundID
fireFadeS = SoundID 44
fireFadeS = SoundID 45
foamSprayLoopS :: SoundID
foamSprayLoopS = SoundID 45
foamSprayLoopS = SoundID 46
explosionS :: SoundID
explosionS = SoundID 46
explosionS = SoundID 47
foamSprayFadeOutS :: SoundID
foamSprayFadeOutS = SoundID 47
foamSprayFadeOutS = SoundID 48
tap2S :: SoundID
tap2S = SoundID 48
tap2S = SoundID 49
tinitusS :: SoundID
tinitusS = SoundID 49
tinitusS = SoundID 50
seagullCry1S :: SoundID
seagullCry1S = SoundID 50
seagullCry1S = SoundID 51
seagullBarkS :: SoundID
seagullBarkS = SoundID 51
seagullBarkS = SoundID 52
stone3S :: SoundID
stone3S = SoundID 52
stone3S = SoundID 53
tingS :: SoundID
tingS = SoundID 53
tingS = SoundID 54
seagullCry2S :: SoundID
seagullCry2S = SoundID 54
seagullCry2S = SoundID 55
bloodShort3S :: SoundID
bloodShort3S = SoundID 55
bloodShort3S = SoundID 56
hit1S :: SoundID
hit1S = SoundID 56
hit1S = SoundID 57
click1S :: SoundID
click1S = SoundID 57
click1S = SoundID 58
bloodShort2S :: SoundID
bloodShort2S = SoundID 58
bloodShort2S = SoundID 59
twoStepSlowS :: SoundID
twoStepSlowS = SoundID 59
twoStepSlowS = SoundID 60
seagullCryS :: SoundID
seagullCryS = SoundID 60
seagullCryS = SoundID 61
crankSlowS :: SoundID
crankSlowS = SoundID 61
crankSlowS = SoundID 62
primeS :: SoundID
primeS = SoundID 62
primeS = SoundID 63
twoStepS :: SoundID
twoStepS = SoundID 63
twoStepS = SoundID 64
bloodShort8S :: SoundID
bloodShort8S = SoundID 64
bloodShort8S = SoundID 65
reloadS :: SoundID
reloadS = SoundID 65
reloadS = SoundID 66
reload1S :: SoundID
reload1S = SoundID 66
reload1S = SoundID 67
slapS :: SoundID
slapS = SoundID 67
slapS = SoundID 68
tone440sawtoothS :: SoundID
tone440sawtoothS = SoundID 68
tone440sawtoothS = SoundID 69
metal3S :: SoundID
metal3S = SoundID 69
metal3S = SoundID 70
tap3S :: SoundID
tap3S = SoundID 70
tap3S = SoundID 71
glassShat4S :: SoundID
glassShat4S = SoundID 71
glassShat4S = SoundID 72
bloodShort1S :: SoundID
bloodShort1S = SoundID 72
bloodShort1S = SoundID 73
bloodShort4S :: SoundID
bloodShort4S = SoundID 73
bloodShort4S = SoundID 74
glassShat2S :: SoundID
glassShat2S = SoundID 74
glassShat2S = SoundID 75
metal1S :: SoundID
metal1S = SoundID 75
metal1S = SoundID 76
foot3S :: SoundID
foot3S = SoundID 76
foot3S = SoundID 77
pickUpS :: SoundID
pickUpS = SoundID 77
pickUpS = SoundID 78
stone5S :: SoundID
stone5S = SoundID 78
stone5S = SoundID 79
dededumS :: SoundID
dededumS = SoundID 79
dededumS = SoundID 80
tap1S :: SoundID
tap1S = SoundID 80
tap1S = SoundID 81
blood1S :: SoundID
blood1S = SoundID 81
blood1S = SoundID 82
bloodShort7S :: SoundID
bloodShort7S = SoundID 82
bloodShort7S = SoundID 83
metal4S :: SoundID
metal4S = SoundID 83
metal4S = SoundID 84
knifeS :: SoundID
knifeS = SoundID 84
knifeS = SoundID 85
computerBeepingS :: SoundID
computerBeepingS = SoundID 85
computerBeepingS = SoundID 86
tone440S :: SoundID
tone440S = SoundID 86
tone440S = SoundID 87
gut6S :: SoundID
gut6S = SoundID 87
gut6S = SoundID 88
smallGlass2S :: SoundID
smallGlass2S = SoundID 88
smallGlass2S = SoundID 89
glassShat1S :: SoundID
glassShat1S = SoundID 89
glassShat1S = SoundID 90
disconnectItemS :: SoundID
disconnectItemS = SoundID 90
disconnectItemS = SoundID 91
metal5S :: SoundID
metal5S = SoundID 91
metal5S = SoundID 92
seagullBarkTransformedS :: SoundID
seagullBarkTransformedS = SoundID 92
seagullBarkTransformedS = SoundID 93
ejectS :: SoundID
ejectS = SoundID 93
ejectS = SoundID 94
ting3S :: SoundID
ting3S = SoundID 94
ting3S = SoundID 95
blood3S :: SoundID
blood3S = SoundID 95
blood3S = SoundID 96
stone2S :: SoundID
stone2S = SoundID 96
stone2S = SoundID 97
tone440raiseS :: SoundID
tone440raiseS = SoundID 97
tone440raiseS = SoundID 98
seagullChatter1S :: SoundID
seagullChatter1S = SoundID 98
seagullChatter1S = SoundID 99
bangS :: SoundID
bangS = SoundID 99
bangS = SoundID 100
slap1S :: SoundID
slap1S = SoundID 100
slap1S = SoundID 101
dedaS :: SoundID
dedaS = SoundID 101
dedaS = SoundID 102
missileLaunchS :: SoundID
missileLaunchS = SoundID 102
missileLaunchS = SoundID 103
gruntS :: SoundID
gruntS = SoundID 103
gruntS = SoundID 104
sineRaisePitchOneSecS :: SoundID
sineRaisePitchOneSecS = SoundID 104
sineRaisePitchOneSecS = SoundID 105
metal2S :: SoundID
metal2S = SoundID 105
metal2S = SoundID 106
gut5S :: SoundID
gut5S = SoundID 106
gut5S = SoundID 107
slideDoorS :: SoundID
slideDoorS = SoundID 107
slideDoorS = SoundID 108
metal6S :: SoundID
metal6S = SoundID 108
metal6S = SoundID 109
autoGunS :: SoundID
autoGunS = SoundID 109
autoGunS = SoundID 110
oldMachineBootS :: SoundID
oldMachineBootS = SoundID 110
oldMachineBootS = SoundID 111
blood6S :: SoundID
blood6S = SoundID 111
blood6S = SoundID 112
buzzS :: SoundID
buzzS = SoundID 112
buzzS = SoundID 113
fireLoudS :: SoundID
fireLoudS = SoundID 113
fireLoudS = SoundID 114
tap4S :: SoundID
tap4S = SoundID 114
tap4S = SoundID 115
shotgunS :: SoundID
shotgunS = SoundID 115
shotgunS = SoundID 116
ting5S :: SoundID
ting5S = SoundID 117
sawtoothFailS :: SoundID
sawtoothFailS = SoundID 116
sawtoothFailS = SoundID 118
miniS :: SoundID
miniS = SoundID 117
miniS = SoundID 119
seagullWhistleS :: SoundID
seagullWhistleS = SoundID 118
seagullWhistleS = SoundID 120
connectItemS :: SoundID
connectItemS = SoundID 119
connectItemS = SoundID 121
whiteNoiseFadeInS :: SoundID
whiteNoiseFadeInS = SoundID 120
whiteNoiseFadeInS = SoundID 122
gut1S :: SoundID
gut1S = SoundID 121
gut1S = SoundID 123
src/Dodge/Wall/Damage.hs
+1 -1
View File
@@ -24,7 +24,7 @@ damageWall dt wl w = case _wlStructure wl of
_ -> w'
where
x = dt ^. dmAmount
w' = damageMaterial dt (_wlMaterial wl) (Right wl) w
w' = damMatSideEffect dt (_wlMaterial wl) (Right wl) w
-- block destruction is convoluted...
maybeDestroyBlock :: Int -> World -> World