mirror of
https://github.com/SapphireServer/Sapphire.git
synced 2025-04-24 05:37:45 +00:00
Merge pull request #256 from GokuWeedLord/actor_rewrite
restructure instance script folder
This commit is contained in:
commit
40797f425e
271 changed files with 29 additions and 616 deletions
|
@ -13,7 +13,7 @@ namespace Entity
|
|||
EventObject( uint32_t objectId, uint32_t mapLinkId, uint8_t initialState, Common::FFXIVARR_POSITION3 pos,
|
||||
const std::string& givenName = "none" );
|
||||
|
||||
using OnTalkEventHandler = std::function< void( Entity::Player&, uint64_t ) >;
|
||||
using OnTalkEventHandler = std::function< void( Entity::Player&, Entity::EventObjectPtr, InstanceContentPtr, uint64_t ) >;
|
||||
|
||||
uint32_t getMapLinkId() const;
|
||||
void setMapLinkId( uint32_t mapLinkId );
|
||||
|
|
|
@ -720,34 +720,18 @@ void Core::DebugCommandHandler::instance( char* data, Entity::Player &player, bo
|
|||
|
||||
instance->setVar( static_cast< uint8_t >( index ), static_cast< uint8_t >( value ) );
|
||||
}
|
||||
else if( subCommand == "objupdate" )
|
||||
{
|
||||
uint32_t objId;
|
||||
|
||||
sscanf( params.c_str(), "%d", &objId );
|
||||
|
||||
auto instance = boost::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
|
||||
if( !instance )
|
||||
return;
|
||||
|
||||
auto obj = instance->getEObj(objId);
|
||||
if( !obj )
|
||||
return;
|
||||
|
||||
//instance->updateEObj(obj);
|
||||
}
|
||||
else if( subCommand == "objstate" )
|
||||
{
|
||||
uint32_t objId;
|
||||
char objName[128];
|
||||
uint8_t state;
|
||||
|
||||
sscanf( params.c_str(), "%d %hhu", &objId, &state );
|
||||
sscanf( params.c_str(), "%s %hhu", objName, &state );
|
||||
|
||||
auto instance = boost::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
|
||||
if( !instance )
|
||||
return;
|
||||
|
||||
auto obj = instance->getEObj(objId);
|
||||
auto obj = instance->getEObjByName( objName );
|
||||
if( !obj )
|
||||
return;
|
||||
|
||||
|
|
|
@ -1,590 +0,0 @@
|
|||
[00:54:47][info] Setting up EXD data
|
||||
[00:54:56][info] #ifndef _COMMON_GEN_H_
|
||||
#define _COMMON_GEN_H_
|
||||
/* This file has been automatically generated.
|
||||
Changes will be lost upon regeneration.
|
||||
To change the content edit tools/exd_common_gen */
|
||||
namespace Core {
|
||||
namespace Common {
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
//ActionCategory.exd
|
||||
enum class ActionCategory : uint8_t
|
||||
{
|
||||
Autoattack = 1,
|
||||
Spell = 2,
|
||||
Weaponskill = 3,
|
||||
Ability = 4,
|
||||
Item = 5,
|
||||
DoLAbility = 6,
|
||||
DoHAbility = 7,
|
||||
Event = 8,
|
||||
LimitBreak = 9,
|
||||
System = 10,
|
||||
Artillery = 11,
|
||||
Mount = 12,
|
||||
Glamour = 13,
|
||||
ItemManipulation = 14,
|
||||
AdrenalineRush = 15,
|
||||
bool operator==( const ActionCategory& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
|
||||
bool operator==( const uint8_t& g, const ActionCategory& t ) { return static_cast< uint8_t >( t ) == g; }
|
||||
};
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
//BeastReputationRank.exd
|
||||
enum class BeastReputationRank : uint8_t
|
||||
{
|
||||
None = 0,
|
||||
Neutral = 1,
|
||||
Recognized = 2,
|
||||
Friendly = 3,
|
||||
Trusted = 4,
|
||||
Respected = 5,
|
||||
Honored = 6,
|
||||
Sworn = 7,
|
||||
Allied = 8,
|
||||
bool operator==( const BeastReputationRank& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
|
||||
bool operator==( const uint8_t& g, const BeastReputationRank& t ) { return static_cast< uint8_t >( t ) == g; }
|
||||
};
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
//BeastTribe.exd
|
||||
enum class BeastTribe : uint8_t
|
||||
{
|
||||
bool operator==( const BeastTribe& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
|
||||
bool operator==( const uint8_t& g, const BeastTribe& t ) { return static_cast< uint8_t >( t ) == g; }
|
||||
};
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
//ClassJob.exd
|
||||
enum class ClassJob : uint8_t
|
||||
{
|
||||
Adventurer = 0,
|
||||
Gladiator = 1,
|
||||
Pugilist = 2,
|
||||
Marauder = 3,
|
||||
Lancer = 4,
|
||||
Archer = 5,
|
||||
Conjurer = 6,
|
||||
Thaumaturge = 7,
|
||||
Carpenter = 8,
|
||||
Blacksmith = 9,
|
||||
Armorer = 10,
|
||||
Goldsmith = 11,
|
||||
Leatherworker = 12,
|
||||
Weaver = 13,
|
||||
Alchemist = 14,
|
||||
Culinarian = 15,
|
||||
Miner = 16,
|
||||
Botanist = 17,
|
||||
Fisher = 18,
|
||||
Paladin = 19,
|
||||
Monk = 20,
|
||||
Warrior = 21,
|
||||
Dragoon = 22,
|
||||
Bard = 23,
|
||||
Whitemage = 24,
|
||||
Blackmage = 25,
|
||||
Arcanist = 26,
|
||||
Summoner = 27,
|
||||
Scholar = 28,
|
||||
Rogue = 29,
|
||||
Ninja = 30,
|
||||
Machinist = 31,
|
||||
Darkknight = 32,
|
||||
Astrologian = 33,
|
||||
Samurai = 34,
|
||||
Redmage = 35,
|
||||
bool operator==( const ClassJob& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
|
||||
bool operator==( const uint8_t& g, const ClassJob& t ) { return static_cast< uint8_t >( t ) == g; }
|
||||
};
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
//ContentType.exd
|
||||
enum class ContentType : uint8_t
|
||||
{
|
||||
DutyRoulette = 1,
|
||||
Dungeons = 2,
|
||||
Guildhests = 3,
|
||||
Trials = 4,
|
||||
Raids = 5,
|
||||
PvP = 6,
|
||||
QuestBattles = 7,
|
||||
FATEs = 8,
|
||||
TreasureHunt = 9,
|
||||
Levequests = 10,
|
||||
GrandCompany = 11,
|
||||
Companions = 12,
|
||||
BeastTribeQuests = 13,
|
||||
OverallCompletion = 14,
|
||||
PlayerCommendation = 15,
|
||||
DisciplesoftheLand = 16,
|
||||
DisciplesoftheHand = 17,
|
||||
RetainerVentures = 18,
|
||||
GoldSaucer = 19,
|
||||
DeepDungeons = 21,
|
||||
WondrousTails = 24,
|
||||
CustomDeliveries = 25,
|
||||
bool operator==( const ContentType& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
|
||||
bool operator==( const uint8_t& g, const ContentType& t ) { return static_cast< uint8_t >( t ) == g; }
|
||||
};
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
//EmoteCategory.exd
|
||||
enum class EmoteCategory : uint8_t
|
||||
{
|
||||
General = 1,
|
||||
Persistent = 2,
|
||||
Expressions = 3,
|
||||
bool operator==( const EmoteCategory& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
|
||||
bool operator==( const uint8_t& g, const EmoteCategory& t ) { return static_cast< uint8_t >( t ) == g; }
|
||||
};
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
//ExVersion.exd
|
||||
enum class ExVersion : uint8_t
|
||||
{
|
||||
ARealmReborn = 0,
|
||||
Heavensward = 1,
|
||||
Stormblood = 2,
|
||||
bool operator==( const ExVersion& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
|
||||
bool operator==( const uint8_t& g, const ExVersion& t ) { return static_cast< uint8_t >( t ) == g; }
|
||||
};
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
//GrandCompany.exd
|
||||
enum class GrandCompany : uint8_t
|
||||
{
|
||||
None = 0,
|
||||
Maelstrom = 1,
|
||||
OrderoftheTwinAdder = 2,
|
||||
ImmortalFlames = 3,
|
||||
bool operator==( const GrandCompany& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
|
||||
bool operator==( const uint8_t& g, const GrandCompany& t ) { return static_cast< uint8_t >( t ) == g; }
|
||||
};
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
//GuardianDeity.exd
|
||||
enum class GuardianDeity : uint8_t
|
||||
{
|
||||
HalonetheFury = 1,
|
||||
MenphinatheLover = 2,
|
||||
ThaliaktheScholar = 3,
|
||||
NymeiatheSpinner = 4,
|
||||
LlymlaentheNavigator = 5,
|
||||
OschontheWanderer = 6,
|
||||
ByregottheBuilder = 7,
|
||||
RhalgrtheDestroyer = 8,
|
||||
AzeymatheWarden = 9,
|
||||
NaldthaltheTraders = 10,
|
||||
NophicatheMatron = 11,
|
||||
AlthyktheKeeper = 12,
|
||||
bool operator==( const GuardianDeity& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
|
||||
bool operator==( const uint8_t& g, const GuardianDeity& t ) { return static_cast< uint8_t >( t ) == g; }
|
||||
};
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
//ItemUICategory.exd
|
||||
enum class ItemUICategory : uint8_t
|
||||
{
|
||||
PugilistsArm = 1,
|
||||
GladiatorsArm = 2,
|
||||
MaraudersArm = 3,
|
||||
ArchersArm = 4,
|
||||
LancersArm = 5,
|
||||
OnehandedThaumaturgesArm = 6,
|
||||
TwohandedThaumaturgesArm = 7,
|
||||
OnehandedConjurersArm = 8,
|
||||
TwohandedConjurersArm = 9,
|
||||
ArcanistsGrimoire = 10,
|
||||
Shield = 11,
|
||||
CarpentersPrimaryTool = 12,
|
||||
CarpentersSecondaryTool = 13,
|
||||
BlacksmithsPrimaryTool = 14,
|
||||
BlacksmithsSecondaryTool = 15,
|
||||
ArmorersPrimaryTool = 16,
|
||||
ArmorersSecondaryTool = 17,
|
||||
GoldsmithsPrimaryTool = 18,
|
||||
GoldsmithsSecondaryTool = 19,
|
||||
LeatherworkersPrimaryTool = 20,
|
||||
LeatherworkersSecondaryTool = 21,
|
||||
WeaversPrimaryTool = 22,
|
||||
WeaversSecondaryTool = 23,
|
||||
AlchemistsPrimaryTool = 24,
|
||||
AlchemistsSecondaryTool = 25,
|
||||
CulinariansPrimaryTool = 26,
|
||||
CulinariansSecondaryTool = 27,
|
||||
MinersPrimaryTool = 28,
|
||||
MinersSecondaryTool = 29,
|
||||
BotanistsPrimaryTool = 30,
|
||||
BotanistsSecondaryTool = 31,
|
||||
FishersPrimaryTool = 32,
|
||||
FishingTackle = 33,
|
||||
Head = 34,
|
||||
Body = 35,
|
||||
Legs = 36,
|
||||
Hands = 37,
|
||||
Feet = 38,
|
||||
Waist = 39,
|
||||
Necklace = 40,
|
||||
Earrings = 41,
|
||||
Bracelets = 42,
|
||||
Ring = 43,
|
||||
Medicine = 44,
|
||||
Ingredient = 45,
|
||||
Meal = 46,
|
||||
Seafood = 47,
|
||||
Stone = 48,
|
||||
Metal = 49,
|
||||
Lumber = 50,
|
||||
Cloth = 51,
|
||||
Leather = 52,
|
||||
Bone = 53,
|
||||
Reagent = 54,
|
||||
Dye = 55,
|
||||
Part = 56,
|
||||
Furnishing = 57,
|
||||
Materia = 58,
|
||||
Crystal = 59,
|
||||
Catalyst = 60,
|
||||
Miscellany = 61,
|
||||
SoulCrystal = 62,
|
||||
Other = 63,
|
||||
ConstructionPermit = 64,
|
||||
Roof = 65,
|
||||
ExteriorWall = 66,
|
||||
Window = 67,
|
||||
Door = 68,
|
||||
RoofDecoration = 69,
|
||||
ExteriorWallDecoration = 70,
|
||||
Placard = 71,
|
||||
Fence = 72,
|
||||
InteriorWall = 73,
|
||||
Flooring = 74,
|
||||
CeilingLight = 75,
|
||||
OutdoorFurnishing = 76,
|
||||
Table = 77,
|
||||
Tabletop = 78,
|
||||
Wallmounted = 79,
|
||||
Rug = 80,
|
||||
Minion = 81,
|
||||
Gardening = 82,
|
||||
Demimateria = 83,
|
||||
RoguesArm = 84,
|
||||
SeasonalMiscellany = 85,
|
||||
TripleTriadCard = 86,
|
||||
DarkKnightsArm = 87,
|
||||
MachinistsArm = 88,
|
||||
AstrologiansArm = 89,
|
||||
AirshipHull = 90,
|
||||
AirshipRigging = 91,
|
||||
AirshipAftcastle = 92,
|
||||
AirshipForecastle = 93,
|
||||
OrchestrionRoll = 94,
|
||||
Painting = 95,
|
||||
SamuraisArm = 96,
|
||||
RedMagesArm = 97,
|
||||
ScholarsArm = 98,
|
||||
FishersSecondaryTool = 99,
|
||||
Currency = 100,
|
||||
bool operator==( const ItemUICategory& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
|
||||
bool operator==( const uint8_t& g, const ItemUICategory& t ) { return static_cast< uint8_t >( t ) == g; }
|
||||
};
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
//ItemSearchCategory.exd
|
||||
enum class ItemSearchCategory : uint8_t
|
||||
{
|
||||
PrimaryArms = 1,
|
||||
PrimaryTools = 2,
|
||||
PrimaryTools1 = 3,
|
||||
Armor = 4,
|
||||
Accessories = 5,
|
||||
Medicines = 6,
|
||||
Materials = 7,
|
||||
Other = 8,
|
||||
PugilistsArms = 9,
|
||||
GladiatorsArms = 10,
|
||||
MaraudersArms = 11,
|
||||
ArchersArms = 12,
|
||||
LancersArms = 13,
|
||||
ThaumaturgesArms = 14,
|
||||
ConjurersArms = 15,
|
||||
ArcanistsArms = 16,
|
||||
Shields = 17,
|
||||
ThrowingWeapons = 18,
|
||||
CarpentersTools = 19,
|
||||
BlacksmithsTools = 20,
|
||||
ArmorersTools = 21,
|
||||
GoldsmithsTools = 22,
|
||||
LeatherworkersTools = 23,
|
||||
WeaversTools = 24,
|
||||
AlchemistsTools = 25,
|
||||
CulinariansTools = 26,
|
||||
MinersTools = 27,
|
||||
BotanistsTools = 28,
|
||||
FishersTools = 29,
|
||||
FishingTackle = 30,
|
||||
Head = 31,
|
||||
Undershirts = 32,
|
||||
Body = 33,
|
||||
Undergarments = 34,
|
||||
Legs = 35,
|
||||
Hands = 36,
|
||||
Feet = 37,
|
||||
Waist = 38,
|
||||
Necklaces = 39,
|
||||
Earrings = 40,
|
||||
Bracelets = 41,
|
||||
Rings = 42,
|
||||
Medicine = 43,
|
||||
Ingredients = 44,
|
||||
Meals = 45,
|
||||
Seafood = 46,
|
||||
Stone = 47,
|
||||
Metal = 48,
|
||||
Lumber = 49,
|
||||
Cloth = 50,
|
||||
Leather = 51,
|
||||
Bone = 52,
|
||||
Reagents = 53,
|
||||
Dyes = 54,
|
||||
WeaponParts = 55,
|
||||
Furnishings = 56,
|
||||
Materia = 57,
|
||||
Crystals = 58,
|
||||
Catalysts = 59,
|
||||
Miscellany = 60,
|
||||
SoulCrystals = 61,
|
||||
Arrows = 62,
|
||||
QuestItems = 63,
|
||||
Other1 = 64,
|
||||
ExteriorFixtures = 65,
|
||||
InteriorFixtures = 66,
|
||||
OutdoorFurnishings = 67,
|
||||
ChairsandBeds = 68,
|
||||
Tables = 69,
|
||||
Tabletop = 70,
|
||||
Wallmounted = 71,
|
||||
Rugs = 72,
|
||||
RoguesArms = 73,
|
||||
SeasonalMiscellany = 74,
|
||||
Minions = 75,
|
||||
DarkKnightsArms = 76,
|
||||
MachinistsArms = 77,
|
||||
AstrologiansArms = 78,
|
||||
AirshipComponents = 79,
|
||||
OrchestrionComponents = 80,
|
||||
GardeningItems = 81,
|
||||
Paintings = 82,
|
||||
SamuraisArms = 83,
|
||||
RedMagesArms = 84,
|
||||
ScholarsArms = 85,
|
||||
bool operator==( const ItemSearchCategory& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
|
||||
bool operator==( const uint8_t& g, const ItemSearchCategory& t ) { return static_cast< uint8_t >( t ) == g; }
|
||||
};
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
//OnlineStatus.exd
|
||||
enum class OnlineStatus : uint8_t
|
||||
{
|
||||
Producer = 1,
|
||||
GameMaster = 2,
|
||||
GameMaster1 = 3,
|
||||
GameMaster2 = 4,
|
||||
Disconnected = 5,
|
||||
WaitingforFriendListApproval = 6,
|
||||
WaitingforLinkshellApproval = 7,
|
||||
WaitingforFreeCompanyApproval = 8,
|
||||
NotFound = 9,
|
||||
Offline = 10,
|
||||
Mentor = 11,
|
||||
Busy = 12,
|
||||
PvP = 13,
|
||||
PlayingTripleTriad = 14,
|
||||
ViewingCutscene = 15,
|
||||
UsingaChocoboPorter = 16,
|
||||
AwayfromKeyboard = 17,
|
||||
CameraMode = 18,
|
||||
LookingforRepairs = 19,
|
||||
LookingtoRepair = 20,
|
||||
LookingtoMeldMateria = 21,
|
||||
Roleplaying = 22,
|
||||
LookingforParty = 23,
|
||||
SwordforHire = 24,
|
||||
WaitingforDutyFinder = 25,
|
||||
RecruitingPartyMembers = 26,
|
||||
Mentor1 = 27,
|
||||
PvEMentor = 28,
|
||||
TradeMentor = 29,
|
||||
PvPMentor = 30,
|
||||
Returner = 31,
|
||||
NewAdventurer = 32,
|
||||
AllianceLeader = 33,
|
||||
AlliancePartyLeader = 34,
|
||||
AlliancePartyMember = 35,
|
||||
PartyLeader = 36,
|
||||
PartyMember = 37,
|
||||
PartyLeaderCrossworld = 38,
|
||||
PartyMemberCrossworld = 39,
|
||||
AnotherWorld = 40,
|
||||
SharingDuty = 41,
|
||||
SimilarDuty = 42,
|
||||
InDuty = 43,
|
||||
TrialAdventurer = 44,
|
||||
FreeCompany = 45,
|
||||
GrandCompany = 46,
|
||||
Online = 47,
|
||||
bool operator==( const OnlineStatus& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
|
||||
bool operator==( const uint8_t& g, const OnlineStatus& t ) { return static_cast< uint8_t >( t ) == g; }
|
||||
};
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
//Race.exd
|
||||
enum class Race : uint8_t
|
||||
{
|
||||
Hyur = 1,
|
||||
Elezen = 2,
|
||||
Lalafell = 3,
|
||||
Miqote = 4,
|
||||
Roegadyn = 5,
|
||||
AuRa = 6,
|
||||
bool operator==( const Race& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
|
||||
bool operator==( const uint8_t& g, const Race& t ) { return static_cast< uint8_t >( t ) == g; }
|
||||
};
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
//Tribe.exd
|
||||
enum class Tribe : uint8_t
|
||||
{
|
||||
Midlander = 1,
|
||||
Highlander = 2,
|
||||
Wildwood = 3,
|
||||
Duskwight = 4,
|
||||
Plainsfolk = 5,
|
||||
Dunesfolk = 6,
|
||||
SeekeroftheSun = 7,
|
||||
KeeperoftheMoon = 8,
|
||||
SeaWolf = 9,
|
||||
Hellsguard = 10,
|
||||
Raen = 11,
|
||||
Xaela = 12,
|
||||
bool operator==( const Tribe& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
|
||||
bool operator==( const uint8_t& g, const Tribe& t ) { return static_cast< uint8_t >( t ) == g; }
|
||||
};
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
//Town.exd
|
||||
enum class Town : uint8_t
|
||||
{
|
||||
Nowheresville = 0,
|
||||
LimsaLominsa = 1,
|
||||
Gridania = 2,
|
||||
Uldah = 3,
|
||||
Ishgard = 4,
|
||||
Kugane = 7,
|
||||
bool operator==( const Town& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
|
||||
bool operator==( const uint8_t& g, const Town& t ) { return static_cast< uint8_t >( t ) == g; }
|
||||
};
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
//Weather.exd
|
||||
enum class Weather : uint8_t
|
||||
{
|
||||
ClearSkies = 1,
|
||||
FairSkies = 2,
|
||||
Clouds = 3,
|
||||
Fog = 4,
|
||||
Wind = 5,
|
||||
Gales = 6,
|
||||
Rain = 7,
|
||||
Showers = 8,
|
||||
Thunder = 9,
|
||||
Thunderstorms = 10,
|
||||
DustStorms = 11,
|
||||
Sandstorms = 12,
|
||||
HotSpells = 13,
|
||||
HeatWaves = 14,
|
||||
Snow = 15,
|
||||
Blizzards = 16,
|
||||
Gloom = 17,
|
||||
Auroras = 18,
|
||||
Darkness = 19,
|
||||
Tension = 20,
|
||||
Clouds1 = 21,
|
||||
StormClouds = 22,
|
||||
RoughSeas = 23,
|
||||
RoughSeas1 = 24,
|
||||
Louring = 25,
|
||||
HeatWaves1 = 26,
|
||||
Gloom1 = 27,
|
||||
Gales1 = 28,
|
||||
Eruptions = 29,
|
||||
FairSkies1 = 30,
|
||||
FairSkies2 = 31,
|
||||
FairSkies3 = 32,
|
||||
FairSkies4 = 33,
|
||||
FairSkies5 = 34,
|
||||
Irradiance = 35,
|
||||
CoreRadiation = 36,
|
||||
CoreRadiation1 = 37,
|
||||
CoreRadiation2 = 38,
|
||||
CoreRadiation3 = 39,
|
||||
ShelfClouds = 40,
|
||||
ShelfClouds1 = 41,
|
||||
ShelfClouds2 = 42,
|
||||
ShelfClouds3 = 43,
|
||||
Oppression = 44,
|
||||
Oppression1 = 45,
|
||||
Oppression2 = 46,
|
||||
Oppression3 = 47,
|
||||
Oppression4 = 48,
|
||||
UmbralWind = 49,
|
||||
UmbralStatic = 50,
|
||||
Smoke = 51,
|
||||
FairSkies6 = 52,
|
||||
RoyalLevin = 53,
|
||||
Hyperelectricity = 54,
|
||||
RoyalLevin1 = 55,
|
||||
Oppression5 = 56,
|
||||
Thunder1 = 57,
|
||||
Thunder2 = 58,
|
||||
CutScene = 59,
|
||||
Multiplicity = 60,
|
||||
Multiplicity1 = 61,
|
||||
Rain1 = 62,
|
||||
FairSkies7 = 63,
|
||||
Rain2 = 64,
|
||||
FairSkies8 = 65,
|
||||
Dragonstorm = 66,
|
||||
Dragonstorm1 = 67,
|
||||
Subterrain = 68,
|
||||
Concordance = 69,
|
||||
Concordance1 = 70,
|
||||
BeyondTime = 71,
|
||||
BeyondTime1 = 72,
|
||||
BeyondTime2 = 73,
|
||||
DemonicInfinity = 74,
|
||||
DemonicInfinity1 = 75,
|
||||
DemonicInfinity2 = 76,
|
||||
DimensionalDisruption = 77,
|
||||
DimensionalDisruption1 = 78,
|
||||
DimensionalDisruption2 = 79,
|
||||
Revelstorm = 80,
|
||||
Revelstorm1 = 81,
|
||||
EternalBliss = 82,
|
||||
EternalBliss1 = 83,
|
||||
Wyrmstorm = 84,
|
||||
Wyrmstorm1 = 85,
|
||||
Revelstorm2 = 86,
|
||||
Quicklevin = 87,
|
||||
Thunder3 = 88,
|
||||
DimensionalDisruption3 = 89,
|
||||
FairSkies9 = 90,
|
||||
bool operator==( const Weather& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
|
||||
bool operator==( const uint8_t& g, const Weather& t ) { return static_cast< uint8_t >( t ) == g; }
|
||||
};
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
@ -3,6 +3,19 @@
|
|||
|
||||
class Sastasha : public InstanceContentScript
|
||||
{
|
||||
private:
|
||||
static void memoOnTalk( Entity::Player& player, Entity::EventObjectPtr object, InstanceContentPtr instance, uint64_t actorId )
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
static void switchOnTalk( Entity::Player& player, Entity::EventObjectPtr object, InstanceContentPtr instance, uint64_t actorId )
|
||||
{
|
||||
object->setState( 7 );
|
||||
|
||||
instance->getEObjByName( "Hiddendoor" )->setState( 7 );
|
||||
}
|
||||
|
||||
public:
|
||||
Sastasha() : InstanceContentScript( 4 )
|
||||
{ }
|
||||
|
@ -25,17 +38,23 @@ public:
|
|||
instance->registerEObj( "Bluecoralformation", 2000213, 3668215, 4, { 75.869797f, 35.101421f, -32.537209f }, 0.930753f );
|
||||
instance->registerEObj( "Redcoralformation", 2000214, 3668214, 4, { 88.769371f, 31.135691f, -40.869640f }, 0.930753f );
|
||||
instance->registerEObj( "Greencoralformation", 2000215, 3668216, 4, { 64.988159f, 33.672821f, -56.690559f }, 0.991789f );
|
||||
instance->registerEObj( "Inconspicuousswitch", 2000216, 3653858, 4, { 62.907951f, 33.969521f, -31.172279f }, 1.000000f );
|
||||
instance->registerEObj( "Hiddendoor", 2000217, 3653517, 4, { 59.000000f, 32.000000f, -35.000000f }, 1.000000f );
|
||||
|
||||
auto switchObj = instance->registerEObj( "Inconspicuousswitch", 2000216, 3653858, 4, { 62.907951f, 33.969521f, -31.172279f }, 1.000000f );
|
||||
switchObj->setOnTalkHandler( switchOnTalk );
|
||||
|
||||
instance->registerEObj( "Hiddendoor", 2000217, 3653517, 5, { 59.000000f, 32.000000f, -35.000000f }, 1.000000f );
|
||||
instance->registerEObj( "Giantclam", 2000222, 4208408, 4, { 181.170303f, 32.104599f, -128.069000f }, 0.991789f );
|
||||
instance->registerEObj( "Unknown10", 2000260, 4208409, 4, { 166.318695f, 30.735420f, -128.312103f }, 0.991789f );
|
||||
instance->registerEObj( "Unknown11", 2000261, 4208410, 4, { 158.800598f, 28.586321f, -76.340927f }, 0.991789f );
|
||||
instance->registerEObj( "Unknown12", 2000262, 4208411, 4, { 125.463402f, 29.260550f, -51.934608f }, 0.991789f );
|
||||
instance->registerEObj( "Unknown13", 2000263, 4208412, 4, { 126.070198f, 28.913260f, -99.908722f }, 1.000000f );
|
||||
instance->registerEObj( "Unknown14", 2000264, 4208413, 4, { 97.055313f, 27.081551f, -70.264381f }, 0.991789f );
|
||||
instance->registerEObj( "Bloodymemo", 2000212, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
|
||||
instance->registerEObj( "Bloodymemo", 2001548, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
|
||||
instance->registerEObj( "Bloodymemo", 2001549, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
|
||||
|
||||
auto memo = instance->registerEObj( "Bloodymemo", 2000212, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
|
||||
memo->setOnTalkHandler( memoOnTalk );
|
||||
//instance->registerEObj( "Bloodymemo", 2001548, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
|
||||
//instance->registerEObj( "Bloodymemo", 2001549, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
|
||||
|
||||
instance->registerEObj( "Rambadedoor", 2000225, 3653865, 4, { -35.299999f, 24.000000f, 60.799999f }, 1.000000f );
|
||||
instance->registerEObj( "Captainsquarters", 2000227, 3687697, 4, { -95.044670f, 20.513069f, 172.039597f }, 0.991789f );
|
||||
instance->registerEObj( "WaveriderGate", 2000231, 3655909, 4, { -130.600006f, 16.000000f, 156.800003f }, 1.000000f );
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue