uh yeah i keep forgetting ab pushing these. sorry.

main.lua

@@ -1,21 +1,28 @@
 function love.load()
+
 	do_pause = false
+
 	debug = false
 	debug_collision = false
+	editor_mode = false
+
 	textScale = 1
 	fps_count = 0
 	fps_second = 0
 	fps_draw = 0
 	fps_total = 0
+
 	love.graphics.setColor(1,1,1)
 	love.keyboard.setKeyRepeat(true)
 	love.graphics.setDefaultFilter("nearest") -- good pixel
+
 	game = {
 		scale = 2,
 		width = love.graphics.getWidth(),
 		height = love.graphics.getHeight(),
 		paused = false
 	}
+
 	require "data/scripts"
 	Canvas = {
 		Darkness = CreateDarkness()
@@ -23,19 +30,25 @@ function love.load()
 	love.graphics.setCanvas(Canvas.Darkness)
 	SetDarkness()
 	love.graphics.setCanvas()
+
 	Camera.width = game.width
 	Camera.height = game.height
+
 	levelList = {"level1","2","3","ewae","tileset"}
 	levelNum = 1
 	currLevel = levelList[levelNum]
 	LoadedEntities = {}
 	LevelLoadTiles()
-	main_Player = Player:New(0,20)
+
+	main_Player = Player:New(75,50)
+
 	table.insert(LoadedEntities,main_Player)
 	table.insert(LoadedEntities,Kupo:New(700,150))
 	table.insert(LoadedEntities,Kupo:New(800,150))
-	CreateLight(200,64,80,nil,5,{1,0,0})
-	main_Player.sprite = love.graphics.newImage("assets/characters/nancy/idle1.png")
+	table.insert(LoadedEntities,Decoration:New(200,89,animation.decoration.candelabra,80))
+	table.insert(LoadedEntities,Fairy:New(200,88))
+
+	gravity = 0.2
 end
 
 function love.update(dt)
@@ -50,16 +63,35 @@ function love.update(dt)
 	fps_count = fps_count + 1
 	current_dt = dt
 
-	-- GAME STEP
-	if not do_pause then
-		SetCollisionFlags(main_Player)
-		for _, enty in pairs(LoadedEntities) do
-			enty:Smart()
-			enty:DoPhysics()
-		end
+
+	if editor_mode then
+
+
 		AnimateTiles()
-		Camera:CenterAt(main_Player.pos.x, main_Player.pos.y)
-		--camera:ScreenAt(main_Player.pos.x, main_Player.pos.y,game.width,game.height)
+	else
+		-- GAME STEP
+		if not do_pause then
+			SetCollisionFlags(main_Player)
+			for _, enty in pairs(LoadedEntities) do
+				enty:Smart()
+				enty:DoPhysics()
+			end
+			AnimateTiles()
+			Camera:CenterAt(main_Player.pos.x, main_Player.pos.y)
+			--camera:ScreenAt(main_Player.pos.x, main_Player.pos.y,game.width,game.height)
+		end
+	end
+end
+
+
+function love.wheelmoved(_, y)
+	if editor_mode then
+		if palette then
+			p_scroll = p_scroll + y
+		else
+			local oscale = game.scale
+		 	game.scale = math.max(0.1,game.scale + y/16)
+		end
 	end
 end
 
@@ -86,19 +118,23 @@ function love.keypressed(key)
 	end
 
 	if key == "f2" then
-		main_Player.pos.x, main_Player.pos.y = -16,-0.1
+		if editor_mode then
+
+		else
+			main_Player.pos.x, main_Player.pos.y = 16,-10
+		end
 	end
 
 	if key == "f3" then
 		LoadLevel()
 	end
 
-	if key == "f5" then
-		levelNum = levelNum + 1
-		if levelNum > #levelList then levelNum = levelNum - #levelList end
-		currLevel = levelList[levelNum]
-		LevelLoadTiles()
-		main_Player.pos.x, main_Player.pos.y = 0,-0.1
+	if key == "f4" then
+		if editor_mode then
+			editor_mode = false
+		else
+			editor_mode = true
+		end
 	end
 end