Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-10-10 09:28:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into scripting-lua

Browse Source
This commit is contained in:
Wincent Holm
2022-05-14 09:11:47 +02:00
parent ac7823802e cc23538244
commit e6227562b0
29 changed files with 411 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dScripts/AmTeapotServer.cpp Normal file
View File

@@ -0,0 +1,15 @@
#include "AmTeapotServer.h"
#include "InventoryComponent.h"
#include "GameMessages.h"
void AmTeapotServer::OnUse(Entity* self, Entity* user) {
auto* inventoryComponent = user->GetComponent<InventoryComponent>();
if (!inventoryComponent) return;
if (inventoryComponent->GetLotCount(BLUE_FLOWER_LEAVES) >= 10){
inventoryComponent->RemoveItem(BLUE_FLOWER_LEAVES, 10);
inventoryComponent->AddItem(WU_S_IMAGINATION_TEA, 1);
}
GameMessages::SendTerminateInteraction(user->GetObjectID(), FROM_INTERACTION, self->GetObjectID());
}

10
dScripts/AmTeapotServer.h Normal file
View File

@@ -0,0 +1,10 @@
#pragma once
#include "CppScripts.h"
class AmTeapotServer : public CppScripts::Script {
public:
void OnUse(Entity* self, Entity* user) override;
private:
LOT BLUE_FLOWER_LEAVES = 12317;
LOT WU_S_IMAGINATION_TEA = 12109;
};

15
dScripts/BaseConsoleTeleportServer.cpp
View File

