diff --git a/README.txt b/README.txt index c0a2188..d9e053c 100644 --- a/README.txt +++ b/README.txt @@ -26,5 +26,4 @@ BORING STUFF -------------------------------------------------- Jaidyn Ann Code under GPLv3 (see COPYING.txt) -Art under varying (libre; see ./art/COPYING.txt) -Libraries under varying (libre; see ./lib/COPYING.txt) +Art assets all under CC-BY diff --git a/art/music/default.mp3 b/art/music/default.mp3 new file mode 100644 index 0000000..735687a Binary files /dev/null and b/art/music/default.mp3 differ diff --git a/art/music/default.mp3.txt b/art/music/default.mp3.txt new file mode 100644 index 0000000..5b1db5a --- /dev/null +++ b/art/music/default.mp3.txt @@ -0,0 +1,5 @@ +https://opengameart.org/content/quirky-runner + +Quirky Runner + +CC-BY 3.0 diff --git a/art/music/menu.mp3 b/art/music/menu.mp3 new file mode 100644 index 0000000..3f96dd1 Binary files /dev/null and b/art/music/menu.mp3 differ diff --git a/art/music/menu.mp3.txt b/art/music/menu.mp3.txt new file mode 100644 index 0000000..274aab7 --- /dev/null +++ b/art/music/menu.mp3.txt @@ -0,0 +1,4 @@ +https://opengameart.org/sites/default/files/the_life_and_times_of_inky_blinky_pinky_and_clyde_1.mp3 + +The Life and Times of Inky, Blinky, Pinky and Clyde +CC-BY 3.0 diff --git a/art/music/win.mp3 b/art/music/win.mp3 new file mode 100644 index 0000000..3067437 Binary files /dev/null and b/art/music/win.mp3 differ diff --git a/art/music/win.mp3.txt b/art/music/win.mp3.txt new file mode 100644 index 0000000..45b65cc --- /dev/null +++ b/art/music/win.mp3.txt @@ -0,0 +1,5 @@ +https://opengameart.org/content/windle-pixels-8-bit-circus + +Windle Pixel's 8-Bit Circus + +CC-BY 3.0 diff --git a/main.lua b/main.lua index 5dc8af9..61f4dd5 100644 --- a/main.lua +++ b/main.lua @@ -80,12 +80,12 @@ end function mainmenu_load () mode = mainmenu selection = 1 --- if(bgm) then --- bgm:stop() --- end --- bgm = love.audio.newSource("art/music/menu.ogg", "static") --- bgm:play() --- bgm:setLooping(true) + if(bgm) then + bgm:stop() + end + bgm = love.audio.newSource("art/music/default.mp3", "static") + bgm:play() + bgm:setLooping(true) -- bgm:setVolume(1.5) frontMenu = nil mapMenu = nil @@ -196,6 +196,9 @@ end -- PAUSE STATE ---------------------------------------- function pause_load() + if(bgm) then + bgm:stop() + end mode = pause end @@ -215,6 +218,9 @@ end function pause_keypressed(key) if (key == "return") then + if(bgm) then + bgm:play() + end mode = game elseif (key == "escape") then mainmenu_load() @@ -265,6 +271,13 @@ end function youwin_load () mode = youwin + if(bgm) then + bgm:stop() + end + bgm = love.audio.newSource("art/music/win.mp3", "static") + bgm:play() + bgm:setLooping(true) + camera = stalker() map = Map:new("maps/sys/win.lua") end @@ -282,7 +295,7 @@ function youwin_draw () camera:detach() love.graphics.draw(love.graphics.newText(r_ttf, - "monkey happy!\n"), 200, 200, 0, 3, 3) + "monkey happy!\nhit enter!"), 200, 200, 0, 3, 3) camera:attach() end @@ -357,9 +370,9 @@ function game_keypressed(key) player.following = false elseif (key == "=" and camera.scale < 10) then - camera.scale = camera.scale + 1 - elseif (key == "-" and camera.scale > 1) then - camera.scale = camera.scale - 1 + camera.scale = camera.scale + .5 + elseif (key == "-" and camera.scale > .5) then + camera.scale = camera.scale - .5 elseif (key == "escape") then pause_load() diff --git a/maps/Monkey Business/1.lua b/maps/Monkey Business/1.lua index abc609a..b5460c5 100644 --- a/maps/Monkey Business/1.lua +++ b/maps/Monkey Business/1.lua @@ -4,12 +4,12 @@ return { tiledversion = "1.4.3", orientation = "orthogonal", renderorder = "right-down", - width = 100, - height = 100, + width = 120, + height = 50, tilewidth = 16, tileheight = 16, nextlayerid = 5, - nextobjectid = 46, + nextobjectid = 47, properties = {}, tilesets = {}, layers = { @@ -29,8 +29,8 @@ return { name = "hi", type = "", shape = "text", - x = 37.6276, - y = 34.1667, + x = 390.961, + y = 10.1667, width = 94.08, height = 17, rotation = 0, @@ -319,8 +319,8 @@ return { name = "", type = "", shape = "rectangle", - x = 1370, - y = 236, + x = 1619.33, + y = 241.333, width = 222.667, height = 77.3333, rotation = 0, @@ -345,8 +345,8 @@ return { name = "", type = "spawn", shape = "point", - x = 93, - y = 80, + x = 441, + y = 82.6667, width = 0, height = 0, rotation = 0, @@ -360,13 +360,28 @@ return { name = "", type = "banana", shape = "point", - x = 1484, - y = 240, + x = 1721.33, + y = 238.667, width = 0, height = 0, rotation = 0, visible = true, properties = {} + }, + { + id = 46, + name = "", + type = "", + shape = "text", + x = 1121.04, + y = 265.167, + width = 80.5938, + height = 19, + rotation = 0, + visible = true, + text = "-->", + wrap = true, + properties = {} } } } diff --git a/maps/Monkey Business/1.tmx b/maps/Monkey Business/1.tmx index 66c4fac..8112518 100644 --- a/maps/Monkey Business/1.tmx +++ b/maps/Monkey Business/1.tmx @@ -1,10 +1,10 @@ - + - + move with wasd or arrow keys @@ -31,17 +31,20 @@ - + - + - + + + --> + diff --git a/maps/Monkey Business/2.lua b/maps/Monkey Business/2.lua index edab4a4..4c1ecd4 100644 --- a/maps/Monkey Business/2.lua +++ b/maps/Monkey Business/2.lua @@ -5,11 +5,11 @@ return { orientation = "orthogonal", renderorder = "right-down", width = 50, - height = 20, + height = 50, tilewidth = 16, tileheight = 16, nextlayerid = 7, - nextobjectid = 18, + nextobjectid = 23, properties = {}, tilesets = {}, layers = { @@ -25,71 +25,71 @@ return { properties = {}, objects = { { - id = 1, + id = 5, + name = "", + type = "", + shape = "rectangle", + x = 779.288, + y = 116.365, + width = 20, + height = 145.333, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 18, + name = "", + type = "", + shape = "rectangle", + x = 16.2311, + y = 735.171, + width = 782.91, + height = 63.9694, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 19, + name = "", + type = "", + shape = "rectangle", + x = 112.663, + y = 258.742, + width = 683.614, + height = 479.293, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 20, name = "", type = "", shape = "polygon", - x = 752, - y = 128, + x = 301.707, + y = 257.787, width = 0, height = 0, rotation = 0, visible = true, polygon = { { x = 0, y = 0 }, - { x = -224, y = 48 }, - { x = -1.33333, y = 48 } + { x = -188.089, y = -98.3411 }, + { x = -189.044, y = 0.954768 } }, properties = {} }, { - id = 2, + id = 21, name = "", type = "", shape = "rectangle", - x = 748, - y = 14.6667, - width = 52, - height = 161.333, - rotation = 0, - visible = true, - properties = {} - }, - { - id = 3, - name = "", - type = "", - shape = "rectangle", - x = 1.33333, - y = 177.333, - width = 797.333, - height = 16, - rotation = 0, - visible = true, - properties = {} - }, - { - id = 4, - name = "", - type = "", - shape = "rectangle", - x = -2.66667, - y = 30.6667, - width = 510.667, - height = 16, - rotation = 0, - visible = true, - properties = {} - }, - { - id = 5, - name = "", - type = "", - shape = "rectangle", - x = -2.66667, - y = 46.6667, - width = 20, - height = 145.333, + x = 374.269, + y = 118.391, + width = 423.917, + height = 21.9597, rotation = 0, visible = true, properties = {} @@ -112,8 +112,8 @@ return { name = "", type = "spawn", shape = "point", - x = 697.333, - y = 134.667, + x = 50.0004, + y = 727.578, width = 0, height = 0, rotation = 0, @@ -127,8 +127,8 @@ return { name = "", type = "banana", shape = "point", - x = 54.6667, - y = 174.667, + x = 725.869, + y = 252.003, width = 0, height = 0, rotation = 0, @@ -148,33 +148,33 @@ return { offsety = 0, properties = {}, objects = { - { - id = 16, - name = "", - type = "", - shape = "text", - x = 515.628, - y = 63.5, - width = 82.0781, - height = 17, - rotation = 0, - visible = true, - text = "touch it! go on!", - wrap = true, - properties = {} - }, { id = 17, name = "", type = "", shape = "text", - x = 151.628, - y = 63.5, + x = 407.506, + y = 84.5049, width = 82.0781, height = 17, rotation = 0, visible = true, - text = "frozen monkeys + frozen buttons", + text = "frozen button + frozen monkey", + wrap = true, + properties = {} + }, + { + id = 22, + name = "", + type = "", + shape = "text", + x = 17.944, + y = 604.416, + width = 80.5938, + height = 19, + rotation = 0, + visible = true, + text = "climb!", wrap = true, properties = {} } @@ -196,8 +196,8 @@ return { name = "", type = "door", shape = "rectangle", - x = 444, - y = 49.3333, + x = 376.211, + y = 132.398, width = 20, height = 128, rotation = 0, @@ -209,8 +209,8 @@ return { name = "", type = "frozenDoor", shape = "rectangle", - x = 110.667, - y = 48, + x = 625.287, + y = 128.201, width = 17.3333, height = 129.333, rotation = 0, @@ -235,8 +235,8 @@ return { name = "", type = "button", shape = "rectangle", - x = 480, - y = 166.667, + x = 304.323, + y = 247.822, width = 42.6667, height = 9.33333, rotation = 0, @@ -248,8 +248,8 @@ return { name = "", type = "frozenButton", shape = "rectangle", - x = 176, - y = 166.667, + x = 539.767, + y = 249.732, width = 58.6667, height = 9.33333, rotation = 0, diff --git a/maps/Monkey Business/2.tmx b/maps/Monkey Business/2.tmx index ee6502b..1b56c79 100644 --- a/maps/Monkey Business/2.tmx +++ b/maps/Monkey Business/2.tmx @@ -1,42 +1,42 @@ - + - - + + + + + - - - - + - + - + - - touch it! go on! + + frozen button + frozen monkey - - frozen monkeys + frozen buttons + + climb! - - + + - - + + diff --git a/maps/Monkey Business/3.lua b/maps/Monkey Business/3.lua new file mode 100644 index 0000000..56fee70 --- /dev/null +++ b/maps/Monkey Business/3.lua @@ -0,0 +1,221 @@ +return { + version = "1.4", + luaversion = "5.1", + tiledversion = "1.4.3", + orientation = "orthogonal", + renderorder = "right-down", + width = 100, + height = 100, + tilewidth = 16, + tileheight = 16, + nextlayerid = 5, + nextobjectid = 14, + properties = {}, + tilesets = {}, + layers = { + { + type = "objectgroup", + draworder = "topdown", + id = 2, + name = "platforms", + visible = true, + opacity = 1, + offsetx = 0, + offsety = 0, + properties = {}, + objects = { + { + id = 1, + name = "", + type = "", + shape = "rectangle", + x = 333.333, + y = 950.667, + width = 754.667, + height = 93.3333, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 2, + name = "", + type = "", + shape = "rectangle", + x = 624.667, + y = 79.3333, + width = 162, + height = 18, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 3, + name = "", + type = "", + shape = "rectangle", + x = 626.667, + y = 98.3333, + width = 21, + height = 109, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 4, + name = "", + type = "", + shape = "rectangle", + x = 767.667, + y = 98.3333, + width = 20, + height = 108, + rotation = 0, + visible = true, + properties = {} + } + } + }, + { + type = "objectgroup", + draworder = "topdown", + id = 3, + name = "doors", + visible = true, + opacity = 1, + offsetx = 0, + offsety = 0, + properties = {}, + objects = { + { + id = 5, + name = "", + type = "door", + shape = "rectangle", + x = 628.667, + y = 192.333, + width = 159, + height = 17, + rotation = 0, + visible = true, + properties = {} + } + } + }, + { + type = "objectgroup", + draworder = "topdown", + id = 4, + name = "buttons", + visible = true, + opacity = 1, + offsetx = 0, + offsety = 0, + properties = {}, + objects = { + { + id = 6, + name = "", + type = "button", + shape = "rectangle", + x = 672.667, + y = 393.667, + width = 70.3333, + height = 16, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 7, + name = "", + type = "banana", + shape = "point", + x = 702.667, + y = 191.333, + width = 0, + height = 0, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 8, + name = "", + type = "spawn", + shape = "point", + x = 711.667, + y = 950.333, + width = 0, + height = 0, + rotation = 0, + visible = true, + properties = { + ["count"] = "10" + } + }, + { + id = 9, + name = "", + type = "", + shape = "text", + x = 663.703, + y = 786.5, + width = 80.5938, + height = 19, + rotation = 0, + visible = true, + text = "+/- to zoom", + wrap = true, + properties = {} + }, + { + id = 11, + name = "", + type = "", + shape = "rectangle", + x = 858.667, + y = 613.333, + width = 24, + height = 76, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 12, + name = "", + type = "", + shape = "polygon", + x = 870.667, + y = 580, + width = 0, + height = 0, + rotation = 0, + visible = true, + polygon = { + { x = 0, y = 0 }, + { x = -25.3333, y = 38.6667 }, + { x = 30.6667, y = 38.6667 } + }, + properties = {} + }, + { + id = 13, + name = "", + type = "", + shape = "rectangle", + x = 566.667, + y = 412, + width = 302.667, + height = 41.3333, + rotation = 0, + visible = true, + properties = {} + } + } + } + } +} diff --git a/maps/Monkey Business/3.tmx b/maps/Monkey Business/3.tmx new file mode 100644 index 0000000..c5e04d2 --- /dev/null +++ b/maps/Monkey Business/3.tmx @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + +/- to zoom + + + + + + + + diff --git a/maps/sys/menu.lua b/maps/sys/menu.lua index 8773035..0d990b4 100644 --- a/maps/sys/menu.lua +++ b/maps/sys/menu.lua @@ -9,7 +9,7 @@ return { tilewidth = 16, tileheight = 16, nextlayerid = 4, - nextobjectid = 33, + nextobjectid = 49, properties = {}, tilesets = {}, layers = { @@ -160,6 +160,19 @@ return { rotation = 0, visible = true, properties = {} + }, + { + id = 33, + name = "", + type = "banana", + shape = "point", + x = 78.9474, + y = 784.897, + width = 0, + height = 0, + rotation = 0, + visible = true, + properties = {} } } } diff --git a/maps/sys/menu.tmx b/maps/sys/menu.tmx index 79c6724..efb28ff 100644 --- a/maps/sys/menu.tmx +++ b/maps/sys/menu.tmx @@ -1,7 +1,7 @@ - + - + @@ -24,5 +24,8 @@ + + + diff --git a/maps/sys/win.lua b/maps/sys/win.lua index 8773035..d19677c 100644 --- a/maps/sys/win.lua +++ b/maps/sys/win.lua @@ -9,7 +9,7 @@ return { tilewidth = 16, tileheight = 16, nextlayerid = 4, - nextobjectid = 33, + nextobjectid = 49, properties = {}, tilesets = {}, layers = { @@ -64,61 +64,35 @@ return { properties = {} }, { - id = 27, + id = 37, + name = "", + type = "", + shape = "rectangle", + x = 466.819, + y = 306.636, + width = 120.137, + height = 11.4416, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 40, name = "", type = "", shape = "polygon", - x = 800, - y = 530.242, + x = 54.9199, + y = 311.213, width = 0, height = 0, rotation = 0, visible = true, polygon = { { x = 0, y = 0 }, - { x = -360.606, y = 269.697 }, - { x = -6.06061, y = 266.667 } + { x = 529.748, y = 225.4 }, + { x = -3.43249, y = 229.977 } }, properties = {} - }, - { - id = 28, - name = "", - type = "", - shape = "rectangle", - x = 46.6665, - y = 791.333, - width = 66.6667, - height = 14.6667, - rotation = 0, - visible = true, - properties = {} - }, - { - id = 29, - name = "", - type = "", - shape = "rectangle", - x = 177.333, - y = 790, - width = 105.333, - height = 16, - rotation = 0, - visible = true, - properties = {} - }, - { - id = 30, - name = "", - type = "", - shape = "rectangle", - x = 346.667, - y = 788.667, - width = 54.6667, - height = 16, - rotation = 0, - visible = true, - properties = {} } } }, @@ -138,14 +112,14 @@ return { name = "", type = "spawn", shape = "point", - x = 321.333, - y = 484, + x = 521.562, + y = 299.789, width = 0, height = 0, rotation = 0, visible = true, properties = { - ["count"] = 10 + ["count"] = 1 } }, { @@ -153,8 +127,125 @@ return { name = "", type = "respawn", shape = "point", - x = 330.667, - y = 2.66667, + x = 535.472, + y = 17.5408, + width = 0, + height = 0, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 33, + name = "", + type = "banana", + shape = "point", + x = 99.5423, + y = 315.789, + width = 0, + height = 0, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 41, + name = "", + type = "banana", + shape = "point", + x = 133.867, + y = 320.366, + width = 0, + height = 0, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 42, + name = "", + type = "banana", + shape = "point", + x = 124.714, + y = 291.762, + width = 0, + height = 0, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 43, + name = "", + type = "banana", + shape = "point", + x = 183.066, + y = 307.78, + width = 0, + height = 0, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 44, + name = "", + type = "banana", + shape = "point", + x = 177.346, + y = 259.725, + width = 0, + height = 0, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 45, + name = "", + type = "banana", + shape = "point", + x = 219.68, + y = 296.339, + width = 0, + height = 0, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 46, + name = "", + type = "banana", + shape = "point", + x = 181.922, + y = 356.979, + width = 0, + height = 0, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 47, + name = "", + type = "banana", + shape = "point", + x = 217.391, + y = 328.375, + width = 0, + height = 0, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 48, + name = "", + type = "banana", + shape = "point", + x = 245.995, + y = 358.124, width = 0, height = 0, rotation = 0, diff --git a/maps/sys/win.tmx b/maps/sys/win.tmx new file mode 100644 index 0000000..971c492 --- /dev/null +++ b/maps/sys/win.tmx @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +