Merge pull request #91 from acidlabsdev/main

fix(require): fix broken requires

Author: xesdoog

.editorconfig

@@ -6,3 +6,10 @@ indent_size = 4
 end_of_line = crlf
 insert_final_newline = true
 charset = utf-8
+
+[*.yml]
+indent_style = space
+indent_size = 4
+end_of_line = crlf
+insert_final_newline = true
+charset = utf-8

.github/workflows/zip-release.yml

@@ -107,6 +107,12 @@ jobs:
           });
 
           let changelog = "";
+          let breaking = false;
+          let breakingMsg = ">[!Important]\n>**This is a breaking change**\n>To install this update, please remove the previous version completely and then install the new version.\n\n";
+
+          function isBreakingChange(str) {
+            return str.toLowerCase().includes("breaking change");
+          }
 
           const mergedPRs = pulls.filter(pr => pr.merged_at && new Date(pr.merged_at) > lastTagDate);
           const extractField = (body, fieldName) => {
@@ -120,15 +126,11 @@ jobs:
 
           if (mergedPRs.length > 0) {
             for (const pr of mergedPRs) {
-              changelog += `## PR #${pr.number}: ${pr.title}\n`;
-              const body = pr.body
+              changelog += `### PR #${pr.number}: ${pr.title}\n`;
+              const body = pr.body;
               if (body) {
-                const lines = body.split('\n').map(line => line.trim());
-                for (const line of lines) {
-                  if (line)
-                    changelog += `${line}\n`;
-                }
-                changelog += "\n";
+                breaking = breaking || isBreakingChange(body);
+                changelog += `${body.trim()}\n\n`;
               }
             }
           } else {
@@ -141,17 +143,25 @@ jobs:
 
             const commits = compared.data.commits;
             for (const commit of commits) {
-              const msg = commit.commit.message;
+              const msg = commit.commit.message || "";
               const body = commit.commit.body;
+
               if (msg.toLowerCase().startsWith("merge pull"))
                 continue;
 
+              breaking = breaking || isBreakingChange(msg);
               changelog += `## ${msg}\n\n`;
-              if (body)
-                changelog += `${body}\n\n`;
+
+              if (body) {
+                breaking = breaking || isBreakingChange(body);
+                changelog += `${body.trim()}\n\n`;
+              }
             }
           }
 
+          if (breaking) {
+            changelog = `${breakingMsg}${changelog}`
+          }
           core.setOutput("changelog", changelog);
 
     - name: Bump Version

SSV2/includes/features/YimResupplierV3.lua

@@ -9,7 +9,7 @@
 
 local SGSL                       = require("includes.services.SGSL")
 local Warehouse                  = require("includes.modules.businesses.Warehouse")
-local Factory                    = require("SSV2.includes.modules.businesses.Factory")
+local Factory                    = require("includes.modules.businesses.Factory")
 local Nightclub                  = require("includes.modules.businesses.Nightclub")
 local Clubhouse                  = require("includes.modules.businesses.Clubhouse")
 local CashSafe                   = require("includes.modules.businesses.CashSafe")
@@ -414,13 +414,15 @@ end
 
 function YRV3:PopulateNightclub()
 	if (self.m_businesses.nightclub) then
+		self.m_data_initialized = true
 		return
 	end
 
 	ThreadManager:Run(function()
 		local nc_index = stats.get_int("MPX_NIGHTCLUB_OWNED")
 		local ref = self.m_raw_data.Nightclubs[nc_index]
 		if (nc_index == 0 or not ref) then
+			self.m_data_initialized = true
 			return
 		end