[Expansion] Content Filtering Adjustments (#1910)

* Change default expansion values for ALL to -1 from 0

* Adjust content_filter_criteria

* Refactor content filtering logic

* Allow flag strings to also just be empty instead of null

* Formatting

* Editor oops
This commit is contained in:
Chris Miles
2022-01-02 20:52:29 -06:00
committed by GitHub
parent c0f57bed1f
commit 9815f50efa
23 changed files with 365 additions and 121 deletions
+10 -9
View File
@@ -4802,7 +4802,8 @@ XS(XS__SetContentFlag)
std::string flag_name = (std::string) SvPV_nolen(ST(0));
bool enabled = (int) SvIV(ST(1)) != 0;
ZoneStore::SetContentFlag(flag_name, enabled);
content_service.SetContentFlag(flag_name, enabled);
XSRETURN_EMPTY;
}
@@ -5141,7 +5142,7 @@ XS(XS__gethexcolorcode) {
sv_setpv(TARG, hex_color_code.c_str());
XSprePUSH;
PUSHTARG;
XSRETURN(1);
XSRETURN(1);
}
XS(XS__getaaexpmodifierbycharid);
@@ -5149,7 +5150,7 @@ XS(XS__getaaexpmodifierbycharid) {
dXSARGS;
if (items != 2)
Perl_croak(aTHX_ "Usage: quest::getaaexpmodifierbycharid(uint32 character_id, uint32 zone_id)");
dXSTARG;
double aa_modifier;
uint32 character_id = (uint32) SvUV(ST(0));
@@ -5165,7 +5166,7 @@ XS(XS__getexpmodifierbycharid) {
dXSARGS;
if (items != 2)
Perl_croak(aTHX_ "Usage: quest::getexpmodifierbycharid(uint32 character_id, uint32 zone_id)");
dXSTARG;
double exp_modifier;
uint32 character_id = (uint32) SvUV(ST(0));
@@ -5313,7 +5314,7 @@ XS(XS__getspellstat) {
uint8 slot = 0;
if (items == 3)
slot = (uint8) SvUV(ST(2));
stat_value = quest_manager.getspellstat(spell_id, stat_identifier, slot);
XSprePUSH;
@@ -7551,7 +7552,7 @@ XS(XS__worldwideassigntask) {
if (items == 3)
max_status = (uint8) SvUV(ST(2));
quest_manager.WorldWideTaskUpdate(update_type, task_identifier, task_subidentifier, update_count, enforce_level_requirement, min_status, max_status);
}
XSRETURN_EMPTY;
@@ -7616,7 +7617,7 @@ XS(XS__worldwidedisabletask) {
if (items == 3)
max_status = (uint8) SvUV(ST(2));
quest_manager.WorldWideTaskUpdate(update_type, task_identifier, task_subidentifier, update_count, enforce_level_requirement, min_status, max_status);
}
XSRETURN_EMPTY;
@@ -7640,7 +7641,7 @@ XS(XS__worldwideenabletask) {
if (items == 3)
max_status = (uint8) SvUV(ST(2));
quest_manager.WorldWideTaskUpdate(update_type, task_identifier, task_subidentifier, update_count, enforce_level_requirement, min_status, max_status);
}
XSRETURN_EMPTY;
@@ -7664,7 +7665,7 @@ XS(XS__worldwidefailtask) {
if (items == 3)
max_status = (uint8) SvUV(ST(2));
quest_manager.WorldWideTaskUpdate(update_type, task_identifier, task_subidentifier, update_count, enforce_level_requirement, min_status, max_status);
}
XSRETURN_EMPTY;