Compare commits
10
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1e6e7920a5 | ||
|
|
0b94ed05e0 | ||
|
|
1757d6a8c3
|
||
|
|
7d8df34624
|
||
|
|
6b0cefbb4a | ||
|
|
8b7894ccb1
|
||
|
|
3917b5303e | ||
|
|
1b615df72f | ||
|
|
867aa789f7 | ||
|
|
4d0e55d33c |
@@ -18,7 +18,7 @@ jobs:
|
||||
|
||||
- name: Update Submodule to Latest And Pull LFS
|
||||
run: |
|
||||
git submodule update --remote --merge assets rooms
|
||||
git submodule update --remote --merge assets
|
||||
git lfs pull
|
||||
git submodule foreach git lfs pull
|
||||
|
||||
@@ -40,7 +40,7 @@ jobs:
|
||||
|
||||
git config user.name "Gitea Bot"
|
||||
git config user.email "bot@gitea.io"
|
||||
git add asphalt.lock.toml places/common/src/shared/assets/assets.luau places/common/src/shared/assets/assets.d.ts assets rooms
|
||||
git add asphalt.lock.toml src/shared/assets/assets.luau src/shared/assets/assets.d.ts assets
|
||||
|
||||
# On ne commit que s'il y a des changements
|
||||
if git diff --staged --quiet; then
|
||||
|
||||
+3
-4
@@ -1,9 +1,8 @@
|
||||
node_modules
|
||||
|
||||
places/*/include
|
||||
places/*/flamework.build
|
||||
places/*/out
|
||||
places/*/dist
|
||||
/flamework.build
|
||||
|
||||
/tsconfig.tsbuildinfo
|
||||
|
||||
out
|
||||
|
||||
|
||||
@@ -5,18 +5,12 @@ version = 2
|
||||
[inputs.assets.087ddcc2dd2cc2deb264b3e4036fb6328d903d2a4d6bb90968dcbfc279fc4c85]
|
||||
asset_id = 120860142409755
|
||||
|
||||
[inputs.assets.0899ab5a89266f121a555a228662ab3af910d1c71ce167705e39c3fdc448bef1]
|
||||
asset_id = 129493473437352
|
||||
|
||||
[inputs.assets.16254d0038705124ed2810d226afc6d2967c6624929805cbc0228c79aba3fda1]
|
||||
asset_id = 93869395830786
|
||||
|
||||
[inputs.assets.1c58c2fc14f2f516dbd58dc16f34bda6367134641dfcb627f8086c47dede4e90]
|
||||
asset_id = 100562459880003
|
||||
|
||||
[inputs.assets.2e90437a7da6a62d8ae1e876549ae604ec126ba407b15e58a7880bbfafc94a1d]
|
||||
asset_id = 76052577701850
|
||||
|
||||
[inputs.assets.3b92d7f3eb07aff1e39ee3500246c1518432613393221ca6447c8336d171db7a]
|
||||
asset_id = 127096632190841
|
||||
|
||||
|
||||
+1
-1
Submodule assets updated: ee0a7e620d...a90f375ed1
+1
-1
@@ -172,5 +172,5 @@ export default defineConfig(
|
||||
"prettier/prettier": "warn",
|
||||
},
|
||||
},
|
||||
globalIgnores(["/out", "**/assets.d.ts", "scripts"]),
|
||||
globalIgnores(["out", "**/assets.d.ts", "scripts"]),
|
||||
);
|
||||
|
||||
+14
-5
@@ -8,8 +8,13 @@
|
||||
],
|
||||
"scripts": {
|
||||
"lint": "eslint --cache",
|
||||
"prepare": "husky"
|
||||
"prepare": "husky",
|
||||
"prepack": "rotor build --type=package"
|
||||
},
|
||||
"files": [
|
||||
"out",
|
||||
"flamework.build"
|
||||
],
|
||||
"keywords": [],
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
@@ -20,6 +25,7 @@
|
||||
"@isentinel/dict-roblox": "^1.0.4",
|
||||
"@rbxts/compiler-types": "3.0.0-types.0",
|
||||
"@rbxts/types": "^1.0.912",
|
||||
"@rotor-rbx/rotor": "^2.2.1",
|
||||
"@typescript-eslint/eslint-plugin": "^8.57.1",
|
||||
"@typescript-eslint/parser": "^8.57.1",
|
||||
"cspell": "^10.0.0",
|
||||
@@ -34,7 +40,11 @@
|
||||
"lint-staged": "^17.0.0",
|
||||
"prettier": "^3.8.1",
|
||||
"prettier-plugin-toml": "^2.0.6",
|
||||
"roblox-ts": "^3.0.0",
|
||||
"rbxts-transform-boost": "^2.0.1",
|
||||
"rbxts-transform-luau": "^1.0.1",
|
||||
"rbxts-transformer-flamework": "^1.3.2",
|
||||
"rbxts-transformer-instances": "git+https://git.azur.webhop.me/Next-Station/rbxts-transformer-instances.git",
|
||||
"rbxts-transformer-services": "^1.1.1",
|
||||
"tsc-progress": "^1.0.4",
|
||||
"typescript": "^5.5.4",
|
||||
"typescript-eslint": "^8.57.1",
|
||||
@@ -50,8 +60,7 @@
|
||||
"@rbxts/services": "^1.6.0",
|
||||
"@rbxts/t": "^3.2.1",
|
||||
"@rbxts/vide": "^0.6.1",
|
||||
"@rbxts/vide-charm": "^0.4.0",
|
||||
"rbxts-transformer-instances": "git+https://git.azur.webhop.me/Next-Station/rbxts-transformer-instances.git"
|
||||
"@rbxts/vide-charm": "^0.4.0"
|
||||
},
|
||||
"packageManager": "pnpm@11.5.0"
|
||||
"packageManager": "pnpm@11.9.0"
|
||||
}
|
||||
|
||||
Generated
+401
-276
File diff suppressed because it is too large
Load Diff
@@ -2,4 +2,5 @@ publicHoistPattern:
|
||||
- "*@rbxts*"
|
||||
- "*@flamework*"
|
||||
allowBuilds:
|
||||
"@rotor-rbx/rotor": true
|
||||
rbxts-transformer-instances: true
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import settingsFile from "@common/shared/settings";
|
||||
import { SettingDefinition, SettingRealType, SettingType } from "@common/shared/typings/settings";
|
||||
import { Controller, OnStart } from "@flamework/core";
|
||||
import { Atom, atom } from "@rbxts/charm";
|
||||
import Object, { keys } from "@rbxts/object-utils";
|
||||
import { keys } from "@rbxts/object-utils";
|
||||
|
||||
import settingsFile from "../../shared/settings";
|
||||
import { SettingDefinition, SettingRealType, SettingType } from "../../shared/typings/settings";
|
||||
import { Events, Functions } from "../network";
|
||||
|
||||
/**
|
||||
@@ -78,11 +78,11 @@ export class SettingsController implements OnStart {
|
||||
* Setup atoms and definition at service start.
|
||||
*/
|
||||
private setupAtoms() {
|
||||
const sections = Object.keys<Record<string, SettingDefinition[]>>(settingsFile).filter((key) =>
|
||||
const sections = keys<Record<string, SettingDefinition[]>>(settingsFile).filter((key) =>
|
||||
typeIs(settingsFile[key], "table"),
|
||||
);
|
||||
sections.forEach((key) => {
|
||||
const map = new Map<string, Charm.Atom<unknown>>();
|
||||
const map = new Map<string, Atom<unknown>>();
|
||||
const defMap = new Map<string, SettingDefinition>();
|
||||
this.atomsCache.set(key, map);
|
||||
this.defCache.set(key, defMap);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { GlobalEvents, GlobalFunctions } from "@common/shared/network";
|
||||
import { GlobalEvents, GlobalFunctions } from "../shared/network";
|
||||
|
||||
export const Events = GlobalEvents.createClient({});
|
||||
export const Functions = GlobalFunctions.createClient({});
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import { NotDerivate, useBox } from "@common/shared/utils/ui/vide";
|
||||
import { Atom } from "@rbxts/charm";
|
||||
import Vide, { Derivable, source } from "@rbxts/vide";
|
||||
|
||||
import { NotDerivate, useBox } from "../../../../shared/utils/ui/vide";
|
||||
|
||||
/**
|
||||
* Props of a toggle.
|
||||
*/
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import { SettingsController } from "@common/client/controllers/settings";
|
||||
import { SettingDefinition, SettingRealType, SettingType } from "@common/shared/typings/settings";
|
||||
import { Atom } from "@rbxts/charm";
|
||||
import Vide, { Case, For, Source, source, Switch } from "@rbxts/vide";
|
||||
|
||||
import { SettingDefinition, SettingRealType, SettingType } from "../../../../shared/typings/settings";
|
||||
import { SettingsController } from "../../../controllers/settings";
|
||||
import { Toggle } from "../global/toggle";
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { Toggle } from "@common/client/ui/components/global/toggle";
|
||||
import { Hoarcekat } from "@common/shared/utils/ui/hoarcekat";
|
||||
import { Node } from "@rbxts/vide";
|
||||
|
||||
import { Hoarcekat } from "../../../../shared/utils/ui/hoarcekat";
|
||||
import { Toggle } from "../../components/global/toggle";
|
||||
|
||||
export = Hoarcekat(Toggle as () => Node);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { GlobalEvents, GlobalFunctions } from "@common/shared/network";
|
||||
import { GlobalEvents, GlobalFunctions } from "../shared/network";
|
||||
|
||||
export const Events = GlobalEvents.createServer({});
|
||||
export const Functions = GlobalFunctions.createServer({});
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import { OnPlayerJoined, OnPlayerQuit } from "@common/shared/modding/players";
|
||||
import { Modding, OnStart } from "@flamework/core";
|
||||
import { Players } from "@rbxts/services";
|
||||
|
||||
import { OnPlayerJoined, OnPlayerQuit } from "../../../shared/modding/players";
|
||||
|
||||
/**
|
||||
* This Service Manage some player event with modding.
|
||||
*/
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import { OnPlayerJoined } from "@common/shared/modding/players";
|
||||
import SettingsFile from "@common/shared/settings";
|
||||
import { SetSetting, SettingTypeChecker } from "@common/shared/typings/settings";
|
||||
import { OnStart, Service } from "@flamework/core";
|
||||
|
||||
import { OnPlayerJoined } from "../../shared/modding/players";
|
||||
import SettingsFile from "../../shared/settings";
|
||||
import { SetSetting, SettingTypeChecker } from "../../shared/typings/settings";
|
||||
import { Events, Functions } from "../network";
|
||||
import { DataService, Store } from "./data";
|
||||
|
||||
|
||||
Vendored
+17
-23
@@ -3,35 +3,29 @@
|
||||
declare const assets: {
|
||||
audio: {
|
||||
music: {
|
||||
"a-bench-for-ducks.ogg": Content
|
||||
"eggplants-in-the-sky.ogg": Content
|
||||
"lobby.ogg": Content
|
||||
"meowmeowmeow.ogg": Content
|
||||
"railway-resonance.ogg": Content
|
||||
"root.ogg": Content
|
||||
"solstice.ogg": Content
|
||||
"stay-on-track.ogg": Content
|
||||
"weltschmerz.ogg": Content
|
||||
"a-bench-for-ducks.ogg": string
|
||||
"eggplants-in-the-sky.ogg": string
|
||||
"lobby.ogg": string
|
||||
"meowmeowmeow.ogg": string
|
||||
"railway-resonance.ogg": string
|
||||
"root.ogg": string
|
||||
"solstice.ogg": string
|
||||
"stay-on-track.ogg": string
|
||||
"weltschmerz.ogg": string
|
||||
}
|
||||
}
|
||||
images: {
|
||||
kiwirina: {
|
||||
"LUNA....png": Content
|
||||
"eyes.png": Content
|
||||
"kiwi tag.png": Content
|
||||
"lateworkerconceptmob.png": Content
|
||||
"next station ost cover.png": Content
|
||||
"porte closed.png": Content
|
||||
"porte open.png": Content
|
||||
"LUNA....png": string
|
||||
"eyes.png": string
|
||||
"kiwi tag.png": string
|
||||
"lateworkerconceptmob.png": string
|
||||
"next station ost cover.png": string
|
||||
"porte closed.png": string
|
||||
"porte open.png": string
|
||||
}
|
||||
svg: {
|
||||
"cube.svg": Content
|
||||
}
|
||||
}
|
||||
rooms: {
|
||||
normal: {
|
||||
"plus-corridor.rbxm": Content
|
||||
"straight-corridor.rbxm": Content
|
||||
"cube.svg": string
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,35 +3,29 @@
|
||||
local assets = {
|
||||
audio = {
|
||||
music = {
|
||||
["a-bench-for-ducks.ogg"] = Content.fromUri("rbxassetid://93869395830786"),
|
||||
["eggplants-in-the-sky.ogg"] = Content.fromUri("rbxassetid://74192100149187"),
|
||||
["lobby.ogg"] = Content.fromUri("rbxassetid://119303577477446"),
|
||||
["meowmeowmeow.ogg"] = Content.fromUri("rbxassetid://106235234984065"),
|
||||
["railway-resonance.ogg"] = Content.fromUri("rbxassetid://97452653460582"),
|
||||
["root.ogg"] = Content.fromUri("rbxassetid://76389194668757"),
|
||||
["solstice.ogg"] = Content.fromUri("rbxassetid://76565610359366"),
|
||||
["stay-on-track.ogg"] = Content.fromUri("rbxassetid://123486861030898"),
|
||||
["weltschmerz.ogg"] = Content.fromUri("rbxassetid://108803792430337"),
|
||||
["a-bench-for-ducks.ogg"] = "rbxassetid://93869395830786",
|
||||
["eggplants-in-the-sky.ogg"] = "rbxassetid://74192100149187",
|
||||
["lobby.ogg"] = "rbxassetid://119303577477446",
|
||||
["meowmeowmeow.ogg"] = "rbxassetid://106235234984065",
|
||||
["railway-resonance.ogg"] = "rbxassetid://97452653460582",
|
||||
["root.ogg"] = "rbxassetid://76389194668757",
|
||||
["solstice.ogg"] = "rbxassetid://76565610359366",
|
||||
["stay-on-track.ogg"] = "rbxassetid://123486861030898",
|
||||
["weltschmerz.ogg"] = "rbxassetid://108803792430337",
|
||||
},
|
||||
},
|
||||
images = {
|
||||
kiwirina = {
|
||||
["LUNA....png"] = Content.fromUri("rbxassetid://105469337892524"),
|
||||
["eyes.png"] = Content.fromUri("rbxassetid://115382005766484"),
|
||||
["kiwi tag.png"] = Content.fromUri("rbxassetid://100562459880003"),
|
||||
["lateworkerconceptmob.png"] = Content.fromUri("rbxassetid://120860142409755"),
|
||||
["next station ost cover.png"] = Content.fromUri("rbxassetid://127096632190841"),
|
||||
["porte closed.png"] = Content.fromUri("rbxassetid://119045003698167"),
|
||||
["porte open.png"] = Content.fromUri("rbxassetid://83329348606912"),
|
||||
["LUNA....png"] = "rbxassetid://105469337892524",
|
||||
["eyes.png"] = "rbxassetid://115382005766484",
|
||||
["kiwi tag.png"] = "rbxassetid://100562459880003",
|
||||
["lateworkerconceptmob.png"] = "rbxassetid://120860142409755",
|
||||
["next station ost cover.png"] = "rbxassetid://127096632190841",
|
||||
["porte closed.png"] = "rbxassetid://119045003698167",
|
||||
["porte open.png"] = "rbxassetid://83329348606912",
|
||||
},
|
||||
svg = {
|
||||
["cube.svg"] = Content.fromUri("rbxassetid://92619665942094"),
|
||||
},
|
||||
},
|
||||
rooms = {
|
||||
normal = {
|
||||
["plus-corridor.rbxm"] = Content.fromUri("rbxassetid://129493473437352"),
|
||||
["straight-corridor.rbxm"] = Content.fromUri("rbxassetid://76052577701850"),
|
||||
["cube.svg"] = "rbxassetid://92619665942094",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { Networking } from "@flamework/networking";
|
||||
|
||||
import { SetSetting } from "./typings/settings";
|
||||
import { SetSetting } from "../shared/typings/settings";
|
||||
|
||||
/**
|
||||
* Global client to server events.
|
||||
|
||||
Vendored
+1
-1
@@ -1,4 +1,4 @@
|
||||
import { SettingDefinition } from "@common/shared/typings/settings";
|
||||
import { SettingDefinition } from "./typings/settings";
|
||||
|
||||
/**
|
||||
* Type definition of the setting definition file.
|
||||
|
||||
+10
-6
@@ -13,18 +13,12 @@
|
||||
"strict": true,
|
||||
"target": "ESNext",
|
||||
"skipLibCheck": true,
|
||||
"paths": {
|
||||
"@common/*": ["./src/*"],
|
||||
},
|
||||
"typeRoots": ["node_modules/@rbxts", "node_modules/@flamework"],
|
||||
"types": ["compiler-types", "types"],
|
||||
"incremental": true,
|
||||
"experimentalDecorators": true,
|
||||
|
||||
"plugins": [
|
||||
{
|
||||
"transform": "rbxts-transformer-access"
|
||||
},
|
||||
{
|
||||
"transform": "rbxts-transformer-flamework",
|
||||
"obfuscation": true
|
||||
@@ -41,6 +35,16 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"transform": "rbxts-transform-boost",
|
||||
"hoist": true
|
||||
},
|
||||
{
|
||||
"transform": "rbxts-transform-luau",
|
||||
"strict": true,
|
||||
"optimize": 2,
|
||||
"annotate": true
|
||||
},
|
||||
{
|
||||
"transform": "tsc-progress",
|
||||
"title": "Building...",
|
||||
|
||||
+3
-4
@@ -4,10 +4,9 @@
|
||||
"rootDir": "src",
|
||||
"rootDirs": ["src"],
|
||||
"outDir": "out",
|
||||
"typeRoots": [
|
||||
"node_modules/@rbxts",
|
||||
"node_modules/@flamework",
|
||||
]
|
||||
"typeRoots": ["node_modules/@rbxts", "node_modules/@flamework"],
|
||||
"declaration": true,
|
||||
"moduleResolution": "Node"
|
||||
},
|
||||
"include": ["src/**/*", "node_modules/rbxts-transformer-instances"]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user