diff --git a/BondageClub/.eslintrc.json b/BondageClub/.eslintrc.json index 05e2e7db29e87857cace959c71ba5b3b542b7b45..63466e5dbbc680d967e62a569927d13dfce9d95c 100644 --- a/BondageClub/.eslintrc.json +++ b/BondageClub/.eslintrc.json @@ -9,13 +9,7 @@ }, "root": true, "ignorePatterns": [ - "Scripts/socket.io/*", - "Scripts/three/*", - "Scripts/webgl/**/*", - "Scripts/LZString.js", - "Screens/MiniGame/Chess/chess.min.js", - "Screens/MiniGame/Chess/chessboard-0.3.0.js", - "Screens/MiniGame/Chess/jquery-3.2.1.min.js" + "Scripts/lib/**/*.js" ], "rules": { "dot-notation": "error", diff --git a/BondageClub/Scripts/LZString.d.ts b/BondageClub/Scripts/lib/LZString.d.ts similarity index 100% rename from BondageClub/Scripts/LZString.d.ts rename to BondageClub/Scripts/lib/LZString.d.ts diff --git a/BondageClub/Scripts/LZString.js b/BondageClub/Scripts/lib/LZString.js similarity index 100% rename from BondageClub/Scripts/LZString.js rename to BondageClub/Scripts/lib/LZString.js diff --git a/BondageClub/Screens/MiniGame/Chess/chess.min.js b/BondageClub/Scripts/lib/chess/chess.min.js similarity index 100% rename from BondageClub/Screens/MiniGame/Chess/chess.min.js rename to BondageClub/Scripts/lib/chess/chess.min.js diff --git a/BondageClub/Screens/MiniGame/Chess/chessboard-0.3.0.js b/BondageClub/Scripts/lib/chess/chessboard-0.3.0.js similarity index 100% rename from BondageClub/Screens/MiniGame/Chess/chessboard-0.3.0.js rename to BondageClub/Scripts/lib/chess/chessboard-0.3.0.js diff --git a/BondageClub/Screens/MiniGame/Chess/jquery-3.2.1.min.js b/BondageClub/Scripts/lib/jquery-3.2.1.min.js similarity index 100% rename from BondageClub/Screens/MiniGame/Chess/jquery-3.2.1.min.js rename to BondageClub/Scripts/lib/jquery-3.2.1.min.js diff --git a/BondageClub/Scripts/socket.io/socket.io.min.js b/BondageClub/Scripts/lib/socket.io/socket.io.min.js similarity index 100% rename from BondageClub/Scripts/socket.io/socket.io.min.js rename to BondageClub/Scripts/lib/socket.io/socket.io.min.js diff --git a/BondageClub/Scripts/socket.io/socket.io.min.js.map b/BondageClub/Scripts/lib/socket.io/socket.io.min.js.map similarity index 100% rename from BondageClub/Scripts/socket.io/socket.io.min.js.map rename to BondageClub/Scripts/lib/socket.io/socket.io.min.js.map diff --git a/BondageClub/Scripts/three/FBXLoader.js b/BondageClub/Scripts/lib/three/FBXLoader.js similarity index 100% rename from BondageClub/Scripts/three/FBXLoader.js rename to BondageClub/Scripts/lib/three/FBXLoader.js diff --git a/BondageClub/Scripts/three/GLTFLoader.js b/BondageClub/Scripts/lib/three/GLTFLoader.js similarity index 100% rename from BondageClub/Scripts/three/GLTFLoader.js rename to BondageClub/Scripts/lib/three/GLTFLoader.js diff --git a/BondageClub/Scripts/three/inflate.min.js b/BondageClub/Scripts/lib/three/inflate.min.js similarity index 100% rename from BondageClub/Scripts/three/inflate.min.js rename to BondageClub/Scripts/lib/three/inflate.min.js diff --git a/BondageClub/Scripts/three/three.min.js b/BondageClub/Scripts/lib/three/three.min.js similarity index 100% rename from BondageClub/Scripts/three/three.min.js rename to BondageClub/Scripts/lib/three/three.min.js diff --git a/BondageClub/Scripts/webgl/resources/m4.js b/BondageClub/Scripts/lib/webgl/resources/m4.js similarity index 100% rename from BondageClub/Scripts/webgl/resources/m4.js rename to BondageClub/Scripts/lib/webgl/resources/m4.js diff --git a/BondageClub/Tools/Node/tsconfig-assetcheck.json b/BondageClub/Tools/Node/tsconfig-assetcheck.json index f08678026fef8d53775bae78dcb7381a4c0935fd..dd049c69137d7b2ee36655b92cdd0ac1e91ae12d 100644 --- a/BondageClub/Tools/Node/tsconfig-assetcheck.json +++ b/BondageClub/Tools/Node/tsconfig-assetcheck.json @@ -13,4 +13,7 @@ "../../Assets/**/*", "../../Backgrounds/**/*.js", ], + "exclude": [ + "../../Scripts/lib/**/*.js" + ] } diff --git a/BondageClub/index.html b/BondageClub/index.html index 926895c182eebe019d63ac80b29e75bde9318017..7fe462172b8785a7cbd28b847ac7bbfa830b9b94 100644 --- a/BondageClub/index.html +++ b/BondageClub/index.html @@ -1,4 +1,4 @@ -<!DOCTYPE html> +<!DOCTYPE html> <html style="width:100%; height:100%; padding:0px; margin:0px;"> <head> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" /> @@ -14,10 +14,15 @@ <link rel="stylesheet" href="CSS/Styles.css"> <link rel="stylesheet" href="CSS/chessboard-0.3.0.css"> <link rel="stylesheet" href="CSS/Chess.css"> + <script src="Scripts/lib/webgl/resources/m4.js"></script> + <script src="Scripts/lib/LZString.js"></script> + <script src="Scripts/lib/socket.io/socket.io.min.js"></script> + <script async src="Scripts/lib/jquery-3.2.1.min.js"></script> + <script async src="Scripts/lib/chess/chess.min.js"></script> + <script async src="Scripts/lib/chess/chessboard-0.3.0.js"></script> </head> <script src="Backgrounds/Backgrounds.js"></script> -<script src="Scripts/webgl/resources/m4.js"></script> <script src="Scripts/GLDraw.js"></script> <script src="Scripts/Common.js"></script> <script src="Scripts/CommonDraw.js"></script> @@ -52,9 +57,7 @@ <script src="Scripts/ModularItem.js"></script> <script src="Scripts/TypedItem.js"></script> <script src="Screens/Character/ItemColor/ItemColor.js"></script> -<script src="Scripts/LZString.js"></script> <script src="Scripts/VibratorMode.js"></script> -<script src="Scripts/socket.io/socket.io.min.js"></script> <script src="Scripts/DynamicDraw.js"></script> <script src="Scripts/Notification.js"></script> <script src="Scripts/Graph.js"></script> @@ -127,9 +130,6 @@ <script src="Screens/MiniGame/Tennis/Tennis.js"></script> <script src="Screens/MiniGame/PuppyWalker/PuppyWalker.js"></script> <script src="Screens/MiniGame/DojoStruggle/DojoStruggle.js"></script> -<script src="Screens/MiniGame/Chess/jquery-3.2.1.min.js"></script> -<script src="Screens/MiniGame/Chess/chess.min.js"></script> -<script src="Screens/MiniGame/Chess/chessboard-0.3.0.js"></script> <script src="Screens/MiniGame/Chess/chess.js"></script> <script src="Screens/MiniGame/Chess/BondageChess.js"></script> <script src="Screens/Cutscene/PlayerCollaring/PlayerCollaring.js"></script> diff --git a/BondageClub/jsconfig.json b/BondageClub/jsconfig.json index f7ce68561c792844a2778f286b138766c97d5724..239dbea9ef33c6e3061b6ea609a21ee0d878ea0c 100644 --- a/BondageClub/jsconfig.json +++ b/BondageClub/jsconfig.json @@ -4,5 +4,6 @@ "lib": ["es2018", "dom"], "checkJs": true }, - "include": ["Scripts/**/*", "Screens/**/*", "Assets/**/*", "Backgrounds/**/*.js"] + "include": ["Scripts/**/*", "Screens/**/*", "Assets/**/*", "Backgrounds/**/*.js"], + "exclude": ["Scripts/lib/**/*.js"] }