diff --git a/config.js b/config.js index f10485c..906950c 100644 --- a/config.js +++ b/config.js @@ -174,7 +174,7 @@ module.exports = { // 62: "Custom pictures" in the settings menu, to hide players' item pictures. // 83: den items tinted (the tint in their version, DenItemHelper.applyTint). // 84: fixes from the owner's list of bugs (bugs.txt, 2026-10-23). - buildVersion: env.AJ_BUILD_VERSION || "87", + buildVersion: env.AJ_BUILD_VERSION || "92", // what the official CDN is asked for; not ours to change. upstreamBuildVersion: "3", @@ -207,7 +207,7 @@ module.exports = { // are written into both pages. the emails and the host's country are // placeholders until set; the operator is, at the owner's word, said to // be in the EU without a name or a country. - termsVersion: "2026-10-21", + termsVersion: "2026-10-24", legalEmail: env.AJ_LEGAL_EMAIL || "legal@burrow.moe", adminEmail: env.AJ_ADMIN_EMAIL || "admin@burrow.moe", operator: env.AJ_OPERATOR || "an individual based in the European Union", diff --git a/lib/trades.js b/lib/trades.js index 1d82c76..e98e3dc 100644 --- a/lib/trades.js +++ b/lib/trades.js @@ -46,7 +46,7 @@ const TRADES_KEPT = 50; // per account, for its page const MAX_WAITING_OFFERS = 50; // offers left on one account const MAX_OFFERS_MADE = 20; // by one account, still waiting -module.exports = ({findOnline, blocks, showTrading}) => { +module.exports = ({findOnline, blocks}) => { // TradeManager.onTradeListReceived: [username, clothingCount, (defId, // invIdx, color)..., denItemCount, (defId, invIdx, version, approved, // imageId, creatorDbId, creatorUuid)..., petCount, (speciesId, invIdx, @@ -134,6 +134,10 @@ module.exports = ({findOnline, blocks, showTrading}) => { return coming === 0 || collectionOf(account, type).length + coming - gives.filter(item => item.type === type).length <= max; }); + const endTrade = trade => { + trade.requester.trade = trade.owner.trade = null; + }; + // ends the trade `session` is part of, telling the other side with `status`. const abandon = (session, status) => { const {trade} = session; @@ -141,10 +145,8 @@ module.exports = ({findOnline, blocks, showTrading}) => { return; } const other = trade.requester === session ? trade.owner : trade.requester; - trade.requester.trade = trade.owner.trade = null; + endTrade(trade); other.sendXt("ti", -1, status, session.account.username, USERNAME_SHOWN); - showTrading(session); - showTrading(other); }; // moves one entry between accounts. it gets a fresh inventory id, and @@ -216,8 +218,6 @@ module.exports = ({findOnline, blocks, showTrading}) => { return; } session.trade = owner.trade = {requester: session, owner, wantedType, wanted, offered, accepted: false, confirmed: new Set()}; - showTrading(session); - showTrading(owner); // TradeManager.displayTradeRequested: [0, requesterName, moderatedFlag, // wantedCode, wantedInvIdx, clothingCount, denCount, petCount, ...items] const ofType = type => offered.filter(item => item.type === type); @@ -259,9 +259,7 @@ module.exports = ({findOnline, blocks, showTrading}) => { return; } const {requester, owner, wantedType, wanted, offered} = trade; - requester.trade = owner.trade = null; - showTrading(requester); - showTrading(owner); + endTrade(trade); // either side may have recycled or re-traded something while deciding. const stillThere = collectionOf(owner.account, wantedType).includes(wanted) && offered.every(item => collectionOf(requester.account, item.type).includes(item.entry)) @@ -324,11 +322,8 @@ module.exports = ({findOnline, blocks, showTrading}) => { }, // ["1"/"0"]: busy flag while the trade window is open; nothing to - // answer. it shows as the trading sign (lib/world.js showTrading). - tb(session, roomId, [busy]) { - session.tradeBusy = busy === "1"; - showTrading(session); - }, + // answer. + tb() {}, ti(session, roomId, params) { switch (params[0]) { diff --git a/lib/world.js b/lib/world.js index 62ab7a4..5c40708 100644 --- a/lib/world.js +++ b/lib/world.js @@ -822,10 +822,6 @@ const handlers = { other.sendXt("au", session.room.id, 1, session.id, count, ...coords, teleport); } } - // a trade going on when they came in: the sign over them again - if (firstUpdate) { - showTrading(session); - } }, // GenericListXtCommManager.handleNewData: [listId, entryType, 4 unused @@ -1477,25 +1473,8 @@ const staffMove = (whoName, toName) => { return {ok: true, room: shown}; }; -// trading: a sign over the animal of a player in a trade, or with the trade -// window open, in everyone else's game (the patched AvatarWorldView. -// setTrading): "xtr" [.., .., sfsId, 1 | 0], told as it changes, and to -// whoever comes into the room (enterRoom). -const isTrading = session => Boolean(session.trade || session.tradeBusy); -const showTrading = session => { - const on = isTrading(session) && Boolean(session.room); - if (Boolean(session.tradingShown) === on) { - return; - } - session.tradingShown = on; - for (const other of watchers(session)) { - other.sendXt("xtr", -1, session.id, on ? 1 : 0); - } -}; - const context = { others: watchers, - showTrading, watchers, findOnline, findBySfsId, @@ -1563,9 +1542,6 @@ const leaveRoom = session => { session.room = null; session.pos = null; delete session.activeAction; - // the sign goes with the animal; it comes back in the next room if the - // trade goes on there (showTrading) - session.tradingShown = false; minigames.roomLeft(session); for (const other of room.sessions) { // AvatarManager.avatarRemoveResponse @@ -1777,9 +1753,6 @@ const enterRoom = (session, name, base, displayName, shardId, props = {}) => { for (const other of others(session)) { if (other.pos && sees(session, other)) { sendAvatarCreate(session, other); - if (other.tradingShown) { - session.sendXt("xtr", -1, other.id, 1); - } } } return room; diff --git a/public/privacy.html b/public/privacy.html index c4f8a9e..28c677f 100644 --- a/public/privacy.html +++ b/public/privacy.html @@ -242,7 +242,7 @@

7. Children

-

Burrow is for people aged 16 and over. We do not knowingly collect data from anyone younger and we do not offer parental consent. If we learn that an account belongs to someone under that age we delete it. Parents and guardians can ask for this at {{legalEmail}}.

+

Burrow is for people aged 18 and over. We do not knowingly collect data from anyone younger and we do not offer parental consent. If we learn that an account belongs to someone under that age we delete it. Parents and guardians can ask for this at {{legalEmail}}.

diff --git a/public/register.html b/public/register.html index e722440..5598fd7 100644 --- a/public/register.html +++ b/public/register.html @@ -203,7 +203,7 @@ + I am 18 or older, and old enough in my country to agree to this myself. I agree to the Terms of Service and the Privacy Policy.
diff --git a/public/terms.html b/public/terms.html index 0399ab8..e9587c2 100644 --- a/public/terms.html +++ b/public/terms.html @@ -168,8 +168,8 @@

2. Who may play

By creating an account you confirm that you meet these requirements and that you agree to these terms and to the Privacy Policy. We delete accounts that we learn belong to someone under the required age.

diff --git a/swf-src/AJClient.as b/swf-src/AJClient.as index 2f6858a..776d2a8 100644 --- a/swf-src/AJClient.as +++ b/swf-src/AJClient.as @@ -539,14 +539,7 @@ package } else { - // the item giver is the web one now (the account page's - // /account/items, signed in as there), opened in the browser: - // the one in the game is retired. it shared its colour box - // with the Item Maker, whose colours turned up in it. - if(ExternalInterface.available) - { - ExternalInterface.call("ajOpenPage",gMainFrame.clientInfo.websiteURL + "account/items"); - } + _toolsInstance.showItemFinder(true); } } catch(e:Error) @@ -1540,17 +1533,6 @@ package } } - // "xtr": [.., .., sfsId, 1 | 0]: another player trading, or not - // (lib/world.js showTrading). - public static function onTrading(param1:Object) : void - { - var _loc2_:AvatarWorldView = AvatarManager.avatarViewList != null ? AvatarManager.avatarViewList[int(param1[2])] as AvatarWorldView : null; - if(_loc2_ != null) - { - _loc2_.setTrading(String(param1[3]) == "1"); - } - } - // "xyn": [.., .., id, text]. A yes-or-no box; the answer goes back as // "xyn" [id, 1 | 0]. public static function askYesNo(param1:Object) : void @@ -4573,7 +4555,7 @@ package _loc3_.currTxt.text = (_loc5_ ? "> " : "") + makerShort(String(_loc4_.name || "(no name)"),24) + (_makerMode == "mine" ? (_loc4_.waiting == "item" ? " (waiting)" : _loc4_.waiting == "picture" ? " (picture waiting)" : _loc4_.art ? (_loc4_.kind == "clothing" ? (_loc4_.artMode == "texture" ? " (texture)" : " (sticker)") : " (picture)") : "") : " #" + _loc4_.id); _loc3_.addEventListener("mouseDown",onMakerButton); _makerRowsSprite.addChild(_loc3_); - _makerRowsSprite.addChild(finderPreview(_loc4_,_loc2_,186,_loc3_.y)); + _makerRowsSprite.addChild(finderPreview(_loc4_,_loc2_,186,_loc3_.y,false)); _loc2_++; } if(_makerMode == "mine" && _loc1_.length == 0) @@ -5240,6 +5222,17 @@ package return _loc4_; } + // the item's own colour that a row is on (param1.colorIndex), or 0 + private function itemOwnColour(param1:Object) : uint + { + var _loc2_:Object = ItemXtCommManager.getItemDef(int(param1.id)); + if(_loc2_ == null || _loc2_.colors == null || _loc2_.colors.length == 0) + { + return 0; + } + return uint(_loc2_.colors[Math.min(int(param1.colorIndex),_loc2_.colors.length - 1)]); + } + // the colour a clothing row is drawn in: the box's colour id or hex // colour, else the item's own colour that the row is on private function finderPreviewColour(param1:Object) : uint @@ -5268,16 +5261,15 @@ package // a negative id is the same colour written signed return uint(Number(_loc2_)); } - _loc4_ = ItemXtCommManager.getItemDef(int(param1.id)); - if(_loc4_ == null || _loc4_.colors == null || _loc4_.colors.length == 0) - { - return 0; - } - return uint(_loc4_.colors[Math.min(int(param1.colorIndex),_loc4_.colors.length - 1)]); + return itemOwnColour(param1); } // the row's item as the game draws it in a shop, in a box at the row's end - private function finderPreview(param1:Object, param2:int, param3:Number, param4:Number) : Sprite + // param5: a row of the item giver's, drawn in its colour box's colour + // and recoloured as that changes. the Item Maker's rows are drawn by + // this too, in the item's own colour: the giver's box coloured them, + // and its colour turned up in the maker. + private function finderPreview(param1:Object, param2:int, param3:Number, param4:Number, param5:Boolean = true) : Sprite { var _loc5_:Sprite = new Sprite(); var _loc6_:Sprite = new Sprite(); @@ -5317,7 +5309,7 @@ package return _loc5_; } _loc8_ = new Item(); - Item(_loc8_).init(int(param1.id),0,finderPreviewColour(param1),null,true); + Item(_loc8_).init(int(param1.id),0,param5 ? finderPreviewColour(param1) : itemOwnColour(param1),null,true); } // fitted to the box once drawn, which may be before the icon is // handed back when its picture was loaded already @@ -5343,7 +5335,10 @@ package _loc8_.imageLoadedCallback(); } } - _finderIcons[param2] = _loc8_; + if(param5) + { + _finderIcons[param2] = _loc8_; + } } catch(e:Error) { diff --git a/swf-src/AvatarEditor.as b/swf-src/AvatarEditor.as index 73e4471..c4d41ad 100644 --- a/swf-src/AvatarEditor.as +++ b/swf-src/AvatarEditor.as @@ -224,6 +224,17 @@ package gui private var _colorTableColor2:ColorTable; private var _colorTablePatterns:ColorTable; + + // a special animal's pattern has four colours, a byte each of its + // colour number (its presets set all four; LayerBitmap draws them and + // the blends between them): the tables of the second, third and + // fourth, each shown in place of the first's while its number beside + // them is chosen + private var _patternColorTables:Array; + + private var _patternColorBtns:Array; + + private var _patternColorSlot:int; private var _colorTableEyes:ColorTable; @@ -434,6 +445,15 @@ package gui _colorTableColor1.destroy(); _colorTableColor2.destroy(); _colorTablePatterns.destroy(); + for each(var _loc9_:ColorTable in _patternColorTables) + { + if(_loc9_ != _colorTablePatterns) + { + _loc9_.destroy(); + } + } + _patternColorTables = null; + _patternColorBtns = null; _colorTableEyes.destroy(); _namebarBadgeMediaIds = null; _nameBars = null; @@ -622,6 +642,17 @@ package gui _colorTableColor2.init(1,240,150,10,5,_gamePalette,_avatarPalette2,_loc10_,onColorChanged,102); _colorTablePatterns = new ColorTable(); _colorTablePatterns.init(3,240,150,10,5,_gamePalette,_avatarPalette1,_loc8_,onColorChanged,102); + _patternColorTables = [_colorTablePatterns]; + var _loc13_:int = 1; + while(_loc13_ < 4) + { + _patternColorTables[_loc13_] = new ColorTable(); + ColorTable(_patternColorTables[_loc13_]).init(3 + _loc13_,240,150,10,5,_gamePalette,_avatarPalette1,_loc2_[1] >> 24 - _loc13_ * 8 & 0xFF,onColorChanged,102); + ColorTable(_patternColorTables[_loc13_]).x = 21; + ColorTable(_patternColorTables[_loc13_]).y = 176; + _loc13_++; + } + _patternColorSlot = 0; _colorTableEyes = new ColorTable(); _colorTableEyes.init(2,240,150,10,5,_gamePalette,_avatarPalette1,_loc5_,onColorChanged,102); _colorTableColor1.x = 21; @@ -916,9 +947,16 @@ package gui _loc9_ = _loc6_ >> 8 & 0xFF; _loc3_ = _loc6_ & 0xFF; _loc6_ = uint(_loc5_ << 24 | _loc7_ << 16 | _loc9_ << 8 | _loc3_); + break; + case 4: + case 5: + case 6: + // a special animal's pattern's second, third or fourth colour + _loc5_ = 24 - (param1 - 3) * 8; + _loc6_ = uint(_loc6_ & ~(0xFF << _loc5_) | (param2 & 0xFF) << _loc5_); } _avatarEditorView.colors = [_loc4_,_loc6_,_loc8_]; - if(param1 == 2 || param1 == 3) + if(param1 >= 2) { colorCurrEyePattIcon(); } @@ -1263,6 +1301,7 @@ package gui avEditor.colorTableBlock.patternsAndEyes.removeChild(_colorTableEyes); } avEditor.colorTableBlock.patternsAndEyes.addChild(_colorTablePatterns); + showPatternColorChoice(_worldAvatar.customAvId != -1); if(_patterns.length > 0) { if(_patterns.length <= 1 && _worldAvatar.customAvId == -1) @@ -1293,6 +1332,7 @@ package gui { avEditor.colorTableBlock.patternsAndEyes.removeChild(_colorTablePatterns); } + showPatternColorChoice(false); if(_customAvtIcon && avEditor.colorTableBlock.patternsAndEyes.specialAvtIconCont.contains(_customAvtIcon)) { avEditor.colorTableBlock.patternsAndEyes.specialAvtIconCont.removeChild(_customAvtIcon); @@ -1323,6 +1363,77 @@ package gui avEditor.colorTableBlock.colors.visible = false; } + // the "1" to "4" left of the pattern's colour table, choosing which of + // its four colours it sets, with that colour's table (param1), or + // neither, and the first's table back + private function showPatternColorChoice(param1:Boolean) : void + { + var _loc2_:MovieClip = avEditor.colorTableBlock.patternsAndEyes; + var _loc3_:int = 0; + var _loc4_:Sprite = null; + if(_patternColorBtns == null) + { + _patternColorBtns = []; + while(_loc3_ < 4) + { + _loc4_ = createSmallButton(String(_loc3_ + 1)); + _loc4_.name = "patternColor" + _loc3_; + _loc4_.x = 2; + _loc4_.y = 176 + _loc3_ * 20; + _loc4_.addEventListener("mouseDown",onPatternColorBtn,false,0,true); + _patternColorBtns.push(_loc4_); + _loc3_++; + } + } + _loc3_ = 0; + while(_loc3_ < _patternColorBtns.length) + { + _loc4_ = _patternColorBtns[_loc3_]; + if(param1) + { + _loc2_.addChild(_loc4_); + _loc4_.alpha = _loc3_ == _patternColorSlot ? 1 : 0.45; + } + else if(_loc4_.parent) + { + _loc4_.parent.removeChild(_loc4_); + } + _loc3_++; + } + // the first's table is added and taken away with the tab + _loc3_ = 1; + while(_loc3_ < _patternColorTables.length) + { + if(_loc2_.contains(_patternColorTables[_loc3_])) + { + _loc2_.removeChild(_patternColorTables[_loc3_]); + } + _loc3_++; + } + if(param1) + { + if(_patternColorSlot == 0) + { + _loc2_.addChild(_colorTablePatterns); + } + else + { + if(_loc2_.contains(_colorTablePatterns)) + { + _loc2_.removeChild(_colorTablePatterns); + } + _loc2_.addChild(_patternColorTables[_patternColorSlot]); + } + } + } + + private function onPatternColorBtn(param1:MouseEvent) : void + { + param1.stopPropagation(); + _patternColorSlot = int(Sprite(param1.currentTarget).name.charAt(12)); + showPatternColorChoice(true); + } + private function onCustomIconLoaded(param1:MovieClip) : void { if(_avatarEditorView) diff --git a/swf-src/AvatarWorldView.as b/swf-src/AvatarWorldView.as index 86459ad..a5eebe6 100644 --- a/swf-src/AvatarWorldView.as +++ b/swf-src/AvatarWorldView.as @@ -241,8 +241,6 @@ package avatar private var _typing:Sprite; - private var _tradingSign:Sprite; - private var _typingDots:Array; private var _typingTimer:Timer; @@ -683,8 +681,6 @@ package avatar } _typing = null; _typingDots = null; - setTrading(false); - _tradingSign = null; removeChild(_namebar); if(_secondaryEmot && _chatLayer.contains(_secondaryEmot)) { @@ -1159,49 +1155,6 @@ package avatar } } - // trading (lib/world.js showTrading): a round sign with two arrows by - // the head, for as long as the trade goes on. a child of the animal's - // own, so it goes where the animal goes. - public function setTrading(param1:Boolean) : void - { - var _loc2_:Point = null; - if(!param1) - { - if(_tradingSign && _tradingSign.parent) - { - _tradingSign.parent.removeChild(_tradingSign); - } - return; - } - if(_tradingSign == null) - { - _tradingSign = new Sprite(); - _tradingSign.mouseEnabled = false; - _tradingSign.mouseChildren = false; - _tradingSign.graphics.lineStyle(2,0x7F6744); - _tradingSign.graphics.beginFill(0xFFF2C4); - _tradingSign.graphics.drawCircle(0,0,12); - _tradingSign.graphics.endFill(); - // an arrow to the right over one to the left - _tradingSign.graphics.lineStyle(2,0x4FA52F,1,false,"normal","round","round"); - _tradingSign.graphics.moveTo(-6,-3); - _tradingSign.graphics.lineTo(6,-3); - _tradingSign.graphics.moveTo(3,-6); - _tradingSign.graphics.lineTo(6,-3); - _tradingSign.graphics.lineTo(3,0); - _tradingSign.graphics.lineStyle(2,0xD4482A,1,false,"normal","round","round"); - _tradingSign.graphics.moveTo(6,4); - _tradingSign.graphics.lineTo(-6,4); - _tradingSign.graphics.moveTo(-3,1); - _tradingSign.graphics.lineTo(-6,4); - _tradingSign.graphics.lineTo(-3,7); - } - _loc2_ = _avatar ? AvatarUtility.getAvatarChatOffset(_avatar.avTypeId) : new Point(0,-80); - _tradingSign.x = _loc2_.x + 26; - _tradingSign.y = _loc2_.y + 16; - addChild(_tradingSign); - } - private function hideTyping() : void { if(_typingTimer) diff --git a/swf-src/MySettings.as b/swf-src/MySettings.as index 66b838c..9f8f800 100644 --- a/swf-src/MySettings.as +++ b/swf-src/MySettings.as @@ -160,10 +160,9 @@ package gui } var _loc4_:Array = [{ "type":TOGGLE_TYPE_JOIN, - // the web item giver (AJClient.openTool), in the browser "frame":"itemFinder", "iconFrame":"redeemCode", - "labelLabel":"Item Giver (web)", + "labelLabel":"Item Giver", "btnLabel":"Open" },{ // a player's own items (AJClient's Item Maker) diff --git a/swf-src/XtReplyDemuxer.as b/swf-src/XtReplyDemuxer.as index 2050526..dc960c3 100644 --- a/swf-src/XtReplyDemuxer.as +++ b/swf-src/XtReplyDemuxer.as @@ -135,11 +135,6 @@ package AJClient.onMentions(param1.obj); return; } - if(param1.obj[0] == "xtr") - { - AJClient.onTrading(param1.obj); - return; - } if(param1.obj[0] == "xty") { AJClient.onTyping(param1.obj); diff --git a/swf/ajclient.swf b/swf/ajclient.swf index 8f42359..3fcacf6 100644 Binary files a/swf/ajclient.swf and b/swf/ajclient.swf differ