diff --git a/AUTHORS b/AUTHORS new file mode 100644 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,17 @@ +Christopher Howard +http://frigidcode.com + +Some sound effects were adapted from the following works: +- Alien Machine Gun + | License: http://www.creativecommons.org/licenses/by/3.0/ + | Recorded by Matt Cutillo + | soundbible.com +- Grenade Sound + | License: http://www.creativecommons.org/licenses/by/3.0/ + | Recorded by Mike Koenig + | soundbible.com +- Robot Blip Sound + | License: http://www.creativecommons.org/licenses/by/3.0/ + | Recorded by Marianne Gagnon + | soundbible.com + diff --git a/Display.hs b/Display.hs --- a/Display.hs +++ b/Display.hs @@ -88,6 +88,7 @@ , g (Translate (am (-400)) (ap 340) (inventoryDisplay (lance r) (resourceTracker u))) , g (Translate (-200) 150 (levelMessage (levelMessageTimer u) (level u))) + , h 2.5 (i 20 (Translate (ap (220)) (am (-300)) helpColumn3)) , h 2 (i 20 (Translate (am (-450)) (am (-230)) helpColumn2)) , h 2 (i 20 (Translate (am (-470)) (am (-320)) helpColumn1)) ] @@ -143,6 +144,14 @@ , "U-ARROW, 8 to accelerate" , "TAB, 5 to switch weapons" , "SPACEBAR, ENTER for deflector" + ] + +helpColumn3 = + Color white $ + Pictures $ + lineFormatting + [ "Enjoy the game? To donate" + , "visit ." ] lineFormatting ys = lineFormatting' 20 0 ys diff --git a/Resources.hs b/Resources.hs --- a/Resources.hs +++ b/Resources.hs @@ -17,6 +17,7 @@ import qualified Unit.Smart.ATank as ATank import qualified Unit.Smart.STank as STank import qualified Unit.Smart.Death as Death +import qualified Unit.Smart.DeathII as DeathII import qualified Unit.Smart.Master as Master import qualified Unit.Smart.Ninja as Ninja import qualified Unit.Smart.Saucer as Saucer @@ -33,6 +34,7 @@ , "atank.bmp" , "blade.bmp" , "death.bmp" + , "deathii.bmp" , "deflector-1.bmp" , "deflector-2.bmp" , "interceptor-1.bmp" @@ -570,6 +572,29 @@ , (-280, 770) ] } + , + -- 15 + a { asteroids = asteroidGen rt wmap + [ ((-540, -940), (-50, -40)) + , ((1320, -1090), (70, -100)) + ] ++ + bigAsteroidGen rt wmap + [ ((900, 500), (70, 20)) + , ((-400, -1100), (-34, 60)) + ] + , smartUnits = deathGen rt wmap + [ ((-600, 1300.0), 0.0) + , ((600, 1300.0), 0.0) + ] ++ + deathGenII rt wmap + [ ((0, -1400), 0) + ] ++ + masterGen rt wmap + [ ((-700, 800), 0, 10) + , ((-1000, 1000), 0, 11) + , ((1200, -1000), 0, 12) + ] + } ] let addItems a = do (it1, it2) <- randomItemPair x1 <- randomRIO (0, 2999) @@ -630,6 +655,9 @@ deathGen rt wmap = map (\(x, y) -> SmartUnit (Death.new rt wmap (wrappoint wmap x) y)) + +deathGenII rt wmap = + map (\(x, y) -> SmartUnit (DeathII.new rt wmap (wrappoint wmap x) y)) saucerGen rt wmap = map (\(x, y) -> SmartUnit (Saucer.new rt wmap (wrappoint wmap x) y)) diff --git a/Step.hs b/Step.hs --- a/Step.hs +++ b/Step.hs @@ -86,29 +86,37 @@ && not (skipLevel u) = return (t, u) | level u + 1 >= length (Universe.levels u) = - do hPutStrLn stderr "Out of levels! Game over." - exitSuccess - | otherwise = - do silenceMost (arena u) - let a = Universe.levels u !! (level u + 1) - let l = lance (arena u) - let wmap = Universe.wrapMap a - let u' - = u { arena = - a { lance = - fmap - (\ l -> - l { Lance.center = wrappoint wmap - (0.0, 0.0) - , angle = 0.0 - , Lance.velocity = (0.0, 0.0)}) - l - } - , level = level u + 1 - , skipLevel = False - , levelMessageTimer = Just 0.0 - } - return (t, u') + do case lance (arena u) of + Nothing -> return (t, u) + Just l -> f u { arena = (arena u) { lance = Just l + { godMode = True + , inventory = + map (\_ -> True) (inventory l) + , swClock = 0 + } } } 0 + | otherwise = f u (level u + 1) + + where f c b = + do silenceMost (arena c) + let a = Universe.levels c !! b + let l = lance (arena c) + let wmap = Universe.wrapMap a + let a' + = c { arena = + a { lance = + fmap + (\ l -> + l { Lance.center = wrappoint wmap + (0.0, 0.0) + , angle = 0.0 + , Lance.velocity = (0.0, 0.0)}) + l + } + , level = b + , skipLevel = False + , levelMessageTimer = Just 0.0 + } + return (t, a') {- Here we'll terminateAudio everything in the arena that can receive it, not diff --git a/Unit/Smart/DeathII.hs b/Unit/Smart/DeathII.hs new file mode 100644 --- /dev/null +++ b/Unit/Smart/DeathII.hs @@ -0,0 +1,226 @@ +module Unit.Smart.DeathII ( DeathII(..) + , new + ) where + +import Data.WrapAround ( WP, WM, vectorRelation ) +import Animation + ( Audible(..), Animation(..), termSndSrc, handSndSrc ) +import Graphics.Gloss.Data.Picture () +import Graphics.Gloss.Data.Color () +import GHC.Float () +import Math + ( vectorDirection, targetingA, subV, moreThanZero, isNan ) +import ResourceTracker ( RT, protectedGetImage ) +import Updating + ( Transient(..), Observant(..), InternallyUpdating(..) ) +import qualified Moving as M + ( Moving(..), + Locatable(..), + Colliding(..), + newVelocity, + newLocation ) +import Combat + ( Projectile(..), Launcher(..), Damaging(..), Damageable(..) ) +import qualified Projectile.Interceptor as P.Interceptor ( speed, new ) +import qualified Projectile.BulletMII as P.BulletMII ( new ) +import AfterEffect ( AfterEffect(AfterEffect) ) +import qualified AfterEffect.SimpleExplosion as SimpleExplosion + ( new ) +import Data.Maybe () +import Universe ( Arena(lance) ) +import qualified Universe as U ( Arena(wrapMap) ) +import Sound.ALUT ( Source ) +import Common ( Velocity, Time, Angle ) + + +radialVelocity = pi +maxVelocityMag = 400 +kamikazeDamage = 150 +maxIntegrity = 16 +accelerationRate = 400 +adjAngleC = pi / 8 +shotDelay_sniper = 3.5 +shotDelay_spread = 2.5 +collisionR = 75 + +data DeathII = DeathII { angle :: Angle + , velocity :: Velocity + , center :: WP + , wmap :: WM + , launchTube :: [Projectile] + , sinceLastShot_sniper :: Time + , sinceLastShot_spread :: Time + , integrity :: Double + , vision :: Maybe Arena + , rt :: RT + , queueShotSnd :: Bool + , shotSndSrc :: Maybe Source + } + +instance Audible DeathII where + + processAudio s a = handSndSrc s + queueShotSnd + shotSndSrc + (\a -> a { queueShotSnd = False }) + rt + "energy-shot-02.wav" + (\a b -> a { shotSndSrc = Just b }) + a (wmap s) (M.center) + + terminateAudio s = termSndSrc s shotSndSrc + +new a b c d = DeathII { center = c + , angle = d + , velocity = (0, 0) + , wmap = b + , launchTube = [] + , sinceLastShot_sniper = 0 + , sinceLastShot_spread = 0 + , integrity = maxIntegrity + , vision = Nothing + , rt = a + , queueShotSnd = False + , shotSndSrc = Nothing + } + +instance Observant DeathII where + + updateVision s a = s { vision = Just a } + +updateAngle t s + = case vision s of + Nothing -> s + Just a -> case lance a of + Nothing -> s + Just l -> let b = angle s in + let e = if isNan b then 0.1 else b in + let m = vectorDirection + (vectorRelation + (wmap s) + (center s) + (M.center l)) in + let adj + | m - e > adjAngleC = radialVelocity * t + | m - e < (-1) * adjAngleC = (-radialVelocity) * t + | otherwise = 0 in + s { angle = angle s + adj } + +updateVelocity t s = + s { velocity = b } + where c = M.newVelocity + (velocity s) accelerationRate (angle s) maxVelocityMag t + b = case vision s of + Nothing -> velocity s + Just a -> + case lance a of + Nothing -> velocity s + Just l -> let d = angle s in + let e = if isNan d then 0.1 else d in + let m = vectorDirection + (vectorRelation + (wmap s) + (center s) + (M.center l)) in + if abs (m - e) <= adjAngleC then c else velocity s + +instance Animation DeathII where + image s _ = protectedGetImage (rt s) "deathii.bmp" + +instance M.Locatable DeathII where + center = center + +instance M.Moving DeathII where + velocity = velocity + +instance M.Colliding DeathII where + collisionRadius _ = collisionR + +instance InternallyUpdating DeathII where + + preUpdate s t = (updateFiringInformation t + . updateVelocity t + . updateAngle t) s + + postUpdate s t = + s { center = M.newLocation (wmap s) (center s) (velocity s) t } + +updateFiringInformation t s = + fst ((handleSpreadFiring . handleSniperFiring) (s, t)) + +handleSniperFiring (self, t) = + let sinceLastShot_sniper' = sinceLastShot_sniper self + t in + if sinceLastShot_sniper' >= shotDelay_sniper + then (self { sinceLastShot_sniper = 0.0 + , launchTube = projectile : launchTube self + , queueShotSnd = True + }, t) + else (self { sinceLastShot_sniper = sinceLastShot_sniper' }, t) + where projectile = Projectile + (P.Interceptor.new + (wmap self) + (rt self) + pAngle + (center self) + (velocity self)) + pSpeed = P.Interceptor.speed + pAngle = case vision self of + Nothing -> angle self + Just arena -> + case lance arena of + Nothing -> angle self + Just l -> targetingA + pSpeed + (vectorRelation + (U.wrapMap arena) + (center self) + (M.center l)) + (subV + (M.velocity l) + (M.velocity self)) + +handleSpreadFiring (self, t) = + let sinceLastShot_spread' = sinceLastShot_spread self + t in + if sinceLastShot_spread' >= shotDelay_spread + then (self { sinceLastShot_spread = 0.0 + , launchTube = projectiles ++ launchTube self + , queueShotSnd = True + }, t) + else (self { sinceLastShot_spread = sinceLastShot_spread' }, t) + where projectiles = map projectile [ x * pi / 8.0 - pi / 4.0 | x <- [0..7] ] + projectile x = Projectile + (P.BulletMII.new + (wmap self) + (pAngle + x) + (center self) + (velocity self)) + pAngle = case vision self of + Nothing -> angle self + Just arena -> + case lance arena of + Nothing -> angle self + Just l -> vectorDirection + (vectorRelation + (U.wrapMap arena) + (center self) + (M.center l)) + + +instance Launcher DeathII where + + deployProjectiles s = (launchTube s, s { launchTube = [] }) + +instance Transient DeathII where + + expired' s = if moreThanZero (integrity s) then Nothing else Just [a] + + where a = AfterEffect + (SimpleExplosion.new (rt s) (wmap s) (center s) (velocity s)) + +instance Damageable DeathII where + + inflictDamage s d = s { integrity = max 0 (integrity s - d) } + +instance Damaging DeathII where + + damageEnergy _ = kamikazeDamage diff --git a/edge.cabal b/edge.cabal --- a/edge.cabal +++ b/edge.cabal @@ -8,7 +8,7 @@ -- (http://www.haskell.org/haskellwiki/Package_versioning_policy) for -- standards guiding when and how versions should be incremented. -Version: 0.8.20 +Version: 0.9.0.1 -- A short (one-line) description of the package. Synopsis: Top view space combat arcade game @@ -48,7 +48,7 @@ -- Extra files to be distributed with the package, such as examples or -- a README. -Extra-source-files: DONATE +Extra-source-files: DONATE, edge.svg, AUTHORS -- Constraint on the version of Cabal needed to build this package. Cabal-version: >=1.10 @@ -111,6 +111,7 @@ , Unit.Smart.ATank , Unit.Smart.STank , Unit.Smart.Death + , Unit.Smart.DeathII , Unit.Smart.Master , Unit.Smart.Ninja , Unit.Smart.Saucer diff --git a/edge.svg b/edge.svg new file mode 100644 --- /dev/null +++ b/edge.svg @@ -0,0 +1,205 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/image/deathii.bmp b/image/deathii.bmp new file mode 100644 Binary files /dev/null and b/image/deathii.bmp differ