From 8ddf3610ac0571000d47edef2576ed7d8443029b Mon Sep 17 00:00:00 2001
From: lustlion <undeadmaelys@protonmail.ch>
Date: Sat, 12 Feb 2022 11:36:43 +0100
Subject: [PATCH] restructured folder

---
 {data/scripts => code}/animation.lua          |  0
 {data/scripts => code}/audio.lua              |  0
 {data/scripts => code}/camera.lua             |  0
 {data/scripts => code}/collision.lua          |  0
 {data/scripts => code}/debug.lua              |  0
 {data/scripts => code}/editor.lua             |  0
 {data/scripts => code}/entities/arrow.lua     |  0
 .../scripts => code}/entities/cursed_book.lua |  0
 .../scripts => code}/entities/decoration.lua  |  0
 {data/scripts => code}/entities/fairy.lua     |  0
 {data/scripts => code}/entities/kupo.lua      |  0
 {data/scripts => code}/entities/particle.lua  |  0
 {data/scripts => code}/entities/player.lua    |  9 +++--
 {data/scripts => code}/entity.lua             | 14 ++++----
 {data/scripts => code}/game.lua               |  0
 {data/scripts => code}/gameworld.lua          |  0
 {data/scripts => code}/hex.lua                |  0
 {data/scripts => code}/in_out.lua             |  0
 {data/scripts => code}/keybind.lua            |  0
 {data/scripts => code}/level.lua              |  0
 {data/scripts => code}/lights.lua             |  0
 {data/scripts => code}/locale.lua             |  0
 {data/scripts => code}/math.lua               |  0
 {data/scripts => code}/menu.lua               |  0
 {data/scripts => code}/objects.lua            |  0
 {data/scripts => code}/particle.lua           |  0
 code/require.lua                              | 33 +++++++++++++++++++
 {data/scripts => code}/ui.lua                 |  4 +--
 {data/scripts => code}/ui/button.lua          |  0
 {data/scripts => code}/ui/dialog.lua          |  0
 data/scripts.lua                              | 29 ----------------
 data/sfx.lua                                  |  1 +
 main.lua                                      |  3 +-
 33 files changed, 49 insertions(+), 44 deletions(-)
 rename {data/scripts => code}/animation.lua (100%)
 rename {data/scripts => code}/audio.lua (100%)
 rename {data/scripts => code}/camera.lua (100%)
 rename {data/scripts => code}/collision.lua (100%)
 rename {data/scripts => code}/debug.lua (100%)
 rename {data/scripts => code}/editor.lua (100%)
 rename {data/scripts => code}/entities/arrow.lua (100%)
 rename {data/scripts => code}/entities/cursed_book.lua (100%)
 rename {data/scripts => code}/entities/decoration.lua (100%)
 rename {data/scripts => code}/entities/fairy.lua (100%)
 rename {data/scripts => code}/entities/kupo.lua (100%)
 rename {data/scripts => code}/entities/particle.lua (100%)
 rename {data/scripts => code}/entities/player.lua (91%)
 rename {data/scripts => code}/entity.lua (92%)
 rename {data/scripts => code}/game.lua (100%)
 rename {data/scripts => code}/gameworld.lua (100%)
 rename {data/scripts => code}/hex.lua (100%)
 rename {data/scripts => code}/in_out.lua (100%)
 rename {data/scripts => code}/keybind.lua (100%)
 rename {data/scripts => code}/level.lua (100%)
 rename {data/scripts => code}/lights.lua (100%)
 rename {data/scripts => code}/locale.lua (100%)
 rename {data/scripts => code}/math.lua (100%)
 rename {data/scripts => code}/menu.lua (100%)
 rename {data/scripts => code}/objects.lua (100%)
 rename {data/scripts => code}/particle.lua (100%)
 create mode 100644 code/require.lua
 rename {data/scripts => code}/ui.lua (60%)
 rename {data/scripts => code}/ui/button.lua (100%)
 rename {data/scripts => code}/ui/dialog.lua (100%)
 delete mode 100644 data/scripts.lua

