(feat) You can now change virtual server without a need to reconnect …

…with Homecoming.
G2O-Script-Workshop · Nov 17, 2024 · 838d04b · 838d04b
1 parent 0a33495
commit 838d04b
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 15 deletions.
diff --git a/Homecoming/Scripts/Client/CLocalPlayer.nut b/Homecoming/Scripts/Client/CLocalPlayer.nut
@@ -472,6 +472,26 @@ class LocalPlayer {
 		return this.pos;
 	}
 
+	function setWaypoint(wp){
+		local wp_pos = getWaypoint(convert(wp, "string"))
+
+		if(wp_pos != null){
+			this.setPosition(
+				wp_pos.x,
+				wp_pos.y,
+				wp_pos.z,
+				0
+			);
+		} else {
+			this.setPosition(
+				0.0,
+				0.0,
+				0.0,
+				0
+			);
+		}
+	}
+
 
 	function giveItem(instance, amount){
 		_giveItem(this.id, instance, amount);

diff --git a/Homecoming/Scripts/Client/CMainMenu.nut b/Homecoming/Scripts/Client/CMainMenu.nut
@@ -143,6 +143,21 @@ function launchMenuScene(toggle){
 	menuCollection.setVisible(toggle);
 
 	if(toggle){
+		Chat.setVisible(false);
+		Chat.clear();
+		timeCollection.setVisible(false);
+
+		if(getPlayerPosition(heroId) != getWaypoint("TOT")) Player[heroId].setWaypoint("TOT");
+
+		setHudMode(HUD_ALL, HUD_MODE_HIDDEN);
+		setDayLength(10000);
+
+		disableControls(true);
+		disableMusicSystem(true);
+
+		Camera.movementEnabled = false;
+		Camera.modeChangeEnabled = false;
+
 		Sword.addToWorld();
 		calculateSwordOffset();
 		addEventHandler("onRender", menuSwordScene);
@@ -180,12 +195,19 @@ function menuChangeVisibility(toggle){
 		menuGUI.play.setColor({r = 255, g = 255, b = 255, a = 255});
 	}
 
-	if(toggle) calculateSwordOffset();
+	if(toggle) {
+		updateDiscordState(format("In Main Menu"));
+		calculateSwordOffset();
+	}
 }
 
 JoinMenuMessage.bind(function(message){
 	launchMenuScene(true);
 
+	Music.setVolume(100);
+	Music.looping = true;
+	Music.play();
+
 	menuGUI.settings.setDisabled(true);
 	menuGUI.options.setDisabled(true);
 
@@ -194,10 +216,6 @@ JoinMenuMessage.bind(function(message){
 	local versionDrawSize = menuGUI.version.getSizePx();
 	menuGUI.version.setPositionPx(nax(8192 - anx(versionDrawSize.height + versionDrawSize.width)), nay(8192 - versionDrawSize.width));
 	menuGUI.version.setDisabled(true);
-
-	Music.setVolume(100);
-	Music.looping = true;
-	Music.play();
 });
 
 addEventHandler("GUI.onClick", function(self){

diff --git a/Homecoming/Scripts/Client/CMainMenu/Appearance.nut b/Homecoming/Scripts/Client/CMainMenu/Appearance.nut
@@ -189,6 +189,7 @@ local creatorGUI = {
 
 function toggleCreator(toggle){
 	creatorCollection.setVisible(toggle);
+	updateDiscordState(format("Creating a character..."));
 
 	local xardasWaypoint = {
 		x = 29628.5
@@ -255,7 +256,6 @@ function toggleCreator(toggle){
 						Player[heroId].setScale(heroId, _scale.x, _scale.y, _scale.z, _scale.f);
 
 				}
-			updateDiscordState(format("%s (Creating a Character...)", getPlayerName(heroId)));
 	} else {
 		setPlayerAngle(heroId, xardasWaypoint.a);
 	}

diff --git a/Homecoming/Scripts/Client/CSelectClass.nut b/Homecoming/Scripts/Client/CSelectClass.nut
@@ -40,6 +40,7 @@ local function updateClassInfo(class_id){
 	if(class_id > _classLen - 1) class_id = 0;
 
 	selectedClass = class_id;
+	updateDiscordState(format("Picking a class..."));
 
 	local ui = selectClassGUI;
 	local info = _classWorld[selectedClass];

diff --git a/Homecoming/Scripts/Client/CServerList.nut b/Homecoming/Scripts/Client/CServerList.nut
@@ -73,6 +73,7 @@ local serverListScroll = serverGUI.list.scrollbar.range;
 
 function showServerList(toggle){
 	serverCollection.setVisible(toggle);
+	updateDiscordState(format("Choosing a server..."));
 
 	if(toggle){
 		addEventHandler("GUI.onMouseIn", srvListMouseIn);

diff --git a/Homecoming/Scripts/Client/Client.nut b/Homecoming/Scripts/Client/Client.nut
@@ -1,14 +1,14 @@
 addEventHandler("onInit", function(){
 	clearMultiplayerMessages();
 
-	setHudMode(HUD_ALL, HUD_MODE_HIDDEN);
+/* 	setHudMode(HUD_ALL, HUD_MODE_HIDDEN);
 	setDayLength(10000);
 
 	disableControls(true);
 	disableMusicSystem(true);
 
     Camera.movementEnabled = false;
-	Camera.modeChangeEnabled = false;
+	Camera.modeChangeEnabled = false; */
 
 	disableKey(KEY_F1, true);
 	disableKey(KEY_F2, true);

diff --git a/Homecoming/Scripts/Client/Interface.nut b/Homecoming/Scripts/Client/Interface.nut
@@ -13,14 +13,22 @@ addEventHandler("onKeyDown", function(key){
 		break;
 
 		case KEY_F3:
-			toggleAnim(!animCollection.getVisible());
+				toggleAnim(!animCollection.getVisible());
 		break;
 
 		case KEY_F4:
 			if(animCollection.getVisible()) return;
 				NetStats.setVisible(!NetStats.visible)
 		break;
 
+		case KEY_F9:
+			if(animCollection.getVisible()) return;
+				local disconnectFromVirtual = ServerLeaveMessage(heroId, Player[heroId].getVirtualWorld()).serialize();
+				disconnectFromVirtual.send(RELIABLE);
+
+				launchMenuScene(true);
+		break;
+
 		case KEY_ESCAPE:
 			if(animCollection.getVisible()) return;
 				// CIngame.nut

diff --git a/Homecoming/Scripts/Server/HeroClass/Prototype.nut b/Homecoming/Scripts/Server/HeroClass/Prototype.nut
@@ -493,12 +493,21 @@ class PrototypeHero {
 	function setWaypoint(wp){
 		local wp_pos = getWaypoint(this.world, convert(wp, "string"));
 
-		this.setPosition(
-			wp_pos.x,
-			wp_pos.y,
-			wp_pos.z,
-			0
-		);
+		if(wp_pos != null){
+			this.setPosition(
+				wp_pos.x,
+				wp_pos.y,
+				wp_pos.z,
+				0
+			);
+		} else {
+			this.setPosition(
+				0.0,
+				0.0,
+				0.0,
+				0
+			);
+		}
 	}
 
 	function respawn(){