Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-11-13 13:48:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge RC script from differnt branch

Browse Source 
Add wandering vendor script
Update proximity monitors to move with their respective entityies
This commit is contained in:
Aaron Kimbre
2023-08-15 14:35:35 -05:00
parent e35b95f3c8
commit 691a42ba20
14 changed files with 98 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dScripts/CppScripts.cpp
View File

@@ -235,6 +235,7 @@
#include "AmDarklingDragon.h"
#include "AmBlueX.h"
#include "AmTeapotServer.h"
#include "WanderingVendor.h"
// NJ Scripts
#include "NjGarmadonCelebration.h"
@@ -762,6 +763,8 @@ CppScripts::Script* CppScripts::GetScript(Entity* parent, const std::string& scr
script = new AmBlueX();
else if (scriptName == "scripts\\02_server\\Map\\AM\\L_TEAPOT_SERVER.lua")
script = new AmTeapotServer();
else if (scriptName == "scripts\\02_server\\Map\\AM\\L_WANDERING_VENDOR.lua")
script = new WanderingVendor();
// Ninjago
else if (scriptName == "scripts\\02_server\\Map\\njhub\\L_GARMADON_CELEBRATION_SERVER.lua")