Merge pull request #10 from max-bacon/dev

Dev

.github/workflows/deploy_dev.yaml

@@ -1,4 +1,4 @@
-name: Deploy Dev
+name: Deploy Dev (Lync)
 
 on:
   push:
@@ -9,18 +9,28 @@ jobs:
 
   deploy:
     name: Deploy
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
     steps:
-    - name: Checkout code
+
+    - name: Install Node.js
+      uses: actions/setup-node@v3
+
+    - name: Checkout repo
       uses: actions/checkout@v3
 
+    - name: Checkout Lync
+      uses: actions/checkout@master
+      with:
+        repository: Iron-Stag-Games/Lync
+        path: Lync
+
     - uses: ok-nick/setup-aftman@v0.3.0
       name: Install Aftman
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
 
     - run: wally install
-
-    - run: rojo build -o game.rbxlx
 
-    - run: rbxcloud experience publish -f game.rbxlx -p ${{ secrets.DEV_PLACE_ID }} -u ${{ secrets.DEV_UNIVERSE_ID }} -t published -a ${{ secrets.API_KEY }}
+    - run: node "Lync/Lync/index.js" lync.project.json OFFLINE
+
+    - run: rbxcloud experience publish -f BuildScripts/Build/Build.rbxl -p ${{ secrets.DEV_PLACE_ID }} -u ${{ secrets.DEV_UNIVERSE_ID }} -t published -a ${{ secrets.API_KEY }}

.github/workflows/deploy_prod.yaml

@@ -1,4 +1,4 @@
-name: Deploy Prod
+name: Deploy Prod (Lync)
 
 on:
   push:
@@ -9,18 +9,28 @@ jobs:
 
   deploy:
     name: Deploy
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
     steps:
-    - name: Checkout code
+
+    - name: Install Node.js
+      uses: actions/setup-node@v3
+
+    - name: Checkout repo
       uses: actions/checkout@v3
 
+    - name: Checkout Lync
+      uses: actions/checkout@master
+      with:
+        repository: Iron-Stag-Games/Lync
+        path: Lync
+
     - uses: ok-nick/setup-aftman@v0.3.0
       name: Install Aftman
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
-    
+
     - run: wally install
-    
-    - run: rojo build -o game.rbxlx
+
+    - run: node "Lync/Lync/index.js" lync.project.json OFFLINE
 
     - run: rbxcloud experience publish -f game.rbxlx -p ${{ secrets.PROD_PLACE_ID }} -u ${{ secrets.PROD_UNIVERSE_ID }} -t published -a ${{ secrets.API_KEY }}

.github/workflows/deploy_stage.yaml

@@ -1,4 +1,4 @@
-name: Deploy Stage
+name: Deploy Stage (Lync)
 
 on:
   push:
@@ -9,18 +9,28 @@ jobs:
 
   deploy:
     name: Deploy
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
     steps:
-    - name: Checkout code
+
+    - name: Install Node.js
+      uses: actions/setup-node@v3
+
+    - name: Checkout repo
       uses: actions/checkout@v3
 
+    - name: Checkout Lync
+      uses: actions/checkout@master
+      with:
+        repository: Iron-Stag-Games/Lync
+        path: Lync
+
     - uses: ok-nick/setup-aftman@v0.3.0
       name: Install Aftman
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
-    
+
     - run: wally install
-    
-    - run: rojo build -o game.rbxlx
+
+    - run: node "Lync/Lync/index.js" lync.project.json OFFLINE
 
     - run: rbxcloud experience publish -f game.rbxlx -p ${{ secrets.STAGE_PLACE_ID }} -u ${{ secrets.STAGE_UNIVERSE_ID }} -t published -a ${{ secrets.API_KEY }}

.gitignore

@@ -7,3 +7,9 @@ temp/
 
 *.rbxlx.lock
 *.rbxl.lock
+
+BuildScripts/Build/*
+
+!BuildScripts/Build/.gitkeep
+
+!default.base.rbxl

.luaurc

@@ -0,0 +1,7 @@
+{
+	"languageMode": "strict",
+	"lint": { "*": true, "LocalUnused": false, "FunctionUnused": false, "ImportUnused": false},
+	"lintErrors": true,
+	"typeErrors": true,
+	"globals": []
+}

.lune/extract.luau

@@ -0,0 +1,68 @@
+--[[
+
+lune extract.luau
+
+]]
+
+local roblox = require("@lune/roblox")
+local fs = require("@lune/fs")
+
+local ignore = {
+	"Camera",
+	"Packages",
+	"Terrain",
+}
+
+local restrict = {}
+
+local placeFile = fs.readFile(".lune/map.rbxl")
+local game = roblox.deserializePlace(placeFile)
+
+local function check(name, checkArr)
+	for _, c in pairs(checkArr) do
+		if c == name then
+			return true
+		end
+	end
+	return false
+end
+
+local function isFile(name: string)
+	-- print(name)
+	if fs.isFile(name .. ".rbxm") then
+		return true
+	else
+		return false
+	end
+end
+
+local function main(save: string, loc)
+	local Models = loc
+	fs.writeDir(save)
+
+	for _, entryName in fs.readDir(save) do
+		if fs.isFile(entryName) then
+			fs.removeFile(entryName)
+		end
+	end
+
+	for _, model in ipairs(Models:GetChildren()) do
+		print(model.Name)
+		if not check(model.Name, ignore) then
+			if isFile(save .. model.Name) and not check(model.Name, restrict) then
+				local i = 0
+				repeat
+					i = i + 1
+				until not isFile(save .. model.Name .. i)
+
+				fs.writeFile(save .. model.Name .. i .. ".rbxm", roblox.serializeModel({model}))
+			else
+				fs.writeFile(save .. model.Name .. ".rbxm", roblox.serializeModel({model}))
+			end
+		end
+	end
+end
+
+main("assets/Workspace/", game.Workspace)
+main("assets/Lighting/", game.Lighting)
+main("assets/ServerStorage/", game.ServerStorage)

.lune/lighting-extract.luau

@@ -0,0 +1,44 @@
+--[[
+
+lune lighting-extract.luau
+
+]]
+
+local roblox = require("@lune/roblox")
+local fs = require("@lune/fs")
+
+local save = "assets/Lighting/"
+
+local placeFile = fs.readFile(".lune/map.rbxl")
+local game = roblox.deserializePlace(placeFile)
+
+local function isFile(name: string)
+	if fs.isFile(name .. ".rbxm") then
+		return true
+	else
+		return false
+	end
+end
+
+local Models = game.Lighting
+fs.writeDir(save)
+
+for _, entryName in fs.readDir(save) do
+	if fs.isFile(entryName) then
+		fs.removeFile(entryName)
+	end
+end
+
+for _, model in ipairs(Models:GetChildren()) do
+	print(model.Name)
+	if isFile(save .. model.Name) then
+		local i = 0
+		repeat
+			i = i + 1
+		until not isFile(save .. model.Name .. i)
+
+		fs.writeFile(save .. model.Name .. i .. ".rbxm", roblox.serializeModel({ model }))
+	else
+		fs.writeFile(save .. model.Name .. ".rbxm", roblox.serializeModel({ model }))
+	end
+end