diff --git a/data/scripts/animation.lua b/code/animation.lua
similarity index 100%
rename from data/scripts/animation.lua
rename to code/animation.lua
diff --git a/data/scripts/audio.lua b/code/audio.lua
similarity index 100%
rename from data/scripts/audio.lua
rename to code/audio.lua
diff --git a/data/scripts/camera.lua b/code/camera.lua
similarity index 100%
rename from data/scripts/camera.lua
rename to code/camera.lua
diff --git a/data/scripts/collision.lua b/code/collision.lua
similarity index 100%
rename from data/scripts/collision.lua
rename to code/collision.lua
diff --git a/data/scripts/debug.lua b/code/debug.lua
similarity index 100%
rename from data/scripts/debug.lua
rename to code/debug.lua
diff --git a/data/scripts/editor.lua b/code/editor.lua
similarity index 100%
rename from data/scripts/editor.lua
rename to code/editor.lua
diff --git a/data/scripts/entities/arrow.lua b/code/entities/arrow.lua
similarity index 100%
rename from data/scripts/entities/arrow.lua
rename to code/entities/arrow.lua
diff --git a/data/scripts/entities/cursed_book.lua b/code/entities/cursed_book.lua
similarity index 100%
rename from data/scripts/entities/cursed_book.lua
rename to code/entities/cursed_book.lua
diff --git a/data/scripts/entities/decoration.lua b/code/entities/decoration.lua
similarity index 100%
rename from data/scripts/entities/decoration.lua
rename to code/entities/decoration.lua
diff --git a/data/scripts/entities/fairy.lua b/code/entities/fairy.lua
similarity index 100%
rename from data/scripts/entities/fairy.lua
rename to code/entities/fairy.lua
diff --git a/data/scripts/entities/kupo.lua b/code/entities/kupo.lua
similarity index 100%
rename from data/scripts/entities/kupo.lua
rename to code/entities/kupo.lua
diff --git a/data/scripts/entities/particle.lua b/code/entities/particle.lua
similarity index 100%
rename from data/scripts/entities/particle.lua
rename to code/entities/particle.lua
diff --git a/data/scripts/entities/player.lua b/code/entities/player.lua
similarity index 91%
rename from data/scripts/entities/player.lua
rename to code/entities/player.lua
index 7d01d6e..b59e758 100644
--- a/data/scripts/entities/player.lua
+++ b/code/entities/player.lua
@@ -194,12 +194,11 @@ function Player:DoPhysics()
   if self.isHooked then
     local hook = Vector(self.pos.x, self.pos.y, self.hookAnchor.x, self.hookAnchor.y)
     if GetVectorValue(hook) > self.hookedDistance then
-      self.canFall = false
       local hook_angle = GetAngleFromVector(hook[1],hook[2])
-      --pos_x = self.hookAnchor.x + self.hookedDistance * math.cos(-math.rad(180)+hook_angle) + ((gravity ^ 2)/2) * math.sin(hook_angle)
-      --pos_y = self.hookAnchor.y + self.hookedDistance * math.sin(-math.rad(180)+hook_angle) + ((gravity ^ 2)/2) * math.cos(hook_angle)
-      self.vel.x = self.vel.x + gravity * (-math.sin(hook_angle))
-      self.vel.y = self.vel.y + gravity * math.cos(hook_angle)
+      local pos_x = self.hookAnchor.x + self.hookedDistance * math.cos(-math.rad(180)+hook_angle)
+      local pos_y = self.hookAnchor.y + self.hookedDistance * math.sin(-math.rad(180)+hook_angle)
+      self.vel.x = self.vel.x + pos_x - self.pos.x
+      self.vel.y = self.vel.y + pos_y - self.pos.y
     end
   end
 
diff --git a/data/scripts/entity.lua b/code/entity.lua
similarity index 92%
rename from data/scripts/entity.lua
rename to code/entity.lua
index 3e4d013..c94aa99 100644
--- a/data/scripts/entity.lua
+++ b/code/entity.lua
@@ -248,10 +248,10 @@ function Entity:Debug()
 		)
 	end
 end
