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

better hurt/attract semantics

Browse Source
This commit is contained in:
Shaun Kerr 2019-05-16 09:34:10 +12:00
parent 64a03fbe3e
commit 7a5304e9b6
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Groups.hs
View File

@ -44,6 +44,11 @@ getAdj x nt = curFrens x nt ++ (foldr (++) [] (adjGroups x nt))
hurt :: MainCharacter -> MainCharacter -> BoardState -> BoardState hurt :: MainCharacter -> MainCharacter -> BoardState -> BoardState
hurt x y (nt,d) hurt x y (nt,d)
| not $ y `elem` (getAdj x nt) = (nt,d) | not $ y `elem` (getAdj x nt) = (nt,d)
| otherwise = hurt' x y (nt,d)
-- X hurts Y (no restrictions)
hurt' :: MainCharacter -> MainCharacter -> BoardState -> BoardState
hurt' x y (nt,d)
| y `elem` d = if (curFrens y nt == []) | y `elem` d = if (curFrens y nt == [])
then (nt, d) then (nt, d)
else ([y] : (groupMinusChar y) : (otherGroups y nt), d) else ([y] : (groupMinusChar y) : (otherGroups y nt), d)
@ -55,5 +60,10 @@ hurt x y (nt,d)
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) | not $ y `elem` (getAdj x nt) = (nt,d)
| otherwise = attract' x y (nt'd)
-- Attract X and Y (no restrictions)
attract' :: MainCharacter -> MainCharacter -> BoardState -> BoardState
attract' x y (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)