fix: settings, chat, video spots and other bugs from the owner's list

- Jam-A-Gram privacy: the inbox's options were taken the wrong way round
- report window: no instruction text over the reason
- the museum's theatre and other unnamed rooms get names; every shop a title
- "How did you hear?" is never offered (its window soft locked the game)
- video spots with nothing to play open a "Your Video" box on the game page;
  the trade list's help plays a video; the theatre's box no longer vanishes
- emotes, actions and phrases are limited per player, as typed chat is
- phrases from the menus come in the sender's chat bubble style
- settings: WASD, blocked players and custom items as two-sided switches,
  graphics at their best by default, a switch for bubble animations, and
  Manage Account beside two-step sign-in opens the account page
- pressing a @mention in a bubble no longer walks the player there
This commit is contained in:
Burrowdev committed 2026-10-23 21:12:04 +03:00
1 parent e9097a9a4f
commit 22fb7f0fa5
16 files changed
+589 -207

No files matched your search

+9 -7
View File
@@ -1832,9 +1832,10 @@ package
// 9004 Frame rate: 1 is 60; anything else is Max, as fast as the
// timer goes (about 80 a second on the owner's machine, where
// the 120 and 144 this once offered came to the same).
// 9005 Camera: 1 Smooth (room.RoomManagerWorld.easeCamera), else the
// game's own.
// 9007 Performance profile: 1 Low-end, 2 High, unset Balanced. A
// 9005 Camera: 2 the game's own, else Smooth
// (room.RoomManagerWorld.easeCamera).
// 9007 Performance profile: 1 Low-end, 3 Balanced, else (unset) High:
// the best the game can look, which most machines manage. A
// profile changes only optional rendering work, never the
// game's native 24 FPS (which would slow its animations).
// 9008 Play as your pet (gui.PetInventory, lib/pets.js): 1 on.
@@ -1874,12 +1875,13 @@ package
return settingOf(9003) != 1;
}
// 0 Balanced, 1 Low-end, 2 High. It is persisted with the other client
// settings, so the preference follows the player to another computer.
// 0 Balanced, 1 Low-end, 2 High (kept as 3, 1, and 2 or nothing). It
// is persisted with the other client settings, so the preference
// follows the player to another computer.
public static function performanceProfile() : int
{
var _loc1_:int = settingOf(9007);
return _loc1_ == 1 || _loc1_ == 2 ? _loc1_ : 0;
return _loc1_ == 1 ? 1 : (_loc1_ == 3 ? 0 : 2);
}
public static function performanceProfileLabel() : String
@@ -1910,7 +1912,7 @@ package
var _loc1_:Boolean = false;
try
{
_loc1_ = smoothOn() && settingOf(9005) == 1;
_loc1_ = smoothOn() && settingOf(9005) != 2;
}
catch(e:Error)
{
+4 -2
View File
@@ -167,7 +167,7 @@ package buddy
private static function onHasReferralAssociationResponse(param1:int) : void
{
_hasRequestedReferralAssociation = true;
_buddyListReferFriendBg.visible = true;
_buddyListReferFriendBg.visible = param1 == 1;
if(param1 == 1)
{
_buddyListReferAFriendBtn.visible = true;
@@ -175,8 +175,10 @@ package buddy
}
else
{
// "How did you hear?" is never offered here: its window soft
// locked the game, and nothing reads its answer.
_buddyListReferAFriendBtn.visible = false;
_buddyListHowDidYouHearBtn.visible = true;
_buddyListHowDidYouHearBtn.visible = false;
}
if(_buddyListPopup.visible)
{
+15 -1
View File
@@ -216,6 +216,8 @@ package gui
var field:TextField = TextField(_msgTxt);
var shown:String = field.text;
field.addEventListener("link",onMentionLink,false,0,true);
field.addEventListener("mouseDown",onMentionMouse,false,0,true);
field.addEventListener("mouseUp",onMentionMouse,false,0,true);
AJClient.resolveMentions(shown,function(param1:Array):void
{
if(field.text == shown)
@@ -275,7 +277,7 @@ package gui
_styleText = uint(parseInt(_loc4_[2],16));
_styleBorder = uint(parseInt(_loc4_[3],16));
_styleOpacity = Math.max(0.25,Math.min(1,Number(_loc4_[4]) / 100));
_styleAnimation = _loc4_[5] == "pulse" || _loc4_[5] == "shimmer" || _loc4_[5] == "flow" || _loc4_[5] == "rainbow" ? _loc4_[5] : "none";
_styleAnimation = GuiManager.chatBubbleAnimationsEnabled() && (_loc4_[5] == "pulse" || _loc4_[5] == "shimmer" || _loc4_[5] == "flow" || _loc4_[5] == "rainbow") ? _loc4_[5] : "none";
_styleSpeed = Math.max(40,Math.min(300,Number(_loc4_[6])));
_styleGradient = _loc4_.length > 7 && (_loc4_[7] == "solid" || _loc4_[7] == "radial") ? _loc4_[7] : "linear";
_styleAngle = _loc4_.length > 8 && int(_loc4_[8]) >= 0 && int(_loc4_[8]) <= 315 && int(_loc4_[8]) % 45 == 0 ? int(_loc4_[8]) : 45;
@@ -979,6 +981,18 @@ package gui
}
}
// a press on a tag goes no further: the room under the balloon would
// take it for a click on the floor and walk the player there.
private function onMentionMouse(param1:MouseEvent) : void
{
var _loc2_:TextField = param1.currentTarget as TextField;
var _loc3_:int = _loc2_ != null ? _loc2_.getCharIndexAtPoint(param1.localX,param1.localY) : -1;
if(_loc3_ >= 0 && _loc2_.getTextFormat(_loc3_,_loc3_ + 1).url)
{
param1.stopPropagation();
}
}
// a tag clicked: "@name" (setText)
private function onMentionLink(param1:TextEvent) : void
{
+30 -1
View File
@@ -1,6 +1,7 @@
package gui
{
import collection.StreamDefCollection;
import flash.external.ExternalInterface;
import movie.MovieManager;
import quest.QuestManager;
import room.RoomManagerWorld;
@@ -50,10 +51,17 @@ package gui
var _loc4_:Boolean = false;
// the video lists came from the official server; this one answers
// them empty, and a player with nothing to play threw (#1009 in
// VideoPlayerOSMF.playNonStreaming)
// VideoPlayerOSMF.playNonStreaming). a video spot clicked opens the
// game page's video box instead (game.html ajVideoSpot), for a link
// of the player's own; the trade list's help plays a video of ours.
// a list the room plays by itself ("autoplay") opens nothing.
if(param2 == null || param2.length == 0)
{
DarkenManager.showLoadingSpiral(false);
if(param3 == null || param3.msg == null || String(param3.msg).indexOf("autoplay") == -1)
{
openVideoSpot(param1 == TRADE_HELP_LIST ? TRADE_HELP_VIDEO : "");
}
return;
}
if(param2.length > 1)
@@ -143,6 +151,27 @@ package gui
movieSelector.destroy();
movieSelector = null;
}
openVideoSpot("close");
}
// the trade list's "how to trade" video (AvatarEditor.onInfoBtnDown)
private static const TRADE_HELP_LIST:int = 22;
private static const TRADE_HELP_VIDEO:String = "dQw4w9WgXcQ";
// the game page's video box (game.html ajVideoSpot): a YouTube id to
// play, "" for a link of the player's choosing, "close" to put it away
public static function openVideoSpot(param1:String) : void
{
try
{
if(ExternalInterface.available)
{
ExternalInterface.call("ajVideoSpot",param1);
}
}
catch(e:Error)
{
}
}
public static function togglePlayPauseVideoPlayer(param1:Boolean) : void
+37
View File
@@ -272,6 +272,8 @@ package gui
private static var _sharedObj:SharedObject;
private static var _customChatBubbles:Boolean = true;
private static var _chatBubbleAnimations:Boolean = true;
private static var _giftGemsMediaHelper:MediaHelper;
@@ -368,12 +370,14 @@ package gui
{
_sharedObj = null;
_customChatBubbles = true;
_chatBubbleAnimations = true;
if(gMainFrame.myFlashVarUserName != null)
{
try
{
_sharedObj = SharedObject.getLocal(gMainFrame.myFlashVarUserName);
_customChatBubbles = _sharedObj.data.customChatBubbles !== false;
_chatBubbleAnimations = _sharedObj.data.chatBubbleAnimations !== false;
if(_sharedObj.data.cursor == null || _sharedObj.data.cursor == "custom")
{
CursorManager.switchToCursor("custom_cursor");
@@ -489,6 +493,30 @@ package gui
}
}
// the same, for custom bubbles' animations (pulse, shimmer, flow,
// rainbow): off, every bubble keeps its colours and stands still.
public static function chatBubbleAnimationsEnabled() : Boolean
{
return _chatBubbleAnimations;
}
public static function setChatBubbleAnimationsEnabled(param1:Boolean) : void
{
_chatBubbleAnimations = param1;
if(_sharedObj == null)
{
return;
}
_sharedObj.data.chatBubbleAnimations = param1;
try
{
_sharedObj.flush();
}
catch(e:Error)
{
}
}
public static function startFFM(param1:Boolean = false) : void
{
if(gMainFrame.server.getCurrentRoom())
@@ -995,6 +1023,15 @@ package gui
public static function initMoviePlayer(param1:int, param2:StreamDefCollection, param3:Boolean = true, param4:int = 512, param5:int = 288) : void
{
// nothing to play (the official server's video lists are gone; a
// tutorial video that never came): the game page's video box
// instead, as GenericListGuiManager.launchMovies does.
if(param2 == null || param2.length == 0 || param2.getStreamDefItem(0) == null)
{
DarkenManager.showLoadingSpiral(false);
GenericListGuiManager.openVideoSpot("");
return;
}
if(_videoPlayer)
{
_videoPlayer.destroy();
+92 -54
View File
@@ -14,6 +14,7 @@ package gui.itemWindows
import flash.geom.Matrix;
import flash.events.MouseEvent;
import flash.events.Event;
import flash.external.ExternalInterface;
import flash.geom.Rectangle;
import flash.net.URLRequest;
import flash.net.navigateToURL;
@@ -133,7 +134,7 @@ package gui.itemWindows
_window.toggleBtn.visible = true;
_window.toggleBtn.toggleBtn.toggleKnob.gotoAndStop("up");
_window.toggleBtn.toggleBtn.toggleBG.gotoAndStop("up");
_window.icon.gotoAndStop(_currItem.frame);
_window.icon.gotoAndStop(_currItem.iconFrame != null ? _currItem.iconFrame : _currItem.frame);
_window.toggleBtn.addEventListener("mouseDown",handleMouseDown,false,0,true);
_window.toggleBtn.addEventListener("rollOver",handleMouseOver,false,0,true);
_window.toggleBtn.addEventListener("rollOut",handleMouseOut,false,0,true);
@@ -236,17 +237,16 @@ package gui.itemWindows
}
break;
case "hideBlocked":
showHideBlocked();
break;
case "customArt":
showCustomArt();
case "wasd":
_window.toggleBtn.gotoAndStop("double");
_window.toggleBtn.toggleBtn.gotoAndStop(ownSwitchOn() ? "startingOn" : "startingOff");
setToggleLabels();
_window.labelTxtCont.labelTxt.text = _currItem.labelLabel;
break;
case "expandedInventory":
showExpandedInventory();
break;
case "wasd":
showWasd();
break;
case "performance":
showPerformance();
break;
@@ -443,17 +443,57 @@ package gui.itemWindows
}
}
// "WASD Movement": walking with those four keys as well as the
// arrow keys (room.RoomManagerView). user var 9002, not one of the game's.
private function showWasd() : void
// the switches of this server's own (MySettings): on is the left
// choice, as on the Nametag row. "WASD Movement": walking with those
// four keys as well as the arrow keys (room.RoomManagerView), user var
// 9002. "Blocked Players": shown, or hidden in rooms, user var 9001.
// "Custom Items": the pictures players give their items, or every item
// with its base's art (AJClient.customArtOn), user var 9006.
private function ownSwitchOn() : Boolean
{
var _loc1_:String = AJClient.wasdOn() ? "Turn off" : "Turn on";
_window.goNowBtn.down.txt.text = _loc1_;
_window.goNowBtn.mouse.mouse.txt.text = _loc1_;
_window.goNowBtn.mouse.up.txt.text = _loc1_;
_window.labelTxtCont.labelTxt.text = "WASD Movement";
switch(_currItem.frame)
{
case "wasd":
return AJClient.wasdOn();
case "hideBlocked":
return !blockedAreHidden();
case "customArt":
return AJClient.customArtOn();
}
return false;
}
private function setOwnSwitch(param1:Boolean) : void
{
switch(_currItem.frame)
{
case "wasd":
setWasd(param1);
break;
case "hideBlocked":
setHideBlocked(!param1);
break;
case "customArt":
setCustomArt(param1);
}
}
// the two choices either side of a switch: the game's strings, or
// words of this server's
private function setToggleLabels() : void
{
if(_currItem.onLabel != null)
{
_window.toggleBtn.toggleBtn.valueTxt.onTxt.text = _currItem.onLabel;
_window.toggleBtn.toggleBtn.valueTxt.offTxt.text = _currItem.offLabel;
}
else
{
LocalizationManager.translateId(_window.toggleBtn.toggleBtn.valueTxt.onTxt,_currItem.onTxt);
LocalizationManager.translateId(_window.toggleBtn.toggleBtn.valueTxt.offTxt,_currItem.offTxt);
}
}
// the three rows of smooth graphics (AJClient has what each does): a
// name on the left and on the button what it is set to now; a press
// goes on to the next choice. user vars 9003 to 9005.
@@ -481,10 +521,12 @@ package gui.itemWindows
showChoice("Performance",AJClient.performanceProfileLabel());
}
// High, Balanced, Low-end, and round again (AJClient.performanceProfile
// has how each is kept)
private function nextPerformance() : void
{
var _loc1_:int = AJClient.performanceProfile();
setChoice(9007,_loc1_ == 0 ? 1 : (_loc1_ == 1 ? 2 : 0));
setChoice(9007,_loc1_ == 2 ? 3 : (_loc1_ == 0 ? 1 : 2));
showPerformance();
}
@@ -513,7 +555,6 @@ package gui.itemWindows
{
gMainFrame.stage.focus = null;
}
showWasd();
}
private function blockedAreHidden() : Boolean
@@ -521,38 +562,16 @@ package gui.itemWindows
return gMainFrame.userInfo.userVarCache.getUserVarValueById(9001) == 1;
}
private function showHideBlocked() : void
{
var _loc1_:String = blockedAreHidden() ? "Show" : "Hide";
_window.goNowBtn.down.txt.text = _loc1_;
_window.goNowBtn.mouse.mouse.txt.text = _loc1_;
_window.goNowBtn.mouse.up.txt.text = _loc1_;
_window.labelTxtCont.labelTxt.text = blockedAreHidden() ? "Blocked players: hidden" : "Blocked players: shown";
}
private function setHideBlocked(param1:Boolean) : void
{
gMainFrame.userInfo.userVarCache.updateUserVar(9001,param1 ? 1 : 0);
AchievementXtCommManager.requestSetUserVar(9001,param1 ? 1 : 0);
showHideBlocked();
}
// "Custom pictures": the pictures players give their items, or every
// item with its base's art (AJClient.customArtOn). user var 9006.
private function showCustomArt() : void
{
var _loc1_:String = AJClient.customArtOn() ? "Hide" : "Show";
_window.goNowBtn.down.txt.text = _loc1_;
_window.goNowBtn.mouse.mouse.txt.text = _loc1_;
_window.goNowBtn.mouse.up.txt.text = _loc1_;
_window.labelTxtCont.labelTxt.text = AJClient.customArtOn() ? "Custom pictures: shown" : "Custom pictures: hidden";
}
private function setCustomArt(param1:Boolean) : void
{
gMainFrame.userInfo.userVarCache.updateUserVar(9006,param1 ? 0 : 1);
AchievementXtCommManager.requestSetUserVar(9006,param1 ? 0 : 1);
showCustomArt();
}
// "Expanded Inventory" (Strawberry Jam's): more, smaller items a row in
@@ -727,7 +746,10 @@ package gui.itemWindows
_chatButtons.outline = _loc2_;
_loc1_.addChild(chatButton("Reset",380,397,110,"chat-reset"));
_loc1_.addChild(chatButton("Save",505,397,125,"chat-save"));
_chatStatus = chatText("",30,451,590,14,0x5A2C19,false);
_loc2_ = chatButton("",30,441,190,"chat-animations");
_loc1_.addChild(_loc2_);
_chatButtons.animations = _loc2_;
_chatStatus = chatText("",235,451,400,14,0x5A2C19,false);
_loc1_.addChild(_chatStatus);
_loc1_.addChild(chatButton("X",600,18,36,"chat-close"));
GuiManager.guiLayer.addChild(_chatPopup);
@@ -804,6 +826,7 @@ package gui.itemWindows
setChatButton(_chatButtons.speed,"Speed: " + _chatStyle.speed + "%");
setChatButton(_chatButtons.outline,"Outline: " + _chatStyle.outline + " px");
setChatButton(_chatButtons.enabled,"Custom bubbles: " + (GuiManager.customChatBubblesEnabled() ? "On" : "Off"));
setChatButton(_chatButtons.animations,"Animations: " + (GuiManager.chatBubbleAnimationsEnabled() ? "On" : "Off"));
if(_chatSelectedStop < 0 || _chatSelectedStop >= _chatStops.length)
{
_chatSelectedStop = 0;
@@ -1407,6 +1430,12 @@ package gui.itemWindows
refreshChatPopup(false);
_chatStatus.text = GuiManager.customChatBubblesEnabled() ? "Custom bubbles are visible on this client." : "Custom bubbles are hidden only on this client.";
}
else if(_loc3_ == "chat-animations")
{
GuiManager.setChatBubbleAnimationsEnabled(!GuiManager.chatBubbleAnimationsEnabled());
refreshChatPopup(false);
_chatStatus.text = GuiManager.chatBubbleAnimationsEnabled() ? "Bubbles move as their owners chose." : "Every bubble stands still on this client.";
}
else if(_loc3_ == "chat-save")
{
_loc4_ = 0;
@@ -1435,6 +1464,7 @@ package gui.itemWindows
var _loc3_:String = null;
var _loc4_:Array = null;
var _loc6_:int = 0;
var _loc7_:Boolean = false;
param1.stopPropagation();
if(_currItem.type == MySettings.TOGGLE_TYPE_TOGGLE_BTN)
{
@@ -1447,6 +1477,13 @@ package gui.itemWindows
case "music":
handleMuteUnmute();
break;
case "wasd":
case "hideBlocked":
case "customArt":
_loc7_ = !ownSwitchOn();
setOwnSwitch(_loc7_);
param1.currentTarget.toggleBtn.gotoAndPlay(_loc7_ ? "on" : "off");
break;
case "buddyRequest":
case "gameInvites":
case "doorBell":
@@ -1564,8 +1601,7 @@ package gui.itemWindows
}
}
}
LocalizationManager.translateId(_window.toggleBtn.toggleBtn.valueTxt.onTxt,_currItem.onTxt);
LocalizationManager.translateId(_window.toggleBtn.toggleBtn.valueTxt.offTxt,_currItem.offTxt);
setToggleLabels();
}
else if(_currItem.type == MySettings.TOGGLE_TYPE_CURSOR)
{
@@ -1653,18 +1689,9 @@ package gui.itemWindows
}
AJClient.runCommand(_loc3_);
break;
case "hideBlocked":
setHideBlocked(!blockedAreHidden());
break;
case "customArt":
setCustomArt(!AJClient.customArtOn());
break;
case "expandedInventory":
setExpandedInventory(!AJClient.expandedInventoryOn());
break;
case "wasd":
setWasd(!AJClient.wasdOn());
break;
case "performance":
nextPerformance();
break;
@@ -1690,10 +1717,21 @@ package gui.itemWindows
GuiManager.initEmailConfirmation(null,null,false);
break;
case "twoFactor":
_loc3_ = gMainFrame.clientInfo.websiteURL + "parents";
// the account page, where two-step sign-in is set up. the
// game's webview may open no window: the page asks the
// client to open it in the system browser (game.html
// ajOpenPage), as the client's own Manage Account does.
_loc3_ = gMainFrame.clientInfo.websiteURL + "account";
try
{
navigateToURL(new URLRequest(_loc3_),"_blank");
if(ExternalInterface.available)
{
ExternalInterface.call("ajOpenPage",_loc3_);
}
else
{
navigateToURL(new URLRequest(_loc3_),"_blank");
}
}
catch(e:Error)
{
+17 -6
View File
@@ -213,9 +213,14 @@ package gui
"run":showSavedList
*/
},{
"type":TOGGLE_TYPE_JOIN,
// this server's switches, drawn as the Nametag row is: the two
// choices named either side of the knob (ItemWindowToggle)
"type":TOGGLE_TYPE_TOGGLE_BTN,
"frame":"wasd",
"iconFrame":"world"
"iconFrame":"world",
"labelLabel":"WASD Movement",
"onLabel":"On",
"offLabel":"Off"
},{
"type":TOGGLE_TYPE_JOIN,
"frame":"performance",
@@ -233,14 +238,20 @@ package gui
"frame":"camera",
"iconFrame":"world"
},{
"type":TOGGLE_TYPE_JOIN,
"type":TOGGLE_TYPE_TOGGLE_BTN,
"frame":"hideBlocked",
"iconFrame":"buddyRequest"
"iconFrame":"buddyRequest",
"labelLabel":"Blocked Players",
"onLabel":"Shown",
"offLabel":"Hidden"
},{
// the pictures players give their items (AJClient.customArtOn)
"type":TOGGLE_TYPE_JOIN,
"type":TOGGLE_TYPE_TOGGLE_BTN,
"frame":"customArt",
"iconFrame":"redeemCode"
"iconFrame":"redeemCode",
"labelLabel":"Custom Items",
"onLabel":"Shown",
"offLabel":"Hidden"
},{
// more, smaller items a row in the clothes and item pickers
// (AJClient.expandedInventoryOn)
+1 -2
View File
@@ -242,8 +242,7 @@ package gui
_loc2_.addEventListener("change",onDetailTyped,false,0,true);
_loc1_.x = -143;
_loc1_.y = -19;
LocalizationManager.updateToFit(_reportFromCard.bodyTxt,"Choose a REASON, tell the moderator what happened, then click REPORT.");
_reportFromCard.bodyTxt.height = 48;
_reportFromCard.bodyTxt.visible = false;
_reportFromCard.addChildAt(_loc1_,_reportFromCard.getChildIndex(_reportFromCard.reasonChatTree));
_detailBar = _loc1_;
_detailInput = _loc2_;
+2 -1
View File
@@ -173,7 +173,8 @@ package avatar
{
return;
}
AvatarManager.addAvatarMessage(param1,_playerSfsUserId,0);
// the bubble comes with the server's echo, as typed chat's does, so
// that it is drawn in the player's chat style (lib/world.js)
addChatMessage(param1);
gMainFrame.server.sendMessage(param2 + RAW_STR + 1);
if(_chatHist.enableFreeChatValue)