diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..5720745 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,38 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Pure Lua", + "type": "lua", + "request": "launch", + "projectDir": "${workspaceRoot}", + "clientIndex": "1", + "program": "${workspaceRoot}/test.lua", + "luaexe": "C:/Program Files (x86)/Lua/5.1/lua.exe" + }, + { + "name": "SimpleLua 2", + "type": "lua", + "request": "launch", + "projectDir": "${workspaceRoot}", + "clientIndex": "2" + }, + { + "name": "SimpleLua 3", + "type": "lua", + "request": "launch", + "projectDir": "${workspaceRoot}", + "clientIndex": "3" + }, + { + "type": "lua", + "request": "launch", + "name": "Launch", + "projectDir": "${workspaceRoot}", + "program": "./love.exe", + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..2421e38 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,8 @@ +{ + "files.exclude": { + "**/.classpath": true, + "**/.project": true, + "**/.settings": true, + "**/.factorypath": true + } +} \ No newline at end of file diff --git a/OpenAL32.dll b/OpenAL32.dll new file mode 100644 index 0000000..fbb982b Binary files /dev/null and b/OpenAL32.dll differ diff --git a/SDL2.dll b/SDL2.dll new file mode 100644 index 0000000..7b76a0a Binary files /dev/null and b/SDL2.dll differ diff --git a/Visual Novel/VNCore.lua b/Visual Novel/VNCore.lua new file mode 100644 index 0000000..6e039be --- /dev/null +++ b/Visual Novel/VNCore.lua @@ -0,0 +1,66 @@ +return { + init = function(frame, parseManager, multi) + frame.Visibility = 0 + local workspace = frame:newImageLabel(nil,"Workspace", 0,0,0,0,0,0,1,1) + workspace.Color = Color.Green + local HUD = frame:newFullFrame("HUD") + local go = false + HUD.Visibility = 0 + local handle = parseManager:load("init.dms") + handle:define{ + sleep = thread.sleep + } + local chat = HUD:newTextLabel("","",0,0,0,0,.5/40,31/40,39/40,1/5) + local name = chat:newTextLabel("Name","Name",0,0,80,0,0,-1.165/5,0,1/5) + name.Visible = false + name:fitFont() + name:widthToTextSize() + name:setRoundness(6,6,180) + local disp = chat:newTextLabel("","",15/2,15/2,-15,-15,0,0,1,1) + disp.TextFormat = "left" + disp.Font = name.Font + disp.Visibility = 0 + disp.BorderSize = 0 + chat:setRoundness(15,15,180) + workspace:OnReleased(function(b,self) + if b == "l" then + go = true + else + HUD.Visible = not HUD.Visible + end + end) + parseManager.print("\n"..handle:dump()) + handle.__TEXT = function(text) -- change the default text stuff + local pan = false + local n,txt = text:match("([%w ]+):(.+)") + if n then + text = txt + name.text = n + name:widthToTextSize() + name.Visible = true + end + multi:newThread("UpdateText",function() + disp.text = "" + for i in text:gmatch(".") do + disp.text = disp.text .. i + thread.sleep(.05) + if go then disp.text = text go = false pan = true break end + end + pan = true + go = false + end) + thread.hold(function() + return pan + end) + pan = false + end + multi:newThread("Runner",function() + local active = true + while true do + thread.skip() + active = handle:think() + end + end) + return frame + end +} \ No newline at end of file diff --git a/Visual Novel/init.dms b/Visual Novel/init.dms index aa2a5fc..9f52557 100644 --- a/Visual Novel/init.dms +++ b/Visual Novel/init.dms @@ -1,6 +1,12 @@ ENTRY init [init]{ - "Hi!" + "Ryan: Hi!" "hmm..." "wait!" + "Bob: What are you talking about?" + "Ryan: I forget tbh..." + "Bob: but you just told me how important this was!" + "Ryan: did I? Damn my memory is really bad..." + "Bob: maybe you should see a doctor." + "Ryan: That might be a good idea..." } \ No newline at end of file diff --git a/Visual Novel/main.lua b/Visual Novel/main.lua index 50f8adc..8687872 100644 --- a/Visual Novel/main.lua +++ b/Visual Novel/main.lua @@ -4,33 +4,10 @@ local bin = require("bin") GLOBAL,sThread = require("multi.integration.loveManager").init() require("GuiManager") require("parseManager") -local handle = parseManager:load("init.dms") -handle:define{ - sleep = thread.sleep -} -local disp = gui:newTextLabel("","",0,0,200,100) -local go = false -disp:OnReleased(function() - go = true -end) -parseManager.print(handle:dump()) -handle.__TEXT = function(text) - disp.text = text - thread.hold(function() - return go - end) - go = false -end -multi:newThread("Runner",function() - local active = true - while true do - thread.skip() - active = handle:think() - end -end) function love.update() multi:uManager() end multi.OnError(function(...) print(...) -end) \ No newline at end of file +end) +VNCore = require("VNCore").init(gui:newFullFrame("Main"), parseManager, multi) diff --git a/love.dll b/love.dll new file mode 100644 index 0000000..7dfc01c Binary files /dev/null and b/love.dll differ diff --git a/love.exe b/love.exe new file mode 100644 index 0000000..480cc0f Binary files /dev/null and b/love.exe differ diff --git a/lovec.exe b/lovec.exe new file mode 100644 index 0000000..26ed49d Binary files /dev/null and b/lovec.exe differ diff --git a/lua51.dll b/lua51.dll new file mode 100644 index 0000000..8112ccd Binary files /dev/null and b/lua51.dll differ diff --git a/mpg123.dll b/mpg123.dll new file mode 100644 index 0000000..69273a4 Binary files /dev/null and b/mpg123.dll differ diff --git a/msvcp120.dll b/msvcp120.dll new file mode 100644 index 0000000..4ea1efa Binary files /dev/null and b/msvcp120.dll differ diff --git a/msvcr120.dll b/msvcr120.dll new file mode 100644 index 0000000..d711c92 Binary files /dev/null and b/msvcr120.dll differ