fix: eggs, pets, minigames, themes, HQ facts and more

- egg stands sell an egg again; a bought egg hatches and is named at once
- pets whose bits name no pet the game has no longer stop loading
- the adopt-a-pet gift path opens with nothing adopted yet
- Spider Zapper and Wind Rider start with their players: spiders can be
  shot, and Wind Rider is played; Spider Zapper's waves are answered
- Phantom's Treasure can be left from its title screen and level choice
- the Touch Pool's fact window always closes
- the last key in Return of the Phantoms lies where it can be reached
- the Alpha HQ's bios and relics open and close
- a land animal in water (and a sea one on land) is drawn when it stands
- a seasonal theme's room has today's shops in it (lib/themerooms.js)
- the Forgotten Archive sells its own stock, not unfinished pieces
- custom items whose def is gone stay out of trade lists
- the captcha is always shown, and tried again when it fails
- builds 85
This commit is contained in:
Burrowdev committed 2026-10-24 01:57:49 +03:00
1 parent c7efda7030
commit 4355994253
19 files changed
+4891 -28

No files matched your search

+19 -4
View File
@@ -826,7 +826,22 @@ package avatar
public function getBaseIdle() : int
{
return _roomType == 1 ? 32 : 14;
return drawnSwimming() ? 32 : 14;
}
// whether the animal is drawn with its swimming animations: the
// room's kind when it has art for both, else the one it has. a land
// animal in water (or a sea one on land) asked for art it has none of,
// and stood invisible until it did something it had art for.
private function drawnSwimming() : Boolean
{
var _loc1_:Boolean = _avatar == null || Utility.isLand(_avatar.enviroTypeFlag);
var _loc2_:Boolean = _avatar == null || Utility.isOcean(_avatar.enviroTypeFlag);
if(_loc1_ == _loc2_)
{
return _roomType == 1;
}
return _loc2_;
}
public function setPath(param1:Array) : void
@@ -2679,7 +2694,7 @@ package avatar
_lastMoveAngle = _loc7_;
var _loc8_:Object = convertToIdle(_lastMoveAngle);
_lastIdleAnim = _loc8_.anim;
if(_roomType == 1)
if(drawnSwimming())
{
_lastIdleAnim = getBaseIdle();
}
@@ -2746,7 +2761,7 @@ package avatar
_loc9_ = 14;
}
}
if(_roomType == 1)
if(drawnSwimming())
{
_loc9_ = 29;
}
@@ -2839,7 +2854,7 @@ package avatar
public function preload(param1:Function) : void
{
var _loc2_:Array = [];
if(_roomType == 1)
if(drawnSwimming())
{
_loc2_.push(29);
_loc2_.push(32);
+15 -3
View File
@@ -702,11 +702,17 @@ package gui
{
_loc2_.txt.text = "";
}
if(_loc2_.title != null)
// the Alpha HQ's bios have no title (string 0), and an id with no
// string throws: the popup stayed on screen with nothing able to
// close it. none is left as it is.
if(_loc2_.title != null && param1.title > 0)
{
LocalizationManager.translateId(_loc2_.title.txt,param1.title);
}
LocalizationManager.translateId(_loc2_.txt,param1.description);
if(param1.description > 0)
{
LocalizationManager.translateId(_loc2_.txt,param1.description);
}
if(param1.media && param1.media != 0)
{
_loc3_ = new MediaHelper();
@@ -724,7 +730,13 @@ package gui
}
}
_loc2_.addEventListener("mouseDown",factMouseDownHandler,false,0,true);
if(_loc2_.nextBtn)
// one fact on its own (not one of a list) has no next or previous
if(_loc2_.nextBtn && (_genericFactDefIndexList == null || isNaN(param1.index)))
{
_loc2_.nextBtn.visible = false;
_loc2_.prevBtn.visible = false;
}
else if(_loc2_.nextBtn)
{
_loc2_.nextBtn.addEventListener("mouseDown",factNextPrevBtnHandler,false,0,true);
_loc2_.prevBtn.addEventListener("mouseDown",factNextPrevBtnHandler,false,0,true);
+487
View File
@@ -0,0 +1,487 @@
package pet
{
import flash.display.MovieClip;
import flash.display.Sprite;
import loader.MediaHelper;
import localization.LocalizationManager;
public class PetBase extends Sprite
{
public static const DEF_ID_CAT:int = 1;
public static const DEF_ID_FROG:int = 2;
public static const DEF_ID_DUCK:int = 3;
public static const DEF_ID_DOG:int = 4;
public static const DEF_ID_BFLY:int = 5;
public static const DEF_ID_HAMS:int = 6;
public static const DEF_ID_BAT:int = 7;
public static const DEF_ID_SEAHORSE:int = 8;
public static const DEF_ID_ANGLER:int = 9;
public static const DEF_ID_REINDEER:int = 10;
public static const DEF_ID_SNAKE:int = 11;
public static const DEF_ID_JELLYFISH:int = 12;
public static const DEF_ID_BUNNY:int = 13;
public static const DEF_ID_HUMMINGBIRD:int = 14;
public static const DEF_ID_TURTLE:int = 15;
public static const DEF_ID_MONKEY:int = 16;
public static const DEF_ID_TARANTUAL:int = 17;
public static const DEF_ID_FOX:int = 18;
public static const DEF_ID_OWL:int = 19;
public static const DEF_ID_TIGER:int = 20;
public static const DEF_ID_ARCTIC_WOLF:int = 21;
public static const DEF_ID_RACCOON:int = 22;
public static const DEF_ID_JOEY:int = 23;
public static const DEF_ID_EAGLET:int = 24;
public static const DEF_ID_CHEETAH:int = 25;
public static const DEF_ID_RHINO:int = 26;
public static const DEF_ID_GIRAFFE:int = 27;
public static const DEF_ID_SUGAR_GLIDER:int = 28;
public static const DEF_ID_LION_CUB:int = 29;
public static const DEF_ID_PANDA:int = 30;
public static const DEF_ID_POLAR_BEAR_CUB:int = 31;
public static const DEF_ID_GECKO:int = 32;
public static const DEF_ID_PONY:int = 34;
public static const DEF_ID_PIGLET:int = 35;
public static const DEF_ID_FERRET:int = 36;
public static const DEF_ID_ELEPHANT:int = 37;
public static const DEF_ID_ARMADILLO:int = 38;
public static const DEF_ID_PEACOCK:int = 39;
public static const DEF_ID_BEE:int = 40;
public static const DEF_ID_ROOSTER:int = 41;
public static const DEF_ID_SKUNK:int = 42;
public static const DEF_ID_TURKEY:int = 43;
public static const DEF_ID_PENGUIN:int = 44;
public static const DEF_ID_SNOW_LEOPARD:int = 45;
public static const DEF_ID_MANITS:int = 46;
public static const DEF_ID_LADYBUG:int = 47;
public static const DEF_ID_CRICKET:int = 48;
public static const DEF_ID_SQUIRREL:int = 49;
public static const DEF_ID_MOUSE:int = 50;
public static const DEF_ID_FIREFLY:int = 51;
public static const DEF_ID_LEMUR:int = 52;
public static const DEF_ID_HIPPO:int = 53;
public static const DEF_ID_GOAT:int = 54;
public static const DEF_ID_MEERKAT:int = 55;
public static const DEF_ID_GOLDEN_BUNNY:int = 56;
public static const DEF_ID_PHANTOM:int = 57;
public static const DEF_ID_SEAL:int = 58;
public static const DEF_ID_OTTER:int = 59;
public static const DEF_ID_PHANTOM_RARE:int = 60;
public static const DEF_ID_GROUND_HOG:int = 61;
public static const DEF_ID_LLAMA:int = 62;
public static const DEF_ID_ARCTIC_FOX:int = 63;
public static const DEF_ID_HYENA:int = 64;
public static const DEF_ID_SLOTH:int = 65;
public static const DEF_ID_DOVE:int = 66;
public static const DEF_ID_CHICK:int = 67;
public static const DEF_ID_GOLDEN_ARMADILLO:int = 68;
public static const DEF_ID_FALCON:int = 69;
public static const DEF_ID_CROCODILE:int = 70;
public static const DEF_ID_PLATYPUS:int = 71;
public static const DEF_ID_PHANTOM_JW:int = 72;
public static const DEF_ID_GOLDEN_PONY:int = 73;
public static const DEF_ID_SHARK:int = 74;
public static const DEF_ID_DOLPHIN:int = 75;
public static const DEF_ID_ECHIDNA:int = 76;
public static const DEF_ID_KOALA:int = 77;
public static const DEF_ID_LYNX:int = 80;
public static const DEF_ID_OCTOPUS:int = 81;
public static const DEF_ID_FENNEC_FOX_JW:int = 82;
public static const DEF_ID_HEDGEHOG:int = 83;
public static const DEF_ID_SCORPION:int = 84;
public static const DEF_ID_CROW:int = 85;
public static const DEF_ID_MOOSE:int = 86;
public static const DEF_ID_POODLE:int = 87;
public static const DEF_ID_LOVEBUNNY:int = 88;
public static const DEF_ID_SABERTOOTH:int = 89;
public static const DEF_ID_DIREWOLF:int = 90;
public static const DEF_ID_DODO:int = 91;
public static const DEF_ID_FANTASY_PEACOCK:int = 92;
public static const DEF_ID_MILLIPEDE:int = 93;
public static const DEF_ID_MOTH:int = 94;
public static const DEF_ID_VULTURE:int = 95;
public static const DEF_ID_COYOTE:int = 96;
public static const DEF_ID_MEAGYNS:int = 97;
public static const DEF_ID_FALCON2:int = 98;
public static const DEF_ID_LOVE_BUG:int = 99;
public static const DEF_ID_FLYING_PIG:int = 100;
public static const DEF_ID_SPARROW:int = 101;
public static const DEF_ID_FENNEC_FOX:int = 102;
public static const DEF_ID_CARDINAL:int = 103;
public static const DEF_ID_FRILLED_LIZARD:int = 104;
public static const DEF_ID_DRAGONFLY:int = 105;
public static const DEF_ID_MAGENTA_SEAL:int = 106;
public static const DEF_ID_PANGOLIN:int = 107;
public static const DEF_ID_CAMEL:int = 108;
public static const DEF_ID_SNAIL:int = 109;
public static const DEF_ID_GALACTIC_FIREFLY:int = 110;
public static const DEF_ID_CATERPILLAR:int = 111;
public static const DEF_ID_LAMB:int = 112;
public static const DEF_ID_GOLDEN_REINDEER:int = 113;
public static const DEF_ID_HIGHLANDCOW:int = 114;
public static const DEF_ID_NIGHTHAWK:int = 115;
public static const DEF_ID_FRANKENKITTEN:int = 116;
public static const TYPE_LAND_GROUND:int = 0;
public static const TYPE_LAND_AIR:int = 1;
public static const TYPE_OCEAN_GROUND:int = 2;
public static const TYPE_OCEAN_AIR:int = 3;
public static const TYPE_AMPHIB_GROUND:int = 4;
public static const TYPE_AMPHIB_AIR:int = 5;
protected var _petDef:PetDef;
protected var _lBits:uint;
protected var _uBits:uint;
protected var _eBits:uint;
protected var _traitDefId:uint;
protected var _toyDefId:uint;
protected var _foodDefId:uint;
protected var _content:MovieClip;
protected var _createdTs:Number;
private var _mediaHelper:MediaHelper;
private var _onPetLoadedCallback:Function;
public function PetBase(param1:Number, param2:uint, param3:uint, param4:uint, param5:uint, param6:uint, param7:uint, param8:Function)
{
super();
_createdTs = param1;
_lBits = param2;
_uBits = param3;
_eBits = param4;
_traitDefId = param5;
_toyDefId = param6;
_foodDefId = param7;
_onPetLoadedCallback = param8;
_petDef = PetManager.getPetDef(param2 & 0xFF);
// bits naming no pet the game has: the first pet, rather than
// a pet that never loads and stops what was drawing it
if(_petDef == null)
{
_petDef = PetManager.getPetDef(1);
}
_mediaHelper = new MediaHelper();
_mediaHelper.init(mediaIdForDefId(_petDef.defId),onMediaLoaded,true);
}
public function destroy() : void
{
}
public function getPetTitleName() : String
{
return LocalizationManager.translateIdOnly(_petDef.titleStrId);
}
public function isGround() : Boolean
{
if(_petDef.isEgg && !PetManager.hasHatched(_createdTs))
{
return true;
}
return PetManager.isGround(_petDef.type);
}
public function isEggAndHasNotHatched() : Boolean
{
if(_petDef.isEgg)
{
return PetManager.hasHatched(_createdTs) == false;
}
return false;
}
public function isEgg() : Boolean
{
return _petDef.isEgg;
}
public function getType() : int
{
return _petDef.type;
}
public function getDefID() : int
{
return _petDef.defId;
}
public function canGoInOcean() : Boolean
{
if(_petDef.type == 2 || _petDef.type == 3 || _petDef.type == 4 || _petDef.type == 5)
{
return true;
}
return false;
}
public function canGoOnLand() : Boolean
{
if(_petDef.type == 0 || _petDef.type == 1 || _petDef.type == 4 || _petDef.type == 5)
{
return true;
}
return false;
}
public function getLBits() : uint
{
return _lBits;
}
public function getUBits() : uint
{
return _uBits;
}
public function getEBits() : uint
{
return _eBits;
}
public function getContent() : MovieClip
{
return _content;
}
public function getCreatedTs() : Number
{
return _createdTs;
}
public function colorMyItem(param1:int, param2:MovieClip, param3:int, param4:int, param5:int, param6:int, param7:int, param8:int) : void
{
if(_content)
{
_content.colorMe(param1,param2,param3,param4,param5,param6,param7,param8);
}
}
public function updateAllBits(param1:uint, param2:uint, param3:uint) : void
{
if(_content)
{
_lBits = param1;
_uBits = param2;
_eBits = param3;
PetManager.setPetState(_content,_lBits,_uBits,_eBits);
}
}
public function updateUBits(param1:uint) : void
{
_uBits = param1;
PetManager.setPetState(_content,_lBits,_uBits,_eBits);
}
public function animatePet(param1:Boolean) : void
{
if(_content && "willItAnimate" in _content.pet)
{
_content.pet.willItAnimate(param1);
}
}
protected function setSparkle(param1:int) : void
{
if(_content)
{
_content.pet.setSparkle(param1);
}
}
private function onMediaLoaded(param1:MovieClip) : void
{
var _loc2_:int = 0;
if(param1)
{
_content = param1;
this.addChild(_content);
_mediaHelper.destroy();
delete _content.mediaHelper;
delete _content.passback;
PetManager.setPetState(_content,_lBits,_uBits,_eBits);
if(_onPetLoadedCallback != null)
{
_onPetLoadedCallback(_content);
}
_content.pet.setAnim(0);
if(_petDef.isEgg)
{
if(_content.pet.hasOwnProperty("setEggDayInt"))
{
_loc2_ = _createdTs > 0 ? Math.floor((Utility.getInitialEpochTime() - _createdTs) / 86400) : 0;
_content.pet.setEggDayInt(_loc2_);
}
}
}
}
private function mediaIdForDefId(param1:int) : int
{
var _loc2_:PetDef = PetManager.getPetDef(param1);
if(_loc2_)
{
return _loc2_.mediaRefId;
}
return -1;
}
public function get personalityDefId() : uint
{
return _traitDefId;
}
public function set personalityDefId(param1:uint) : void
{
_traitDefId = param1;
}
public function get favoriteToyDefId() : uint
{
return _toyDefId;
}
public function set favoriteToyDefId(param1:uint) : void
{
_toyDefId = param1;
}
public function get favoriteFoodDefId() : uint
{
return _foodDefId;
}
public function set favoriteFoodDefId(param1:uint) : void
{
_foodDefId = param1;
}
}
}
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
+178
View File
@@ -0,0 +1,178 @@
package adoptAPet
{
import flash.display.MovieClip;
import flash.events.MouseEvent;
import gui.DarkenManager;
import gui.GuiManager;
import loader.MediaHelper;
public class TierPathPopup
{
private const POPUP_MEDIA_ID:int = 7208;
private var _tierPopup:MovieClip;
private var _mediaHelper:MediaHelper;
private var _closeCallback:Function;
public function TierPathPopup(param1:Function)
{
super();
DarkenManager.showLoadingSpiral(true);
_closeCallback = param1;
_mediaHelper = new MediaHelper();
_mediaHelper.init(7208,onPopupLoaded);
}
public function destroy() : void
{
removeEventListeners();
DarkenManager.unDarken(_tierPopup);
GuiManager.guiLayer.removeChild(_tierPopup);
_closeCallback = null;
_tierPopup = null;
}
private function onPopupLoaded(param1:MovieClip) : void
{
DarkenManager.showLoadingSpiral(false);
_tierPopup = MovieClip(param1.getChildAt(0));
_tierPopup.x = 900 / 2;
_tierPopup.y = 550 / 2;
// a fault laying out the path left the window unshown, its
// checklist waiting under it: it is shown either way now
try
{
setupPathAndDots();
}
catch(e:Error)
{
GlobalErrorCatch.reportToServer("adopt a pet gift path: " + e + "\n" + e.getStackTrace());
}
addEventListeners();
GuiManager.guiLayer.addChild(_tierPopup);
DarkenManager.darken(_tierPopup);
}
private function setupPathAndDots() : void
{
var _loc4_:int = 0;
var _loc3_:MovieClip = null;
var _loc8_:MovieClip = null;
var _loc1_:MovieClip = null;
var _loc7_:MovieClip = null;
var _loc10_:Boolean = false;
var _loc2_:Boolean = false;
var _loc5_:int = int(AdoptAPetManager.TIERED_GIFT_COUNTS[AdoptAPetManager.TIERED_GIFT_COUNTS.length - 1]);
var _loc9_:int = AdoptAPetManager.numTieredGiftCount;
var _loc6_:Boolean = false;
// frames count from 1: none adopted yet is the first
_tierPopup.pinkPath.gotoAndStop(Math.max(1,Math.min(_loc9_,_tierPopup.pinkPath.totalFrames)));
_loc4_ = 1;
while(_loc4_ <= _loc5_)
{
_loc3_ = _tierPopup["dot_" + _loc4_];
_loc8_ = _tierPopup["threshold" + _loc4_];
if(_loc4_ <= _loc9_)
{
_loc2_ = true;
}
if(_loc3_ != null)
{
_loc7_ = _loc3_;
if(_loc2_)
{
_loc10_ = false;
_loc2_ = false;
_loc1_ = _loc3_;
_loc3_.num.text = _loc4_;
_loc3_.star.visible = true;
if(_loc7_ != null)
{
_loc7_.num.visible = false;
if(_loc7_.num.text != "1")
{
_loc7_.star.visible = false;
}
else
{
_loc7_.star.visible = false;
}
}
}
else
{
_loc3_.num.visible = false;
_loc3_.star.visible = false;
}
}
else if(_loc8_ != null)
{
if(_loc4_ <= _loc9_)
{
_loc10_ = true;
_loc8_.gotoAndStop("open");
}
else
{
if(!_loc6_)
{
_loc8_.gotoAndStop("next");
_loc6_ = true;
}
else
{
_loc8_.gotoAndStop("future");
}
_loc8_.numTxt.text = _loc4_;
}
}
else if(!_loc10_)
{
_loc2_ = false;
}
_loc4_++;
}
if(_loc1_ != null)
{
if(_loc10_)
{
_loc1_.num.visible = false;
_loc1_.star.visible = false;
}
else
{
_loc1_.num.visible = true;
_loc1_.star.visible = true;
_loc1_.num.text = _loc9_;
}
}
}
private function addEventListeners() : void
{
_tierPopup.bx.addEventListener("mouseDown",onCloseBtn,false,0,true);
}
private function removeEventListeners() : void
{
_tierPopup.bx.removeEventListener("mouseDown",onCloseBtn);
}
private function onCloseBtn(param1:MouseEvent) : void
{
param1.stopPropagation();
if(_closeCallback != null)
{
_closeCallback();
}
else
{
destroy();
}
}
}
}
+1404
View File
File diff suppressed because it is too large. Load diff