@@ -19,21 +19,6 @@ void BaseConsoleTeleportServer::BaseOnMessageBoxResponse(Entity* self, Entity* s
if (button == 1)
{
if (self->GetLOT() == 14333)
{
auto* rocketLaunchComponent = self->GetComponent<RocketLaunchpadControlComponent>();
if (rocketLaunchComponent == nullptr)
{
return;
}
const auto& teleportZone = self->GetVar<std::u16string>(u"transferZoneID");
rocketLaunchComponent->Launch(player, LWOOBJID_EMPTY, std::stoi(GeneralUtils::UTF16ToWTF8(teleportZone)));
return;
}
GameMessages::SendSetStunned(player->GetObjectID(), PUSH, player->GetSystemAddress(), player->GetObjectID(),
true, true, true, true, true, true, true

9
dScripts/CppScripts.cpp
View File

@@ -147,6 +147,7 @@
#include "FvNinjaGuard.h"
#include "FvPassThroughWall.h"
#include "FvBounceOverWall.h"
#include "FvFong.h"
// FB Scripts
#include "AgJetEffectServer.h"
@@ -202,7 +203,6 @@
#include "NtSleepingGuard.h"
// DLU Scripts
#include "SbLupTeleport.h"
#include "DLUVanityNPC.h"
// AM Scripts
@@ -226,6 +226,7 @@
#include "AmSkullkinTower.h"
#include "AmDarklingDragon.h"
#include "AmBlueX.h"
#include "AmTeapotServer.h"
// NJ Scripts
#include "NjGarmadonCelebration.h"
@@ -568,6 +569,8 @@ CppScripts::Script* CppScripts::GetScript(Entity* parent, const std::string& scr
script = new FvPassThroughWall();
else if (scriptName == "scripts\\ai\\FV\\L_ACT_BOUNCE_OVER_WALL.lua")
script = new FvBounceOverWall();
else if (scriptName == "scripts\\02_server\\Map\\FV\\L_NPC_FONG.lua")
script = new FvFong();
//Misc:
if (scriptName == "scripts\\02_server\\Map\\General\\L_EXPLODING_ASSET.lua")
@@ -702,6 +705,8 @@ CppScripts::Script* CppScripts::GetScript(Entity* parent, const std::string& scr
script = new BaseEnemyApe();
else if (scriptName == "scripts\\02_server\\Map\\AM\\L_BLUE_X.lua")
script = new AmBlueX();
else if (scriptName == "scripts\\02_server\\Map\\AM\\L_TEAPOT_SERVER.lua")
script = new AmTeapotServer();
// Ninjago
else if (scriptName == "scripts\\02_server\\Map\\njhub\\L_GARMADON_CELEBRATION_SERVER.lua")
@@ -764,8 +769,6 @@ CppScripts::Script* CppScripts::GetScript(Entity* parent, const std::string& scr
script = new NjNyaMissionitems();
//DLU:
else if (scriptName == "scripts\\02_server\\DLU\\L_SB_LUP_TELEPORT.lua")
script = new SbLupTeleport();
else if (scriptName == "scripts\\02_server\\DLU\\DLUVanityNPC.lua")
script = new DLUVanityNPC();

35
dScripts/Darkitect.cpp Normal file
View File

@@ -0,0 +1,35 @@
#include "Darkitect.h"
#include "MissionComponent.h"
#include "DestroyableComponent.h"
#include "EntityManager.h"
#include "GameMessages.h"
#include "Character.h"
void Darkitect::Reveal(Entity* self, Entity* player)
{
const auto playerID = player->GetObjectID();
GameMessages::SendNotifyClientObject(self->GetObjectID(), u"reveal", 0, 0, playerID, "", player->GetSystemAddress());
self->AddCallbackTimer(20, [this, self, playerID]() {
auto* player = EntityManager::Instance()->GetEntity(playerID);
if (!player) return;
auto* destroyableComponent = player->GetComponent<DestroyableComponent>();
auto* missionComponent = player->GetComponent<MissionComponent>();
auto* character = player->GetCharacter();
if (destroyableComponent != nullptr && missionComponent != nullptr && character != nullptr) {
destroyableComponent->SetArmor(0);
destroyableComponent->SetHealth(1);
destroyableComponent->SetImagination(0);
if (missionComponent->GetMissionState(1295) == MissionState::MISSION_STATE_ACTIVE) {
character->SetPlayerFlag(1911, true);
}
EntityManager::Instance()->SerializeEntity(player);
}
});
}

9
dScripts/Darkitect.h Normal file
View File

@@ -0,0 +1,9 @@
#pragma once
class Entity;
class Darkitect
{
public:
void Reveal(Entity* self, Entity* player);
};

12
dScripts/FvFong.cpp Normal file
View File

@@ -0,0 +1,12 @@
#include "FvFong.h"
#include "Darkitect.h"
#include "MissionComponent.h"
void FvFong::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, MissionState missionState)
{
if (missionID == 734 && missionState == MissionState::MISSION_STATE_READY_TO_COMPLETE)
{
Darkitect Baron;
Baron.Reveal(self, target);
}
}

8
dScripts/FvFong.h Normal file
View File

@@ -0,0 +1,8 @@
#pragma once
#include "CppScripts.h"
class FvFong : public CppScripts::Script
{
public:
void OnMissionDialogueOK(Entity* self, Entity* target, int missionID, MissionState missionState) override;
};

55
dScripts/NtDarkitectRevealServer.cpp
View File

@@ -1,53 +1,16 @@
#include "NtDarkitectRevealServer.h"
#include "Darkitect.h"
#include "MissionComponent.h"
#include "DestroyableComponent.h"
#include "EntityManager.h"
#include "GameMessages.h"
#include "Character.h"
void NtDarkitectRevealServer::OnUse(Entity* self, Entity* user)
void NtDarkitectRevealServer::OnUse(Entity* self, Entity* user)
{
Darkitect(self, user);
Darkitect Baron;
Baron.Reveal(self, user);
auto* missionComponent = user->GetComponent<MissionComponent>();
auto* missionComponent = user->GetComponent<MissionComponent>();
if (missionComponent != nullptr)
{
missionComponent->ForceProgressTaskType(1344, 1, 14293);
}
}
void NtDarkitectRevealServer::Darkitect(Entity* self, Entity* player)
{
const auto playerID = player->GetObjectID();
GameMessages::SendNotifyClientObject(self->GetObjectID(), u"reveal", 0, 0, playerID, "", player->GetSystemAddress());
self->AddCallbackTimer(20, [this, self, playerID]() {
auto* player = EntityManager::Instance()->GetEntity(playerID);
if (player == nullptr)
{
return;
}
auto* destroyableComponent = player->GetComponent<DestroyableComponent>();
auto* missionComponent = player->GetComponent<MissionComponent>();
auto* character = player->GetCharacter();
if (destroyableComponent != nullptr && missionComponent != nullptr && character != nullptr)
{
destroyableComponent->SetArmor(0);
destroyableComponent->SetHealth(1);
destroyableComponent->SetImagination(0);
if (missionComponent->GetMissionState(1295) == MissionState::MISSION_STATE_ACTIVE)
{
character->SetPlayerFlag(1911, true);
}
EntityManager::Instance()->SerializeEntity(player);
}
});
if (missionComponent != nullptr)
{
missionComponent->ForceProgressTaskType(1344, 1, 14293);
}
}

3
dScripts/NtDarkitectRevealServer.h
View File

@@ -4,6 +4,5 @@
class NtDarkitectRevealServer : public CppScripts::Script
{
public:
void OnUse(Entity* self, Entity* user) override;
void Darkitect(Entity* self, Entity* player);
void OnUse(Entity* self, Entity* user) override;
};

154
dScripts/SbLupTeleport.cpp
View File

@@ -1,154 +0,0 @@
#include "SbLupTeleport.h"
#include "dZoneManager.h"
#include "EntityManager.h"
#include "GeneralUtils.h"
#include "GameMessages.h"
void SbLupTeleport::OnStartup(Entity* self)
{
self->SetVar(u"currentZone", (int32_t) dZoneManager::Instance()->GetZoneID().GetMapID());
self->SetVar(u"choiceZone", m_ChoiceZoneID);
self->SetVar(u"teleportAnim", m_TeleportAnim);
self->SetVar(u"teleportString", m_TeleportString);
self->SetVar(u"spawnPoint", m_SpawnPoint);
args = {};
AMFStringValue* callbackClient = new AMFStringValue();
callbackClient->SetStringValue(std::to_string(self->GetObjectID()));
args.InsertValue("callbackClient", callbackClient);
AMFStringValue* strIdentifier = new AMFStringValue();
strIdentifier->SetStringValue("choiceDoor");
args.InsertValue("strIdentifier", strIdentifier);
AMFStringValue* title = new AMFStringValue();
title->SetStringValue("%[LUP_Starbase3001_Launchpad]");
args.InsertValue("title", title);
AMFArrayValue* choiceOptions = new AMFArrayValue();
{
AMFArrayValue* nsArgs = new AMFArrayValue();
AMFStringValue* image = new AMFStringValue();
image->SetStringValue("textures/ui/zone_thumnails/Deep_Freeze.dds");
nsArgs->InsertValue("image", image);
AMFStringValue* caption = new AMFStringValue();
caption->SetStringValue("%[ZoneTable_1601_DisplayDescription]");
nsArgs->InsertValue("caption", caption);
AMFStringValue* identifier = new AMFStringValue();
identifier->SetStringValue("zoneID_1601");
nsArgs->InsertValue("identifier", identifier);
AMFStringValue* tooltipText = new AMFStringValue();
tooltipText->SetStringValue("%[ZoneTable_1601_summary]");
nsArgs->InsertValue("tooltipText", tooltipText);
choiceOptions->PushBackValue(nsArgs);
}
{
AMFArrayValue* ntArgs = new AMFArrayValue();
AMFStringValue* image = new AMFStringValue();
image->SetStringValue("textures/ui/zone_thumnails/Robot_City.dds");
ntArgs->InsertValue("image", image);
AMFStringValue* caption = new AMFStringValue();
caption->SetStringValue("%[ZoneTable_1602_DisplayDescription]");
ntArgs->InsertValue("caption", caption);
AMFStringValue* identifier = new AMFStringValue();
identifier->SetStringValue("zoneID_1602");
ntArgs->InsertValue("identifier", identifier);
AMFStringValue* tooltipText = new AMFStringValue();
tooltipText->SetStringValue("%[ZoneTable_1602_summary]");
ntArgs->InsertValue("tooltipText", tooltipText);
choiceOptions->PushBackValue(ntArgs);
}
{
AMFArrayValue* ntArgs = new AMFArrayValue();
AMFStringValue* image = new AMFStringValue();
image->SetStringValue("textures/ui/zone_thumnails/Moon_Base.dds");
ntArgs->InsertValue("image", image);
AMFStringValue* caption = new AMFStringValue();
caption->SetStringValue("%[ZoneTable_1603_DisplayDescription]");
ntArgs->InsertValue("caption", caption);
AMFStringValue* identifier = new AMFStringValue();
identifier->SetStringValue("zoneID_1603");
ntArgs->InsertValue("identifier", identifier);
AMFStringValue* tooltipText = new AMFStringValue();
tooltipText->SetStringValue("%[ZoneTable_1603_summary]");
ntArgs->InsertValue("tooltipText", tooltipText);
choiceOptions->PushBackValue(ntArgs);
}
{
AMFArrayValue* ntArgs = new AMFArrayValue();
AMFStringValue* image = new AMFStringValue();
image->SetStringValue("textures/ui/zone_thumnails/Porto_Bello.dds");
ntArgs->InsertValue("image", image);
AMFStringValue* caption = new AMFStringValue();
caption->SetStringValue("%[ZoneTable_1604_DisplayDescription]");
ntArgs->InsertValue("caption", caption);
AMFStringValue* identifier = new AMFStringValue();
identifier->SetStringValue("zoneID_1604");
ntArgs->InsertValue("identifier", identifier);
AMFStringValue* tooltipText = new AMFStringValue();
tooltipText->SetStringValue("%[ZoneTable_1604_summary]");
ntArgs->InsertValue("tooltipText", tooltipText);
choiceOptions->PushBackValue(ntArgs);
}
args.InsertValue("options", choiceOptions);
}
void SbLupTeleport::OnUse(Entity* self, Entity* user)
{
auto* player = user;
//if (CheckChoice(self, player))
{
GameMessages::SendUIMessageServerToSingleClient(player, player->GetSystemAddress(), "QueueChoiceBox", &args);
}
/*else
{
BaseOnUse(self, player);
}*/
}
void SbLupTeleport::OnMessageBoxResponse(Entity* self, Entity* sender, int32_t button, const std::u16string& identifier, const std::u16string& userData)
{
BaseOnMessageBoxResponse(self, sender, button, identifier, userData);
}
void SbLupTeleport::OnChoiceBoxResponse(Entity* self, Entity* sender, int32_t button, const std::u16string& buttonIdentifier, const std::u16string& identifier)
{
BaseChoiceBoxRespond(self, sender, button, buttonIdentifier, identifier);
}
void SbLupTeleport::OnTimerDone(Entity* self, std::string timerName)
{
BaseOnTimerDone(self, timerName);
}
void SbLupTeleport::OnFireEventServerSide(Entity *self, Entity *sender, std::string args, int32_t param1, int32_t param2, int32_t param3)
{
BaseOnFireEventServerSide(self, sender, args, param1, param2, param3);
}

23
dScripts/SbLupTeleport.h
View File

@@ -1,23 +0,0 @@
#pragma once
#include "CppScripts.h"
#include "ChooseYourDestinationNsToNt.h"
#include "BaseConsoleTeleportServer.h"
#include "AMFFormat.h"
class SbLupTeleport : public CppScripts::Script, ChooseYourDestinationNsToNt, BaseConsoleTeleportServer
{
public:
void OnStartup(Entity* self) override;
void OnUse(Entity* self, Entity* user) override;
void OnMessageBoxResponse(Entity* self, Entity* sender, int32_t button, const std::u16string& identifier, const std::u16string& userData) override;
void OnChoiceBoxResponse(Entity* self, Entity* sender, int32_t button, const std::u16string& buttonIdentifier, const std::u16string& identifier) override;
void OnTimerDone(Entity* self, std::string timerName) override;
void OnFireEventServerSide(Entity *self, Entity *sender, std::string args, int32_t param1, int32_t param2, int32_t param3) override;
private:
int32_t m_ChoiceZoneID = 1600;
std::string m_SpawnPoint = "NS_LW";
std::u16string m_TeleportAnim = u"lup-teleport";
std::u16string m_TeleportString = u"UI_TRAVEL_TO_LUP_STATION";
AMFArrayValue args = {};
};