This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1. Download https://luarocks.org/releases/luarocks-3.9.1-windows-64.zip | |
2. Extract to server root (Ex. C:\server, where zone.exe is) | |
3. Download and install https://dev.mysql.com/downloads/installer/ you only need MySQL Server installed (don't need to configure, but only way to get C Connector AFAIK) | |
4. Open x64 Native Tools Command Prompt For VS whatever version | |
5. Navitage to server root (where zone.exe is) | |
6. run luarocks.exe unpack luasql-mysql | |
7. Edit luasql-mysql-2.6.0-1\luasql\rockspec\luasql-mysql-2.6.0-1.rockspec | |
8. Add "Advapi32" to the libaries line (ex. `libraries = { "mysqlclient", "Advapi32" },`) | |
9. Now run luarocks.exe --lua-version 5.1 --tree lua_modules install luasql-mysql-2.6.0-1\luasql\rockspec\luasql-mysql-2.6.0-1.rockspec MYSQL_DIR="C:\Program Files\MySQL\MySQL Server 8.0" LUA_INCDIR=C:\src\Server\vcpkg\vcpkg-export-x64\installed\x64-windows\include\luajit LUA_LIBDIR=C:\src\Server\vcpkg\vcpkg-export-x64\installed\x64-windows\lib MYSQL_LIBDIR="C:\Program Files\MySQL\MySQL Server 8.0\lib" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/zone/client.cpp b/zone/client.cpp | |
index eb157dc2f..acbb7cc74 100644 | |
--- a/zone/client.cpp | |
+++ b/zone/client.cpp | |
@@ -8566,6 +8566,42 @@ void Client::QuestReward(Mob* target, uint32 copper, uint32 silver, uint32 gold, | |
safe_delete(outapp); | |
} | |
+void Client::QuestReward(Mob* target, const QuestReward_Struct &reward, bool faction) | |
+{ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/zone/mob.cpp b/zone/mob.cpp | |
index 71e876938..db7793605 100644 | |
--- a/zone/mob.cpp | |
+++ b/zone/mob.cpp | |
@@ -186,6 +186,7 @@ Mob::Mob( | |
last_hp_percent = 0; | |
last_hp = 0; | |
+ last_max_hp = 0; | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
abysmal/#Alexsa_Whyte.pl:106: if (plugin::check_handin(\%itemcount, 67603 => 1)&& !defined $qglobals{SkinSampleTM}) { | |
gunthak/Gwen_Lonnes.pl:32: elsif(plugin::check_handin(\%itemcount, 59058 => 1, 59059 => 1) && defined($qglobals{GwenLonnesA}) && ($qglobals{GwenLonnesA} == 1)){ #A Jar of Broken Skull Clan Ink, A Dark Ore Amulet | |
gunthak/Craegin_Coldtongue.pl:35: if(plugin::check_handin(\%itemcount, 59034 => 1) && defined($qglobals{CraeginA}) && ($qglobals{CraeginA} == 1)) { #A strange dark powder | |
jaggedpine/#Annous_Pineshadow.pl:49: elsif (plugin::check_handin(\%itemcount, 8964 => 1, 8963 => 1, 8962 => 1 ) && $qglobals{galeweaver} == 1){ # Writ, sphere, and scroll turn in | |
jaggedpine/#Annous_Pineshadow.pl:60: elsif (plugin::check_handin(\%itemcount, 8966 => 1) && $qglobals{galeweaver} == 2){ #Turn in orb of the gale | |
jaggedpine/#Kaithys_Galestrider.pl:100: if (plugin::check_handin(\%itemcount, 8915 => 1) && $qglobals{silverbladeofthunder} == 1){ # Purified Silver Blade turn in from Gurrin Nitestorm in Suref |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#include <iostream> | |
#include <unordered_map> | |
struct test { | |
int a; | |
int b; | |
}; | |
int main() | |
{ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/world/shared_tasks.cpp b/world/shared_tasks.cpp | |
index 41d193b71..85d3697e2 100644 | |
--- a/world/shared_tasks.cpp | |
+++ b/world/shared_tasks.cpp | |
@@ -1,6 +1,8 @@ | |
-#include "shared_tasks.h" | |
-#include "clientlist.h" | |
+#include "../common/string_util.h" | |
#include "cliententry.h" | |
+#include "clientlist.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bind "KP_SLASH" "buy mag7; buy sawedoff" | |
bind "KP_MULTIPLY" "buy p250" | |
bind "KP_MINUS" "buy p90" | |
bind "KP_HOME" "buy vest; buy vesthelm" | |
bind "KP_UPARROW" "buy deagle" | |
bind "KP_PGUP" "buy defuser" | |
bind "KP_PLUS" "buy bizon" | |
bind "KP_LEFTARROW" "buy flashbang" | |
bind "KP_5" "buy awp" | |
bind "KP_RIGHTARROW" "buy hegrenade" |
This file has been truncated, but you can view the full file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AAID: 2 | |
unknown004: 1 | |
hotkey_sid: -1 | |
hotkey_sid2: -1 | |
title_sid: 2 (Innate Strength) | |
desc_sid: 2 (This ability raises your base Strength by 2 points for each ability level.) | |
min_level: 51 | |
cost: 1 | |
group_id: 1 | |
current_level: 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/common/emu_oplist.h b/common/emu_oplist.h | |
index 5078cca68..3f4556a07 100644 | |
--- a/common/emu_oplist.h | |
+++ b/common/emu_oplist.h | |
@@ -6,6 +6,7 @@ N(OP_0x0347), | |
N(OP_AAAction), | |
N(OP_AAExpUpdate), | |
N(OP_AcceptNewTask), | |
+N(OP_AcceptNewSharedTask), | |
N(OP_AckPacket), |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/zone/mob_ai.cpp b/zone/mob_ai.cpp | |
index 405ff3643..28adf2dc5 100644 | |
--- a/zone/mob_ai.cpp | |
+++ b/zone/mob_ai.cpp | |
@@ -1706,6 +1706,27 @@ void NPC::AI_DoMovement() { | |
} | |
} | |
+ if (zone->HasMap()) { | |
+ glm::vec3 normal; |
NewerOlder