diff --git a/_module/ncs/array_example.ncs b/_module/ncs/array_example.ncs index 90adc904..df8db1a3 100644 Binary files a/_module/ncs/array_example.ncs and b/_module/ncs/array_example.ncs differ diff --git a/_module/ncs/displ_onspawn.ncs b/_module/ncs/displ_onspawn.ncs index 7ec5ed6f..0ef8b72c 100644 Binary files a/_module/ncs/displ_onspawn.ncs and b/_module/ncs/displ_onspawn.ncs differ diff --git a/_module/ncs/hcrh_setbonusxp.ncs b/_module/ncs/hcrh_setbonusxp.ncs index dd82613d..8da25edf 100644 Binary files a/_module/ncs/hcrh_setbonusxp.ncs and b/_module/ncs/hcrh_setbonusxp.ncs differ diff --git a/_module/ncs/hcrh_setbrntorch.ncs b/_module/ncs/hcrh_setbrntorch.ncs index 24880d35..2fc98c6b 100644 Binary files a/_module/ncs/hcrh_setbrntorch.ncs and b/_module/ncs/hcrh_setbrntorch.ncs differ diff --git a/_module/ncs/hcrh_setdmresrv.ncs b/_module/ncs/hcrh_setdmresrv.ncs index 7950af50..d458cfb7 100644 Binary files a/_module/ncs/hcrh_setdmresrv.ncs and b/_module/ncs/hcrh_setdmresrv.ncs differ diff --git a/_module/ncs/hcrh_setgivelvl.ncs b/_module/ncs/hcrh_setgivelvl.ncs index a26c956c..ea29c7eb 100644 Binary files a/_module/ncs/hcrh_setgivelvl.ncs and b/_module/ncs/hcrh_setgivelvl.ncs differ diff --git a/_module/ncs/hcrh_setlvlcost.ncs b/_module/ncs/hcrh_setlvlcost.ncs index 20810542..7ae725ec 100644 Binary files a/_module/ncs/hcrh_setlvlcost.ncs and b/_module/ncs/hcrh_setlvlcost.ncs differ diff --git a/_module/ncs/hcrh_setpktrack.ncs b/_module/ncs/hcrh_setpktrack.ncs index aa0f6819..f45c35a7 100644 Binary files a/_module/ncs/hcrh_setpktrack.ncs and b/_module/ncs/hcrh_setpktrack.ncs differ diff --git a/_module/ncs/hcrh_setrest.ncs b/_module/ncs/hcrh_setrest.ncs index 53b01d3f..5aa35b69 100644 Binary files a/_module/ncs/hcrh_setrest.ncs and b/_module/ncs/hcrh_setrest.ncs differ diff --git a/_module/ncs/hcrh_setrezchnce.ncs b/_module/ncs/hcrh_setrezchnce.ncs index 2604ed8d..77f0c7e0 100644 Binary files a/_module/ncs/hcrh_setrezchnce.ncs and b/_module/ncs/hcrh_setrezchnce.ncs differ diff --git a/_module/ncs/hcrh_setsumtime.ncs b/_module/ncs/hcrh_setsumtime.ncs index 1313c925..8d24ccae 100644 Binary files a/_module/ncs/hcrh_setsumtime.ncs and b/_module/ncs/hcrh_setsumtime.ncs differ diff --git a/_module/ncs/ranzisnotfree.ncs b/_module/ncs/ranzisnotfree.ncs index 2c713f44..1d6c7e13 100644 Binary files a/_module/ncs/ranzisnotfree.ncs and b/_module/ncs/ranzisnotfree.ncs differ diff --git a/_module/nss/anph_payout.nss b/_module/nss/anph_payout.nss index 61705ea1..2ca3e7ef 100644 --- a/_module/nss/anph_payout.nss +++ b/_module/nss/anph_payout.nss @@ -56,7 +56,7 @@ void main() int nAmount = nBaseAmount + FloatToInt(fExtraPerLevel * nLevel); object oTmpItem = CreateItemOnObject(sResRef, OBJECT_SELF); - int nPrice = max(GetGoldPieceValue(oTmpItem), 1) * nAmount; + int nPrice = PRCMax(GetGoldPieceValue(oTmpItem), 1) * nAmount; if (sResRef == "GOLD") nPrice = 10*nAmount; diff --git a/_module/nss/chr_inc.nss b/_module/nss/chr_inc.nss index 632165d3..090002cc 100644 --- a/_module/nss/chr_inc.nss +++ b/_module/nss/chr_inc.nss @@ -425,7 +425,7 @@ void chr_OnRest(object oPC, int nRestEvent) } NWNX_Object_SetCurrentHitPoints(oPC, - min(GetMaxHitPoints(oPC), GetLocalInt(oPC, CHR_REST_VAR_HITPOINTS_BEFORE_REST) + 5 + GetHitDice(oPC))); + PRCMin(GetMaxHitPoints(oPC), GetLocalInt(oPC, CHR_REST_VAR_HITPOINTS_BEFORE_REST) + 5 + GetHitDice(oPC))); RemoveBlackScreen(oPC); DeleteLocalInt(oPC, CHR_REST_VAR_REST_CANCELLED_BY_SCRIPT); diff --git a/_module/nss/dev_commands.nss b/_module/nss/dev_commands.nss index e80df717..b859c39b 100644 --- a/_module/nss/dev_commands.nss +++ b/_module/nss/dev_commands.nss @@ -112,7 +112,7 @@ void main() } else if ((sParams = ParseCommand(sMessage, "#gainitem")) != BADPARSE) { - CreateItemOnObject(sParams, oDM, max(1, StringToInt(sParams))); + CreateItemOnObject(sParams, oDM, PRCMax(1, StringToInt(sParams))); } else if ((sParams = ParseCommand(sMessage, "#pat")) != BADPARSE) { diff --git a/_module/nss/faction_inc.nss b/_module/nss/faction_inc.nss index 2b621a79..9c7155dc 100644 --- a/_module/nss/faction_inc.nss +++ b/_module/nss/faction_inc.nss @@ -161,7 +161,7 @@ void fctn_UpdateReputation(object creature) int relation = StringToInt(NWNX_SQL_ReadDataInActiveRow(1)); if (GetLocalInt(creature, "FACTION_SPARRING_MODE")) - relation = min(50, relation); + relation = PRCMin(50, relation); object rep = fctn_GetRepresentative(other); diff --git a/_module/nss/inc_array.nss b/_module/nss/inc_array.nss index 7671723d..25b6eca2 100644 --- a/_module/nss/inc_array.nss +++ b/_module/nss/inc_array.nss @@ -306,7 +306,7 @@ int Array_Find_Str(string tag, string element, object obj=OBJECT_INVALID) // Just create it before trying to select in case it doesn't exist yet. CreateArrayTable(tag, obj); - stmt = "SELECT IFNULL(MIN(ind),@invalid_index) FROM "+GetTableName(tag, obj)+" WHERE value = @element"; + stmt = "SELECT IFNULL(PRCMin(ind),@invalid_index) FROM "+GetTableName(tag, obj)+" WHERE value = @element"; sqlQuery = SqlPrepareQueryObject(GetModule(), stmt); SqlBindInt(sqlQuery, "@invalid_index", INVALID_INDEX); diff --git a/_module/nss/mod_onlevelup.nss b/_module/nss/mod_onlevelup.nss index 9ddb51f0..41d9e2b5 100644 --- a/_module/nss/mod_onlevelup.nss +++ b/_module/nss/mod_onlevelup.nss @@ -65,7 +65,7 @@ void main() int nLevel = util_GetLevel(oPC); int nINT = GetAbilityScore(oPC, ABILITY_INTELLIGENCE, TRUE); - int nMaxBankedSkillPoints = max(1, 1+(nINT - 10)/2); + int nMaxBankedSkillPoints = PRCMax(1, 1+(nINT - 10)/2); if (NWNX_Creature_GetSkillPointsRemaining(oPC) > nMaxBankedSkillPoints) { int nXP = GetXP(oPC); diff --git a/_module/nss/nwnx_inc_array.nss b/_module/nss/nwnx_inc_array.nss index 1d9294b0..74a15ae2 100644 --- a/_module/nss/nwnx_inc_array.nss +++ b/_module/nss/nwnx_inc_array.nss @@ -300,7 +300,7 @@ void Array_Erase(string tag, int index, object obj=OBJECT_INVALID) // if not found, return INVALID_INDEX int Array_Find_Str(string tag, string element, object obj=OBJECT_INVALID) { - string stmt = "SELECT IFNULL(MIN(ind),@invalid_index) FROM "+GetTableName(tag, obj)+" WHERE value = @element"; + string stmt = "SELECT IFNULL(PRCMin(ind),@invalid_index) FROM "+GetTableName(tag, obj)+" WHERE value = @element"; sqlquery sqlQuery = SqlPrepareQueryObject(GetModule(), stmt); SqlBindInt(sqlQuery, "@invalid_index", INVALID_INDEX); SqlBindString(sqlQuery, "@element", element); diff --git a/_module/nss/nwnx_redis.nss b/_module/nss/nwnx_redis.nss index 0ead8152..3e07f201 100644 --- a/_module/nss/nwnx_redis.nss +++ b/_module/nss/nwnx_redis.nss @@ -184,7 +184,7 @@ int NWNX_Redis_BRPOPLPUSH( * Time complexity: O(log(N)) with N being the number of elements in the sorted set. * Annotated return value: array */ -int NWNX_Redis_BZPOPMIN( +int NWNX_Redis_BZPOPPRCMin( string key, // Redis type: integer int timeout @@ -2615,7 +2615,7 @@ int NWNX_Redis_ZPOPMAX( * being the number of elements popped. * Annotated return value: array */ -int NWNX_Redis_ZPOPMIN( +int NWNX_Redis_ZPOPPRCMin( string key, // Redis type: integer int count = 0 @@ -3382,7 +3382,7 @@ int NWNX_Redis_BRPOPLPUSH( return NWNXPopInt(); } -int NWNX_Redis_BZPOPMIN( +int NWNX_Redis_BZPOPPRCMin( string key, // Redis type: integer int timeout @@ -5342,7 +5342,7 @@ int NWNX_Redis_ZPOPMAX( return NWNXPopInt(); } -int NWNX_Redis_ZPOPMIN( +int NWNX_Redis_ZPOPPRCMin( string key, // Redis type: integer int count = 0 diff --git a/_module/nss/nwnx_redis_short.nss b/_module/nss/nwnx_redis_short.nss index ec1945e6..aa8a46c6 100644 --- a/_module/nss/nwnx_redis_short.nss +++ b/_module/nss/nwnx_redis_short.nss @@ -179,7 +179,7 @@ int BRPOPLPUSH( * Time complexity: O(log(N)) with N being the number of elements in the sorted set. * Annotated return value: array */ -int BZPOPMIN( +int BZPOPPRCMin( string key, // Redis type: integer int timeout @@ -2610,7 +2610,7 @@ int ZPOPMAX( * being the number of elements popped. * Annotated return value: array */ -int ZPOPMIN( +int ZPOPPRCMin( string key, // Redis type: integer int count = 0 @@ -3377,7 +3377,7 @@ int BRPOPLPUSH( return NWNXPopInt(); } -int BZPOPMIN( +int BZPOPPRCMin( string key, // Redis type: integer int timeout @@ -5337,7 +5337,7 @@ int ZPOPMAX( return NWNXPopInt(); } -int ZPOPMIN( +int ZPOPPRCMin( string key, // Redis type: integer int count = 0 diff --git a/_module/nss/pc_onheart.nss b/_module/nss/pc_onheart.nss index d9f5167b..b50cf065 100644 --- a/_module/nss/pc_onheart.nss +++ b/_module/nss/pc_onheart.nss @@ -54,7 +54,7 @@ void main() if (nExtra > 0) { int nPercent = (nExtra*100) / nHeavyEnc; - nPercent = min(99, nPercent); + nPercent = PRCMin(99, nPercent); nFallChance += nPercent/2; if (bSidestep) diff --git a/_module/nss/spell_missile.nss b/_module/nss/spell_missile.nss index f5d3fd10..38d9b5c9 100644 --- a/_module/nss/spell_missile.nss +++ b/_module/nss/spell_missile.nss @@ -50,7 +50,7 @@ struct missiles GetMissiles(int nSpellId, object oCaster, int nMetaMagic) case SPELL_SHADOW_CONJURATION_MAGIC_MISSILE: m.vfx = VFX_IMP_MIRV; m.vfximpact = VFX_IMP_MAGBLUE; - m.count = min((1+nCasterLevel)/2, 5); + m.count = PRCMin((1+nCasterLevel)/2, 5); m.numdice = 1; m.whichdice = 4; m.dmgmod = 1; @@ -60,7 +60,7 @@ struct missiles GetMissiles(int nSpellId, object oCaster, int nMetaMagic) case SPELL_ISAACS_LESSER_MISSILE_STORM: m.vfx = VFX_IMP_MIRV; m.vfximpact = VFX_IMP_MAGBLUE; - m.count = min(nCasterLevel, 10); + m.count = PRCMin(nCasterLevel, 10); m.numdice = 1; m.whichdice = 6; m.dmgmod = 0; @@ -70,7 +70,7 @@ struct missiles GetMissiles(int nSpellId, object oCaster, int nMetaMagic) case SPELL_ISAACS_GREATER_MISSILE_STORM: m.vfx = VFX_IMP_MIRV; m.vfximpact = VFX_IMP_MAGBLUE; - m.count = min(nCasterLevel, 20); + m.count = PRCMin(nCasterLevel, 20); m.numdice = 2; m.whichdice = 6; m.dmgmod = 0; @@ -80,7 +80,7 @@ struct missiles GetMissiles(int nSpellId, object oCaster, int nMetaMagic) case SPELL_BALL_LIGHTNING: m.vfx = VFX_IMP_MIRV_ELECTRIC; m.vfximpact = VFX_IMP_LIGHTNING_S; - m.count = min(nCasterLevel, 15); + m.count = PRCMin(nCasterLevel, 15); m.numdice = 1; m.whichdice = 6; m.dmgmod = 0; @@ -100,7 +100,7 @@ struct missiles GetMissiles(int nSpellId, object oCaster, int nMetaMagic) case SPELL_FIREBRAND: m.vfx = VFX_IMP_MIRV_FLAME; m.vfximpact = VFX_IMP_FLAME_M; - m.count = min(nCasterLevel, 15); + m.count = PRCMin(nCasterLevel, 15); m.numdice = 1; m.whichdice = 6; m.dmgmod = nCasterLevel; diff --git a/_module/nss/spell_weapon.nss b/_module/nss/spell_weapon.nss index a74f0e0e..793cd0ce 100644 --- a/_module/nss/spell_weapon.nss +++ b/_module/nss/spell_weapon.nss @@ -238,9 +238,9 @@ void main() AddItemEnhancementEffect(oOffHand, fDuration, 1); break; case SPELL_GREATER_MAGIC_WEAPON: - AddItemEnhancementEffect(oWeapon, fDuration, min(nCasterLvl/3, 3)); + AddItemEnhancementEffect(oWeapon, fDuration, PRCMin(nCasterLvl/3, 3)); if (nApplyToOffHand) - AddItemEnhancementEffect(oOffHand, fDuration, min(nCasterLvl/3, 3)); + AddItemEnhancementEffect(oOffHand, fDuration, PRCMin(nCasterLvl/3, 3)); break; case SPELL_KEEN_EDGE: AddKeenEffectToWeapon(oWeapon, fDuration); diff --git a/_module/nss/util_inc.nss b/_module/nss/util_inc.nss index e6adefb1..f854e6e0 100644 --- a/_module/nss/util_inc.nss +++ b/_module/nss/util_inc.nss @@ -42,8 +42,8 @@ location util_DecodeLocation(string s); int util_IsWeapon(object oItem); -//int max(int a, int b) { return (a>b) ? a : b; } //:: Defined exactly the same in the PRC's -//int min(int a, int b) { return (ab) ? a : b; } //:: Defined exactly the same in the PRC's +//int PRCMin(int a, int b) { return (a