pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 16:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed zone files

Browse Source
This commit is contained in:
KimLS 2014-08-21 23:46:01 -07:00
parent 4821ed79fb
commit 07a2cbe9a5
70 changed files with 159 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
zone/CMakeLists.txt
View File

@ -1,7 +1,7 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
SET(zone_sources
AA.cpp
aa.cpp
aggro.cpp
attack.cpp
beacon.cpp
@ -69,12 +69,12 @@ SET(zone_sources
map.cpp
merc.cpp
mob.cpp
MobAI.cpp
mob_ai.cpp
mod_functions.cpp
net.cpp
npc.cpp
NpcAI.cpp
Object.cpp
npc_ai.cpp
object.cpp
oriented_bounding_box.cpp
pathing.cpp
perl_client.cpp
@ -86,17 +86,17 @@ SET(zone_sources
perl_npc.cpp
perl_object.cpp
perl_perlpacket.cpp
perl_PlayerCorpse.cpp
perl_player_corpse.cpp
perl_questitem.cpp
perl_raids.cpp
perlpacket.cpp
petitions.cpp
pets.cpp
QGlobals.cpp
qglobals.cpp
questmgr.cpp
QuestParserCollection.cpp
quest_parser_collection.cpp
raids.cpp
RaycastMesh.cpp
raycast_mesh.cpp
spawn2.cpp
spawn2.h
spawngroup.cpp
@ -116,18 +116,18 @@ SET(zone_sources
worldserver.cpp
zone.cpp
zone_logsys.cpp
ZoneConfig.cpp
zone_config.cpp
zonedb.cpp
zonedbasync.cpp
zoning.cpp
)
SET(zone_headers
AA.h
aa.h
basic_functions.h
beacon.h
bot.h
botStructs.h
bot_structs.h
client.h
client_logs.h
client_packet.h
@ -175,25 +175,25 @@ SET(zone_headers
mob.h
net.h
npc.h
NpcAI.h
npc_ai.h
object.h
oriented_bounding_box.h
pathing.h
perlpacket.h
petitions.h
pets.h
QGlobals.h
QuestInterface.h
qglobals.h
quest_interface.h
questmgr.h
QuestParserCollection.h
quest_parser_collection.h
raid.h
raids.h
RaycastMesh.h
raycast_mesh.h
skills.h
spawn2.cpp
spawn2.h
spawngroup.h
StringIDs.h
string_ids.h
tasks.h
titles.h
trap.h
@ -202,7 +202,7 @@ SET(zone_headers
water_map_v2.h
worldserver.h
zone.h
ZoneConfig.h
zone_config.h
zonedb.h
zonedbasync.h
zonedump.h

10
zone/AA.cpp → zone/aa.cpp
View File

@ -19,7 +19,7 @@ Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net)
// Test 1
#include "../common/debug.h"
#include "AA.h"
#include "aa.h"
#include "mob.h"
#include "client.h"
#include "groups.h"
@ -37,7 +37,7 @@ Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net)
#include "../common/string_util.h"
#include "../common/logsys.h"
#include "zonedb.h"
#include "StringIDs.h"
#include "string_ids.h"
//static data arrays, really not big enough to warrant shared mem.
AA_DBAction AA_Actions[aaHighestID][MAX_AA_ACTION_RANKS]; //[aaid][rank]
@ -458,7 +458,7 @@ void Client::HandleAAAction(aaID activate) {
Escape();
break;
// Don't think this code is used any longer for Bestial Alignment as the AA has a spell_id and no nonspell_action.
// Don't think this code is used any longer for Bestial Alignment as the aa.has a spell_id and no nonspell_action.
case aaActionBeastialAlignment:
switch(GetBaseRace()) {
case BARBARIAN:
@ -1237,7 +1237,7 @@ void Client::SendAA(uint32 id, int seq) {
Note: There were many ways to achieve this effect - The method used proved to be the most straight forward and consistent.
Stacking does not currently work ideally for AA's that use hotkeys, therefore they will be excluded at this time.
TODO: Problem with AA hotkeys - When you reach max rank of an AA tier (ie 5/5), it automatically displays the next AA in
TODO: Problem with aa.hotkeys - When you reach max rank of an AA tier (ie 5/5), it automatically displays the next AA in
the series and you can not transfer the hotkey to the next AA series. To the best of the my ability and through many
different variations of coding I could not find an ideal solution to this issue.
@ -1676,7 +1676,7 @@ bool ZoneDatabase::LoadAAEffects() {
return true;
}
//Returns the number effects an AA has when we send them to the client
//Returns the number effects an aa.has when we send them to the client
//For the purposes of sizing a packet because every skill does not
//have the same number effects, they can range from none to a few depending on AA.
//counts the # of effects by counting the different slots of an AAID in the DB.

2
zone/AA.h → zone/aa.h
View File

@ -2134,7 +2134,7 @@ struct AALevelCost_Struct
uint32 Cost;
};
//assumes that no activatable AA has more than 5 ranks
//assumes that no activatable aa.has more than 5 ranks
#define MAX_AA_ACTION_RANKS 20
extern AA_DBAction AA_Actions[aaHighestID][MAX_AA_ACTION_RANKS]; //[aaid][rank]
extern std::map<uint16, AA_SwarmPet> AA_SwarmPets; //key=spell_id

2
zone/aggro.cpp
View File

@ -25,7 +25,7 @@
#include "../common/skills.h"
#include "../common/misc_functions.h"
#include "../common/rulesys.h"
#include "StringIDs.h"
#include "string_ids.h"
#include <iostream>
extern Zone* zone;

6
zone/attack.cpp
View File

@ -29,17 +29,17 @@
#include <assert.h>
#include "masterentity.h"
#include "NpcAI.h"
#include "npc_ai.h"
#include "../common/packet_dump.h"
#include "../common/eq_packet_structs.h"
#include "../common/eq_constants.h"
#include "../common/skills.h"
#include "../common/spdat.h"
#include "zone.h"
#include "StringIDs.h"
#include "string_ids.h"
#include "../common/string_util.h"
#include "../common/rulesys.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
#include "water_map.h"
#include "worldserver.h"
extern WorldServer worldserver;

4
zone/bonuses.cpp
View File

@ -26,7 +26,7 @@
#include "../common/bodytypes.h"
#include "../common/classes.h"
#include "../common/rulesys.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
#include <math.h>
#include <assert.h>
#include <iostream>
@ -35,7 +35,7 @@
#include "../common/unix.h"
#endif
#include "StringIDs.h"
#include "string_ids.h"
void Mob::CalcBonuses()
{

2
zone/bot.cpp
View File

@ -3,7 +3,7 @@
#include "bot.h"
#include "object.h"
#include "doors.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
#include "../common/string_util.h"
extern volatile bool ZoneLoaded;

4
zone/bot.h
View File

@ -3,14 +3,14 @@
#ifdef BOTS
#include "botStructs.h"
#include "bot_structs.h"
#include "mob.h"
#include "client.h"
#include "pets.h"
#include "groups.h"
#include "corpse.h"
#include "zonedb.h"
#include "StringIDs.h"
#include "string_ids.h"
#include "../common/misc_functions.h"
#include "../common/debug.h"
#include "guild_mgr.h"

0
zone/botStructs.h → zone/bot_structs.h
View File

6
zone/client.cpp
View File

@ -57,11 +57,11 @@ extern volatile bool RunLoops;
#include "../common/string_util.h"
#include "forage.h"
#include "command.h"
#include "StringIDs.h"
#include "NpcAI.h"
#include "string_ids.h"
#include "npc_ai.h"
#include "client_logs.h"
#include "guild_mgr.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
extern EntityList entity_list;

4
zone/client.h
View File

@ -43,9 +43,9 @@ class Client;
#include "npc.h"
#include "merc.h"
#include "zone.h"
#include "AA.h"
#include "aa.h"
#include "questmgr.h"
#include "QGlobals.h"
#include "qglobals.h"
#ifdef _WINDOWS
// since windows defines these within windef.h (which windows.h include)

4
zone/client_mods.cpp
View File

@ -30,8 +30,8 @@
#include "worldserver.h"
#include "zonedb.h"
#include "petitions.h"
#include "StringIDs.h"
#include "NpcAI.h"
#include "string_ids.h"
#include "npc_ai.h"
// Return max stat value for level

10
zone/client_packet.cpp
View File

@ -51,24 +51,24 @@
#include "../common/rulesys.h"
#include "../common/spdat.h"
#include "petitions.h"
#include "NpcAI.h"
#include "npc_ai.h"
#include "../common/skills.h"
#include "forage.h"
#include "zone.h"
#include "event_codes.h"
#include "../common/faction.h"
#include "../common/crc32.h"
#include "StringIDs.h"
#include "string_ids.h"
#include "map.h"
#include "titles.h"
#include "pets.h"
#include "ZoneConfig.h"
#include "zone_config.h"
#include "guild_mgr.h"
#include "pathing.h"
#include "water_map.h"
#include "merc.h"
#include "../common/zone_numbers.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
extern Zone* zone;
extern volatile bool ZoneLoaded;
@ -8970,7 +8970,7 @@ bool Client::FinishConnState2(DBAsyncWork* dbaw) {
continue;
}
if(aa[a]->value > 1) //hack in some stuff for sony's new AA method (where each level of each AA has a seperate ID)
if(aa[a]->value > 1) //hack in some stuff for sony's new AA method (where each level of each aa.has a seperate ID)
aa_points[(id - aa[a]->value +1)] = aa[a]->value;
else
aa_points[id] = aa[a]->value;

6
zone/client_process.cpp
View File

@ -50,7 +50,7 @@
#include "../common/string_util.h"
#include "../common/spdat.h"
#include "petitions.h"
#include "NpcAI.h"
#include "npc_ai.h"
#include "../common/skills.h"
#include "forage.h"
#include "zone.h"
@ -58,11 +58,11 @@
#include "../common/faction.h"
#include "../common/crc32.h"
#include "../common/rulesys.h"
#include "StringIDs.h"
#include "string_ids.h"
#include "map.h"
#include "guild_mgr.h"
#include <string>
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
extern Zone* zone;
extern volatile bool ZoneLoaded;

6
zone/command.cpp
View File

@ -68,11 +68,11 @@ extern WorldServer worldserver;
extern TaskManager *taskmanager;
void CatchSignal(int sig_num);
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
#include "StringIDs.h"
#include "string_ids.h"
#include "command.h"
#include "QGlobals.h"
#include "qglobals.h"
//struct cl_struct *commandlist; // the actual linked list of commands
int commandcount; // how many commands we have

4
zone/corpse.cpp
View File

@ -37,10 +37,10 @@ Child of the Mob class.
#include "../common/packet_functions.h"
#include "../common/string_util.h"
#include "../common/crc32.h"
#include "StringIDs.h"
#include "string_ids.h"
#include "worldserver.h"
#include "../common/rulesys.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
extern EntityList entity_list;
extern Zone* zone;

2
zone/doors.cpp
View File

@ -21,7 +21,7 @@
#include <string.h>
#include "masterentity.h"
#include "worldserver.h"
#include "StringIDs.h"
#include "string_ids.h"
#include "zonedb.h"
#include "../common/packet_functions.h"
#include "../common/packet_dump.h"

4
zone/effects.cpp
View File

@ -27,8 +27,8 @@
#include "../common/zone_numbers.h"
#include "../common/moremath.h"
#include "../common/guilds.h"
#include "StringIDs.h"
#include "NpcAI.h"
#include "string_ids.h"
#include "npc_ai.h"
float Client::GetActSpellRange(uint16 spell_id, float range, bool IsBard)
{

2
zone/embparser.cpp
View File

@ -26,7 +26,7 @@
#include "masterentity.h"
#include "embparser.h"
#include "questmgr.h"
#include "QGlobals.h"
#include "qglobals.h"
#include "zone.h"
#include <algorithm>
#include <sstream>

4
zone/embparser.h
View File

@ -20,8 +20,8 @@
#define EQMEU_EMBPARSER_H
#ifdef EMBPERL
#include "QuestParserCollection.h"
#include "QuestInterface.h"
#include "quest_parser_collection.h"
#include "quest_interface.h"
#include <string>
#include <queue>
#include <map>

4
zone/entity.cpp
View File

@ -39,11 +39,11 @@
#include "petitions.h"
#include "../common/spdat.h"
#include "../common/features.h"
#include "StringIDs.h"
#include "string_ids.h"
#include "../common/dbasync.h"
#include "guild_mgr.h"
#include "raids.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
#ifdef _WINDOWS
#define snprintf _snprintf

2
zone/entity.h
View File

@ -29,7 +29,7 @@
#include "zonedb.h"
#include "zonedump.h"
#include "zonedbasync.h"
#include "QGlobals.h"
#include "qglobals.h"
class EQApplicationPacket;

4
zone/exp.cpp
View File

@ -18,10 +18,10 @@
#include "../common/debug.h"
#include "../common/features.h"
#include "masterentity.h"
#include "StringIDs.h"
#include "string_ids.h"
#include "../common/string_util.h"
#include "../common/rulesys.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
static uint32 MaxBankedGroupLeadershipPoints(int Level)

4
zone/forage.cpp
View File

@ -30,7 +30,7 @@
#include "npc.h"
#include "water_map.h"
#include "titles.h"
#include "StringIDs.h"
#include "string_ids.h"
#include "../common/misc_functions.h"
#include "../common/string_util.h"
#include "../common/rulesys.h"
@ -40,7 +40,7 @@
#define snprintf _snprintf
#endif
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
//max number of items which can be in the foraging table
//for a given zone.

2
zone/groups.cpp
View File

@ -17,7 +17,7 @@
*/
#include "../common/debug.h"
#include "masterentity.h"
#include "NpcAI.h"
#include "npc_ai.h"
#include "../common/packet_functions.h"
#include "../common/packet_dump.h"
#include "../common/string_util.h"

4
zone/guild.cpp
View File

@ -30,8 +30,8 @@
#include "../common/guilds.h"
#include "../common/string_util.h"
#include "guild_mgr.h"
#include "StringIDs.h"
#include "NpcAI.h"
#include "string_ids.h"
#include "npc_ai.h"
extern WorldServer worldserver;

2
zone/hate_list.cpp
View File

@ -25,7 +25,7 @@
#include "../common/rulesys.h"
#include "../common/misc_functions.h"
#include "hate_list.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
#include "zone.h"
#include "water_map.h"

6
zone/inventory.cpp
View File

@ -30,9 +30,9 @@
#include "../common/guilds.h"
#include "../common/logsys.h"
#include "../common/string_util.h"
#include "StringIDs.h"
#include "NpcAI.h"
#include "QuestParserCollection.h"
#include "string_ids.h"
#include "npc_ai.h"
#include "quest_parser_collection.h"
extern WorldServer worldserver;
// @merth: this needs to be touched up

4
zone/lua_general.cpp
View File

@ -13,9 +13,9 @@
#include "lua_client.h"
#include "lua_npc.h"
#include "lua_entity_list.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
#include "questmgr.h"
#include "QGlobals.h"
#include "qglobals.h"
#include "../common/timer.h"
struct Events { };

4
zone/lua_parser.h
View File

@ -2,8 +2,8 @@
#define _EQE_LUA_PARSER_H
#ifdef LUA_EQEMU
#include "QuestParserCollection.h"
#include "QuestInterface.h"
#include "quest_parser_collection.h"
#include "quest_interface.h"
#include <string>
#include <list>
#include <map>

4
zone/lua_parser_events.cpp
View File

@ -5,8 +5,8 @@
#include <luabind/luabind.hpp>
#include <luabind/object.hpp>
#include "QuestParserCollection.h"
#include "QuestInterface.h"
#include "quest_parser_collection.h"
#include "quest_interface.h"
#include "masterentity.h"
#include "../common/seperator.h"

2
zone/map.cpp
View File

@ -1,7 +1,7 @@
#include "../common/debug.h"
#include "../common/misc_functions.h"
#include "map.h"
#include "RaycastMesh.h"
#include "raycast_mesh.h"
#include "zone.h"
#include <stdint.h>
#include <algorithm>

6
zone/merc.cpp
View File

@ -1,17 +1,17 @@
#include "merc.h"
#include "masterentity.h"
#include "NpcAI.h"
#include "npc_ai.h"
#include "../common/packet_dump.h"
#include "../common/eq_packet_structs.h"
#include "../common/eq_constants.h"
#include "../common/skills.h"
#include "../common/spdat.h"
#include "zone.h"
#include "StringIDs.h"
#include "string_ids.h"
#include "../common/misc_functions.h"
#include "../common/string_util.h"
#include "../common/rulesys.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
#include "water_map.h"
extern volatile bool ZoneLoaded;

4
zone/mob.cpp
View File

@ -18,9 +18,9 @@
#include "../common/debug.h"
#include "masterentity.h"
#include "../common/spdat.h"
#include "StringIDs.h"
#include "string_ids.h"
#include "worldserver.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
#include "../common/string_util.h"
#include <sstream>

6
zone/MobAI.cpp → zone/mob_ai.cpp
View File

@ -23,15 +23,15 @@
#include <algorithm>
#include "npc.h"
#include "masterentity.h"
#include "NpcAI.h"
#include "npc_ai.h"
#include "map.h"
#include "../common/moremath.h"
#include "StringIDs.h"
#include "string_ids.h"
#include "../common/misc_functions.h"
#include "../common/string_util.h"
#include "../common/rulesys.h"
#include "../common/features.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
#include "water_map.h"
extern EntityList entity_list;

2
zone/mod_functions.cpp
View File

@ -12,7 +12,7 @@
#include "mob.h"
#include "client.h"
#include "worldserver.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
#include "event_codes.h"
#include "embparser.h"
#include <string>

2
zone/mod_functions_base.cpp
View File

@ -12,7 +12,7 @@
#include "mob.h"
#include "client.h"
#include "worldserver.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
#include "event_codes.h"
#include "embparser.h"
#include <string>

6
zone/net.cpp
View File

@ -43,18 +43,18 @@
#include "../common/eqemu_exception.h"
#include "../common/spdat.h"
#include "ZoneConfig.h"
#include "zone_config.h"
#include "masterentity.h"
#include "worldserver.h"
#include "net.h"
#include "zone.h"
#include "command.h"
#include "ZoneConfig.h"
#include "zone_config.h"
#include "titles.h"
#include "guild_mgr.h"
#include "tasks.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
#include "embparser.h"
#include "lua_parser.h"
#include "client_logs.h"

4
zone/npc.cpp
View File

@ -43,7 +43,7 @@
#include "../common/misc_functions.h"
#include "../common/string_util.h"
#include "../common/rulesys.h"
#include "StringIDs.h"
#include "string_ids.h"
//#define SPELLQUEUE //Use only if you want to be spammed by spell testing
@ -52,7 +52,7 @@ extern Zone* zone;
extern volatile bool ZoneLoaded;
extern EntityList entity_list;
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float heading, int iflymode, bool IsCorpse)
: Mob(d->name,

2
zone/npc.h
View File

@ -29,7 +29,7 @@ class NPC;
#include "spawn2.h"
#include "../common/loottable.h"
#include "zonedump.h"
#include "QGlobals.h"
#include "qglobals.h"
#include "../common/rulesys.h"
#ifdef _WINDOWS

0
zone/NpcAI.cpp → zone/npc_ai.cpp
View File

0
zone/NpcAI.h → zone/npc_ai.h
View File

4
zone/Object.cpp → zone/object.cpp
View File

@ -27,9 +27,9 @@
#include "../common/misc_functions.h"
#include "../common/string_util.h"
#include "../common/features.h"
#include "StringIDs.h"
#include "string_ids.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
const char DEFAULT_OBJECT_NAME[] = "IT63_ACTORDEF";
const char DEFAULT_OBJECT_NAME_SUFFIX[] = "_ACTORDEF";

0
zone/perl_PlayerCorpse.cpp → zone/perl_player_corpse.cpp
View File

2
zone/pets.cpp
View File

@ -35,7 +35,7 @@
#include "../common/unix.h"
#endif
#include "StringIDs.h"
#include "string_ids.h"
///////////////////////////////////////////////////////////////////////////////
// pet related functions

2
zone/QGlobals.cpp → zone/qglobals.cpp
View File

@ -1,6 +1,6 @@
#include "../common/debug.h"
#include "../common/string_util.h"
#include "QGlobals.h"
#include "qglobals.h"
#include "masterentity.h"
#include "zone.h"
#include "zonedb.h"

0
zone/QGlobals.h → zone/qglobals.h
View File

2
zone/Quest.cpp → zone/quest.cpp
View File

@ -29,7 +29,7 @@
#include "../common/unix.h"
#endif
#include "Quest.h"
#include "quest.h"
pquest_entry Quest::m_pQuests;
int Quest::m_nQuests;

0
zone/Quest.h → zone/quest.h
View File

0
zone/QuestInterface.h → zone/quest_interface.h
View File

4
zone/QuestParserCollection.cpp → zone/quest_parser_collection.cpp
View File

@ -19,8 +19,8 @@
#include "../common/debug.h"
#include "../common/misc_functions.h"
#include "../common/features.h"
#include "QuestParserCollection.h"
#include "QuestInterface.h"
#include "quest_parser_collection.h"
#include "quest_interface.h"
#include "zone.h"
#include "questmgr.h"

2
zone/QuestParserCollection.h → zone/quest_parser_collection.h
View File

@ -23,7 +23,7 @@
#include "../common/item.h"
#include "masterentity.h"
#include "QuestInterface.h"
#include "quest_interface.h"
#include <string.h>
#include <string>

4
zone/questmgr.cpp
View File

@ -73,8 +73,8 @@ And then at then end of embparser.cpp, add:
#include "event_codes.h"
#include "guild_mgr.h"
#include "../common/rulesys.h"
#include "QGlobals.h"
#include "QuestParserCollection.h"
#include "qglobals.h"
#include "quest_parser_collection.h"
#ifdef BOTS
#include "bot.h"

2
zone/raids.cpp
View File

@ -17,7 +17,7 @@
*/
#include "../common/debug.h"
#include "masterentity.h"
#include "NpcAI.h"
#include "npc_ai.h"
#include "../common/packet_functions.h"
#include "../common/packet_dump.h"
#include "../common/string_util.h"

2
zone/RaycastMesh.cpp → zone/raycast_mesh.cpp
View File

@ -1,4 +1,4 @@
#include "RaycastMesh.h"
#include "raycast_mesh.h"
#include <math.h>
#include <assert.h>
#include <stdio.h>

0
zone/RaycastMesh.h → zone/raycast_mesh.h
View File

2
zone/special_attacks.cpp
View File

@ -23,7 +23,7 @@
#include <math.h>
#include "masterentity.h"
#include "StringIDs.h"
#include "string_ids.h"
#include "../common/misc_functions.h"
#include "../common/rulesys.h"

4
zone/spell_effects.cpp
View File

@ -33,8 +33,8 @@
#include "../common/unix.h"
#endif
#include "StringIDs.h"
#include "QuestParserCollection.h"
#include "string_ids.h"
#include "quest_parser_collection.h"
extern Zone* zone;
extern volatile bool ZoneLoaded;

4
zone/spells.cpp
View File

@ -90,8 +90,8 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
#include "../common/packet_dump_file.h"
#endif
#include "StringIDs.h"
#include "QuestParserCollection.h"
#include "string_ids.h"
#include "quest_parser_collection.h"
extern Zone* zone;
extern volatile bool ZoneLoaded;

0
zone/StringIDs.h → zone/string_ids.h
View File

2
zone/tasks.cpp
View File

@ -32,7 +32,7 @@ Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net)
#include "../common/rulesys.h"
#include "masterentity.h"
#include "../common/features.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
#include "mob.h"

62
zone/tradeskills.cpp
View File

@ -29,11 +29,11 @@
#include "../common/packet_functions.h"
#include "../common/packet_dump.h"
#include "titles.h"
#include "StringIDs.h"
#include "string_ids.h"
#include "../common/misc_functions.h"
#include "../common/string_util.h"
#include "../common/rulesys.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
static const SkillUseTypes TradeskillUnknown = Skill1HBlunt; /* an arbitrary non-tradeskill */
@ -928,20 +928,20 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
_log(TRADESKILLS__TRACE, "...Bonusstat: %d , INT: %d , WIS: %d , DEX: %d , STR: %d", bonusstat , GetINT() , GetWIS() , GetDEX() , GetSTR());
float res = MakeRandomFloat(0, 99);
int AAChance = 0;
int aa_chance = 0;
//AA modifiers
//can we do this with nested switches?
if(spec->tradeskill == SkillAlchemy){
switch(GetAA(aaAlchemyMastery)){
case 1:
AAChance = 10;
aa_chance = 10;
break;
case 2:
AAChance = 25;
aa_chance = 25;
break;
case 3:
AAChance = 50;
aa_chance = 50;
break;
}
}
@ -949,13 +949,13 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
if(spec->tradeskill == SkillJewelryMaking){
switch(GetAA(aaJewelCraftMastery)){
case 1:
AAChance = 10;
aa_chance = 10;
break;
case 2:
AAChance = 25;
aa_chance = 25;
break;
case 3:
AAChance = 50;
aa_chance = 50;
break;
}
}
@ -964,13 +964,13 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
if (spec->tradeskill == SkillBlacksmithing) {
switch(GetAA(aaBlacksmithingMastery)) {
case 1:
AAChance = 10;
aa_chance = 10;
break;
case 2:
AAChance = 25;
aa_chance = 25;
break;
case 3:
AAChance = 50;
aa_chance = 50;
break;
}
}
@ -978,13 +978,13 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
if (spec->tradeskill == SkillBaking) {
switch(GetAA(aaBakingMastery)) {
case 1:
AAChance = 10;
aa_chance = 10;
break;
case 2:
AAChance = 25;
aa_chance = 25;
break;
case 3:
AAChance = 50;
aa_chance = 50;
break;
}
}
@ -992,13 +992,13 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
if (spec->tradeskill == SkillBrewing) {
switch(GetAA(aaBrewingMastery)) {
case 1:
AAChance = 10;
aa_chance = 10;
break;
case 2:
AAChance = 25;
aa_chance = 25;
break;
case 3:
AAChance = 50;
aa_chance = 50;
break;
}
}
@ -1006,13 +1006,13 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
if (spec->tradeskill == SkillFletching) {
switch(GetAA(aaFletchingMastery2)) {
case 1:
AAChance = 10;
aa_chance = 10;
break;
case 2:
AAChance = 25;
aa_chance = 25;
break;
case 3:
AAChance = 50;
aa_chance = 50;
break;
}
}
@ -1020,13 +1020,13 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
if (spec->tradeskill == SkillPottery) {
switch(GetAA(aaPotteryMastery)) {
case 1:
AAChance = 10;
aa_chance = 10;
break;
case 2:
AAChance = 25;
aa_chance = 25;
break;
case 3:
AAChance = 50;
aa_chance = 50;
break;
}
}
@ -1034,13 +1034,13 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
if (spec->tradeskill == SkillTailoring) {
switch(GetAA(aaTailoringMastery)) {
case 1:
AAChance = 10;
aa_chance = 10;
break;
case 2:
AAChance = 25;
aa_chance = 25;
break;
case 3:
AAChance = 50;
aa_chance = 50;
break;
}
}
@ -1048,20 +1048,20 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
if (spec->tradeskill == SkillResearch) {
switch(GetAA(aaArcaneTongues)) {
case 1:
AAChance = 10;
aa_chance = 10;
break;
case 2:
AAChance = 25;
aa_chance = 25;
break;
case 3:
AAChance = 50;
aa_chance = 50;
break;
}
}
chance = mod_tradeskill_chance(chance, spec);
if (((spec->tradeskill==75) || GetGM() || (chance > res)) || MakeRandomInt(0, 99) < AAChance){
if (((spec->tradeskill==75) || GetGM() || (chance > res)) || MakeRandomInt(0, 99) < aa_chance){
success_modifier = 1;
if(over_trivial < 0)

4
zone/trading.cpp
View File

@ -17,10 +17,10 @@
*/
#include "../common/debug.h"
#include "masterentity.h"
#include "StringIDs.h"
#include "string_ids.h"
#include "../common/string_util.h"
#include "../common/rulesys.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
#include "worldserver.h"
extern WorldServer worldserver;

6
zone/waypoints.cpp
View File

@ -24,16 +24,16 @@
#include <math.h>
#include "npc.h"
#include "masterentity.h"
#include "NpcAI.h"
#include "npc_ai.h"
#include "map.h"
#include "water_map.h"
#include "../common/moremath.h"
#include "StringIDs.h"
#include "string_ids.h"
#include "../common/misc_functions.h"
#include "../common/string_util.h"
#include "../common/rulesys.h"
#include "../common/features.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
struct wp_distance
{

6
zone/worldserver.cpp
View File

@ -45,12 +45,12 @@
#include "petitions.h"
#include "../common/packet_functions.h"
#include "../common/md5.h"
#include "ZoneConfig.h"
#include "StringIDs.h"
#include "zone_config.h"
#include "string_ids.h"
#include "guild_mgr.h"
#include "../common/rulesys.h"
#include "titles.h"
#include "QGlobals.h"
#include "qglobals.h"
extern EntityList entity_list;

4
zone/zone.cpp
View File

@ -46,7 +46,7 @@
#include "../common/eq_stream_factory.h"
#include "../common/eq_stream.h"
#include "../common/string_util.h"
#include "ZoneConfig.h"
#include "zone_config.h"
#include "../common/breakdowns.h"
#include "map.h"
#include "water_map.h"
@ -57,7 +57,7 @@
#include "client_logs.h"
#include "../common/rulesys.h"
#include "guild_mgr.h"
#include "QuestParserCollection.h"
#include "quest_parser_collection.h"
#ifdef _WINDOWS
#define snprintf _snprintf

2
zone/zone.h
View File

@ -32,7 +32,7 @@
#include "spawn2.h"
#include "tasks.h"
#include "pathing.h"
#include "QGlobals.h"
#include "qglobals.h"
#include <unordered_map>
class Map;

2
zone/ZoneConfig.cpp → zone/zone_config.cpp
View File

@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../common/debug.h"
#include "ZoneConfig.h"
#include "zone_config.h"
ZoneConfig *ZoneConfig::_zone_config = nullptr;

0
zone/ZoneConfig.h → zone/zone_config.h
View File

4
zone/zoning.cpp
View File

@ -23,8 +23,8 @@
#include "../common/packet_dump.h"
#include "../common/rulesys.h"
#include "../common/string_util.h"
#include "StringIDs.h"
#include "QuestParserCollection.h"
#include "string_ids.h"
#include "quest_parser_collection.h"
extern WorldServer worldserver;
extern Zone* zone;