tA/evac
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

support for adjacency

Browse Source
This commit is contained in:
Thorn Avery 2019-05-15 18:56:43 +12:00
parent 2e367ba36f
commit 64a03fbe3e
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Groups.hs
View File

@ -40,18 +40,20 @@ otherGroups x nt = filter (\g -> not $ x `elem` g) nt
getAdj :: MainCharacter -> NeoTokyo -> [MainCharacter] getAdj :: MainCharacter -> NeoTokyo -> [MainCharacter]
getAdj x nt = curFrens x nt ++ (foldr (++) [] (adjGroups x nt)) getAdj x nt = curFrens x nt ++ (foldr (++) [] (adjGroups x nt))
-- Hurt character x -- X hurts Y (only if adjacent)
hurt :: MainCharacter -> BoardState -> BoardState hurt :: MainCharacter -> MainCharacter -> BoardState -> BoardState
hurt x (nt,d) hurt x y (nt,d)
| x `elem` d = if (curFrens x nt == []) | not $ y `elem` (getAdj x nt) = (nt,d)
| y `elem` d = if (curFrens y nt == [])
then (nt, d) then (nt, d)
else ([x] : (groupMinusChar x) : (otherGroups x nt), d) else ([y] : (groupMinusChar y) : (otherGroups y nt), d)
| otherwise = (nt, x:d) | otherwise = (nt, y:d)
where where
groupMinusChar x = (filter (/= x) $ charsGroup x nt) groupMinusChar y = (filter (/= y) $ charsGroup y nt)
-- Attract X and Y -- Attract X and Y (only if adjacent)
attract :: MainCharacter -> MainCharacter -> BoardState -> BoardState attract :: MainCharacter -> MainCharacter -> BoardState -> BoardState
attract x y (nt,d) attract x y (nt,d)
| not $ y `elem` (getAdj x nt) = (nt,d)
| x `elem` d = (nt, (filter (/= x) d)) | x `elem` d = (nt, (filter (/= x) d))
| otherwise = ((uniq (charsGroup x nt ++ charsGroup y nt)) : (otherGroups y (otherGroups x nt)), d) | otherwise = ((uniq (charsGroup x nt ++ charsGroup y nt)) : (otherGroups y (otherGroups x nt)), d)