From b813d89cfa244df94c178a5ffce5e96762787647 Mon Sep 17 00:00:00 2001 From: Burrowdev Date: Sat, 17 Oct 2026 23:45:55 +0300 Subject: [PATCH] feat: animals use the actions they have art for in any room A land animal underwater is shown the land actions (sit, sleep, hop, dance, play) and an ocean animal on land the ocean ones; animals of land and ocean both get a "Swim moves" / "Land moves" button above the actions window to swap sets. gui.ActionManager joins swf-src. The other set's dance and play go by names of their own (:danceLand:, :danceSwim:, :playLand:, :playSwim:), and AvatarWorldView plays each action from the set the animal has art for. --- swf-src/ActionManager.as | 592 +++++++++++++++++++++++++++++++ swf-src/AvatarWorldView.as | 57 ++- swf-src/UserCommXtCommManager.as | 2 +- tools/build-client.sh | 1 + 4 files changed, 649 insertions(+), 3 deletions(-) create mode 100644 swf-src/ActionManager.as diff --git a/swf-src/ActionManager.as b/swf-src/ActionManager.as new file mode 100644 index 0000000..eb5b719 --- /dev/null +++ b/swf-src/ActionManager.as @@ -0,0 +1,592 @@ +package gui +{ + import avatar.Avatar; + import avatar.AvatarManager; + import flash.display.MovieClip; + import flash.display.Sprite; + import flash.events.MouseEvent; + import flash.geom.Rectangle; + import flash.utils.Dictionary; + import game.ArtStudioKit; + import pet.WorldPet; + + // the actions window. an animal has the art for its own set of actions + // only (a land animal's sitting, sleeping, hopping; an ocean animal's + // diving, swirling, posing), so it is shown its own set in any room: a + // land animal underwater still sits and hops. an animal of land and ocean + // both (seal, otter...) has both, and a button above the window swaps the + // set shown ("Swim moves" on land, "Land moves" underwater). + // + // the sets share buttons, and ":dance:" and ":play:" are the same name in + // both (the room picks the animation, AvatarWorldView.setAction): the + // other set's dance and play go by names of their own (OTHER_SET_NAMES). + // the other names (":dive:", ":sitNW:"...) are one set's already. + public class ActionManager + { + + private static const OTHER_SET_NAMES:Object = { + "danceAnim_btnCont":[":danceLand:",":danceSwim:"], + "playAnim_btnCont":[":playLand:",":playSwim:"] + }; + + private static const OTHER_SET_BUTTONS:Object = { + ":danceLand:":"danceAnim_btnCont", + ":danceSwim:":"danceAnim_btnCont", + ":playLand:":"playAnim_btnCont", + ":playSwim:":"playAnim_btnCont" + }; + + private static const SWAP_W:int = 150; + + private static const SWAP_H:int = 26; + + // the set the window shows: the room's, unless swapped + private var _oceanShown:Boolean; + + // action sprites made from a name (matchActionString), and that name + private var _names:Dictionary = new Dictionary(true); + + private var _swapBtn:MovieClip; + + + private const ACTIONWINDOW_DIM_ALPHA:Number = 0.5; + + private const ACTIONWINDOW_BRIGHT_ALPHA:Number = 1; + + public var actionBtn:MovieClip; + + public var actionWindow:MovieClip; + + public var emoteBtn:MovieClip; + + public var emoteWindow:Sprite; + + public var safeChatBtn:MovieClip; + + public var safeChatTree:MovieClip; + + public var setActionCallback:Function; + + public var actionSprites:Array = ["sit1BtnCont","sit2BtnCont","sit3BtnCont","sit4BtnCont","danceAnim_btnCont","sleepAnim_btnCont","hopAnim_btnCont","playAnim_btnCont","pose1BtnCont","pose2BtnCont","diveAnim_btnCont","swirlAnim_btnCont"]; + + public var actionStrings:Object; + + private var _actions:MovieClip; + + private var _petActions:MovieClip; + + private var _views:Array; + + private var _titleBanner:Sprite; + + public function ActionManager(param1:Function, param2:MovieClip, param3:MovieClip, param4:MovieClip, param5:Sprite, param6:MovieClip, param7:MovieClip) + { + super(); + if(setActionCallback != null) + { + throw new Error("ERROR: Singleton ActionManager did not expect to be created twice!"); + } + setActionCallback = param1; + actionBtn = param2; + actionBtn.addEventListener("mouseDown",actionBtnDownHandler,false,0,true); + actionWindow = param3; + addAllActions(); + addSwapButton(); + actionWindow.addChild(_actions); + actionWindow.addChild(_petActions); + _petActions.visible = false; + actionWindow.poseBtns = _actions.poseBtns; + actionWindow.diveBtn = _actions.diveBtn; + actionWindow.swirlBtn = _actions.swirlBtn; + actionWindow.sitBtns = _actions.sitBtns; + actionWindow.visible = false; + emoteBtn = param4; + emoteWindow = param5; + safeChatBtn = param6; + safeChatTree = param7; + setupTitleBanner(); + } + + // a room joined: its set is shown, if the animal has it. + public function turnOnOceanActions(param1:Boolean) : void + { + _oceanShown = ownSet(param1); + showSet(); + } + + // the set to show in a room (true: the ocean's): the room's, unless the + // player's animal has the art of the other only. + private static function ownSet(param1:Boolean) : Boolean + { + var _loc2_:Avatar = AvatarManager.playerAvatar; + if(_loc2_ == null) + { + return param1; + } + var _loc3_:Boolean = Utility.isLand(_loc2_.enviroTypeFlag); + var _loc4_:Boolean = Utility.isOcean(_loc2_.enviroTypeFlag); + return _loc3_ == _loc4_ ? param1 : _loc4_; + } + + // whether the player's animal has the art of a set (true: the ocean's) + private static function playerHasSet(param1:Boolean) : Boolean + { + var _loc2_:Avatar = AvatarManager.playerAvatar; + if(_loc2_ == null) + { + return false; + } + return param1 ? Utility.isOcean(_loc2_.enviroTypeFlag) : Utility.isLand(_loc2_.enviroTypeFlag); + } + + private function showSet() : void + { + actionWindow.poseBtns.visible = _oceanShown; + actionWindow.diveBtn.visible = _oceanShown; + actionWindow.swirlBtn.visible = _oceanShown; + actionWindow.sitBtns.visible = !_oceanShown; + if(_swapBtn) + { + ArtStudioKit.setLabel(_swapBtn,_oceanShown ? "Land moves" : "Swim moves"); + } + } + + private function addSwapButton() : void + { + _swapBtn = ArtStudioKit.button(null,null,SWAP_W,SWAP_H,onSwapBtn,"Swim moves"); + // the window closes on a press anywhere else + _swapBtn.addEventListener("mouseDown",stopPress,false,0,true); + _swapBtn.visible = false; + _actions.addChild(_swapBtn); + } + + private function stopPress(param1:MouseEvent) : void + { + param1.stopPropagation(); + } + + private function onSwapBtn(param1:MouseEvent) : void + { + _oceanShown = !_oceanShown; + showSet(); + } + + private static function roomIsOcean() : Boolean + { + return AvatarManager.roomEnviroType == 1; + } + + // whether the player's animal has the art of both sets + private static function playerHasBothSets() : Boolean + { + var _loc1_:Avatar = AvatarManager.playerAvatar; + return _loc1_ != null && Utility.isLand(_loc1_.enviroTypeFlag) && Utility.isOcean(_loc1_.enviroTypeFlag); + } + + // the swap button, for an animal of both sets, above the window; any + // other is shown its own set (the player may have changed animals + // since the room was joined). + private function updateSwapButton() : void + { + var _loc1_:Boolean = playerHasBothSets(); + var _loc2_:Rectangle = null; + if(!_loc1_ && _oceanShown != ownSet(roomIsOcean())) + { + _oceanShown = ownSet(roomIsOcean()); + showSet(); + } + _swapBtn.visible = _loc1_; + if(_loc1_) + { + _loc2_ = actionWindow.ba.getBounds(actionWindow); + if(_titleBanner && actionWindow.contains(_titleBanner)) + { + _loc2_ = _loc2_.union(_titleBanner.getBounds(actionWindow)); + } + _swapBtn.x = int(_loc2_.x + (_loc2_.width - SWAP_W) / 2); + _swapBtn.y = int(_loc2_.top - SWAP_H - 4); + } + } + + public function turnOnPetActions(param1:Boolean) : void + { + if(param1) + { + _petActions.visible = true; + _actions.visible = false; + } + else + { + _petActions.visible = false; + _actions.visible = true; + } + } + + public function reload(param1:MovieClip, param2:MovieClip, param3:MovieClip, param4:Sprite, param5:MovieClip, param6:MovieClip, param7:Function) : void + { + setActionCallback = param7; + if(actionBtn) + { + actionBtn.removeEventListener("mouseDown",actionBtnDownHandler); + } + actionBtn = param1; + actionBtn.addEventListener("mouseDown",actionBtnDownHandler,false,0,true); + while(actionWindow.numChildren > 2) + { + actionWindow.removeChildAt(actionWindow.numChildren - 1); + } + actionWindow = param2; + addAllActions(); + addSwapButton(); + actionWindow.addChild(_actions); + actionWindow.addChild(_petActions); + _petActions.visible = false; + actionWindow.poseBtns = _actions.poseBtns; + actionWindow.diveBtn = _actions.diveBtn; + actionWindow.swirlBtn = _actions.swirlBtn; + actionWindow.sitBtns = _actions.sitBtns; + actionWindow.visible = false; + emoteBtn = param3; + emoteWindow = param4; + actionWindow = param2; + safeChatBtn = param5; + safeChatTree = param6; + actionBtn.downToUpState(); + setupTitleBanner(); + } + + private function addAllActions() : void + { + var _loc14_:* = 0; + _loc14_ = 10; + var _loc11_:* = 0; + _loc11_ = 25; + var _loc13_:* = 0; + _loc13_ = 40; + var _loc5_:* = 0; + _loc5_ = 91; + var _loc2_:* = 0; + _loc2_ = 2; + var _loc1_:Number = NaN; + _loc1_ = -72; + var _loc4_:Number = NaN; + _loc4_ = -50; + var _loc10_:Number = NaN; + _loc10_ = -88; + var _loc15_:int = 0; + _loc15_ = 4; + var _loc16_:int = 0; + _loc16_ = 2; + var _loc7_:int = 0; + _loc7_ = 8; + var _loc6_:* = 0; + var _loc3_:Sprite = null; + var _loc12_:Sprite = null; + var _loc8_:int = 0; + var _loc9_:int = 0; + _actions = new MovieClip(); + _petActions = new MovieClip(); + _loc6_ = 0; + while(_loc6_ < actionSprites.length) + { + if(_loc6_ < 8) + { + _loc3_ = GETDEFINITIONBYNAME(_loc6_ < 4 ? "sitBtns" : actionSprites[_loc6_]); + if(_loc6_ == 0) + { + _loc3_.x = actionWindow.ba.width * 0.5 + -72 - 25 - 5; + _loc3_.y = 10 + Math.floor(_loc6_ / 2) * 40 + -50; + _actions.addChild(_loc3_); + _actions.sitBtns = _loc3_; + _loc8_ = 1; + while(_loc8_ <= 4) + { + _loc12_ = _loc3_["sit" + _loc8_ + "Btn"]; + _loc12_.buttonMode = true; + _loc12_.useHandCursor = true; + _loc12_.tabEnabled = true; + _loc12_.tabChildren = false; + _loc12_.addEventListener("mouseDown",actionClickHandler,false,0,true); + _loc8_++; + } + } + else if(_loc6_ >= 4) + { + _loc3_.x = 25 + (_loc6_ % 2 * 91 + -72); + _loc3_.y = 10 + Math.floor(_loc6_ / 2) * 40 + -88; + _actions.addChild(_loc3_); + _loc3_.buttonMode = true; + _loc3_.useHandCursor = true; + _loc3_.tabEnabled = true; + _loc3_.tabChildren = false; + _loc3_.addEventListener("mouseDown",actionClickHandler,false,0,true); + } + } + else + { + _loc3_ = GETDEFINITIONBYNAME(_loc6_ == 8 ? "poseBtns" : actionSprites[_loc6_]); + if(_loc6_ == 8) + { + _loc3_.visible = false; + _actions.poseBtns = _loc3_; + _loc3_.x = actionWindow.ba.width * 0.5 + -72 - 25 - 5; + _loc3_.y = 10 + Math.floor((_loc6_ - 8) / 2) * 40 + -50; + _actions.addChild(_loc3_); + _loc9_ = 1; + while(_loc9_ <= 2) + { + _loc12_ = _loc3_["pose" + _loc9_ + "Btn"]; + _loc12_.buttonMode = true; + _loc12_.useHandCursor = true; + _loc12_.tabEnabled = true; + _loc12_.tabChildren = false; + _loc12_.addEventListener("mouseDown",actionClickHandler,false,0,true); + _loc9_++; + } + } + else if(_loc6_ >= 8 + 2) + { + _loc3_.visible = false; + if(_loc6_ == actionSprites.length - 1) + { + _actions.diveBtn = _loc3_; + } + else + { + _actions.swirlBtn = _loc3_; + } + _loc3_.x = 25 + ((_loc6_ - 5) % 2 * 91 + -72); + _loc3_.y = 10 + Math.floor((_loc6_ - 5) / 2) * 40 + -88; + _actions.addChild(_loc3_); + _loc3_.buttonMode = true; + _loc3_.useHandCursor = true; + _loc3_.tabEnabled = true; + _loc3_.tabChildren = false; + _loc3_.addEventListener("mouseDown",actionClickHandler,false,0,true); + } + } + _loc6_++; + } + _loc3_ = GETDEFINITIONBYNAME("playPetAnim_btnCont"); + _loc3_.y = -31; + _loc3_.buttonMode = true; + _loc3_.useHandCursor = true; + _loc3_.tabEnabled = true; + _loc3_.tabChildren = false; + _loc3_.addEventListener("mouseDown",onPetPlayBtn,false,0,true); + _petActions.addChild(_loc3_); + _loc3_ = GETDEFINITIONBYNAME("dancePetAnim_btnCont"); + _petActions.danceBtn = _loc3_; + _loc3_.y = 31; + _loc3_.buttonMode = true; + _loc3_.useHandCursor = true; + _loc3_.tabEnabled = true; + _loc3_.tabChildren = false; + _loc3_.addEventListener("mouseDown",actionClickHandler,false,0,true); + _petActions.addChild(_loc3_); + actionStrings = {}; + actionStrings["sit1BtnCont"] = actionStrings["pose1BtnCont"] = [":sitNW:",":poseLeft:"]; + actionStrings["sit2BtnCont"] = [":sitNE:"]; + actionStrings["sit3BtnCont"] = [":sitSE:"]; + actionStrings["sit4BtnCont"] = actionStrings["pose2BtnCont"] = [":sitSW:",":poseRight:"]; + actionStrings["danceAnim_btnCont"] = actionStrings["dancePetAnim_btnCont"] = [":dance:"]; + actionStrings["sleepAnim_btnCont"] = actionStrings["diveAnim_btnCont"] = [":sleep:",":dive:"]; + actionStrings["hopAnim_btnCont"] = actionStrings["swirlAnim_btnCont"] = [":hop:",":swirl:"]; + actionStrings["playAnim_btnCont"] = [":play:"]; + } + + private function setupTitleBanner() : void + { + if(emoteWindow.name.indexOf("Quest") == -1) + { + if(_titleBanner) + { + if(!actionWindow.contains(_titleBanner)) + { + actionWindow.addChild(_titleBanner); + } + } + else + { + _titleBanner = GETDEFINITIONBYNAME("AnimsTitleBanner"); + _titleBanner.x = -91.75; + _titleBanner.y = -91.25; + actionWindow.addChild(_titleBanner); + } + } + } + + public function destroy() : void + { + setActionCallback = null; + actionBtn.removeEventListener("mouseDown",actionBtnDownHandler); + actionBtn = null; + actionWindow.visible = false; + actionWindow = null; + emoteBtn = null; + emoteWindow = null; + safeChatBtn = null; + safeChatTree = null; + } + + // the name a button sends: the set shown's, and for dance and play the + // other set's own name when the set shown is not the room's. + private function nameFor(param1:String) : String + { + var _loc2_:Array = actionStrings[param1]; + if(!_loc2_) + { + return null; + } + if(OTHER_SET_NAMES[param1] && _oceanShown != roomIsOcean()) + { + return OTHER_SET_NAMES[param1][_oceanShown ? 1 : 0]; + } + return _loc2_.length > 1 ? _loc2_[_oceanShown ? 1 : 0] : _loc2_[0]; + } + + public function getActionString(param1:Sprite) : String + { + if(_names[param1] != undefined) + { + return _names[param1]; + } + var _loc2_:String = param1["constructor"].toString(); + return nameFor(_loc2_.slice(7,_loc2_.length - 1)); + } + + // the button for an action's name, which it then stands for. `typed`: + // the player's own, typed in chat, which is held to the sets their + // animal has art for; another player's is taken as it came + // (AvatarWorldView.setAction plays what their animal has art for). + public function matchActionString(param1:String, param2:Boolean = false) : Sprite + { + var _loc3_:int = 0; + var _loc4_:String = OTHER_SET_BUTTONS[param1]; + var _loc5_:Sprite = null; + if(_loc4_ && param2 && !playerHasSet(param1.indexOf("Swim") != -1)) + { + return null; + } + if(!_loc4_) + { + for each(var _loc2_:String in actionSprites) + { + _loc3_ = int(actionStrings[_loc2_].indexOf(param1)); + if(_loc3_ != -1) + { + if(actionStrings[_loc2_].length <= 1 || !param2 || playerHasSet(_loc3_ == 1)) + { + _loc4_ = _loc2_; + break; + } + } + } + } + if(!_loc4_) + { + return null; + } + _loc5_ = GETDEFINITIONBYNAME(_loc4_); + _names[_loc5_] = param1; + return _loc5_; + } + + public function openActions() : void + { + if(!actionWindow.visible) + { + updateSwapButton(); + actionWindow.visible = true; + brightenActions(); + } + } + + public function dimActions() : void + { + if(actionWindow.visible && actionWindow.alpha != 0.5) + { + actionWindow.alpha = 0.5; + } + } + + public function brightenActions() : void + { + if(actionWindow.alpha != 1) + { + actionWindow.alpha = 1; + } + } + + public function closeActions() : void + { + if(actionWindow.visible) + { + actionWindow.visible = false; + brightenActions(); + actionBtn.downToUpState(); + } + } + + public function grayOutPetDanceBtn(param1:Boolean) : void + { + if(_petActions) + { + _petActions.danceBtn.activateGrayState(param1); + } + } + + private function actionBtnDownHandler(param1:MouseEvent) : void + { + param1.stopPropagation(); + if(!param1.currentTarget.isGray) + { + if(actionWindow.visible) + { + closeActions(); + } + else + { + if(safeChatTree.visible) + { + safeChatBtn.dispatchEvent(param1); + } + if(emoteWindow.visible) + { + emoteBtn.dispatchEvent(param1); + } + openActions(); + } + } + } + + private function actionClickHandler(param1:MouseEvent) : void + { + param1.stopPropagation(); + if(!actionBtn.isGray && !param1.currentTarget.isGray) + { + setActionCallback(new param1.currentTarget.constructor()); + actionBtn.dispatchEvent(new MouseEvent("mouseDown")); + param1.currentTarget.downToUpState(); + } + } + + private function onPetPlayBtn(param1:MouseEvent) : void + { + var _loc2_:WorldPet = null; + param1.stopPropagation(); + if(AvatarManager.playerAvatarWorldView) + { + _loc2_ = AvatarManager.playerAvatarWorldView.getActivePet(); + if(_loc2_) + { + AvatarManager.playerAvatarWorldView.faceAnim(0,0,false); + _loc2_.onClick(param1); + } + } + actionBtn.dispatchEvent(new MouseEvent("mouseDown")); + param1.currentTarget.downToUpState(); + } + } +} + diff --git a/swf-src/AvatarWorldView.as b/swf-src/AvatarWorldView.as index d450818..279f2d6 100644 --- a/swf-src/AvatarWorldView.as +++ b/swf-src/AvatarWorldView.as @@ -90,65 +90,106 @@ package avatar private static const STATE_LAND:int = 6; + // the actions' animations, `land` and `water`. an animal has the art of + // its own set only (land or ocean animals) or of both: an action of a + // set (`set`) plays as that set's when the animal has it, and otherwise + // as the animal's own set's, so a land animal underwater still sits + // (gui.ActionManager). ":dance:" and ":play:" are both sets' and go by + // the room for an animal of both; the other set's dance and play have + // names of their own. public static var _actionLookup:Array = [{ "name":":dance:", "land":23, "water":38, "flip":false + },{ + "name":":danceLand:", + "land":23, + "water":38, + "set":"land", + "flip":false + },{ + "name":":danceSwim:", + "land":23, + "water":38, + "set":"water", + "flip":false },{ "name":":sleep:", "land":22, "water":41, + "set":"land", "flip":false },{ "name":":dive:", "land":22, "water":41, + "set":"water", "flip":false },{ "name":":hop:", "land":17, "water":33, + "set":"land", "flip":false },{ "name":":swirl:", "land":17, "water":33, + "set":"water", "flip":false },{ "name":":play:", "land":6, "water":39, "flip":false + },{ + "name":":playLand:", + "land":6, + "water":39, + "set":"land", + "flip":false + },{ + "name":":playSwim:", + "land":6, + "water":39, + "set":"water", + "flip":false },{ "name":":sitNW:", "land":2, "water":40, + "set":"land", "flip":true },{ "name":":poseLeft:", "land":2, "water":40, + "set":"water", "flip":true },{ "name":":sitNE:", "land":2, "water":40, + "set":"land", "flip":false },{ "name":":sitSE:", "land":4, "water":40, + "set":"land", "flip":true },{ "name":":poseRight:", "land":2, "water":40, + "set":"water", "flip":false },{ "name":":sitSW:", "land":4, "water":40, + "set":"land", "flip":false }]; @@ -1148,11 +1189,22 @@ package avatar _lastIdleAnim = getBaseIdle(); _lastIdleFlip = false; var _loc2_:String = _actionMgr.getActionString(param1); + // the sets this animal has art for + var _loc5_:Boolean = _avatar == null || Utility.isLand(_avatar.enviroTypeFlag); + var _loc6_:Boolean = _avatar == null || Utility.isOcean(_avatar.enviroTypeFlag); + var _loc7_:String = null; for each(var _loc4_:Object in _actionLookup) { if(_loc4_.name == _loc2_) { - _loc3_ = int(_roomType == 0 ? _loc4_.land : _loc4_.water); + // the action's own set, if the animal has it; otherwise its + // only set, or with both (or neither known) the room's + _loc7_ = _loc4_.set; + if(!_loc7_ || (_loc7_ == "water" ? !_loc6_ : !_loc5_)) + { + _loc7_ = _loc5_ == _loc6_ ? (_roomType == 0 ? "land" : "water") : (_loc5_ ? "land" : "water"); + } + _loc3_ = int(_loc7_ == "water" ? _loc4_.water : _loc4_.land); if(_loc3_ > 0) { _lastIdleAnim = _loc3_; @@ -1164,7 +1216,8 @@ package avatar } if(_pet && _loc2_) { - _pet.setActionByName(_loc2_); + // pets know ":dance:" and ":play:", not the other set's names + _pet.setActionByName(_loc2_.replace(/(Land|Swim):$/,":")); } } diff --git a/swf-src/UserCommXtCommManager.as b/swf-src/UserCommXtCommManager.as index 349af83..41b2391 100644 --- a/swf-src/UserCommXtCommManager.as +++ b/swf-src/UserCommXtCommManager.as @@ -536,7 +536,7 @@ package avatar } else { - _loc5_ = _actionMgr.matchActionString(_loc3_); + _loc5_ = _actionMgr.matchActionString(_loc3_,true); if(_loc5_) { sendAvatarAction(_loc5_); diff --git a/tools/build-client.sh b/tools/build-client.sh index b4bc94b..123d793 100755 --- a/tools/build-client.sh +++ b/tools/build-client.sh @@ -33,6 +33,7 @@ set -- \ gui.ReportAPlayer ReportAPlayer.as \ gui.ECardCreation ECardCreation.as \ gui.GuiManager GuiManager.as \ + gui.ActionManager ActionManager.as \ gui.PlayerSearch PlayerSearch.as \ avatar.NPCView NPCView.as \ gui.ChatHistory ChatHistory.as \