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

[Consistency] Deity not diety. (#1407)

Browse Source 
* [Consistency] Deity not diety.

* Uppercase. [skip ci]
This commit is contained in:
Alex 2021-06-16 10:33:10 -04:00 committed by GitHub
parent f2ffca1a06
commit ecdebbc1a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/faction.h
View File

@ -50,8 +50,8 @@ struct NPCFactionList {
struct FactionMods struct FactionMods
{ {
int32 base; int32 base;
int16 min; // The lowest your personal earned faction can go - before race/class/diety adjustments. int16 min; // The lowest your personal earned faction can go - before race/class/deity adjustments.
int16 max; // The highest your personal earned faction can go - before race/class/diety adjustments. int16 max; // The highest your personal earned faction can go - before race/class/deity adjustments.
int32 class_mod; int32 class_mod;
int32 race_mod; int32 race_mod;
int32 deity_mod; int32 deity_mod;
@ -61,8 +61,8 @@ struct Faction {
int32 id; int32 id;
std::map<std::string, int16> mods; std::map<std::string, int16> mods;
int16 base; int16 base;
int16 min; // The lowest your personal earned faction can go - before race/class/diety adjustments. int16 min; // The lowest your personal earned faction can go - before race/class/deity adjustments.
int16 max; // The highest your personal earned faction can go - before race/class/diety adjustments. int16 max; // The highest your personal earned faction can go - before race/class/deity adjustments.
char name[50]; char name[50];
}; };

2
common/shareddb.cpp
View File

@ -1822,7 +1822,7 @@ void SharedDatabase::LoadSpells(void *data, int max_spells) {
sp[tempid].CastingAnim=atoi(row[120]); sp[tempid].CastingAnim=atoi(row[120]);
sp[tempid].SpellAffectIndex=atoi(row[123]); sp[tempid].SpellAffectIndex=atoi(row[123]);
sp[tempid].disallow_sit=atoi(row[124]); sp[tempid].disallow_sit=atoi(row[124]);
sp[tempid].diety_agnostic=atoi(row[125]); sp[tempid].deity_agnostic=atoi(row[125]);
for (y = 0; y < 16; y++) for (y = 0; y < 16; y++)
sp[tempid].deities[y]=atoi(row[126+y]); sp[tempid].deities[y]=atoi(row[126+y]);

4
common/spdat.h
View File

@ -759,11 +759,11 @@ struct SPDat_Spell_Struct
/* 122 */ //uint32 TravelType; // -- TRAVELTYPE /* 122 */ //uint32 TravelType; // -- TRAVELTYPE
/* 123 */ uint16 SpellAffectIndex; // -- SPELLAFFECTINDEX /* 123 */ uint16 SpellAffectIndex; // -- SPELLAFFECTINDEX
/* 124 */ int8 disallow_sit; // 124: high-end Yaulp spells (V, VI, VII, VIII [Rk 1, 2, & 3], & Gallenite's Bark of Fury -- CANCELONSIT /* 124 */ int8 disallow_sit; // 124: high-end Yaulp spells (V, VI, VII, VIII [Rk 1, 2, & 3], & Gallenite's Bark of Fury -- CANCELONSIT
/* 125 */ int8 diety_agnostic;// 125: Words of the Skeptic -- DIETY_AGNOSTIC /* 125 */ int8 deity_agnostic;// 125: Words of the Skeptic -- DEITY_AGNOSTIC
/* 126 */ int8 deities[16]; // Deity check. 201 - 216 per http://www.eqemulator.net/wiki/wikka.php?wakka=DeityList /* 126 */ int8 deities[16]; // Deity check. 201 - 216 per http://www.eqemulator.net/wiki/wikka.php?wakka=DeityList
// -1: Restrict to Deity; 1: Restrict to Deity, but only used on non-Live (Test Server "Blessing of ...") spells; 0: Don't restrict // -1: Restrict to Deity; 1: Restrict to Deity, but only used on non-Live (Test Server "Blessing of ...") spells; 0: Don't restrict
// the client actually stores deities in a single int32_t // the client actually stores deities in a single int32_t
// -- DIETY_BERTOXXULOUS ... DIETY_VEESHAN // -- DEITY_BERTOXXULOUS ... DEITY_VEESHAN
/* 142 */ //int8 npc_no_cast; // 142: between 0 & 100 -- NPC_NO_CAST /* 142 */ //int8 npc_no_cast; // 142: between 0 & 100 -- NPC_NO_CAST
/* 143 */ //int ai_pt_bonus; // 143: always set to 0, client doesn't save this -- AI_PT_BONUS /* 143 */ //int ai_pt_bonus; // 143: always set to 0, client doesn't save this -- AI_PT_BONUS
/* 144 */ int16 new_icon; // Spell icon used by the client in uifiles/default/spells??.tga, both for spell gems & buff window. Looks to depreciate icon & memicon -- NEW_ICON /* 144 */ int16 new_icon; // Spell icon used by the client in uifiles/default/spells??.tga, both for spell gems & buff window. Looks to depreciate icon & memicon -- NEW_ICON

4
zone/embparser_api.cpp
View File

@ -805,9 +805,9 @@ XS(XS__changedeity) {
if (items != 1) if (items != 1)
Perl_croak(aTHX_ "Usage: quest::changedeity(int deity_id)"); Perl_croak(aTHX_ "Usage: quest::changedeity(int deity_id)");
int diety_id = (int) SvIV(ST(0)); int deity_id = (int) SvIV(ST(0));
quest_manager.changedeity(diety_id); quest_manager.changedeity(deity_id);
XSRETURN_EMPTY; XSRETURN_EMPTY;
} }

2
zone/mob.cpp
View File

@ -5557,7 +5557,7 @@ int32 Mob::GetSpellStat(uint32 spell_id, const char *identifier, uint8 slot)
if (slot < 16){ if (slot < 16){
if (id == "classes") {return spells[spell_id].classes[slot]; } if (id == "classes") {return spells[spell_id].classes[slot]; }
else if (id == "dieties") {return spells[spell_id].deities[slot];} else if (id == "deities") {return spells[spell_id].deities[slot];}
} }
if (slot < 12){ if (slot < 12){

6
zone/questmgr.cpp
View File

@ -897,15 +897,15 @@ void QuestManager::sfollow() {
owner->SetFollowID(0); owner->SetFollowID(0);
} }
void QuestManager::changedeity(int diety_id) { void QuestManager::changedeity(int deity_id) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
//Changes the deity. //Changes the deity.
if(initiator) if(initiator)
{ {
if(initiator->IsClient()) if(initiator->IsClient())
{ {
initiator->SetDeity(diety_id); initiator->SetDeity(deity_id);
initiator->Message(Chat::Yellow,"Your Deity has been changed/set to: %i", diety_id); initiator->Message(Chat::Yellow,"Your Deity has been changed/set to: %i", deity_id);
initiator->Save(1); initiator->Save(1);
initiator->Kick("Deity change by QuestManager"); initiator->Kick("Deity change by QuestManager");
} }

2
zone/questmgr.h
View File

@ -106,7 +106,7 @@ public:
void settarget(const char *type, int target_id); void settarget(const char *type, int target_id);
void follow(int entity_id, int distance); void follow(int entity_id, int distance);
void sfollow(); void sfollow();
void changedeity(int diety_id); void changedeity(int deity_id);
void exp(int amt); void exp(int amt);
void level(int newlevel); void level(int newlevel);
void traindisc(int discipline_tome_item_id); void traindisc(int discipline_tome_item_id);

6
zone/zonedb.cpp
View File

@ -3930,8 +3930,8 @@ bool ZoneDatabase::GetFactionData(FactionMods* fm, uint32 class_mod, uint32 race
} }
fm->base = faction_array[faction_id]->base; fm->base = faction_array[faction_id]->base;
fm->min = faction_array[faction_id]->min; // The lowest your personal earned faction can go - before race/class/diety adjustments. fm->min = faction_array[faction_id]->min; // The lowest your personal earned faction can go - before race/class/deity adjustments.
fm->max = faction_array[faction_id]->max; // The highest your personal earned faction can go - before race/class/diety adjustments. fm->max = faction_array[faction_id]->max; // The highest your personal earned faction can go - before race/class/deity adjustments.
if(class_mod > 0) { if(class_mod > 0) {
char str[32]; char str[32];
@ -4131,7 +4131,7 @@ bool ZoneDatabase::LoadFactionData()
LogInfo("Unable to load Faction Base data..."); LogInfo("Unable to load Faction Base data...");
} }
// load race, class and diety modifiers // load race, class and deity modifiers
query = fmt::format("SELECT `faction_id`, `mod`, `mod_name` FROM `faction_list_mod` WHERE `faction_id` IN ({})", faction_id_criteria); query = fmt::format("SELECT `faction_id`, `mod`, `mod_name` FROM `faction_list_mod` WHERE `faction_id` IN ({})", faction_id_criteria);
auto modifier_results = QueryDatabase(query); auto modifier_results = QueryDatabase(query);