(10);
- const best = trackBest(points);
- const total = trackTotal(points);
-
- const pointGain = computed(() => {
- // eslint-disable-next-line prefer-const
- let gain = new Decimal(1);
- return gain;
- });
- globalBus.on("update", diff => {
- points.value = Decimal.add(points.value, Decimal.times(pointGain.value, diff));
- });
- const oomps = trackOOMPS(points, pointGain);
-
- const tree = createTree(() => ({
- nodes: [[prestige.treeNode]],
- branches: [],
- onReset() {
- points.value = toRaw(this.resettingNode.value) === toRaw(prestige.treeNode) ? 0 : 10;
- best.value = points.value;
- total.value = points.value;
- },
- resetPropagation: branchedResetPropagation
- })) as GenericTree;
+ const contentPacks = persistent<(ContentPack | string)[]>(["core"]);
return {
- name: "Tree",
- links: tree.links,
+ name: "Main",
+ minimizable: false,
+ contentPacks,
display: jsx(() => (
<>
- {player.devSpeed === 0 ? Game Paused
: null}
- {player.devSpeed && player.devSpeed !== 1 ? (
- Dev Speed: {format(player.devSpeed)}x
- ) : null}
- {player.offlineTime ? (
- Offline Time: {formatTime(player.offlineTime)}
- ) : null}
-
- {Decimal.lt(points.value, "1e1000") ? You have : null}
-
{format(points.value)}
- {Decimal.lt(points.value, "1e1e6") ? points : null}
-
- {Decimal.gt(pointGain.value, 0) ? ({oomps.value})
: null}
-
- {render(tree)}
+ placeholder
- )),
- points,
- best,
- total,
- oomps,
- tree
+ ))
};
});
@@ -80,7 +30,7 @@ export const main = createLayer("main", function (this: BaseLayer) {
export const getInitialLayers = (
/* eslint-disable-next-line @typescript-eslint/no-unused-vars */
player: Partial
-): Array => [main, prestige];
+): Array => [main];
/**
* A computed ref whose value is true whenever the game is over.
diff --git a/src/data/projInfo.json b/src/data/projInfo.json
index 1504cba..9bf6603 100644
--- a/src/data/projInfo.json
+++ b/src/data/projInfo.json
@@ -1,15 +1,15 @@
{
- "title": "Profectus",
- "description": "A project made in Profectus",
- "id": "",
- "author": "",
+ "title": "Alkatest",
+ "description": "A test",
+ "id": "alkatest",
+ "author": "thepaperpilot",
"discordName": "",
"discordLink": "",
- "versionNumber": "0.0",
+ "versionNumber": "0.0.0",
"versionTitle": "Initial Commit",
- "allowGoBack": true,
+ "allowGoBack": false,
"defaultShowSmall": false,
"defaultDecimalsShown": 2,
"useHeader": true,
diff --git a/src/data/socket.tsx b/src/data/socket.tsx
new file mode 100644
index 0000000..7f1c2ed
--- /dev/null
+++ b/src/data/socket.tsx
@@ -0,0 +1,190 @@
+import Text from "components/fields/Text.vue";
+import { jsx, setDefault } from "features/feature";
+import { globalBus } from "game/events";
+import settings, { registerSettingField } from "game/settings";
+import { io, Socket } from "socket.io-client";
+import { load } from "util/save";
+import { ref, watch } from "vue";
+import { uniqueNamesGenerator, adjectives, colors, animals } from "unique-names-generator";
+import player from "game/player";
+import { useToast } from "vue-toastification";
+import { ProxyState } from "util/proxies";
+import satisfies from "semver/functions/satisfies";
+import projInfo from "data/projInfo.json";
+
+export const connected = ref(false);
+export const room = ref(null);
+export const isHosting = ref(false);
+export const nicknames = ref>({});
+
+const toast = useToast();
+
+const socket = ref | null>();
+const connectionError = ref("");
+
+export function emit(
+ event: T,
+ ...args: Parameters
+): void {
+ if (!connected.value) {
+ return;
+ }
+ socket.value?.emit(event, ...args);
+}
+
+export function getGameState(): GameState {
+ return player.layers.main[ProxyState] as unknown as GameState;
+}
+
+globalBus.on("loadSettings", settings => {
+ setDefault(settings, "server", window.location.origin);
+ setDefault(settings, "nickname", randomName());
+
+ watch(
+ () => settings.server,
+ server => {
+ if (socket.value) {
+ socket.value.close();
+ }
+
+ socket.value = io(server);
+ setupSocket(socket.value);
+
+ connected.value = false;
+ connectionError.value = "";
+ socket.value.connect();
+ },
+ { immediate: true }
+ );
+
+ watch(
+ () => settings.nickname,
+ nickname => {
+ if (room.value) {
+ emit("set nickname", nickname);
+ }
+ }
+ );
+
+ registerSettingField(
+ jsx(() => (
+ <>
+ (settings.server = value)}
+ modelValue={settings.server}
+ />
+
+ {connected.value ? (
+ Connected!
+ ) : connectionError.value ? (
+ {connectionError.value}
+ ) : (
+ Connecting...
+ )}
+
+
+ ))
+ );
+ registerSettingField(
+ jsx(() => (
+ <>
+ (
+
+ Nickname
+
+
+ ))}
+ onUpdate:modelValue={value => (settings.nickname = value)}
+ modelValue={settings.nickname}
+ />
+
+ ))
+ );
+});
+
+function setupSocket(socket: Socket) {
+ socket.on("connect", () => {
+ connectionError.value = "";
+ connected.value = true;
+ });
+ socket.on("connect_error", error => {
+ connectionError.value = `${error.name}: ${error.message}`;
+ });
+ socket.on("disconnect", (reason, details) => {
+ connectionError.value =
+ details instanceof Error
+ ? `${details.name}: ${details.message}`
+ : details?.description ?? reason;
+ connected.value = false;
+ });
+ socket.on("server version", semver => {
+ if (!satisfies(projInfo.versionNumber, semver)) {
+ toast.info("Server only accepts game versions in range: " + semver);
+ socket.disconnect();
+ }
+ });
+
+ socket.on("info", message => {
+ toast.info(message);
+ globalBus.emit("serverSentInfo");
+ });
+ socket.on("set rooms", rooms => {
+ globalBus.emit("setRooms", rooms);
+ });
+ socket.on("joined room", (r, hosting) => {
+ room.value = r;
+ isHosting.value = hosting;
+ });
+ socket.on("left room", () => {
+ room.value = null;
+ });
+ socket.on("set nicknames", n => {
+ nicknames.value = n;
+ });
+}
+
+function randomName(): string {
+ return uniqueNamesGenerator({
+ dictionaries: [adjectives, colors, animals],
+ length: 3,
+ separator: " ",
+ style: "capital"
+ });
+}
+
+watch(connected, connected => {
+ if (!connected && room.value) {
+ stopMultiplayer();
+ }
+});
+
+function stopMultiplayer() {
+ if (!isHosting.value) {
+ load();
+ }
+ room.value = null;
+ isHosting.value = false;
+}
+
+declare module "game/settings" {
+ interface Settings {
+ server: string;
+ nickname: string;
+ }
+}
+
+declare module "game/events" {
+ interface GlobalEvents {
+ openMultiplayer: VoidFunction;
+ setRooms: (rooms: ClientRoomData[]) => void;
+ serverSentInfo: VoidFunction;
+ }
+}
diff --git a/src/util/save.ts b/src/util/save.ts
index 4138e17..b26013e 100644
--- a/src/util/save.ts
+++ b/src/util/save.ts
@@ -1,4 +1,5 @@
import projInfo from "data/projInfo.json";
+import { isHosting, room } from "data/socket";
import { globalBus } from "game/events";
import type { Player, PlayerData } from "game/player";
import player, { stringifySave } from "game/player";
@@ -118,12 +119,12 @@ export async function loadSave(playerObj: Partial): Promise {
}
setInterval(() => {
- if (player.autosave) {
+ if (player.autosave && (!room.value || isHosting.value)) {
save();
}
}, 1000);
window.onbeforeunload = () => {
- if (player.autosave) {
+ if (player.autosave && (!room.value || isHosting.value)) {
save();
}
};