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

Cleanup

Browse Source
This commit is contained in:
justin
2024-11-04 10:28:21 +00:00
parent 2a314d22e3
commit 0237e655b5
4 changed files with 75 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ghcidOutput
+1 -1
View File
@@ -1 +1 @@
All good (594 modules, at 10:18:45) All good (594 modules, at 10:28:16)
graph/itemCombinations.gv
+61 -69
View File
@@ -59,35 +59,35 @@ digraph {
,label="HELD {_ibtHeld = FLAMETORRENT}"]; ,label="HELD {_ibtHeld = FLAMETORRENT}"];
75 [shape=box 75 [shape=box
,label="HELD {_ibtHeld = LASER}"]; ,label="HELD {_ibtHeld = LASER}"];
80 [shape=box 79 [shape=box
,label="HELD {_ibtHeld = SPARKGUN}"]; ,label="HELD {_ibtHeld = SPARKGUN}"];
82 [shape=box 81 [shape=box
,label="HELD {_ibtHeld = TESLAGUN}"]; ,label="HELD {_ibtHeld = TESLAGUN}"];
84 [shape=box 83 [shape=box
,label="LEFT {_ibtLeft = BLINKER}"]; ,label="LEFT {_ibtLeft = BLINKER}"];
87 [shape=box 86 [shape=box
,label="LEFT {_ibtLeft = BLINKERUNSAFE}"]; ,label="LEFT {_ibtLeft = BLINKERUNSAFE}"];
89 [shape=box 88 [shape=box
,label="EQUIP {_ibtEquip = MAGSHIELD}"]; ,label="EQUIP {_ibtEquip = MAGSHIELD}"];
92 [shape=box 91 [shape=box
,label="EQUIP {_ibtEquip = POWERLEGS}"]; ,label="EQUIP {_ibtEquip = POWERLEGS}"];
98 [shape=box 97 [shape=box
,label="HELD {_ibtHeld = FLATSHIELD}"]; ,label="HELD {_ibtHeld = FLATSHIELD}"];
108 [shape=box 107 [shape=box
,label="EQUIP {_ibtEquip = AUTODETECTOR ITEMDETECTOR}"]; ,label="EQUIP {_ibtEquip = AUTODETECTOR ITEMDETECTOR}"];
111 [shape=box 110 [shape=box
,label="EQUIP {_ibtEquip = AUTODETECTOR WALLDETECTOR}"]; ,label="EQUIP {_ibtEquip = AUTODETECTOR WALLDETECTOR}"];
113 [shape=box 112 [shape=box
,label="EQUIP {_ibtEquip = AUTODETECTOR CREATUREDETECTOR}"]; ,label="EQUIP {_ibtEquip = AUTODETECTOR CREATUREDETECTOR}"];
115 [shape=box 114 [shape=box
,label="HELD {_ibtHeld = TORCH}"]; ,label="HELD {_ibtHeld = TORCH}"];
116 [shape=box 115 [shape=box
,label="AMMOMAG {_ibtAmmoMag = BATTERY}"]; ,label="AMMOMAG {_ibtAmmoMag = BATTERY}"];
119 [shape=box 118 [shape=box
,label="EQUIP {_ibtEquip = HEADLAMP}"]; ,label="EQUIP {_ibtEquip = HEADLAMP}"];
120 [shape=box 119 [shape=box
,label="EQUIP {_ibtEquip = HAT}"]; ,label="EQUIP {_ibtEquip = HAT}"];
122 [shape=box 121 [shape=box
,label="HELD {_ibtHeld = BANGSTICK {_xNum = 2}}"]; ,label="HELD {_ibtHeld = BANGSTICK {_xNum = 2}}"];
} }
subgraph 2 { subgraph 2 {
@@ -121,30 +121,29 @@ digraph {
70 [shape=point]; 70 [shape=point];
72 [shape=point]; 72 [shape=point];
74 [shape=point]; 74 [shape=point];
76 [shape=point]; 78 [shape=point];
79 [shape=point]; 80 [shape=point];
81 [shape=point]; 82 [shape=point];
83 [shape=point]; 85 [shape=point];
86 [shape=point]; 87 [shape=point];
88 [shape=point]; 90 [shape=point];
91 [shape=point]; 93 [shape=point];
94 [shape=point]; 94 [shape=point];
95 [shape=point]; 95 [shape=point];
96 [shape=point]; 96 [shape=point];
97 [shape=point]; 98 [shape=point];
99 [shape=point]; 100 [shape=point];
101 [shape=point]; 103 [shape=point];
104 [shape=point]; 106 [shape=point];
107 [shape=point]; 109 [shape=point];
110 [shape=point]; 111 [shape=point];
112 [shape=point]; 113 [shape=point];
114 [shape=point]; 117 [shape=point];
118 [shape=point]; 120 [shape=point];
121 [shape=point]; 122 [shape=point];
123 [shape=point]; 124 [shape=point];
125 [shape=point]; 126 [shape=point];
127 [shape=point]; 128 [shape=point];
129 [shape=point];
} }
0 -> 1 [xlabel="",tailport=e]; 0 -> 1 [xlabel="",tailport=e];
2 -> 0 [xlabel=1 2 -> 0 [xlabel=1
@@ -173,13 +172,13 @@ digraph {
19 -> 40 [xlabel=1 19 -> 40 [xlabel=1
,arrowhead=onone ,arrowhead=onone
,headport=w]; ,headport=w];
19 -> 121 [xlabel=1 19 -> 120 [xlabel=1
,arrowhead=onone ,arrowhead=onone
,headport=w]; ,headport=w];
19 -> 125 [xlabel=1 19 -> 124 [xlabel=1
,arrowhead=onone ,arrowhead=onone
,headport=w]; ,headport=w];
19 -> 127 [xlabel=1 19 -> 126 [xlabel=1
,arrowhead=onone ,arrowhead=onone
,headport=w]; ,headport=w];
22 -> 23 [xlabel="",tailport=e]; 22 -> 23 [xlabel="",tailport=e];
@@ -204,7 +203,7 @@ digraph {
,arrowhead=onone ,arrowhead=onone
,headport=w]; ,headport=w];
36 -> 37 [xlabel="",tailport=e]; 36 -> 37 [xlabel="",tailport=e];
37 -> 129 [xlabel=1 37 -> 128 [xlabel=1
,arrowhead=onone ,arrowhead=onone
,headport=w]; ,headport=w];
38 -> 39 [xlabel="",tailport=e]; 38 -> 39 [xlabel="",tailport=e];
@@ -221,16 +220,13 @@ digraph {
41 -> 46 [xlabel=1 41 -> 46 [xlabel=1
,arrowhead=onone ,arrowhead=onone
,headport=w]; ,headport=w];
41 -> 125 [xlabel=1 41 -> 124 [xlabel=1
,arrowhead=onone ,arrowhead=onone
,headport=w]; ,headport=w];
42 -> 43 [xlabel="",tailport=e]; 42 -> 43 [xlabel="",tailport=e];
44 -> 45 [xlabel="",tailport=e]; 44 -> 45 [xlabel="",tailport=e];
45 -> 74 [xlabel=1
,arrowhead=onone
,headport=w];
46 -> 47 [xlabel="",tailport=e]; 46 -> 47 [xlabel="",tailport=e];
47 -> 127 [xlabel=1 47 -> 126 [xlabel=1
,arrowhead=onone ,arrowhead=onone
,headport=w]; ,headport=w];
49 -> 50 [xlabel="",tailport=e]; 49 -> 50 [xlabel="",tailport=e];
@@ -267,46 +263,42 @@ digraph {
,headport=w]; ,headport=w];
70 -> 71 [xlabel="",tailport=e]; 70 -> 71 [xlabel="",tailport=e];
72 -> 73 [xlabel="",tailport=e]; 72 -> 73 [xlabel="",tailport=e];
74 -> 73 [xlabel="",tailport=e]; 74 -> 75 [xlabel="",tailport=e];
75 -> 74 [xlabel=1 78 -> 79 [xlabel="",tailport=e];
79 -> 80 [xlabel=1
,arrowhead=onone ,arrowhead=onone
,headport=w]; ,headport=w];
76 -> 75 [xlabel="",tailport=e]; 80 -> 81 [xlabel="",tailport=e];
79 -> 80 [xlabel="",tailport=e]; 82 -> 83 [xlabel="",tailport=e];
80 -> 81 [xlabel=1 83 -> 85 [xlabel=1
,arrowhead=onone ,arrowhead=onone
,headport=w]; ,headport=w];
81 -> 82 [xlabel="",tailport=e]; 85 -> 86 [xlabel="",tailport=e];
83 -> 84 [xlabel="",tailport=e]; 87 -> 88 [xlabel="",tailport=e];
84 -> 86 [xlabel=1 90 -> 91 [xlabel="",tailport=e];
,arrowhead=onone 96 -> 97 [xlabel="",tailport=e];
,headport=w]; 106 -> 107 [xlabel=""
86 -> 87 [xlabel="",tailport=e];
88 -> 89 [xlabel="",tailport=e];
91 -> 92 [xlabel="",tailport=e];
97 -> 98 [xlabel="",tailport=e];
107 -> 108 [xlabel=""
,tailport=e]; ,tailport=e];
110 -> 111 [xlabel="" 109 -> 110 [xlabel=""
,tailport=e]; ,tailport=e];
112 -> 113 [xlabel="" 111 -> 112 [xlabel=""
,tailport=e]; ,tailport=e];
114 -> 115 [xlabel="" 113 -> 114 [xlabel=""
,tailport=e]; ,tailport=e];
115 -> 118 [xlabel=1 114 -> 117 [xlabel=1
,arrowhead=onone ,arrowhead=onone
,headport=w]; ,headport=w];
116 -> 114 [xlabel=1 115 -> 113 [xlabel=1
,arrowhead=onone ,arrowhead=onone
,headport=w]; ,headport=w];
118 -> 119 [xlabel="" 117 -> 118 [xlabel=""
,tailport=e]; ,tailport=e];
120 -> 118 [xlabel=1 119 -> 117 [xlabel=1
,arrowhead=onone ,arrowhead=onone
,headport=w]; ,headport=w];
121 -> 122 [xlabel="" 120 -> 121 [xlabel=""
,tailport=e]; ,tailport=e];
122 -> 123 [xlabel=1 121 -> 122 [xlabel=1
,arrowhead=onone ,arrowhead=onone
,headport=w]; ,headport=w];
} }
src/Dodge/Combine/Combinations.hs
-1
View File
@@ -86,7 +86,6 @@ itemCombinations =
, po [HELD FLAMESPITTER, cr STEELDRUM] flameThrower , po [HELD FLAMESPITTER, cr STEELDRUM] flameThrower
, po [HELD FLAMETHROWER, cr STEELDRUM] flameWall , po [HELD FLAMETHROWER, cr STEELDRUM] flameWall
, po [HELD FLAMETHROWER, cr PUMP] flameTorrent , po [HELD FLAMETHROWER, cr PUMP] flameTorrent
, po [HELD LASER, HELD BURSTRIFLE] flameTorrent
, p [o $ cr PRISM, o $ cr TRANSFORMER, o $ cr PIPE] laser , p [o $ cr PRISM, o $ cr TRANSFORMER, o $ cr PIPE] laser
-- , po [HELD LASGUN, HELD LASGUN, cr HARDWARE] dualBeam -- , po [HELD LASGUN, HELD LASGUN, cr HARDWARE] dualBeam
-- , po [HELD LASGUN, cr TRANSFORMER] (lasWide 2) -- , po [HELD LASGUN, cr TRANSFORMER] (lasWide 2)
src/Dodge/Update.hs
+13 -16
View File
@@ -384,26 +384,23 @@ shiftInvItemsDown (_, i) x w = fromMaybe w $ do
g i' m = fst <$> IM.lookupGT i' m g i' m = fst <$> IM.lookupGT i' m
updateMouseOverInventory :: Configuration -> World -> World updateMouseOverInventory :: Configuration -> World -> World
updateMouseOverInventory cfig w = fromMaybe updateMouseOverInventory cfig w =
(w & hud . hudElement . diMouseOver .~ Nothing) w & hud . hudElement . diMouseOver .~ newmouseover
$ do
sss <- w ^? hud . hudElement . diSections
guard $ ButtonRight `M.notMember` (w ^. input . mouseButtons)
|| not (null $ w ^? hud . hudElement . subInventory . ciSelection)
return $
w & hud . hudElement . diMouseOver
.~ inverseSelNumPos cfig ldp sss (w ^. input . mousePos)
where where
ldp = invDisplayParams w newmouseover = do
sss <- w ^? hud . hudElement . diSections
guard $
ButtonRight `M.notMember` (w ^. input . mouseButtons)
|| not (null $ w ^? hud . hudElement . subInventory . ciSelection)
inverseSelNumPos cfig (invDisplayParams w) sss (w ^. input . mousePos)
updateMouseOverCombineInventory :: Configuration -> World -> World updateMouseOverCombineInventory :: Configuration -> World -> World
updateMouseOverCombineInventory cfig w = fromMaybe w $ do updateMouseOverCombineInventory cfig w =
sss <- w ^? hud . hudElement . subInventory . ciSections w & hud . hudElement . subInventory . ciMouseOver .~ newmouseover
return $
w & hud . hudElement . subInventory . ciMouseOver
.~ inverseSelNumPos cfig ldp sss (w ^. input . mousePos)
where where
ldp = secondColumnParams newmouseover = do
sss <- w ^? hud . hudElement . subInventory . ciSections
inverseSelNumPos cfig secondColumnParams sss (w ^. input . mousePos)
updateWheelEvents :: World -> World updateWheelEvents :: World -> World
updateWheelEvents w updateWheelEvents w