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

Fix flatshield wall creation and remove muzzle

Browse Source
This commit is contained in:
justin
2026-01-02 12:34:17 +00:00
parent f6f63c9a14
commit b414da7dab
7 changed files with 392 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Creature/State.hs
+1 -1
View File
@@ -74,7 +74,7 @@ invItemLocUpdate cr loc w = doAnyEquipmentEffect loc cr $ case itm ^. itType of
ATTACH CAPACITOR -> tryDrawToCapacitor loc w
EQUIP WRIST_ECG | haspulse -> tryUseParent loc w
COPIER _ -> copierItemUpdate itm cr w
HELD FLATSHIELD -> rootNotrootEff createShieldWall removeShieldWall itm cr w
HELD FLATSHIELD -> rootAndAttNotEff createShieldWall removeShieldWall itm cr w
HELD MINIGUNX{} -> coolMinigun itm w
HELD MACHINEPISTOL{} -> coolMachinePistol cr itm w
LASER | loc ^. locDT . dtValue . _2 == WeaponTargetingSF
src/Dodge/Data/Item/Location.hs
+1 -1
View File
@@ -31,7 +31,7 @@ data ItemLocation
, _ilInvID :: NewInt InvInt
, _ilIsRoot :: Bool -- of any item
, _ilIsSelected :: Bool
, _ilIsAttached :: Bool -- to selected item
, _ilIsAttached :: Bool -- to selected item. question: downwards and upwards?
, _ilEquipSite :: Maybe EquipSite
}
| OnTurret {_ilTuID :: Int}
src/Dodge/HeldUse.hs
+1
View File
@@ -303,6 +303,7 @@ heldItemMuzzles itm = \case
dbwMuzzles
& ix 0 . mzEffect .~ MuzzleScroller
& ix 0 . mzAmmoSlot . aps .~ UseExactly 100000
FLATSHIELD -> mempty
_ ->
[ Muzzle
{ _mzPos = V2 20 0
src/Dodge/Item/BackgroundEffect.hs
+14
View File
@@ -2,6 +2,7 @@ module Dodge.Item.BackgroundEffect (
itEffectOnPickup,
itEffectOnDrop,
rootNotrootEff,
rootAndAttNotEff,
createShieldWall,
removeShieldWall,
) where
@@ -36,6 +37,19 @@ rootNotrootEff f g it
| it ^? itLocation . ilIsRoot == Just True = f it
| otherwise = g it
rootAndAttNotEff ::
(Item -> Creature -> World -> World) ->
(Item -> Creature -> World -> World) ->
Item ->
Creature ->
World ->
World
rootAndAttNotEff f g it
| it ^? itLocation . ilIsRoot == Just True
&& it ^? itLocation . ilIsAttached == Just True
= f it
| otherwise = g it
createShieldWall :: Item -> Creature -> World -> World
createShieldWall it cr w = case it ^? itParams . flatShieldWlMIX . _Just of
Nothing ->
src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs
+317 -312
View File
@@ -1,4 +1,4 @@
-- generated at 2025-12-31 13:24:22.332967514 UTC
-- generated at 2026-01-02 12:33:10.260560049 UTC
module Dodge.SoundLogic.ExternallyGeneratedSounds where
import Sound.Data
soundToVol :: SoundID -> Float
@@ -61,115 +61,116 @@ soundToVol v = case _getSoundID v of
55 -> 50
56 -> 100
57 -> 2000
58 -> 1000
59 -> 40
60 -> 300
61 -> 250
62 -> 100
63 -> 500
64 -> 2000
65 -> 40
66 -> 200
67 -> 2000
68 -> 1000
58 -> 500
59 -> 1000
60 -> 40
61 -> 300
62 -> 250
63 -> 100
64 -> 500
65 -> 2000
66 -> 40
67 -> 200
68 -> 2000
69 -> 1000
70 -> 2000
71 -> 500
70 -> 1000
71 -> 2000
72 -> 500
73 -> 500
74 -> 100
74 -> 500
75 -> 100
76 -> 2000
77 -> 200
76 -> 100
77 -> 2000
78 -> 200
79 -> 500
80 -> 200
81 -> 2000
82 -> 200
83 -> 1000
79 -> 200
80 -> 500
81 -> 200
82 -> 2000
83 -> 200
84 -> 1000
85 -> 250
86 -> 300
87 -> 2000
88 -> 200
89 -> 1000
90 -> 100
91 -> 300
92 -> 100
93 -> 40
94 -> 1000
95 -> 100
96 -> 1000
97 -> 500
98 -> 100
99 -> 200
100 -> 250
101 -> 200
85 -> 1000
86 -> 250
87 -> 300
88 -> 2000
89 -> 200
90 -> 1000
91 -> 100
92 -> 300
93 -> 100
94 -> 40
95 -> 1000
96 -> 100
97 -> 1000
98 -> 500
99 -> 100
100 -> 200
101 -> 250
102 -> 200
103 -> 50
104 -> 1000
105 -> 50
106 -> 500
103 -> 200
104 -> 50
105 -> 1000
106 -> 50
107 -> 500
108 -> 1000
109 -> 200
110 -> 2000
111 -> 20
112 -> 500
113 -> 200
114 -> 100
115 -> 2000
116 -> 100
108 -> 500
109 -> 1000
110 -> 200
111 -> 2000
112 -> 20
113 -> 500
114 -> 200
115 -> 100
116 -> 2000
117 -> 100
118 -> 200
119 -> 300
120 -> 500
121 -> 100
122 -> 300
123 -> 200
124 -> 1000
125 -> 100
126 -> 50
127 -> 100
118 -> 100
119 -> 200
120 -> 300
121 -> 500
122 -> 100
123 -> 300
124 -> 200
125 -> 1000
126 -> 100
127 -> 50
128 -> 100
129 -> 50
130 -> 1000
131 -> 500
132 -> 40
133 -> 100
134 -> 200
135 -> 500
136 -> 1000
137 -> 300
138 -> 100
139 -> 300
129 -> 100
130 -> 50
131 -> 1000
132 -> 500
133 -> 40
134 -> 100
135 -> 200
136 -> 500
137 -> 1000
138 -> 300
139 -> 100
140 -> 300
141 -> 100
141 -> 300
142 -> 100
143 -> 500
144 -> 100
143 -> 100
144 -> 500
145 -> 100
146 -> 500
147 -> 100
146 -> 100
147 -> 500
148 -> 100
149 -> 500
150 -> 40
151 -> 200
152 -> 50
153 -> 500
154 -> 2000
149 -> 100
150 -> 500
151 -> 40
152 -> 200
153 -> 50
154 -> 500
155 -> 2000
156 -> 40
157 -> 100
156 -> 2000
157 -> 40
158 -> 100
159 -> 500
160 -> 100
161 -> 1000
162 -> 100
163 -> 500
164 -> 8000
165 -> 200
166 -> 300
159 -> 100
160 -> 500
161 -> 100
162 -> 1000
163 -> 100
164 -> 500
165 -> 8000
166 -> 200
167 -> 300
_ -> 50
soundToOnomato :: SoundID -> String
soundToOnomato v = case _getSoundID v of
@@ -231,115 +232,116 @@ soundToOnomato v = case _getSoundID v of
55 -> "BLIH"
56 -> "DRR"
57 -> "CRH"
58 -> "BLPCHCH"
59 -> "CLNK"
60 -> "WHRR"
61 -> "WHR"
62 -> "KKSQWL"
63 -> "CLKCLK"
64 -> "BANGG"
65 -> "TIPTOP"
66 -> "WHH"
67 -> "BRPBRPBRP"
68 -> "TTRKL"
69 -> "CRUMBL"
70 -> "SCREE"
71 -> "WRRR"
72 -> "SCREE"
73 -> "BIPBIPBIP"
74 -> "SLP"
75 -> "CLCLH"
76 -> "CREUH"
77 -> "SQWLTCH"
78 -> "TING"
79 -> "DEDEDA"
80 -> "WHR"
81 -> "CRUH"
82 -> "SQWCH"
83 -> "TRWNG"
84 -> "CRSK"
85 -> "DMP"
86 -> "BEP"
87 -> "BOOM"
88 -> "SKREL"
89 -> "CRSNK"
90 -> "SLP"
91 -> "CHPCHPCHP"
92 -> "SLP"
93 -> "TAP"
94 -> "CRNKL"
95 -> "WRR"
96 -> "CRNK"
97 -> "CUHRUP"
98 -> "SPLRT"
99 -> "TING"
100 -> "WHRHH"
101 -> "CRSKRL"
102 -> "WH"
103 -> "FHFH"
104 -> "BRAP"
105 -> "WHHH"
106 -> "PLH"
107 -> "CLANG"
108 -> "CRUNK"
109 -> "TING"
110 -> "TATATA"
111 -> "SWSH"
112 -> "DNDNDNDN"
113 -> "THCK"
114 -> "SLP"
115 -> "PEW"
116 -> "SKLE"
117 -> "THUD"
118 -> "WH"
119 -> "BWAH"
120 -> "DEDEDUM"
121 -> "WHUMWHUM"
122 -> "WHRP"
123 -> "TING"
124 -> "CRMPL"
125 -> "SKLE"
126 -> "SHUHP"
127 -> "SLP"
128 -> "SPRT"
129 -> "HSS"
130 -> "TRNKL"
131 -> "TAK"
132 -> "CLICK"
133 -> "DUHDEH"
134 -> "SHTCK"
135 -> "DEDUM"
136 -> "BWMP"
137 -> "BWAAH"
138 -> "SLP"
139 -> "DWAAH"
140 -> "TNKTONK"
141 -> "VFVFVF"
142 -> "SLP"
143 -> "CRTINK"
144 -> "VHHP"
145 -> "SPRT"
146 -> "PRUM"
147 -> "SLPP"
148 -> "FWUMP"
149 -> "CLANG"
150 -> "TIP"
151 -> "CRAKLE"
152 -> "HSSS"
153 -> "TRINKL"
154 -> "BANG"
155 -> "CHUGUGUG"
156 -> "TAPP"
157 -> "KKSQWL"
158 -> "SKWLL"
159 -> "DUDURAH"
160 -> "SKWLL"
161 -> "TRNKL"
162 -> "SLP"
163 -> "WHUAWUH"
164 -> "RINGGG"
165 -> "QWLPH"
166 -> "WRRR"
58 -> "AAA"
59 -> "BLPCHCH"
60 -> "CLNK"
61 -> "WHRR"
62 -> "WHR"
63 -> "KKSQWL"
64 -> "CLKCLK"
65 -> "BANGG"
66 -> "TIPTOP"
67 -> "WHH"
68 -> "BRPBRPBRP"
69 -> "TTRKL"
70 -> "CRUMBL"
71 -> "SCREE"
72 -> "WRRR"
73 -> "SCREE"
74 -> "BIPBIPBIP"
75 -> "SLP"
76 -> "CLCLH"
77 -> "CREUH"
78 -> "SQWLTCH"
79 -> "TING"
80 -> "DEDEDA"
81 -> "WHR"
82 -> "CRUH"
83 -> "SQWCH"
84 -> "TRWNG"
85 -> "CRSK"
86 -> "DMP"
87 -> "BEP"
88 -> "BOOM"
89 -> "SKREL"
90 -> "CRSNK"
91 -> "SLP"
92 -> "CHPCHPCHP"
93 -> "SLP"
94 -> "TAP"
95 -> "CRNKL"
96 -> "WRR"
97 -> "CRNK"
98 -> "CUHRUP"
99 -> "SPLRT"
100 -> "TING"
101 -> "WHRHH"
102 -> "CRSKRL"
103 -> "WH"
104 -> "FHFH"
105 -> "BRAP"
106 -> "WHHH"
107 -> "PLH"
108 -> "CLANG"
109 -> "CRUNK"
110 -> "TING"
111 -> "TATATA"
112 -> "SWSH"
113 -> "DNDNDNDN"
114 -> "THCK"
115 -> "SLP"
116 -> "PEW"
117 -> "SKLE"
118 -> "THUD"
119 -> "WH"
120 -> "BWAH"
121 -> "DEDEDUM"
122 -> "WHUMWHUM"
123 -> "WHRP"
124 -> "TING"
125 -> "CRMPL"
126 -> "SKLE"
127 -> "SHUHP"
128 -> "SLP"
129 -> "SPRT"
130 -> "HSS"
131 -> "TRNKL"
132 -> "TAK"
133 -> "CLICK"
134 -> "DUHDEH"
135 -> "SHTCK"
136 -> "DEDUM"
137 -> "BWMP"
138 -> "BWAAH"
139 -> "SLP"
140 -> "DWAAH"
141 -> "TNKTONK"
142 -> "VFVFVF"
143 -> "SLP"
144 -> "CRTINK"
145 -> "VHHP"
146 -> "SPRT"
147 -> "PRUM"
148 -> "SLPP"
149 -> "FWUMP"
150 -> "CLANG"
151 -> "TIP"
152 -> "CRAKLE"
153 -> "HSSS"
154 -> "TRINKL"
155 -> "BANG"
156 -> "CHUGUGUG"
157 -> "TAPP"
158 -> "KKSQWL"
159 -> "SKWLL"
160 -> "DUDURAH"
161 -> "SKWLL"
162 -> "TRNKL"
163 -> "SLP"
164 -> "WHUAWUH"
165 -> "RINGGG"
166 -> "QWLPH"
167 -> "WRRR"
_ -> error "unitialised sound"
soundPathList :: [String]
soundPathList =
@@ -401,6 +403,7 @@ soundPathList =
, "heal.BLIH.50.wav"
, "slideDoor.DRR.100.wav"
, "seagullCry1.CRH.2000.wav"
, "tone440_30s.AAA.500.wav"
, "oldMachineBoot.BLPCHCH.1000.wav"
, "tapQuiet.CLNK.40.wav"
, "whir.WHRR.300.wav"
@@ -627,221 +630,223 @@ slideDoorS :: SoundID
slideDoorS = SoundID 56
seagullCry1S :: SoundID
seagullCry1S = SoundID 57
tone440_30sS :: SoundID
tone440_30sS = SoundID 58
oldMachineBootS :: SoundID
oldMachineBootS = SoundID 58
oldMachineBootS = SoundID 59
tapQuietS :: SoundID
tapQuietS = SoundID 59
tapQuietS = SoundID 60
whirS :: SoundID
whirS = SoundID 60
whirS = SoundID 61
whirupS :: SoundID
whirupS = SoundID 61
whirupS = SoundID 62
blood3S :: SoundID
blood3S = SoundID 62
blood3S = SoundID 63
primeS :: SoundID
primeS = SoundID 63
primeS = SoundID 64
bangEchoS :: SoundID
bangEchoS = SoundID 64
bangEchoS = SoundID 65
twoStepSlowS :: SoundID
twoStepSlowS = SoundID 65
twoStepSlowS = SoundID 66
whirdown1S :: SoundID
whirdown1S = SoundID 66
whirdown1S = SoundID 67
miniS :: SoundID
miniS = SoundID 67
miniS = SoundID 68
metal5S :: SoundID
metal5S = SoundID 68
metal5S = SoundID 69
stone5S :: SoundID
stone5S = SoundID 69
stone5S = SoundID 70
tone440sawtoothS :: SoundID
tone440sawtoothS = SoundID 70
tone440sawtoothS = SoundID 71
fireLoudS :: SoundID
fireLoudS = SoundID 71
fireLoudS = SoundID 72
tone440sawtoothquietS :: SoundID
tone440sawtoothquietS = SoundID 72
tone440sawtoothquietS = SoundID 73
computerBeepingS :: SoundID
computerBeepingS = SoundID 73
computerBeepingS = SoundID 74
slapS :: SoundID
slapS = SoundID 74
slapS = SoundID 75
bloodShort5S :: SoundID
bloodShort5S = SoundID 75
bloodShort5S = SoundID 76
seagullCry2S :: SoundID
seagullCry2S = SoundID 76
seagullCry2S = SoundID 77
gut5S :: SoundID
gut5S = SoundID 77
gut5S = SoundID 78
ting2S :: SoundID
ting2S = SoundID 78
ting2S = SoundID 79
dededaS :: SoundID
dededaS = SoundID 79
dededaS = SoundID 80
whirdownSmall2S :: SoundID
whirdownSmall2S = SoundID 80
whirdownSmall2S = SoundID 81
seagullCryS :: SoundID
seagullCryS = SoundID 81
seagullCryS = SoundID 82
gut3S :: SoundID
gut3S = SoundID 82
gut3S = SoundID 83
metal7S :: SoundID
metal7S = SoundID 83
metal7S = SoundID 84
glassShat4S :: SoundID
glassShat4S = SoundID 84
glassShat4S = SoundID 85
energyReleaseS :: SoundID
energyReleaseS = SoundID 85
energyReleaseS = SoundID 86
tone440S :: SoundID
tone440S = SoundID 86
tone440S = SoundID 87
explosionS :: SoundID
explosionS = SoundID 87
explosionS = SoundID 88
gut4S :: SoundID
gut4S = SoundID 88
gut4S = SoundID 89
glassShat1S :: SoundID
glassShat1S = SoundID 89
glassShat1S = SoundID 90
slap3S :: SoundID
slap3S = SoundID 90
slap3S = SoundID 91
reload1S :: SoundID
reload1S = SoundID 91
reload1S = SoundID 92
slapClean3S :: SoundID
slapClean3S = SoundID 92
slapClean3S = SoundID 93
foot2S :: SoundID
foot2S = SoundID 93
foot2S = SoundID 94
glassShat2S :: SoundID
glassShat2S = SoundID 94
glassShat2S = SoundID 95
fireS :: SoundID
fireS = SoundID 95
fireS = SoundID 96
glassShat3S :: SoundID
glassShat3S = SoundID 96
glassShat3S = SoundID 97
insertS :: SoundID
insertS = SoundID 97
insertS = SoundID 98
blood1S :: SoundID
blood1S = SoundID 98
blood1S = SoundID 99
ting3S :: SoundID
ting3S = SoundID 99
ting3S = SoundID 100
whirdownS :: SoundID
whirdownS = SoundID 100
whirdownS = SoundID 101
gut6S :: SoundID
gut6S = SoundID 101
gut6S = SoundID 102
whirdownShort3S :: SoundID
whirdownShort3S = SoundID 102
whirdownShort3S = SoundID 103
debrisS :: SoundID
debrisS = SoundID 103
debrisS = SoundID 104
tap3S :: SoundID
tap3S = SoundID 104
tap3S = SoundID 105
backgroundSpaceS :: SoundID
backgroundSpaceS = SoundID 105
backgroundSpaceS = SoundID 106
lasPulseS :: SoundID
lasPulseS = SoundID 106
lasPulseS = SoundID 107
clang2S :: SoundID
clang2S = SoundID 107
clang2S = SoundID 108
metal2S :: SoundID
metal2S = SoundID 108
metal2S = SoundID 109
tingS :: SoundID
tingS = SoundID 109
tingS = SoundID 110
autoBS :: SoundID
autoBS = SoundID 110
autoBS = SoundID 111
knifeS :: SoundID
knifeS = SoundID 111
knifeS = SoundID 112
combineS :: SoundID
combineS = SoundID 112
combineS = SoundID 113
connectItemS :: SoundID
connectItemS = SoundID 113
connectItemS = SoundID 114
slapClean7S :: SoundID
slapClean7S = SoundID 114
slapClean7S = SoundID 115
seagullWhistle1S :: SoundID
seagullWhistle1S = SoundID 115
seagullWhistle1S = SoundID 116
bloodShort6S :: SoundID
bloodShort6S = SoundID 116
bloodShort6S = SoundID 117
hitS :: SoundID
hitS = SoundID 117
hitS = SoundID 118
whirdownShort4S :: SoundID
whirdownShort4S = SoundID 118
whirdownShort4S = SoundID 119
sineRaisePitchOneSecS :: SoundID
sineRaisePitchOneSecS = SoundID 119
sineRaisePitchOneSecS = SoundID 120
dededumS :: SoundID
dededumS = SoundID 120
dededumS = SoundID 121
throbC4S :: SoundID
throbC4S = SoundID 121
throbC4S = SoundID 122
whirTapS :: SoundID
whirTapS = SoundID 122
whirTapS = SoundID 123
ting5S :: SoundID
ting5S = SoundID 123
ting5S = SoundID 124
stone2S :: SoundID
stone2S = SoundID 124
stone2S = SoundID 125
blood6S :: SoundID
blood6S = SoundID 125
blood6S = SoundID 126
pickUpS :: SoundID
pickUpS = SoundID 126
pickUpS = SoundID 127
slap2S :: SoundID
slap2S = SoundID 127
slap2S = SoundID 128
bloodShort2S :: SoundID
bloodShort2S = SoundID 128
bloodShort2S = SoundID 129
foamSprayFadeOutS :: SoundID
foamSprayFadeOutS = SoundID 129
foamSprayFadeOutS = SoundID 130
metal6S :: SoundID
metal6S = SoundID 130
metal6S = SoundID 131
tap1S :: SoundID
tap1S = SoundID 131
tap1S = SoundID 132
click1S :: SoundID
click1S = SoundID 132
click1S = SoundID 133
semitoneLoop1S :: SoundID
semitoneLoop1S = SoundID 133
semitoneLoop1S = SoundID 134
disconnectItemS :: SoundID
disconnectItemS = SoundID 134
disconnectItemS = SoundID 135
dedumS :: SoundID
dedumS = SoundID 135
dedumS = SoundID 136
sawtoothFailS :: SoundID
sawtoothFailS = SoundID 136
sawtoothFailS = SoundID 137
sineRaisePitchTwoSecS :: SoundID
sineRaisePitchTwoSecS = SoundID 137
sineRaisePitchTwoSecS = SoundID 138
slap4S :: SoundID
slap4S = SoundID 138
slap4S = SoundID 139
skwareFadeTwoSecS :: SoundID
skwareFadeTwoSecS = SoundID 139
skwareFadeTwoSecS = SoundID 140
reloadFailS :: SoundID
reloadFailS = SoundID 140
reloadFailS = SoundID 141
throb1S :: SoundID
throb1S = SoundID 141
throb1S = SoundID 142
slap5S :: SoundID
slap5S = SoundID 142
slap5S = SoundID 143
smallGlass3S :: SoundID
smallGlass3S = SoundID 143
smallGlass3S = SoundID 144
reverseCymbal1S :: SoundID
reverseCymbal1S = SoundID 144
reverseCymbal1S = SoundID 145
blood2S :: SoundID
blood2S = SoundID 145
blood2S = SoundID 146
insertOneS :: SoundID
insertOneS = SoundID 146
insertOneS = SoundID 147
slap1S :: SoundID
slap1S = SoundID 147
slap1S = SoundID 148
tap4S :: SoundID
tap4S = SoundID 148
tap4S = SoundID 149
clang1S :: SoundID
clang1S = SoundID 149
clang1S = SoundID 150
foot1S :: SoundID
foot1S = SoundID 150
foot1S = SoundID 151
elecCrackleS :: SoundID
elecCrackleS = SoundID 151
elecCrackleS = SoundID 152
foamSprayLoopS :: SoundID
foamSprayLoopS = SoundID 152
foamSprayLoopS = SoundID 153
smallGlass1S :: SoundID
smallGlass1S = SoundID 153
smallGlass1S = SoundID 154
bangS :: SoundID
bangS = SoundID 154
bangS = SoundID 155
seagullChatterS :: SoundID
seagullChatterS = SoundID 155
seagullChatterS = SoundID 156
foot3S :: SoundID
foot3S = SoundID 156
foot3S = SoundID 157
bloodShort3S :: SoundID
bloodShort3S = SoundID 157
bloodShort3S = SoundID 158
blood4S :: SoundID
blood4S = SoundID 158
blood4S = SoundID 159
ejectS :: SoundID
ejectS = SoundID 159
ejectS = SoundID 160
bloodShort4S :: SoundID
bloodShort4S = SoundID 160
bloodShort4S = SoundID 161
metal1S :: SoundID
metal1S = SoundID 161
metal1S = SoundID 162
slapClean5S :: SoundID
slapClean5S = SoundID 162
slapClean5S = SoundID 163
warp1S :: SoundID
warp1S = SoundID 163
warp1S = SoundID 164
tinitusS :: SoundID
tinitusS = SoundID 164
tinitusS = SoundID 165
gut1S :: SoundID
gut1S = SoundID 165
gut1S = SoundID 166
fireFadeS :: SoundID
fireFadeS = SoundID 166
fireFadeS = SoundID 167