-require "data/scripts/entities/kupo"
-require "data/scripts/entities/arrow"
-require "data/scripts/entities/decoration"
-require "data/scripts/entities/player"
-require "data/scripts/entities/fairy"
-require "data/scripts/entities/cursed_book"
-require "data/scripts/entities/particle"
+require "code/entities/kupo"
+require "code/entities/arrow"
+require "code/entities/decoration"
+require "code/entities/player"
+require "code/entities/fairy"
+require "code/entities/cursed_book"
+require "code/entities/particle"
diff --git a/data/scripts/game.lua b/code/game.lua
similarity index 100%
rename from data/scripts/game.lua
rename to code/game.lua
diff --git a/data/scripts/gameworld.lua b/code/gameworld.lua
similarity index 100%
rename from data/scripts/gameworld.lua
rename to code/gameworld.lua
diff --git a/data/scripts/hex.lua b/code/hex.lua
similarity index 100%
rename from data/scripts/hex.lua
rename to code/hex.lua
diff --git a/data/scripts/in_out.lua b/code/in_out.lua
similarity index 100%
rename from data/scripts/in_out.lua
rename to code/in_out.lua
diff --git a/data/scripts/keybind.lua b/code/keybind.lua
similarity index 100%
rename from data/scripts/keybind.lua
rename to code/keybind.lua
diff --git a/data/scripts/level.lua b/code/level.lua
similarity index 100%
rename from data/scripts/level.lua
rename to code/level.lua
diff --git a/data/scripts/lights.lua b/code/lights.lua
similarity index 100%
rename from data/scripts/lights.lua
rename to code/lights.lua
diff --git a/data/scripts/locale.lua b/code/locale.lua
similarity index 100%
rename from data/scripts/locale.lua
rename to code/locale.lua
diff --git a/data/scripts/math.lua b/code/math.lua
similarity index 100%
rename from data/scripts/math.lua
rename to code/math.lua
diff --git a/data/scripts/menu.lua b/code/menu.lua
similarity index 100%
rename from data/scripts/menu.lua
rename to code/menu.lua
diff --git a/data/scripts/objects.lua b/code/objects.lua
similarity index 100%
rename from data/scripts/objects.lua
rename to code/objects.lua
diff --git a/data/scripts/particle.lua b/code/particle.lua
similarity index 100%
rename from data/scripts/particle.lua
rename to code/particle.lua
diff --git a/code/require.lua b/code/require.lua
new file mode 100644
index 0000000..b71e364
--- /dev/null
+++ b/code/require.lua
@@ -0,0 +1,33 @@
+-- data
+require "data/animations"
+require "data/shaders"
+require "data/tiledata"
+require "data/music"
+require "data/sfx"
+require "code/locale"
+
+-- support functions
+require "code/math"
+require "code/hex"
+require "code/in_out"
+
+-- classes
+require "code/audio"
+require "code/entity"
+require "code/animation"
+require "code/collision"
+require "code/level"
+require "code/camera"
+require "code/lights"
+require "code/objects"
+
+-- UI functions
+require "code/debug"
+require "code/keybind"
+require "code/menu"
+require "code/ui"
+
+-- game loop
+require "code/game"
+require "code/gameworld"
+require "code/editor"
diff --git a/data/scripts/ui.lua b/code/ui.lua
similarity index 60%
rename from data/scripts/ui.lua
rename to code/ui.lua
index 5ba5049..d413ccf 100644
--- a/data/scripts/ui.lua
+++ b/code/ui.lua
@@ -5,5 +5,5 @@ function AddElement(self)
   self.id = #UIElement
 end
 
-require "data/scripts/ui/button"
-require "data/scripts/ui/dialog"
+require "code/ui/button"
+require "code/ui/dialog"
diff --git a/data/scripts/ui/button.lua b/code/ui/button.lua
similarity index 100%
rename from data/scripts/ui/button.lua
rename to code/ui/button.lua
diff --git a/data/scripts/ui/dialog.lua b/code/ui/dialog.lua
similarity index 100%
rename from data/scripts/ui/dialog.lua
rename to code/ui/dialog.lua
diff --git a/data/scripts.lua b/data/scripts.lua
deleted file mode 100644
index 5585353..0000000
--- a/data/scripts.lua
+++ /dev/null
@@ -1,29 +0,0 @@
--- data
-require "data/animations"
-require "data/shaders"
-require "data/tiledata"
-require "data/music"
-require "data/sfx"
-require "data/scripts/locale"
--- support functions
-require "data/scripts/math"
-require "data/scripts/hex"
-require "data/scripts/in_out"
--- classes
-require "data/scripts/audio"
-require "data/scripts/entity"
-require "data/scripts/animation"
-require "data/scripts/collision"
-require "data/scripts/level"
-require "data/scripts/camera"
-require "data/scripts/lights"
-require "data/scripts/objects"
--- UI functions
-require "data/scripts/debug"
-require "data/scripts/keybind"
-require "data/scripts/menu"
-require "data/scripts/ui"
--- game loop
-require "data/scripts/game"
-require "data/scripts/gameworld"
-require "data/scripts/editor"
diff --git a/data/sfx.lua b/data/sfx.lua
index e69de29..cc1f767 100644
--- a/data/sfx.lua
+++ b/data/sfx.lua
@@ -0,0 +1 @@
+sfx = {}
diff --git a/main.lua b/main.lua
index 2b21a63..bd4d2bb 100644
--- a/main.lua
+++ b/main.lua
@@ -26,7 +26,8 @@ function love.load()
 		paused = false
 	}
 
-	require "data/scripts"
+	require "code/require"
+
 	logPrint(loveInitLog)
 	loveInitLog = nil
 	Canvas = {