diff --git a/_haks/Compiler - UW2 - Haks.bat b/_haks/Compiler - UW2 - Haks.bat new file mode 100644 index 0000000..8ae3b81 --- /dev/null +++ b/_haks/Compiler - UW2 - Haks.bat @@ -0,0 +1,9 @@ +:loop +"C:\NWN Work\nwnsc.exe" -o -w -n "C:\Games\Steam\steamapps\common\Neverwinter Nights" -i "D:\NWN Repos\UW2_PRC\_haks\poa_exp_abilities";"D:\NWN Repos\PRC8\nwn\nwnprc\trunk\include" "D:\NWN Repos\UW2_PRC\_haks\poa_exp_abilities\*.nss" +if %errorLevel% == -1 goto :loop + +:loop +"C:\NWN Work\nwnsc.exe" -o -w -n "C:\Games\Steam\steamapps\common\Neverwinter Nights" -i "D:\NWN Repos\UW2_PRC\_haks\poa_exp_spells";"D:\NWN Repos\PRC8\nwn\nwnprc\trunk\include" "D:\NWN Repos\UW2_PRC\_haks\poa_exp_spells\*.nss" +if %errorLevel% == -1 goto :loop + +pause \ No newline at end of file diff --git a/_haks/poa_exp_abilities/PRC_vampdrain.ncs b/_haks/poa_exp_abilities/PRC_vampdrain.ncs index 6aa090a..dbb6427 100644 Binary files a/_haks/poa_exp_abilities/PRC_vampdrain.ncs and b/_haks/poa_exp_abilities/PRC_vampdrain.ncs differ diff --git a/_haks/poa_exp_abilities/inv_adeptbreath.ncs b/_haks/poa_exp_abilities/inv_adeptbreath.ncs index 45d710e..00bd45a 100644 Binary files a/_haks/poa_exp_abilities/inv_adeptbreath.ncs and b/_haks/poa_exp_abilities/inv_adeptbreath.ncs differ diff --git a/_haks/poa_exp_abilities/inv_drgnfireadpt.ncs b/_haks/poa_exp_abilities/inv_drgnfireadpt.ncs index df13a8d..f827e78 100644 Binary files a/_haks/poa_exp_abilities/inv_drgnfireadpt.ncs and b/_haks/poa_exp_abilities/inv_drgnfireadpt.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_aurablnda.ncs b/_haks/poa_exp_abilities/nw_s1_aurablnda.ncs index 376b84a..e4aa3c2 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_aurablnda.ncs and b/_haks/poa_exp_abilities/nw_s1_aurablnda.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_auracoldc.ncs b/_haks/poa_exp_abilities/nw_s1_auracoldc.ncs index 841ab57..a5e7712 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_auracoldc.ncs and b/_haks/poa_exp_abilities/nw_s1_auracoldc.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_auraelecc.ncs b/_haks/poa_exp_abilities/nw_s1_auraelecc.ncs index 6e622d9..2d8e4c0 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_auraelecc.ncs and b/_haks/poa_exp_abilities/nw_s1_auraelecc.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_aurafear.ncs b/_haks/poa_exp_abilities/nw_s1_aurafear.ncs index f6cfd5a..8612d76 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_aurafear.ncs and b/_haks/poa_exp_abilities/nw_s1_aurafear.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_aurafirec.ncs b/_haks/poa_exp_abilities/nw_s1_aurafirec.ncs index 50fe632..725e169 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_aurafirec.ncs and b/_haks/poa_exp_abilities/nw_s1_aurafirec.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_auramenca.ncs b/_haks/poa_exp_abilities/nw_s1_auramenca.ncs index ed889d3..507f037 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_auramenca.ncs and b/_haks/poa_exp_abilities/nw_s1_auramenca.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_auraprota.ncs b/_haks/poa_exp_abilities/nw_s1_auraprota.ncs index 468539b..cea1eec 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_auraprota.ncs and b/_haks/poa_exp_abilities/nw_s1_auraprota.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_aurastuna.ncs b/_haks/poa_exp_abilities/nw_s1_aurastuna.ncs index 279ae96..b6eda58 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_aurastuna.ncs and b/_haks/poa_exp_abilities/nw_s1_aurastuna.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_auraunata.ncs b/_haks/poa_exp_abilities/nw_s1_auraunata.ncs index adac269..8ebd947 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_auraunata.ncs and b/_haks/poa_exp_abilities/nw_s1_auraunata.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_aurauneaa.ncs b/_haks/poa_exp_abilities/nw_s1_aurauneaa.ncs index f2ae337..34bc167 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_aurauneaa.ncs and b/_haks/poa_exp_abilities/nw_s1_aurauneaa.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_barbrage.ncs b/_haks/poa_exp_abilities/nw_s1_barbrage.ncs index 6ca508a..c1d6ef3 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_barbrage.ncs and b/_haks/poa_exp_abilities/nw_s1_barbrage.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_barbrage.nss b/_haks/poa_exp_abilities/nw_s1_barbrage.nss index acae686..f6454d7 100644 --- a/_haks/poa_exp_abilities/nw_s1_barbrage.nss +++ b/_haks/poa_exp_abilities/nw_s1_barbrage.nss @@ -261,7 +261,7 @@ void main() if (nTotem) { int nTotemRage = GetMaxEssentiaCapacityFeat(oPC) - nEssentia; - int nExtraEss = max(nTotem/2, 1); + int nExtraEss = PRCMax(nTotem/2, 1); int nBoost; if (nExtraEss >= nTotemRage) { diff --git a/_haks/poa_exp_abilities/nw_s1_bltacid.ncs b/_haks/poa_exp_abilities/nw_s1_bltacid.ncs index 9e9d57b..a5952b3 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltacid.ncs and b/_haks/poa_exp_abilities/nw_s1_bltacid.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltcharm.ncs b/_haks/poa_exp_abilities/nw_s1_bltcharm.ncs index 60db2a7..2a37c20 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltcharm.ncs and b/_haks/poa_exp_abilities/nw_s1_bltcharm.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltchrdr.ncs b/_haks/poa_exp_abilities/nw_s1_bltchrdr.ncs index d86707e..1d69902 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltchrdr.ncs and b/_haks/poa_exp_abilities/nw_s1_bltchrdr.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltcold.ncs b/_haks/poa_exp_abilities/nw_s1_bltcold.ncs index 373a803..2d00a86 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltcold.ncs and b/_haks/poa_exp_abilities/nw_s1_bltcold.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltcondr.ncs b/_haks/poa_exp_abilities/nw_s1_bltcondr.ncs index e8c357f..6560555 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltcondr.ncs and b/_haks/poa_exp_abilities/nw_s1_bltcondr.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltconf.ncs b/_haks/poa_exp_abilities/nw_s1_bltconf.ncs index 914f4a1..e74ecf4 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltconf.ncs and b/_haks/poa_exp_abilities/nw_s1_bltconf.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltdaze.ncs b/_haks/poa_exp_abilities/nw_s1_bltdaze.ncs index 708985f..b8ec5d2 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltdaze.ncs and b/_haks/poa_exp_abilities/nw_s1_bltdaze.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltdeath.ncs b/_haks/poa_exp_abilities/nw_s1_bltdeath.ncs index c1ecd7d..ef10b59 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltdeath.ncs and b/_haks/poa_exp_abilities/nw_s1_bltdeath.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltdexdr.ncs b/_haks/poa_exp_abilities/nw_s1_bltdexdr.ncs index ecc2983..2904c69 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltdexdr.ncs and b/_haks/poa_exp_abilities/nw_s1_bltdexdr.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltdisese.ncs b/_haks/poa_exp_abilities/nw_s1_bltdisese.ncs index 8580d05..c81e0cc 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltdisese.ncs and b/_haks/poa_exp_abilities/nw_s1_bltdisese.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltdomn.ncs b/_haks/poa_exp_abilities/nw_s1_bltdomn.ncs index ab8a4be..3c354b3 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltdomn.ncs and b/_haks/poa_exp_abilities/nw_s1_bltdomn.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltfire.ncs b/_haks/poa_exp_abilities/nw_s1_bltfire.ncs index cf13fea..09ac47c 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltfire.ncs and b/_haks/poa_exp_abilities/nw_s1_bltfire.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltintdr.ncs b/_haks/poa_exp_abilities/nw_s1_bltintdr.ncs index 33b3da4..748e670 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltintdr.ncs and b/_haks/poa_exp_abilities/nw_s1_bltintdr.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltknckd.ncs b/_haks/poa_exp_abilities/nw_s1_bltknckd.ncs index 5c09819..e9a8d53 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltknckd.ncs and b/_haks/poa_exp_abilities/nw_s1_bltknckd.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltlightn.ncs b/_haks/poa_exp_abilities/nw_s1_bltlightn.ncs index 9315527..0286bec 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltlightn.ncs and b/_haks/poa_exp_abilities/nw_s1_bltlightn.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltlvldr.ncs b/_haks/poa_exp_abilities/nw_s1_bltlvldr.ncs index 7f6d6ea..e8628c5 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltlvldr.ncs and b/_haks/poa_exp_abilities/nw_s1_bltlvldr.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltparal.ncs b/_haks/poa_exp_abilities/nw_s1_bltparal.ncs index 352beb7..95cce17 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltparal.ncs and b/_haks/poa_exp_abilities/nw_s1_bltparal.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltpoison.ncs b/_haks/poa_exp_abilities/nw_s1_bltpoison.ncs index d7368cb..e4066f7 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltpoison.ncs and b/_haks/poa_exp_abilities/nw_s1_bltpoison.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltshards.ncs b/_haks/poa_exp_abilities/nw_s1_bltshards.ncs index b260bb7..00a5432 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltshards.ncs and b/_haks/poa_exp_abilities/nw_s1_bltshards.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltslow.ncs b/_haks/poa_exp_abilities/nw_s1_bltslow.ncs index 779dedd..d59eaa3 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltslow.ncs and b/_haks/poa_exp_abilities/nw_s1_bltslow.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltstrdr.ncs b/_haks/poa_exp_abilities/nw_s1_bltstrdr.ncs index 7ecf22e..7819b3e 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltstrdr.ncs and b/_haks/poa_exp_abilities/nw_s1_bltstrdr.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltstun.ncs b/_haks/poa_exp_abilities/nw_s1_bltstun.ncs index 0b8993e..7a8f0d3 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltstun.ncs and b/_haks/poa_exp_abilities/nw_s1_bltstun.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltweb.ncs b/_haks/poa_exp_abilities/nw_s1_bltweb.ncs index 25d622a..67c3671 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltweb.ncs and b/_haks/poa_exp_abilities/nw_s1_bltweb.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_bltwisdr.ncs b/_haks/poa_exp_abilities/nw_s1_bltwisdr.ncs index f357cf1..93d66dc 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_bltwisdr.ncs and b/_haks/poa_exp_abilities/nw_s1_bltwisdr.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_coneacid.ncs b/_haks/poa_exp_abilities/nw_s1_coneacid.ncs index bad0702..9b65127 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_coneacid.ncs and b/_haks/poa_exp_abilities/nw_s1_coneacid.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_conecold.ncs b/_haks/poa_exp_abilities/nw_s1_conecold.ncs index 21c9e7e..4f75c6e 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_conecold.ncs and b/_haks/poa_exp_abilities/nw_s1_conecold.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_conedisea.ncs b/_haks/poa_exp_abilities/nw_s1_conedisea.ncs index 3bac3eb..7ddb012 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_conedisea.ncs and b/_haks/poa_exp_abilities/nw_s1_conedisea.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_coneelec.ncs b/_haks/poa_exp_abilities/nw_s1_coneelec.ncs index f1cfdc7..11ecb35 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_coneelec.ncs and b/_haks/poa_exp_abilities/nw_s1_coneelec.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_conesonic.ncs b/_haks/poa_exp_abilities/nw_s1_conesonic.ncs index f7b256b..3dfb15d 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_conesonic.ncs and b/_haks/poa_exp_abilities/nw_s1_conesonic.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_dragacid.ncs b/_haks/poa_exp_abilities/nw_s1_dragacid.ncs index 9a9f109..f69e944 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_dragacid.ncs and b/_haks/poa_exp_abilities/nw_s1_dragacid.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_dragcold.ncs b/_haks/poa_exp_abilities/nw_s1_dragcold.ncs index d72ee7e..c390afa 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_dragcold.ncs and b/_haks/poa_exp_abilities/nw_s1_dragcold.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_dragfear.ncs b/_haks/poa_exp_abilities/nw_s1_dragfear.ncs index e0a66af..5fd6d0a 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_dragfear.ncs and b/_haks/poa_exp_abilities/nw_s1_dragfear.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_dragfeara.ncs b/_haks/poa_exp_abilities/nw_s1_dragfeara.ncs index 717ef4f..fe3245d 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_dragfeara.ncs and b/_haks/poa_exp_abilities/nw_s1_dragfeara.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_dragfire.ncs b/_haks/poa_exp_abilities/nw_s1_dragfire.ncs index 7a50490..47a34c2 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_dragfire.ncs and b/_haks/poa_exp_abilities/nw_s1_dragfire.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_draggas.ncs b/_haks/poa_exp_abilities/nw_s1_draggas.ncs index 1921e1a..2528b3c 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_draggas.ncs and b/_haks/poa_exp_abilities/nw_s1_draggas.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_draglight.ncs b/_haks/poa_exp_abilities/nw_s1_draglight.ncs index 80fe60f..813fe99 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_draglight.ncs and b/_haks/poa_exp_abilities/nw_s1_draglight.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_dragparal.ncs b/_haks/poa_exp_abilities/nw_s1_dragparal.ncs index b1be0de..4fcdc84 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_dragparal.ncs and b/_haks/poa_exp_abilities/nw_s1_dragparal.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_dragsleep.ncs b/_haks/poa_exp_abilities/nw_s1_dragsleep.ncs index aaeebf8..b4033fa 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_dragsleep.ncs and b/_haks/poa_exp_abilities/nw_s1_dragsleep.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_dragslow.ncs b/_haks/poa_exp_abilities/nw_s1_dragslow.ncs index 186c19e..1e7982b 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_dragslow.ncs and b/_haks/poa_exp_abilities/nw_s1_dragslow.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_dragweak.ncs b/_haks/poa_exp_abilities/nw_s1_dragweak.ncs index a1071d4..7467ec4 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_dragweak.ncs and b/_haks/poa_exp_abilities/nw_s1_dragweak.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_feroc3.ncs b/_haks/poa_exp_abilities/nw_s1_feroc3.ncs index 25681cd..dfb32e0 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_feroc3.ncs and b/_haks/poa_exp_abilities/nw_s1_feroc3.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_gazechaos.ncs b/_haks/poa_exp_abilities/nw_s1_gazechaos.ncs index 584a1fd..5f62c74 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_gazechaos.ncs and b/_haks/poa_exp_abilities/nw_s1_gazechaos.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_gazecharm.ncs b/_haks/poa_exp_abilities/nw_s1_gazecharm.ncs index b27cd59..f5b734c 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_gazecharm.ncs and b/_haks/poa_exp_abilities/nw_s1_gazecharm.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_gazeconfu.ncs b/_haks/poa_exp_abilities/nw_s1_gazeconfu.ncs index f5a010f..58011c9 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_gazeconfu.ncs and b/_haks/poa_exp_abilities/nw_s1_gazeconfu.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_gazedaze.ncs b/_haks/poa_exp_abilities/nw_s1_gazedaze.ncs index d63fc80..340d88c 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_gazedaze.ncs and b/_haks/poa_exp_abilities/nw_s1_gazedaze.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_gazedeath.ncs b/_haks/poa_exp_abilities/nw_s1_gazedeath.ncs index 149369a..8c6da0f 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_gazedeath.ncs and b/_haks/poa_exp_abilities/nw_s1_gazedeath.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_gazedomn.ncs b/_haks/poa_exp_abilities/nw_s1_gazedomn.ncs index ec2f33f..abbfe06 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_gazedomn.ncs and b/_haks/poa_exp_abilities/nw_s1_gazedomn.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_gazedoom.ncs b/_haks/poa_exp_abilities/nw_s1_gazedoom.ncs index 9b0f39a..459bd71 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_gazedoom.ncs and b/_haks/poa_exp_abilities/nw_s1_gazedoom.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_gazeevil.ncs b/_haks/poa_exp_abilities/nw_s1_gazeevil.ncs index d5e209d..e59ef93 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_gazeevil.ncs and b/_haks/poa_exp_abilities/nw_s1_gazeevil.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_gazefear.ncs b/_haks/poa_exp_abilities/nw_s1_gazefear.ncs index bb9fe90..1933b6a 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_gazefear.ncs and b/_haks/poa_exp_abilities/nw_s1_gazefear.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_gazegood.ncs b/_haks/poa_exp_abilities/nw_s1_gazegood.ncs index 33deeef..22b27ce 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_gazegood.ncs and b/_haks/poa_exp_abilities/nw_s1_gazegood.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_gazelaw.ncs b/_haks/poa_exp_abilities/nw_s1_gazelaw.ncs index c4d06dc..9869323 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_gazelaw.ncs and b/_haks/poa_exp_abilities/nw_s1_gazelaw.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_gazestun.ncs b/_haks/poa_exp_abilities/nw_s1_gazestun.ncs index 717ed05..d6fc354 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_gazestun.ncs and b/_haks/poa_exp_abilities/nw_s1_gazestun.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_golemgas.ncs b/_haks/poa_exp_abilities/nw_s1_golemgas.ncs index 5d6dbb8..efb74ee 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_golemgas.ncs and b/_haks/poa_exp_abilities/nw_s1_golemgas.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_hndbreath.ncs b/_haks/poa_exp_abilities/nw_s1_hndbreath.ncs index aa1ea7e..39b6ab6 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_hndbreath.ncs and b/_haks/poa_exp_abilities/nw_s1_hndbreath.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_howlconf.ncs b/_haks/poa_exp_abilities/nw_s1_howlconf.ncs index 10cd020..2649dad 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_howlconf.ncs and b/_haks/poa_exp_abilities/nw_s1_howlconf.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_howldaze.ncs b/_haks/poa_exp_abilities/nw_s1_howldaze.ncs index 82237ef..fc595ff 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_howldaze.ncs and b/_haks/poa_exp_abilities/nw_s1_howldaze.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_howldeath.ncs b/_haks/poa_exp_abilities/nw_s1_howldeath.ncs index 06fe047..c1f8a98 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_howldeath.ncs and b/_haks/poa_exp_abilities/nw_s1_howldeath.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_howlfear.ncs b/_haks/poa_exp_abilities/nw_s1_howlfear.ncs index a2af6c1..1ac9f0e 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_howlfear.ncs and b/_haks/poa_exp_abilities/nw_s1_howlfear.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_howlparal.ncs b/_haks/poa_exp_abilities/nw_s1_howlparal.ncs index aed4415..42488a9 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_howlparal.ncs and b/_haks/poa_exp_abilities/nw_s1_howlparal.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_howlsonic.ncs b/_haks/poa_exp_abilities/nw_s1_howlsonic.ncs index 62c8872..ae721fd 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_howlsonic.ncs and b/_haks/poa_exp_abilities/nw_s1_howlsonic.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_howlstun.ncs b/_haks/poa_exp_abilities/nw_s1_howlstun.ncs index 28a19f6..9a8d7f6 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_howlstun.ncs and b/_haks/poa_exp_abilities/nw_s1_howlstun.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_krenscare.ncs b/_haks/poa_exp_abilities/nw_s1_krenscare.ncs index 484b807..8f7fa04 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_krenscare.ncs and b/_haks/poa_exp_abilities/nw_s1_krenscare.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_mephsalt.ncs b/_haks/poa_exp_abilities/nw_s1_mephsalt.ncs index 0e92ae3..5406ee0 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_mephsalt.ncs and b/_haks/poa_exp_abilities/nw_s1_mephsalt.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_mephsteam.ncs b/_haks/poa_exp_abilities/nw_s1_mephsteam.ncs index 91107e1..f61d7ef 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_mephsteam.ncs and b/_haks/poa_exp_abilities/nw_s1_mephsteam.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_mumundead.ncs b/_haks/poa_exp_abilities/nw_s1_mumundead.ncs index 6897b90..2205868 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_mumundead.ncs and b/_haks/poa_exp_abilities/nw_s1_mumundead.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_pulschrdr.ncs b/_haks/poa_exp_abilities/nw_s1_pulschrdr.ncs index e3f8c5a..acc6c11 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_pulschrdr.ncs and b/_haks/poa_exp_abilities/nw_s1_pulschrdr.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_pulscold.ncs b/_haks/poa_exp_abilities/nw_s1_pulscold.ncs index b17e5af..23df913 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_pulscold.ncs and b/_haks/poa_exp_abilities/nw_s1_pulscold.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_pulscondr.ncs b/_haks/poa_exp_abilities/nw_s1_pulscondr.ncs index a130192..39b62d7 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_pulscondr.ncs and b/_haks/poa_exp_abilities/nw_s1_pulscondr.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_pulsdeath.ncs b/_haks/poa_exp_abilities/nw_s1_pulsdeath.ncs index 230f564..6879326 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_pulsdeath.ncs and b/_haks/poa_exp_abilities/nw_s1_pulsdeath.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_pulsdexdr.ncs b/_haks/poa_exp_abilities/nw_s1_pulsdexdr.ncs index a2fd884..60b1f47 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_pulsdexdr.ncs and b/_haks/poa_exp_abilities/nw_s1_pulsdexdr.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_pulsdis.ncs b/_haks/poa_exp_abilities/nw_s1_pulsdis.ncs index 80e023b..39c19ba 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_pulsdis.ncs and b/_haks/poa_exp_abilities/nw_s1_pulsdis.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_pulselec.ncs b/_haks/poa_exp_abilities/nw_s1_pulselec.ncs index 40fc5cf..dd6a5f0 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_pulselec.ncs and b/_haks/poa_exp_abilities/nw_s1_pulselec.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_pulsfire.ncs b/_haks/poa_exp_abilities/nw_s1_pulsfire.ncs index 20f097e..1da13e5 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_pulsfire.ncs and b/_haks/poa_exp_abilities/nw_s1_pulsfire.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_pulsholy.ncs b/_haks/poa_exp_abilities/nw_s1_pulsholy.ncs index c230207..3b93769 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_pulsholy.ncs and b/_haks/poa_exp_abilities/nw_s1_pulsholy.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_pulsintdr.ncs b/_haks/poa_exp_abilities/nw_s1_pulsintdr.ncs index 6730fc8..ddf504a 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_pulsintdr.ncs and b/_haks/poa_exp_abilities/nw_s1_pulsintdr.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_pulslvldr.ncs b/_haks/poa_exp_abilities/nw_s1_pulslvldr.ncs index de1184e..408bf6e 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_pulslvldr.ncs and b/_haks/poa_exp_abilities/nw_s1_pulslvldr.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_pulsneg.ncs b/_haks/poa_exp_abilities/nw_s1_pulsneg.ncs index 373c052..7dc823b 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_pulsneg.ncs and b/_haks/poa_exp_abilities/nw_s1_pulsneg.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_pulspois.ncs b/_haks/poa_exp_abilities/nw_s1_pulspois.ncs index cafb629..a381a67 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_pulspois.ncs and b/_haks/poa_exp_abilities/nw_s1_pulspois.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_pulsspore.ncs b/_haks/poa_exp_abilities/nw_s1_pulsspore.ncs index 723d855..4f7e590 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_pulsspore.ncs and b/_haks/poa_exp_abilities/nw_s1_pulsspore.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_pulsstrdr.ncs b/_haks/poa_exp_abilities/nw_s1_pulsstrdr.ncs index aa85653..704c1ca 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_pulsstrdr.ncs and b/_haks/poa_exp_abilities/nw_s1_pulsstrdr.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_pulswind.ncs b/_haks/poa_exp_abilities/nw_s1_pulswind.ncs index 92fccc7..75d4133 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_pulswind.ncs and b/_haks/poa_exp_abilities/nw_s1_pulswind.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_pulswisdr.ncs b/_haks/poa_exp_abilities/nw_s1_pulswisdr.ncs index 19253de..da829ca 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_pulswisdr.ncs and b/_haks/poa_exp_abilities/nw_s1_pulswisdr.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_smokeclaw.ncs b/_haks/poa_exp_abilities/nw_s1_smokeclaw.ncs index ebed03b..2e5a547 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_smokeclaw.ncs and b/_haks/poa_exp_abilities/nw_s1_smokeclaw.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_stink_a.ncs b/_haks/poa_exp_abilities/nw_s1_stink_a.ncs index bb2bc5b..bca10c2 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_stink_a.ncs and b/_haks/poa_exp_abilities/nw_s1_stink_a.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_tyrantfga.ncs b/_haks/poa_exp_abilities/nw_s1_tyrantfga.ncs index a28a1df..5f27b26 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_tyrantfga.ncs and b/_haks/poa_exp_abilities/nw_s1_tyrantfga.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s1_tyrantfog.ncs b/_haks/poa_exp_abilities/nw_s1_tyrantfog.ncs index 609cad3..8ba90b5 100644 Binary files a/_haks/poa_exp_abilities/nw_s1_tyrantfog.ncs and b/_haks/poa_exp_abilities/nw_s1_tyrantfog.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s2_bardsong.ncs b/_haks/poa_exp_abilities/nw_s2_bardsong.ncs index 2c2a620..3428a1d 100644 Binary files a/_haks/poa_exp_abilities/nw_s2_bardsong.ncs and b/_haks/poa_exp_abilities/nw_s2_bardsong.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s2_divprot.ncs b/_haks/poa_exp_abilities/nw_s2_divprot.ncs index f82e447..7f7632c 100644 Binary files a/_haks/poa_exp_abilities/nw_s2_divprot.ncs and b/_haks/poa_exp_abilities/nw_s2_divprot.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s2_elemshape.ncs b/_haks/poa_exp_abilities/nw_s2_elemshape.ncs index 2f1ba95..2d1b236 100644 Binary files a/_haks/poa_exp_abilities/nw_s2_elemshape.ncs and b/_haks/poa_exp_abilities/nw_s2_elemshape.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s2_layonhand.ncs b/_haks/poa_exp_abilities/nw_s2_layonhand.ncs index a4dc22d..6935948 100644 Binary files a/_haks/poa_exp_abilities/nw_s2_layonhand.ncs and b/_haks/poa_exp_abilities/nw_s2_layonhand.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s2_wildshape.ncs b/_haks/poa_exp_abilities/nw_s2_wildshape.ncs index 2cff3ab..c13a44e 100644 Binary files a/_haks/poa_exp_abilities/nw_s2_wildshape.ncs and b/_haks/poa_exp_abilities/nw_s2_wildshape.ncs differ diff --git a/_haks/poa_exp_abilities/nw_s3_balordeth.ncs b/_haks/poa_exp_abilities/nw_s3_balordeth.ncs index 3ea0a56..4e9dd36 100644 Binary files a/_haks/poa_exp_abilities/nw_s3_balordeth.ncs and b/_haks/poa_exp_abilities/nw_s3_balordeth.ncs differ diff --git a/_haks/poa_exp_abilities/prc_hexbl_comp_a.ncs b/_haks/poa_exp_abilities/prc_hexbl_comp_a.ncs index 1c7d42b..3ff2771 100644 Binary files a/_haks/poa_exp_abilities/prc_hexbl_comp_a.ncs and b/_haks/poa_exp_abilities/prc_hexbl_comp_a.ncs differ diff --git a/_haks/poa_exp_abilities/prc_hexbl_comp_c.ncs b/_haks/poa_exp_abilities/prc_hexbl_comp_c.ncs index 126ad6f..6f21372 100644 Binary files a/_haks/poa_exp_abilities/prc_hexbl_comp_c.ncs and b/_haks/poa_exp_abilities/prc_hexbl_comp_c.ncs differ diff --git a/_haks/poa_exp_abilities/prc_hexbl_curse.ncs b/_haks/poa_exp_abilities/prc_hexbl_curse.ncs index 084939a..a7927e5 100644 Binary files a/_haks/poa_exp_abilities/prc_hexbl_curse.ncs and b/_haks/poa_exp_abilities/prc_hexbl_curse.ncs differ diff --git a/_haks/poa_exp_abilities/prc_kotmc_combat.ncs b/_haks/poa_exp_abilities/prc_kotmc_combat.ncs index 83b491c..ffe4122 100644 Binary files a/_haks/poa_exp_abilities/prc_kotmc_combat.ncs and b/_haks/poa_exp_abilities/prc_kotmc_combat.ncs differ diff --git a/_haks/poa_exp_abilities/psi_sk_manifmbld.ncs b/_haks/poa_exp_abilities/psi_sk_manifmbld.ncs index b9fee17..6f0e3e2 100644 Binary files a/_haks/poa_exp_abilities/psi_sk_manifmbld.ncs and b/_haks/poa_exp_abilities/psi_sk_manifmbld.ncs differ diff --git a/_haks/poa_exp_abilities/psi_sk_manifmbld.nss b/_haks/poa_exp_abilities/psi_sk_manifmbld.nss index 866382d..0110af2 100644 --- a/_haks/poa_exp_abilities/psi_sk_manifmbld.nss +++ b/_haks/poa_exp_abilities/psi_sk_manifmbld.nss @@ -138,7 +138,7 @@ void BuildMindblade(object oPC, object oMbld, int nMbldType) int nSKLevel = GetLevelByClass(CLASS_TYPE_SOULKNIFE, oPC); /* if(GetHasFeat(FEAT_PRACTICED_MIND_BLADE, oPC)){ int nNonSoulKnifeLevels = GetHitDice(oPC) - nSKLevel; - nSKLevel += min(nNonSoulKnifeLevels, 4); + nSKLevel += PRCMin(nNonSoulKnifeLevels, 4); } */ int nEnh; // The first actual enhancement bonus is gained at L4, but the mindblade needs to diff --git a/_haks/poa_exp_abilities/x0_s2_daze.ncs b/_haks/poa_exp_abilities/x0_s2_daze.ncs index aa14a76..5856a65 100644 Binary files a/_haks/poa_exp_abilities/x0_s2_daze.ncs and b/_haks/poa_exp_abilities/x0_s2_daze.ncs differ diff --git a/_haks/poa_exp_abilities/x0_s2_shadsum.ncs b/_haks/poa_exp_abilities/x0_s2_shadsum.ncs index 18b4706..9aaebf5 100644 Binary files a/_haks/poa_exp_abilities/x0_s2_shadsum.ncs and b/_haks/poa_exp_abilities/x0_s2_shadsum.ncs differ diff --git a/_haks/poa_exp_abilities/x0_s3_summonelem.ncs b/_haks/poa_exp_abilities/x0_s3_summonelem.ncs index 3325627..783c2a4 100644 Binary files a/_haks/poa_exp_abilities/x0_s3_summonelem.ncs and b/_haks/poa_exp_abilities/x0_s3_summonelem.ncs differ diff --git a/_haks/poa_exp_abilities/x1_s2_deatharrow.ncs b/_haks/poa_exp_abilities/x1_s2_deatharrow.ncs index 67d898d..6f20290 100644 Binary files a/_haks/poa_exp_abilities/x1_s2_deatharrow.ncs and b/_haks/poa_exp_abilities/x1_s2_deatharrow.ncs differ diff --git a/_haks/poa_exp_abilities/x1_s2_hailarrow.ncs b/_haks/poa_exp_abilities/x1_s2_hailarrow.ncs index c30f267..7d41670 100644 Binary files a/_haks/poa_exp_abilities/x1_s2_hailarrow.ncs and b/_haks/poa_exp_abilities/x1_s2_hailarrow.ncs differ diff --git a/_haks/poa_exp_abilities/x2_s1_dragneg.ncs b/_haks/poa_exp_abilities/x2_s1_dragneg.ncs index c0f688f..8d5c730 100644 Binary files a/_haks/poa_exp_abilities/x2_s1_dragneg.ncs and b/_haks/poa_exp_abilities/x2_s1_dragneg.ncs differ diff --git a/_haks/poa_exp_abilities/x2_s2_cursesong.ncs b/_haks/poa_exp_abilities/x2_s2_cursesong.ncs index 05011c7..1f56853 100644 Binary files a/_haks/poa_exp_abilities/x2_s2_cursesong.ncs and b/_haks/poa_exp_abilities/x2_s2_cursesong.ncs differ diff --git a/_haks/poa_exp_abilities/x2_s2_discbreath.ncs b/_haks/poa_exp_abilities/x2_s2_discbreath.ncs index 8617928..b854f0d 100644 Binary files a/_haks/poa_exp_abilities/x2_s2_discbreath.ncs and b/_haks/poa_exp_abilities/x2_s2_discbreath.ncs differ diff --git a/_haks/poa_exp_abilities/x2_s2_discbreath.nss b/_haks/poa_exp_abilities/x2_s2_discbreath.nss index 76cc85d..eee28a3 100644 --- a/_haks/poa_exp_abilities/x2_s2_discbreath.nss +++ b/_haks/poa_exp_abilities/x2_s2_discbreath.nss @@ -149,7 +149,7 @@ void main() //Sets the save DC for Dragon Breath attacks. This is a reflex save to halve the damage. //Save is 10+CON+1/2 DD level. Gains +1 at level 13, and every 3 levels after. - int nSaveDCBonus = ((nLevel)/2) + max((nLevel - 10) / 3, 0); + int nSaveDCBonus = ((nLevel)/2) + PRCMax((nLevel - 10) / 3, 0); //Sets damage levels for Dragon Breath attacks. 2d10 at level 3, //4d10 at level 7, and then an additional 2d10 every 3 levels (10, 13, 16, ect) diff --git a/_haks/poa_exp_abilities/x2_s2_epicward.ncs b/_haks/poa_exp_abilities/x2_s2_epicward.ncs index 9a63405..99888fc 100644 Binary files a/_haks/poa_exp_abilities/x2_s2_epicward.ncs and b/_haks/poa_exp_abilities/x2_s2_epicward.ncs differ diff --git a/_haks/poa_exp_abilities/x2_s2_epmagearm.ncs b/_haks/poa_exp_abilities/x2_s2_epmagearm.ncs index e8ebde7..469094b 100644 Binary files a/_haks/poa_exp_abilities/x2_s2_epmagearm.ncs and b/_haks/poa_exp_abilities/x2_s2_epmagearm.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_aid.ncs b/_haks/poa_exp_spells/nw_s0_aid.ncs index 3e0560b..e465442 100644 Binary files a/_haks/poa_exp_spells/nw_s0_aid.ncs and b/_haks/poa_exp_spells/nw_s0_aid.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_awaken.ncs b/_haks/poa_exp_spells/nw_s0_awaken.ncs index efbea1e..14139c7 100644 Binary files a/_haks/poa_exp_spells/nw_s0_awaken.ncs and b/_haks/poa_exp_spells/nw_s0_awaken.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_barkskin.ncs b/_haks/poa_exp_spells/nw_s0_barkskin.ncs index cdf36d9..c149306 100644 Binary files a/_haks/poa_exp_spells/nw_s0_barkskin.ncs and b/_haks/poa_exp_spells/nw_s0_barkskin.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_bladebara.ncs b/_haks/poa_exp_spells/nw_s0_bladebara.ncs index 060296b..552305f 100644 Binary files a/_haks/poa_exp_spells/nw_s0_bladebara.ncs and b/_haks/poa_exp_spells/nw_s0_bladebara.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_bladebarc.ncs b/_haks/poa_exp_spells/nw_s0_bladebarc.ncs index 33bcd33..a4f6d5d 100644 Binary files a/_haks/poa_exp_spells/nw_s0_bladebarc.ncs and b/_haks/poa_exp_spells/nw_s0_bladebarc.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_burnhand.ncs b/_haks/poa_exp_spells/nw_s0_burnhand.ncs index 70c0d0a..d0af5bf 100644 Binary files a/_haks/poa_exp_spells/nw_s0_burnhand.ncs and b/_haks/poa_exp_spells/nw_s0_burnhand.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_burnhand.nss b/_haks/poa_exp_spells/nw_s0_burnhand.nss index 95ec18c..a4532f9 100644 --- a/_haks/poa_exp_spells/nw_s0_burnhand.nss +++ b/_haks/poa_exp_spells/nw_s0_burnhand.nss @@ -48,7 +48,7 @@ void main() int nMetaMagic = PRCGetMetaMagicFeat(); int EleDmg = ChangedElementalDamage(oCaster, DAMAGE_TYPE_FIRE); int nSaveType = ChangedSaveType(EleDmg); - int nDice = min(20, nCasterLevel); + int nDice = PRCMin(20, nCasterLevel); int nDamage; float fDist; diff --git a/_haks/poa_exp_spells/nw_s0_calllghtn.ncs b/_haks/poa_exp_spells/nw_s0_calllghtn.ncs index 8cb8776..e4a20b2 100644 Binary files a/_haks/poa_exp_spells/nw_s0_calllghtn.ncs and b/_haks/poa_exp_spells/nw_s0_calllghtn.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_calllghtn.nss b/_haks/poa_exp_spells/nw_s0_calllghtn.nss index 513e277..cfaf2b1 100644 --- a/_haks/poa_exp_spells/nw_s0_calllghtn.nss +++ b/_haks/poa_exp_spells/nw_s0_calllghtn.nss @@ -64,7 +64,7 @@ void main() int nCasterLvl = PRCGetCasterLevel(oCaster); int nPenetr = nCasterLvl + SPGetPenetr(); int nMetaMagic = PRCGetMetaMagicFeat(); - int nDice = min(20, nCasterLvl); + int nDice = PRCMin(20, nCasterLvl); int EleDmg = ChangedElementalDamage(oCaster, DAMAGE_TYPE_ELECTRICAL); int nSaveType = ChangedSaveType(EleDmg); diff --git a/_haks/poa_exp_spells/nw_s0_chlightn.ncs b/_haks/poa_exp_spells/nw_s0_chlightn.ncs index 812b292..bb57ab5 100644 Binary files a/_haks/poa_exp_spells/nw_s0_chlightn.ncs and b/_haks/poa_exp_spells/nw_s0_chlightn.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_circdeath.ncs b/_haks/poa_exp_spells/nw_s0_circdeath.ncs index ff00c2a..10196ef 100644 Binary files a/_haks/poa_exp_spells/nw_s0_circdeath.ncs and b/_haks/poa_exp_spells/nw_s0_circdeath.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_cloudkilla.ncs b/_haks/poa_exp_spells/nw_s0_cloudkilla.ncs index b431518..32f493d 100644 Binary files a/_haks/poa_exp_spells/nw_s0_cloudkilla.ncs and b/_haks/poa_exp_spells/nw_s0_cloudkilla.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_cloudkillc.ncs b/_haks/poa_exp_spells/nw_s0_cloudkillc.ncs index bcaf0dc..643994e 100644 Binary files a/_haks/poa_exp_spells/nw_s0_cloudkillc.ncs and b/_haks/poa_exp_spells/nw_s0_cloudkillc.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_colspray.ncs b/_haks/poa_exp_spells/nw_s0_colspray.ncs index bcdb487..8f33f3c 100644 Binary files a/_haks/poa_exp_spells/nw_s0_colspray.ncs and b/_haks/poa_exp_spells/nw_s0_colspray.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_conecold.ncs b/_haks/poa_exp_spells/nw_s0_conecold.ncs index 89a3148..8b0e2ba 100644 Binary files a/_haks/poa_exp_spells/nw_s0_conecold.ncs and b/_haks/poa_exp_spells/nw_s0_conecold.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_daze.ncs b/_haks/poa_exp_spells/nw_s0_daze.ncs index 03420d9..8b07664 100644 Binary files a/_haks/poa_exp_spells/nw_s0_daze.ncs and b/_haks/poa_exp_spells/nw_s0_daze.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_delfirea.ncs b/_haks/poa_exp_spells/nw_s0_delfirea.ncs index 04127f0..383980a 100644 Binary files a/_haks/poa_exp_spells/nw_s0_delfirea.ncs and b/_haks/poa_exp_spells/nw_s0_delfirea.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_destruc.ncs b/_haks/poa_exp_spells/nw_s0_destruc.ncs index 4993316..2a16520 100644 Binary files a/_haks/poa_exp_spells/nw_s0_destruc.ncs and b/_haks/poa_exp_spells/nw_s0_destruc.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_dismagic.ncs b/_haks/poa_exp_spells/nw_s0_dismagic.ncs index 2927b63..04b603d 100644 Binary files a/_haks/poa_exp_spells/nw_s0_dismagic.ncs and b/_haks/poa_exp_spells/nw_s0_dismagic.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_enedrain.ncs b/_haks/poa_exp_spells/nw_s0_enedrain.ncs index ed6cff8..c6dd3d4 100644 Binary files a/_haks/poa_exp_spells/nw_s0_enedrain.ncs and b/_haks/poa_exp_spells/nw_s0_enedrain.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_enervat.ncs b/_haks/poa_exp_spells/nw_s0_enervat.ncs index 3f3c6d7..4cb71ed 100644 Binary files a/_haks/poa_exp_spells/nw_s0_enervat.ncs and b/_haks/poa_exp_spells/nw_s0_enervat.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_fireball.ncs b/_haks/poa_exp_spells/nw_s0_fireball.ncs index 30d21bb..8391119 100644 Binary files a/_haks/poa_exp_spells/nw_s0_fireball.ncs and b/_haks/poa_exp_spells/nw_s0_fireball.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_fireball.nss b/_haks/poa_exp_spells/nw_s0_fireball.nss index 81d21fd..9be118f 100644 --- a/_haks/poa_exp_spells/nw_s0_fireball.nss +++ b/_haks/poa_exp_spells/nw_s0_fireball.nss @@ -43,7 +43,7 @@ void main() effect eVis = EffectVisualEffect(VFX_IMP_FLAME_M); effect eDam; //Limit Caster level for the purposes of damage - int nDice = min(20, nCasterLvl); //alterado rafael era 10 mudei para 20 d6 + int nDice = PRCMin(20, nCasterLvl); //alterado rafael era 10 mudei para 20 d6 nCasterLvl += SPGetPenetr(); diff --git a/_haks/poa_exp_spells/nw_s0_firestrm.ncs b/_haks/poa_exp_spells/nw_s0_firestrm.ncs index 7d1e2dd..b4c2c4a 100644 Binary files a/_haks/poa_exp_spells/nw_s0_firestrm.ncs and b/_haks/poa_exp_spells/nw_s0_firestrm.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_flmstrike.ncs b/_haks/poa_exp_spells/nw_s0_flmstrike.ncs index 6b1af8f..17eee56 100644 Binary files a/_haks/poa_exp_spells/nw_s0_flmstrike.ncs and b/_haks/poa_exp_spells/nw_s0_flmstrike.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_flmstrike.nss b/_haks/poa_exp_spells/nw_s0_flmstrike.nss index 02417b3..2669c89 100644 --- a/_haks/poa_exp_spells/nw_s0_flmstrike.nss +++ b/_haks/poa_exp_spells/nw_s0_flmstrike.nss @@ -36,7 +36,7 @@ void main() int nMetaMagic = PRCGetMetaMagicFeat(); int EleDmg = ChangedElementalDamage(oCaster, DAMAGE_TYPE_FIRE); int nSaveType = ChangedSaveType(EleDmg); - int nDice = min(40, nCasterLvl); + int nDice = PRCMin(40, nCasterLvl); int nDamage, nDamage2; effect eStrike = EffectVisualEffect(VFX_IMP_DIVINE_STRIKE_FIRE); diff --git a/_haks/poa_exp_spells/nw_s0_grdispel.ncs b/_haks/poa_exp_spells/nw_s0_grdispel.ncs index ee54459..8f6a4a7 100644 Binary files a/_haks/poa_exp_spells/nw_s0_grdispel.ncs and b/_haks/poa_exp_spells/nw_s0_grdispel.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_hammgods.ncs b/_haks/poa_exp_spells/nw_s0_hammgods.ncs index a7a5e67..8480d42 100644 Binary files a/_haks/poa_exp_spells/nw_s0_hammgods.ncs and b/_haks/poa_exp_spells/nw_s0_hammgods.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_healcirc.ncs b/_haks/poa_exp_spells/nw_s0_healcirc.ncs index bfe908d..fd5f6f5 100644 Binary files a/_haks/poa_exp_spells/nw_s0_healcirc.ncs and b/_haks/poa_exp_spells/nw_s0_healcirc.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_healharm.ncs b/_haks/poa_exp_spells/nw_s0_healharm.ncs index 1549fce..bb75d64 100644 Binary files a/_haks/poa_exp_spells/nw_s0_healharm.ncs and b/_haks/poa_exp_spells/nw_s0_healharm.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_horrwilt.ncs b/_haks/poa_exp_spells/nw_s0_horrwilt.ncs index f025610..d6e5147 100644 Binary files a/_haks/poa_exp_spells/nw_s0_horrwilt.ncs and b/_haks/poa_exp_spells/nw_s0_horrwilt.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_imprinvis.ncs b/_haks/poa_exp_spells/nw_s0_imprinvis.ncs index 4a6f70b..88fd6df 100644 Binary files a/_haks/poa_exp_spells/nw_s0_imprinvis.ncs and b/_haks/poa_exp_spells/nw_s0_imprinvis.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_incclouda.ncs b/_haks/poa_exp_spells/nw_s0_incclouda.ncs index 29f8b0b..7058fdd 100644 Binary files a/_haks/poa_exp_spells/nw_s0_incclouda.ncs and b/_haks/poa_exp_spells/nw_s0_incclouda.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_inccloudc.ncs b/_haks/poa_exp_spells/nw_s0_inccloudc.ncs index 8179b2d..29590b1 100644 Binary files a/_haks/poa_exp_spells/nw_s0_inccloudc.ncs and b/_haks/poa_exp_spells/nw_s0_inccloudc.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_lghtnbolt.ncs b/_haks/poa_exp_spells/nw_s0_lghtnbolt.ncs index 4090caf..dacd65f 100644 Binary files a/_haks/poa_exp_spells/nw_s0_lghtnbolt.ncs and b/_haks/poa_exp_spells/nw_s0_lghtnbolt.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_magmiss.ncs b/_haks/poa_exp_spells/nw_s0_magmiss.ncs index 6bd8123..db15ac7 100644 Binary files a/_haks/poa_exp_spells/nw_s0_magmiss.ncs and b/_haks/poa_exp_spells/nw_s0_magmiss.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_metswarm.ncs b/_haks/poa_exp_spells/nw_s0_metswarm.ncs index 917ee17..b4c3ab4 100644 Binary files a/_haks/poa_exp_spells/nw_s0_metswarm.ncs and b/_haks/poa_exp_spells/nw_s0_metswarm.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_phankill.ncs b/_haks/poa_exp_spells/nw_s0_phankill.ncs index 3949174..53ae90b 100644 Binary files a/_haks/poa_exp_spells/nw_s0_phankill.ncs and b/_haks/poa_exp_spells/nw_s0_phankill.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_pwstun.ncs b/_haks/poa_exp_spells/nw_s0_pwstun.ncs index 0531a69..9d2f408 100644 Binary files a/_haks/poa_exp_spells/nw_s0_pwstun.ncs and b/_haks/poa_exp_spells/nw_s0_pwstun.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_rayfrost.ncs b/_haks/poa_exp_spells/nw_s0_rayfrost.ncs index d19f6dc..77ead6f 100644 Binary files a/_haks/poa_exp_spells/nw_s0_rayfrost.ncs and b/_haks/poa_exp_spells/nw_s0_rayfrost.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_regen.ncs b/_haks/poa_exp_spells/nw_s0_regen.ncs index 868f4d6..6a38a67 100644 Binary files a/_haks/poa_exp_spells/nw_s0_regen.ncs and b/_haks/poa_exp_spells/nw_s0_regen.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_sanctuary.ncs b/_haks/poa_exp_spells/nw_s0_sanctuary.ncs index 3449411..c0075de 100644 Binary files a/_haks/poa_exp_spells/nw_s0_sanctuary.ncs and b/_haks/poa_exp_spells/nw_s0_sanctuary.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_searlght.ncs b/_haks/poa_exp_spells/nw_s0_searlght.ncs index 7e04be7..02ebc40 100644 Binary files a/_haks/poa_exp_spells/nw_s0_searlght.ncs and b/_haks/poa_exp_spells/nw_s0_searlght.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_shadshld.ncs b/_haks/poa_exp_spells/nw_s0_shadshld.ncs index b10f9a7..e3186f5 100644 Binary files a/_haks/poa_exp_spells/nw_s0_shadshld.ncs and b/_haks/poa_exp_spells/nw_s0_shadshld.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_sleep.ncs b/_haks/poa_exp_spells/nw_s0_sleep.ncs index 90b9463..5304f78 100644 Binary files a/_haks/poa_exp_spells/nw_s0_sleep.ncs and b/_haks/poa_exp_spells/nw_s0_sleep.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_sndburst.ncs b/_haks/poa_exp_spells/nw_s0_sndburst.ncs index 5c1f40e..9e9fd54 100644 Binary files a/_haks/poa_exp_spells/nw_s0_sndburst.ncs and b/_haks/poa_exp_spells/nw_s0_sndburst.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_spmantle.ncs b/_haks/poa_exp_spells/nw_s0_spmantle.ncs index c0027d5..caed54d 100644 Binary files a/_haks/poa_exp_spells/nw_s0_spmantle.ncs and b/_haks/poa_exp_spells/nw_s0_spmantle.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_stormvenc.ncs b/_haks/poa_exp_spells/nw_s0_stormvenc.ncs index e9d2f21..93371eb 100644 Binary files a/_haks/poa_exp_spells/nw_s0_stormvenc.ncs and b/_haks/poa_exp_spells/nw_s0_stormvenc.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_sunbeam.ncs b/_haks/poa_exp_spells/nw_s0_sunbeam.ncs index 1b499a0..5e29e22 100644 Binary files a/_haks/poa_exp_spells/nw_s0_sunbeam.ncs and b/_haks/poa_exp_spells/nw_s0_sunbeam.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_vamptch.ncs b/_haks/poa_exp_spells/nw_s0_vamptch.ncs index 7c0f8f8..a57e667 100644 Binary files a/_haks/poa_exp_spells/nw_s0_vamptch.ncs and b/_haks/poa_exp_spells/nw_s0_vamptch.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_virtue.ncs b/_haks/poa_exp_spells/nw_s0_virtue.ncs index b275e0f..e70f96f 100644 Binary files a/_haks/poa_exp_spells/nw_s0_virtue.ncs and b/_haks/poa_exp_spells/nw_s0_virtue.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_wallfirea.ncs b/_haks/poa_exp_spells/nw_s0_wallfirea.ncs index a6b2140..4ab2773 100644 Binary files a/_haks/poa_exp_spells/nw_s0_wallfirea.ncs and b/_haks/poa_exp_spells/nw_s0_wallfirea.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_wallfirec.ncs b/_haks/poa_exp_spells/nw_s0_wallfirec.ncs index 5c4bdd3..96a914e 100644 Binary files a/_haks/poa_exp_spells/nw_s0_wallfirec.ncs and b/_haks/poa_exp_spells/nw_s0_wallfirec.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_weird.ncs b/_haks/poa_exp_spells/nw_s0_weird.ncs index 3463727..17f4ed6 100644 Binary files a/_haks/poa_exp_spells/nw_s0_weird.ncs and b/_haks/poa_exp_spells/nw_s0_weird.ncs differ diff --git a/_haks/poa_exp_spells/nw_s0_wordfaith.ncs b/_haks/poa_exp_spells/nw_s0_wordfaith.ncs index 3f623d4..57bdb0a 100644 Binary files a/_haks/poa_exp_spells/nw_s0_wordfaith.ncs and b/_haks/poa_exp_spells/nw_s0_wordfaith.ncs differ diff --git a/_haks/poa_exp_spells/sp_aberrate.ncs b/_haks/poa_exp_spells/sp_aberrate.ncs index 5e8857a..c1b86ff 100644 Binary files a/_haks/poa_exp_spells/sp_aberrate.ncs and b/_haks/poa_exp_spells/sp_aberrate.ncs differ diff --git a/_haks/poa_exp_spells/sp_acidstorm.ncs b/_haks/poa_exp_spells/sp_acidstorm.ncs index 5640628..a074e82 100644 Binary files a/_haks/poa_exp_spells/sp_acidstorm.ncs and b/_haks/poa_exp_spells/sp_acidstorm.ncs differ diff --git a/_haks/poa_exp_spells/sp_agnazscorch.ncs b/_haks/poa_exp_spells/sp_agnazscorch.ncs index c755dfb..5b44dcd 100644 Binary files a/_haks/poa_exp_spells/sp_agnazscorch.ncs and b/_haks/poa_exp_spells/sp_agnazscorch.ncs differ diff --git a/_haks/poa_exp_spells/sp_apoc_sky.ncs b/_haks/poa_exp_spells/sp_apoc_sky.ncs index 1dbf19c..d4b4137 100644 Binary files a/_haks/poa_exp_spells/sp_apoc_sky.ncs and b/_haks/poa_exp_spells/sp_apoc_sky.ncs differ diff --git a/_haks/poa_exp_spells/sp_armordark.ncs b/_haks/poa_exp_spells/sp_armordark.ncs index f7fa133..dc0f9d0 100644 Binary files a/_haks/poa_exp_spells/sp_armordark.ncs and b/_haks/poa_exp_spells/sp_armordark.ncs differ diff --git a/_haks/poa_exp_spells/sp_ayailla_rb.ncs b/_haks/poa_exp_spells/sp_ayailla_rb.ncs index 222837f..c79fda9 100644 Binary files a/_haks/poa_exp_spells/sp_ayailla_rb.ncs and b/_haks/poa_exp_spells/sp_ayailla_rb.ncs differ diff --git a/_haks/poa_exp_spells/sp_ayailla_rb.nss b/_haks/poa_exp_spells/sp_ayailla_rb.nss index e33383c..1a7f4d5 100644 --- a/_haks/poa_exp_spells/sp_ayailla_rb.nss +++ b/_haks/poa_exp_spells/sp_ayailla_rb.nss @@ -72,12 +72,12 @@ void main() } //evil take damage, separate saving throw - nDam = d6(min(5, nCasterLvl/2)); + nDam = d6(PRCMin(5, nCasterLvl/2)); //maximize if(nMetaMagic & METAMAGIC_MAXIMIZE) { - nDam = 6 * (min(20, nCasterLvl/2)); + nDam = 6 * (PRCMin(20, nCasterLvl/2)); } //empower diff --git a/_haks/poa_exp_spells/sp_bigby_sf.ncs b/_haks/poa_exp_spells/sp_bigby_sf.ncs index b6703df..00041db 100644 Binary files a/_haks/poa_exp_spells/sp_bigby_sf.ncs and b/_haks/poa_exp_spells/sp_bigby_sf.ncs differ diff --git a/_haks/poa_exp_spells/sp_bigby_sf.nss b/_haks/poa_exp_spells/sp_bigby_sf.nss index fe3314d..f69a4d0 100644 --- a/_haks/poa_exp_spells/sp_bigby_sf.nss +++ b/_haks/poa_exp_spells/sp_bigby_sf.nss @@ -60,11 +60,11 @@ void main() if (iAttackRoll > 0) { - int nDam = d6(min(20, (nCasterLevel/2))); + int nDam = d6(PRCMin(20, (nCasterLevel/2))); if(nMetaMagic & METAMAGIC_MAXIMIZE) { - nDam = 6 * (min(20, (nCasterLevel/2))); + nDam = 6 * (PRCMin(20, (nCasterLevel/2))); } if(nMetaMagic & METAMAGIC_EMPOWER) diff --git a/_haks/poa_exp_spells/sp_bigby_trip.ncs b/_haks/poa_exp_spells/sp_bigby_trip.ncs index ae94253..4868b54 100644 Binary files a/_haks/poa_exp_spells/sp_bigby_trip.ncs and b/_haks/poa_exp_spells/sp_bigby_trip.ncs differ diff --git a/_haks/poa_exp_spells/sp_bigby_trip.nss b/_haks/poa_exp_spells/sp_bigby_trip.nss index 186a70e..f3ccafd 100644 --- a/_haks/poa_exp_spells/sp_bigby_trip.nss +++ b/_haks/poa_exp_spells/sp_bigby_trip.nss @@ -56,7 +56,7 @@ void main() int nAbilityScore = GetAbilityScoreForClass(nClassType, oPC); int nAttackBonus = (2 + nCasterLvl + (nAbilityScore - 10)/2 ); - int nTripBonus = min(20,(nCasterLvl/3)); + int nTripBonus = PRCMin(20,(nCasterLvl/3)); int iAttackRoll = GetAttackRoll(oTarget, OBJECT_INVALID, OBJECT_INVALID, 0, nAttackBonus,0,nDisplayFeedback, 0.0, TOUCH_ATTACK_MELEE_SPELL); if (iAttackRoll > 0) @@ -67,7 +67,7 @@ void main() //save if(!PRCMySavingThrow(SAVING_THROW_REFLEX, oTarget, PRCGetSaveDC(oTarget, oPC), SAVING_THROW_TYPE_SPELL)) { - int nOpposing = d20() + (max(GetAbilityModifier(ABILITY_STRENGTH, oTarget), GetAbilityModifier(ABILITY_DEXTERITY, oTarget))) + EvalSizeBonus(oTarget); + int nOpposing = d20() + (PRCMax(GetAbilityModifier(ABILITY_STRENGTH, oTarget), GetAbilityModifier(ABILITY_DEXTERITY, oTarget))) + EvalSizeBonus(oTarget); int nCheck = d20() + 2 + nTripBonus; if(nCheck > nOpposing) diff --git a/_haks/poa_exp_spells/sp_blastfrc.ncs b/_haks/poa_exp_spells/sp_blastfrc.ncs index 0eeebb8..37ed78e 100644 Binary files a/_haks/poa_exp_spells/sp_blastfrc.ncs and b/_haks/poa_exp_spells/sp_blastfrc.ncs differ diff --git a/_haks/poa_exp_spells/sp_blastfrc.nss b/_haks/poa_exp_spells/sp_blastfrc.nss index fbe0452..e478ac2 100644 --- a/_haks/poa_exp_spells/sp_blastfrc.nss +++ b/_haks/poa_exp_spells/sp_blastfrc.nss @@ -49,7 +49,7 @@ int DoSpell(object oCaster, object oTarget, int nCasterLevel, int nEvent) { if (!PRCDoResistSpell(oCaster, oTarget, nPenetr)) { - int nDice= min(nCasterLevel/2, 20); + int nDice= PRCMin(nCasterLevel/2, 20); int nDam = d6(nDice); if(nMetaMagic & METAMAGIC_MAXIMIZE) nDam = 6 * nDice; if(nMetaMagic & METAMAGIC_EMPOWER) nDam += (nDam/2); diff --git a/_haks/poa_exp_spells/sp_blessbahamut.ncs b/_haks/poa_exp_spells/sp_blessbahamut.ncs index e48b1b9..aabbb1d 100644 Binary files a/_haks/poa_exp_spells/sp_blessbahamut.ncs and b/_haks/poa_exp_spells/sp_blessbahamut.ncs differ diff --git a/_haks/poa_exp_spells/sp_blsflm.ncs b/_haks/poa_exp_spells/sp_blsflm.ncs index 94faa07..308a2e8 100644 Binary files a/_haks/poa_exp_spells/sp_blsflm.ncs and b/_haks/poa_exp_spells/sp_blsflm.ncs differ diff --git a/_haks/poa_exp_spells/sp_bolt_glory.ncs b/_haks/poa_exp_spells/sp_bolt_glory.ncs index 88ba499..df5b014 100644 Binary files a/_haks/poa_exp_spells/sp_bolt_glory.ncs and b/_haks/poa_exp_spells/sp_bolt_glory.ncs differ diff --git a/_haks/poa_exp_spells/sp_bolt_glory.nss b/_haks/poa_exp_spells/sp_bolt_glory.nss index bda34d4..957b9e0 100644 --- a/_haks/poa_exp_spells/sp_bolt_glory.nss +++ b/_haks/poa_exp_spells/sp_bolt_glory.nss @@ -70,11 +70,11 @@ void main() { if((nRace == RACIAL_TYPE_UNDEAD) || (nRace == RACIAL_TYPE_OUTSIDER && nAlign == ALIGNMENT_EVIL)) { - nDam = d6(min(nCasterLevel, 40)); + nDam = d6(PRCMin(nCasterLevel, 40)); if(nMetaMagic & METAMAGIC_MAXIMIZE) { - nDam = 6 * min(nCasterLevel, 40); + nDam = 6 * PRCMin(nCasterLevel, 40); } if(nMetaMagic & METAMAGIC_EMPOWER) { @@ -88,11 +88,11 @@ void main() //Material native and living (nRace != RACIAL_TYPE_OUTSIDER && nRace != RACIAL_TYPE_UNDEAD && nRace != RACIAL_TYPE_CONSTRUCT)) { - nDam = d6(min(nCasterLevel/2, 30)); + nDam = d6(PRCMin(nCasterLevel/2, 30)); if(nMetaMagic & METAMAGIC_MAXIMIZE) { - nDam = 6 * min(nCasterLevel/2, 30); + nDam = 6 * PRCMin(nCasterLevel/2, 30); } if(nMetaMagic & METAMAGIC_EMPOWER) { diff --git a/_haks/poa_exp_spells/sp_celest_bld.ncs b/_haks/poa_exp_spells/sp_celest_bld.ncs index 41d6a8e..0417e36 100644 Binary files a/_haks/poa_exp_spells/sp_celest_bld.ncs and b/_haks/poa_exp_spells/sp_celest_bld.ncs differ diff --git a/_haks/poa_exp_spells/sp_chaavs_lgh.ncs b/_haks/poa_exp_spells/sp_chaavs_lgh.ncs index 2b1e7a9..3a15631 100644 Binary files a/_haks/poa_exp_spells/sp_chaavs_lgh.ncs and b/_haks/poa_exp_spells/sp_chaavs_lgh.ncs differ diff --git a/_haks/poa_exp_spells/sp_chaavs_lgh.nss b/_haks/poa_exp_spells/sp_chaavs_lgh.nss index 2e69bed..83dac8b 100644 --- a/_haks/poa_exp_spells/sp_chaavs_lgh.nss +++ b/_haks/poa_exp_spells/sp_chaavs_lgh.nss @@ -70,7 +70,7 @@ void main() effect eVilLink = EffectLinkEffects(EffectAttackDecrease(nModify, ATTACK_BONUS_MISC), EffectSavingThrowDecrease(SAVING_THROW_ALL, nModify, SAVING_THROW_TYPE_FEAR)); effect eGoodLink = EffectLinkEffects(EffectAttackIncrease(nModify, ATTACK_BONUS_MISC), EffectSavingThrowIncrease(SAVING_THROW_ALL, nModify, SAVING_THROW_TYPE_FEAR)); - eGoodLink = EffectLinkEffects(eGoodLink, EffectTemporaryHitpoints(d8(1) + min(40, nCasterLvl))); + eGoodLink = EffectLinkEffects(eGoodLink, EffectTemporaryHitpoints(d8(1) + PRCMin(40, nCasterLvl))); while(GetIsObjectValid(oTarget)) { diff --git a/_haks/poa_exp_spells/sp_chan_pyrob.ncs b/_haks/poa_exp_spells/sp_chan_pyrob.ncs index ef037a4..fc0d8f9 100644 Binary files a/_haks/poa_exp_spells/sp_chan_pyrob.ncs and b/_haks/poa_exp_spells/sp_chan_pyrob.ncs differ diff --git a/_haks/poa_exp_spells/sp_chan_pyrob.nss b/_haks/poa_exp_spells/sp_chan_pyrob.nss index 5ec0b1a..75f3dcb 100644 --- a/_haks/poa_exp_spells/sp_chan_pyrob.nss +++ b/_haks/poa_exp_spells/sp_chan_pyrob.nss @@ -74,47 +74,47 @@ void main() return; } - nDam = d4(min((nCasterLvl/2), 40)); + nDam = d4(PRCMin((nCasterLvl/2), 40)); if(nMetaMagic & METAMAGIC_MAXIMIZE) { - nDam = 4 * (min((nCasterLvl/2), 40)); + nDam = 4 * (PRCMin((nCasterLvl/2), 40)); } } //standard else if(nSpell == SPELL_CHANNELED_PYROBURST_2) { - nDam = d6(min(40, nCasterLvl)); + nDam = d6(PRCMin(40, nCasterLvl)); fRadius = 3.048f; if(nMetaMagic & METAMAGIC_MAXIMIZE) { - nDam = 6 * (min(40, nCasterLvl)); + nDam = 6 * (PRCMin(40, nCasterLvl)); } } //full round else if(nSpell == SPELL_CHANNELED_PYROBURST_3) { - nDam = d8(min(40, nCasterLvl)); + nDam = d8(PRCMin(40, nCasterLvl)); fRadius = 4.57f; if(nMetaMagic & METAMAGIC_MAXIMIZE) { - nDam = 8 * (min(40, nCasterLvl)); + nDam = 8 * (PRCMin(40, nCasterLvl)); } } //two rounds else if(nSpell == SPELL_CHANNELED_PYROBURST_4) { - nDam = d10(min(40, nCasterLvl)); + nDam = d10(PRCMin(40, nCasterLvl)); fRadius = 6.10f; if(nMetaMagic & METAMAGIC_MAXIMIZE) { - nDam = 10 * (min(40, nCasterLvl)); + nDam = 10 * (PRCMin(40, nCasterLvl)); } } diff --git a/_haks/poa_exp_spells/sp_close_wounds.ncs b/_haks/poa_exp_spells/sp_close_wounds.ncs index 88b865f..9856dc5 100644 Binary files a/_haks/poa_exp_spells/sp_close_wounds.ncs and b/_haks/poa_exp_spells/sp_close_wounds.ncs differ diff --git a/_haks/poa_exp_spells/sp_cloud_achaiA.ncs b/_haks/poa_exp_spells/sp_cloud_achaiA.ncs index df84e9b..deaf4e4 100644 Binary files a/_haks/poa_exp_spells/sp_cloud_achaiA.ncs and b/_haks/poa_exp_spells/sp_cloud_achaiA.ncs differ diff --git a/_haks/poa_exp_spells/sp_clutch_orcus.ncs b/_haks/poa_exp_spells/sp_clutch_orcus.ncs index 3f83ddd..c9d27b2 100644 Binary files a/_haks/poa_exp_spells/sp_clutch_orcus.ncs and b/_haks/poa_exp_spells/sp_clutch_orcus.ncs differ diff --git a/_haks/poa_exp_spells/sp_curimpbl.ncs b/_haks/poa_exp_spells/sp_curimpbl.ncs index 4d6878a..42e9483 100644 Binary files a/_haks/poa_exp_spells/sp_curimpbl.ncs and b/_haks/poa_exp_spells/sp_curimpbl.ncs differ diff --git a/_haks/poa_exp_spells/sp_curpfail.ncs b/_haks/poa_exp_spells/sp_curpfail.ncs index 8806934..faaa14f 100644 Binary files a/_haks/poa_exp_spells/sp_curpfail.ncs and b/_haks/poa_exp_spells/sp_curpfail.ncs differ diff --git a/_haks/poa_exp_spells/sp_damng_darkA.ncs b/_haks/poa_exp_spells/sp_damng_darkA.ncs index d90a497..a9089f9 100644 Binary files a/_haks/poa_exp_spells/sp_damng_darkA.ncs and b/_haks/poa_exp_spells/sp_damng_darkA.ncs differ diff --git a/_haks/poa_exp_spells/sp_dancg_web.ncs b/_haks/poa_exp_spells/sp_dancg_web.ncs index 21a7780..31334cc 100644 Binary files a/_haks/poa_exp_spells/sp_dancg_web.ncs and b/_haks/poa_exp_spells/sp_dancg_web.ncs differ diff --git a/_haks/poa_exp_spells/sp_dancg_web.nss b/_haks/poa_exp_spells/sp_dancg_web.nss index 287e0cd..6268370 100644 --- a/_haks/poa_exp_spells/sp_dancg_web.nss +++ b/_haks/poa_exp_spells/sp_dancg_web.nss @@ -46,7 +46,7 @@ void main() float fDur; int nMetaMagic = PRCGetMetaMagicFeat(); int nCasterLvl = PRCGetCasterLevel(oPC); - int nMin = min(40, nCasterLvl); + int nMin = PRCMin(40, nCasterLvl); int nDam; int nDC = PRCGetSaveDC(oTarget, oPC); diff --git a/_haks/poa_exp_spells/sp_darkbolt.ncs b/_haks/poa_exp_spells/sp_darkbolt.ncs index 85f2843..de336e8 100644 Binary files a/_haks/poa_exp_spells/sp_darkbolt.ncs and b/_haks/poa_exp_spells/sp_darkbolt.ncs differ diff --git a/_haks/poa_exp_spells/sp_darkbolt1.ncs b/_haks/poa_exp_spells/sp_darkbolt1.ncs index a8c8587..b2432b4 100644 Binary files a/_haks/poa_exp_spells/sp_darkbolt1.ncs and b/_haks/poa_exp_spells/sp_darkbolt1.ncs differ diff --git a/_haks/poa_exp_spells/sp_deep_slumber.ncs b/_haks/poa_exp_spells/sp_deep_slumber.ncs index baa3905..164d5c6 100644 Binary files a/_haks/poa_exp_spells/sp_deep_slumber.ncs and b/_haks/poa_exp_spells/sp_deep_slumber.ncs differ diff --git a/_haks/poa_exp_spells/sp_deflect.ncs b/_haks/poa_exp_spells/sp_deflect.ncs index 3d0bbc8..ceb67da 100644 Binary files a/_haks/poa_exp_spells/sp_deflect.ncs and b/_haks/poa_exp_spells/sp_deflect.ncs differ diff --git a/_haks/poa_exp_spells/sp_deflect.nss b/_haks/poa_exp_spells/sp_deflect.nss index e9ecdca..e5d65c1 100644 --- a/_haks/poa_exp_spells/sp_deflect.nss +++ b/_haks/poa_exp_spells/sp_deflect.nss @@ -54,7 +54,7 @@ void main() int nMetaMagic = PRCGetMetaMagicFeat(); int nSpell = PRCGetSpellId(); int nBonus = nSpell == SPELL_DEFLECT ? nCasterLvl/2: - min(20, (nCasterLvl/3)); + PRCMin(20, (nCasterLvl/3)); PRCSignalSpellEvent(oPC, FALSE, nSpell, oPC); diff --git a/_haks/poa_exp_spells/sp_dispell_tch.ncs b/_haks/poa_exp_spells/sp_dispell_tch.ncs index ffe5307..b7cf370 100644 Binary files a/_haks/poa_exp_spells/sp_dispell_tch.ncs and b/_haks/poa_exp_spells/sp_dispell_tch.ncs differ diff --git a/_haks/poa_exp_spells/sp_disrpt_undead.ncs b/_haks/poa_exp_spells/sp_disrpt_undead.ncs index 7b66d10..707fe42 100644 Binary files a/_haks/poa_exp_spells/sp_disrpt_undead.ncs and b/_haks/poa_exp_spells/sp_disrpt_undead.ncs differ diff --git a/_haks/poa_exp_spells/sp_divprot.ncs b/_haks/poa_exp_spells/sp_divprot.ncs index 4a3a443..8201517 100644 Binary files a/_haks/poa_exp_spells/sp_divprot.ncs and b/_haks/poa_exp_spells/sp_divprot.ncs differ diff --git a/_haks/poa_exp_spells/sp_dmnd_spray.ncs b/_haks/poa_exp_spells/sp_dmnd_spray.ncs index 92df949..f552b1b 100644 Binary files a/_haks/poa_exp_spells/sp_dmnd_spray.ncs and b/_haks/poa_exp_spells/sp_dmnd_spray.ncs differ diff --git a/_haks/poa_exp_spells/sp_dmnd_spray.nss b/_haks/poa_exp_spells/sp_dmnd_spray.nss index d113e56..d92f791 100644 --- a/_haks/poa_exp_spells/sp_dmnd_spray.nss +++ b/_haks/poa_exp_spells/sp_dmnd_spray.nss @@ -57,11 +57,11 @@ void main() { if(!PRCDoResistSpell(oPC, oTarget, nCasterLvl + SPGetPenetr())) { - int nDam = d6(min(nCasterLvl,40)); + int nDam = d6(PRCMin(nCasterLvl,40)); if(nMetaMagic & METAMAGIC_MAXIMIZE) { - nDam = 6 * (min(nCasterLvl, 40)); + nDam = 6 * (PRCMin(nCasterLvl, 40)); } if(nMetaMagic & METAMAGIC_EMPOWER) { diff --git a/_haks/poa_exp_spells/sp_doom_scarab.ncs b/_haks/poa_exp_spells/sp_doom_scarab.ncs index e38c517..3e36361 100644 Binary files a/_haks/poa_exp_spells/sp_doom_scarab.ncs and b/_haks/poa_exp_spells/sp_doom_scarab.ncs differ diff --git a/_haks/poa_exp_spells/sp_doom_scarab.nss b/_haks/poa_exp_spells/sp_doom_scarab.nss index 81ec381..6b2fac2 100644 --- a/_haks/poa_exp_spells/sp_doom_scarab.nss +++ b/_haks/poa_exp_spells/sp_doom_scarab.nss @@ -63,12 +63,12 @@ void main() while(GetIsObjectValid(oTarget)) { - nDam = d6(min(nCasterLvl/2, 40)); + nDam = d6(PRCMin(nCasterLvl/2, 40)); nDC = PRCGetSaveDC(oTarget, oPC); if(nMetaMagic & METAMAGIC_MAXIMIZE) { - nDam = 6 * (min(nCasterLvl/2, 40)); + nDam = 6 * (PRCMin(nCasterLvl/2, 40)); } if(nMetaMagic & METAMAGIC_EMPOWER) diff --git a/_haks/poa_exp_spells/sp_elemstrike.ncs b/_haks/poa_exp_spells/sp_elemstrike.ncs index d0d4f5a..9c86e06 100644 Binary files a/_haks/poa_exp_spells/sp_elemstrike.ncs and b/_haks/poa_exp_spells/sp_elemstrike.ncs differ diff --git a/_haks/poa_exp_spells/sp_elemstrike.nss b/_haks/poa_exp_spells/sp_elemstrike.nss index a0d1f18..9dcaa3d 100644 --- a/_haks/poa_exp_spells/sp_elemstrike.nss +++ b/_haks/poa_exp_spells/sp_elemstrike.nss @@ -59,7 +59,7 @@ void main() location lTarget = PRCGetSpellTargetLocation(); int nSpellID = PRCGetSpellId(); int nCasterLvl = PRCGetCasterLevel(oCaster); - int nDice = min(40, nCasterLvl); + int nDice = PRCMin(40, nCasterLvl); int nPenter = nCasterLvl + SPGetPenetr(); int nMetaMagic = PRCGetMetaMagicFeat(); int nDamageType, nImpVfx, nDamage, nDamage2; diff --git a/_haks/poa_exp_spells/sp_energz_ptn.ncs b/_haks/poa_exp_spells/sp_energz_ptn.ncs index 2ecc4b3..b5ac7c9 100644 Binary files a/_haks/poa_exp_spells/sp_energz_ptn.ncs and b/_haks/poa_exp_spells/sp_energz_ptn.ncs differ diff --git a/_haks/poa_exp_spells/sp_energz_ptn.nss b/_haks/poa_exp_spells/sp_energz_ptn.nss index a70c31a..ead57c4 100644 --- a/_haks/poa_exp_spells/sp_energz_ptn.nss +++ b/_haks/poa_exp_spells/sp_energz_ptn.nss @@ -120,7 +120,7 @@ void main() SetLocalInt(oGrenade, "PRC_EnergizedPotionSave", SAVING_THROW_TYPE_SONIC); sDamageType = "Sonic"; } - nLevel = min(20, nLevel); + nLevel = PRCMin(20, nLevel); SetLocalInt(oGrenade, "PRC_GrenadeLevel", nLevel); SetLocalInt(oGrenade, "PRC_EnPotSaveDC", nDC); diff --git a/_haks/poa_exp_spells/sp_exalt_fury.ncs b/_haks/poa_exp_spells/sp_exalt_fury.ncs index 6508f1a..555a744 100644 Binary files a/_haks/poa_exp_spells/sp_exalt_fury.ncs and b/_haks/poa_exp_spells/sp_exalt_fury.ncs differ diff --git a/_haks/poa_exp_spells/sp_exaltd_raim.ncs b/_haks/poa_exp_spells/sp_exaltd_raim.ncs index f86e236..2795504 100644 Binary files a/_haks/poa_exp_spells/sp_exaltd_raim.ncs and b/_haks/poa_exp_spells/sp_exaltd_raim.ncs differ diff --git a/_haks/poa_exp_spells/sp_exaltd_raim.nss b/_haks/poa_exp_spells/sp_exaltd_raim.nss index f6e822f..ac17c6c 100644 --- a/_haks/poa_exp_spells/sp_exaltd_raim.nss +++ b/_haks/poa_exp_spells/sp_exaltd_raim.nss @@ -44,7 +44,7 @@ Created: 6/28/06 int GetERSpellResistance(int nCasterLvl) { - int nSRBonus = min(nCasterLvl, 20); + int nSRBonus = PRCMin(nCasterLvl, 20); int nIPConst; switch(nSRBonus) @@ -81,7 +81,7 @@ void main() object oMyArmor = IPGetTargetedOrEquippedArmor(FALSE); int nCasterLvl = PRCGetCasterLevel(oPC); int nSR = GetERSpellResistance(nCasterLvl); - int nArmor = min(nCasterLvl / 5, 8); + int nArmor = PRCMin(nCasterLvl / 5, 8); float fDur = (60.0f * nCasterLvl); int nMetaMagic = PRCGetMetaMagicFeat(); diff --git a/_haks/poa_exp_spells/sp_extr_wtrele.ncs b/_haks/poa_exp_spells/sp_extr_wtrele.ncs index b380690..f547960 100644 Binary files a/_haks/poa_exp_spells/sp_extr_wtrele.ncs and b/_haks/poa_exp_spells/sp_extr_wtrele.ncs differ diff --git a/_haks/poa_exp_spells/sp_extr_wtrele.nss b/_haks/poa_exp_spells/sp_extr_wtrele.nss index 9c3af96..3d44586 100644 --- a/_haks/poa_exp_spells/sp_extr_wtrele.nss +++ b/_haks/poa_exp_spells/sp_extr_wtrele.nss @@ -48,7 +48,7 @@ void main() object oTarget = PRCGetSpellTargetObject(); int nCasterLvl = PRCGetCasterLevel(oPC); int nMetaMagic = PRCGetMetaMagicFeat(); - int nDam = d6(min(nCasterLvl, 40)); + int nDam = d6(PRCMin(nCasterLvl, 40)); int nSaveDC = PRCGetSaveDC(oTarget, oPC); int nType = MyPRCGetRacialType(oTarget); @@ -62,7 +62,7 @@ void main() if(nMetaMagic & METAMAGIC_MAXIMIZE) { - nDam = 6*(min(nCasterLvl, 40)); + nDam = 6*(PRCMin(nCasterLvl, 40)); } if(nMetaMagic & METAMAGIC_EMPOWER) diff --git a/_haks/poa_exp_spells/sp_false_life.ncs b/_haks/poa_exp_spells/sp_false_life.ncs index dd0bff0..4fd4dc5 100644 Binary files a/_haks/poa_exp_spells/sp_false_life.ncs and b/_haks/poa_exp_spells/sp_false_life.ncs differ diff --git a/_haks/poa_exp_spells/sp_false_life.nss b/_haks/poa_exp_spells/sp_false_life.nss index b7931cb..9ba8485 100644 --- a/_haks/poa_exp_spells/sp_false_life.nss +++ b/_haks/poa_exp_spells/sp_false_life.nss @@ -39,9 +39,9 @@ void main() if(nMetaMagic & METAMAGIC_EXTEND) fDur *= 2; - int nBonus = d10(1) + (min(20, nCasterLvl)); + int nBonus = d10(1) + (PRCMin(20, nCasterLvl)); if(nMetaMagic & METAMAGIC_MAXIMIZE) - nBonus = 10 + (min(20, nCasterLvl)); + nBonus = 10 + (PRCMin(20, nCasterLvl)); if(nMetaMagic & METAMAGIC_EMPOWER) nBonus += (nBonus/2); diff --git a/_haks/poa_exp_spells/sp_fester_death.ncs b/_haks/poa_exp_spells/sp_fester_death.ncs index 658ce7f..df82356 100644 Binary files a/_haks/poa_exp_spells/sp_fester_death.ncs and b/_haks/poa_exp_spells/sp_fester_death.ncs differ diff --git a/_haks/poa_exp_spells/sp_fire_trapA.ncs b/_haks/poa_exp_spells/sp_fire_trapA.ncs index ba49f8e..350ee47 100644 Binary files a/_haks/poa_exp_spells/sp_fire_trapA.ncs and b/_haks/poa_exp_spells/sp_fire_trapA.ncs differ diff --git a/_haks/poa_exp_spells/sp_fireburst.ncs b/_haks/poa_exp_spells/sp_fireburst.ncs index bba3e1f..2d1ee3d 100644 Binary files a/_haks/poa_exp_spells/sp_fireburst.ncs and b/_haks/poa_exp_spells/sp_fireburst.ncs differ diff --git a/_haks/poa_exp_spells/sp_flesh_armor.ncs b/_haks/poa_exp_spells/sp_flesh_armor.ncs index 4987a3d..6941e9d 100644 Binary files a/_haks/poa_exp_spells/sp_flesh_armor.ncs and b/_haks/poa_exp_spells/sp_flesh_armor.ncs differ diff --git a/_haks/poa_exp_spells/sp_flesh_armor.nss b/_haks/poa_exp_spells/sp_flesh_armor.nss index 0c41b1f..29ef6c9 100644 --- a/_haks/poa_exp_spells/sp_flesh_armor.nss +++ b/_haks/poa_exp_spells/sp_flesh_armor.nss @@ -43,7 +43,7 @@ void main() int nCasterLvl = PRCGetCasterLevel(oPC); float fDur= (600.0f * nCasterLvl); int nMetaMagic = PRCGetMetaMagicFeat(); - int nAmount = min(50 + (nCasterLvl/2), (5 * nCasterLvl)); + int nAmount = PRCMin(50 + (nCasterLvl/2), (5 * nCasterLvl)); effect eDR = EffectDamageReduction(10 + (nCasterLvl/2), DAMAGE_POWER_PLUS_ONE, nAmount); //placeholder VFX diff --git a/_haks/poa_exp_spells/sp_flesh_rip.ncs b/_haks/poa_exp_spells/sp_flesh_rip.ncs index 7d0b568..30d66dc 100644 Binary files a/_haks/poa_exp_spells/sp_flesh_rip.ncs and b/_haks/poa_exp_spells/sp_flesh_rip.ncs differ diff --git a/_haks/poa_exp_spells/sp_flesh_rip.nss b/_haks/poa_exp_spells/sp_flesh_rip.nss index 84899fb..4a3e1c2 100644 --- a/_haks/poa_exp_spells/sp_flesh_rip.nss +++ b/_haks/poa_exp_spells/sp_flesh_rip.nss @@ -42,7 +42,7 @@ void main() int nMetaMagic = PRCGetMetaMagicFeat(); int nType = MyPRCGetRacialType(oPC); int nType2 = MyPRCGetRacialType(oTarget); - int nDice = min(20, nCasterLvl); + int nDice = PRCMin(20, nCasterLvl); PRCSignalSpellEvent(oTarget,TRUE, SPELL_FLESH_RIPPER, oPC); diff --git a/_haks/poa_exp_spells/sp_forceblast.ncs b/_haks/poa_exp_spells/sp_forceblast.ncs index f3a67e3..6ecad36 100644 Binary files a/_haks/poa_exp_spells/sp_forceblast.ncs and b/_haks/poa_exp_spells/sp_forceblast.ncs differ diff --git a/_haks/poa_exp_spells/sp_forceorb.ncs b/_haks/poa_exp_spells/sp_forceorb.ncs index 71edb61..c485af0 100644 Binary files a/_haks/poa_exp_spells/sp_forceorb.ncs and b/_haks/poa_exp_spells/sp_forceorb.ncs differ diff --git a/_haks/poa_exp_spells/sp_gfireburst.ncs b/_haks/poa_exp_spells/sp_gfireburst.ncs index fb37d13..6ebd54d 100644 Binary files a/_haks/poa_exp_spells/sp_gfireburst.ncs and b/_haks/poa_exp_spells/sp_gfireburst.ncs differ diff --git a/_haks/poa_exp_spells/sp_gheroism.ncs b/_haks/poa_exp_spells/sp_gheroism.ncs index df4786a..b68d67d 100644 Binary files a/_haks/poa_exp_spells/sp_gheroism.ncs and b/_haks/poa_exp_spells/sp_gheroism.ncs differ diff --git a/_haks/poa_exp_spells/sp_gutwrench.ncs b/_haks/poa_exp_spells/sp_gutwrench.ncs index d431ad4..793a9ce 100644 Binary files a/_haks/poa_exp_spells/sp_gutwrench.ncs and b/_haks/poa_exp_spells/sp_gutwrench.ncs differ diff --git a/_haks/poa_exp_spells/sp_hailofstone.ncs b/_haks/poa_exp_spells/sp_hailofstone.ncs index 5d77a41..563f8db 100644 Binary files a/_haks/poa_exp_spells/sp_hailofstone.ncs and b/_haks/poa_exp_spells/sp_hailofstone.ncs differ diff --git a/_haks/poa_exp_spells/sp_healrbm.ncs b/_haks/poa_exp_spells/sp_healrbm.ncs index c5927ca..c3fa45f 100644 Binary files a/_haks/poa_exp_spells/sp_healrbm.ncs and b/_haks/poa_exp_spells/sp_healrbm.ncs differ diff --git a/_haks/poa_exp_spells/sp_hellfire.ncs b/_haks/poa_exp_spells/sp_hellfire.ncs index c384051..d680626 100644 Binary files a/_haks/poa_exp_spells/sp_hellfire.ncs and b/_haks/poa_exp_spells/sp_hellfire.ncs differ diff --git a/_haks/poa_exp_spells/sp_heroism.ncs b/_haks/poa_exp_spells/sp_heroism.ncs index 6c69ba9..a06639a 100644 Binary files a/_haks/poa_exp_spells/sp_heroism.ncs and b/_haks/poa_exp_spells/sp_heroism.ncs differ diff --git a/_haks/poa_exp_spells/sp_hf_storm.ncs b/_haks/poa_exp_spells/sp_hf_storm.ncs index 8f19672..c00548a 100644 Binary files a/_haks/poa_exp_spells/sp_hf_storm.ncs and b/_haks/poa_exp_spells/sp_hf_storm.ncs differ diff --git a/_haks/poa_exp_spells/sp_ice_knife.ncs b/_haks/poa_exp_spells/sp_ice_knife.ncs index 9092a65..80aa3b7 100644 Binary files a/_haks/poa_exp_spells/sp_ice_knife.ncs and b/_haks/poa_exp_spells/sp_ice_knife.ncs differ diff --git a/_haks/poa_exp_spells/sp_iceburst.ncs b/_haks/poa_exp_spells/sp_iceburst.ncs index 802487a..1637d1b 100644 Binary files a/_haks/poa_exp_spells/sp_iceburst.ncs and b/_haks/poa_exp_spells/sp_iceburst.ncs differ diff --git a/_haks/poa_exp_spells/sp_impmagearm.ncs b/_haks/poa_exp_spells/sp_impmagearm.ncs index 20f24a1..6c988e4 100644 Binary files a/_haks/poa_exp_spells/sp_impmagearm.ncs and b/_haks/poa_exp_spells/sp_impmagearm.ncs differ diff --git a/_haks/poa_exp_spells/sp_kelgore_fb.ncs b/_haks/poa_exp_spells/sp_kelgore_fb.ncs index 513d904..f53af69 100644 Binary files a/_haks/poa_exp_spells/sp_kelgore_fb.ncs and b/_haks/poa_exp_spells/sp_kelgore_fb.ncs differ diff --git a/_haks/poa_exp_spells/sp_lahms_fd.ncs b/_haks/poa_exp_spells/sp_lahms_fd.ncs index 3ac4baa..038c505 100644 Binary files a/_haks/poa_exp_spells/sp_lahms_fd.ncs and b/_haks/poa_exp_spells/sp_lahms_fd.ncs differ diff --git a/_haks/poa_exp_spells/sp_lconvict.ncs b/_haks/poa_exp_spells/sp_lconvict.ncs index ccdf5c2..b5d4632 100644 Binary files a/_haks/poa_exp_spells/sp_lconvict.ncs and b/_haks/poa_exp_spells/sp_lconvict.ncs differ diff --git a/_haks/poa_exp_spells/sp_lcurimpbl.ncs b/_haks/poa_exp_spells/sp_lcurimpbl.ncs index e20a288..c7aca30 100644 Binary files a/_haks/poa_exp_spells/sp_lcurimpbl.ncs and b/_haks/poa_exp_spells/sp_lcurimpbl.ncs differ diff --git a/_haks/poa_exp_spells/sp_lcurpfail.ncs b/_haks/poa_exp_spells/sp_lcurpfail.ncs index 0052dfa..2a08cf0 100644 Binary files a/_haks/poa_exp_spells/sp_lcurpfail.ncs and b/_haks/poa_exp_spells/sp_lcurpfail.ncs differ diff --git a/_haks/poa_exp_spells/sp_leonl_roar.ncs b/_haks/poa_exp_spells/sp_leonl_roar.ncs index 482caa7..69e0db8 100644 Binary files a/_haks/poa_exp_spells/sp_leonl_roar.ncs and b/_haks/poa_exp_spells/sp_leonl_roar.ncs differ diff --git a/_haks/poa_exp_spells/sp_lowersr.ncs b/_haks/poa_exp_spells/sp_lowersr.ncs index 5b0cd1c..014e245 100644 Binary files a/_haks/poa_exp_spells/sp_lowersr.ncs and b/_haks/poa_exp_spells/sp_lowersr.ncs differ diff --git a/_haks/poa_exp_spells/sp_lshlfat.ncs b/_haks/poa_exp_spells/sp_lshlfat.ncs index b3cb3a5..3a66e08 100644 Binary files a/_haks/poa_exp_spells/sp_lshlfat.ncs and b/_haks/poa_exp_spells/sp_lshlfat.ncs differ diff --git a/_haks/poa_exp_spells/sp_mass_frshld.ncs b/_haks/poa_exp_spells/sp_mass_frshld.ncs index 26d0f6c..55f6b68 100644 Binary files a/_haks/poa_exp_spells/sp_mass_frshld.ncs and b/_haks/poa_exp_spells/sp_mass_frshld.ncs differ diff --git a/_haks/poa_exp_spells/sp_mass_frshld.nss b/_haks/poa_exp_spells/sp_mass_frshld.nss index dc5f528..9419b23 100644 --- a/_haks/poa_exp_spells/sp_mass_frshld.nss +++ b/_haks/poa_exp_spells/sp_mass_frshld.nss @@ -36,7 +36,7 @@ void main() int nCasterLvl = PRCGetCasterLevel(oPC); location lLoc = PRCGetSpellTargetLocation(); int nMetaMagic = PRCGetMetaMagicFeat(); - int nDam = min(40,nCasterLvl); + int nDam = PRCMin(40,nCasterLvl); float fDur = RoundsToSeconds(nCasterLvl); effect eVis, eShield, eReduce; int nSpell = GetSpellId(); diff --git a/_haks/poa_exp_spells/sp_nec_bloat.ncs b/_haks/poa_exp_spells/sp_nec_bloat.ncs index cd33ed7..ca69192 100644 Binary files a/_haks/poa_exp_spells/sp_nec_bloat.ncs and b/_haks/poa_exp_spells/sp_nec_bloat.ncs differ diff --git a/_haks/poa_exp_spells/sp_nec_bloat.nss b/_haks/poa_exp_spells/sp_nec_bloat.nss index 178d9a5..f982c57 100644 --- a/_haks/poa_exp_spells/sp_nec_bloat.nss +++ b/_haks/poa_exp_spells/sp_nec_bloat.nss @@ -52,7 +52,7 @@ void main() object oPC = OBJECT_SELF; object oTarget = PRCGetSpellTargetObject(); - int nLevel = min(PRCGetCasterLevel(oPC), 20); + int nLevel = PRCMin(PRCGetCasterLevel(oPC), 20); int nMetaMagic = PRCGetMetaMagicFeat(); PRCSignalSpellEvent(oTarget, TRUE, SPELL_NECROTIC_BLOAT, oPC); diff --git a/_haks/poa_exp_spells/sp_nec_burst.ncs b/_haks/poa_exp_spells/sp_nec_burst.ncs index 29465f2..86413f5 100644 Binary files a/_haks/poa_exp_spells/sp_nec_burst.ncs and b/_haks/poa_exp_spells/sp_nec_burst.ncs differ diff --git a/_haks/poa_exp_spells/sp_nec_burst.nss b/_haks/poa_exp_spells/sp_nec_burst.nss index d76790c..3e6c1d2 100644 --- a/_haks/poa_exp_spells/sp_nec_burst.nss +++ b/_haks/poa_exp_spells/sp_nec_burst.nss @@ -51,7 +51,7 @@ void main() object oPC = OBJECT_SELF; - int nLevel = min(PRCGetCasterLevel(oPC), 40); + int nLevel = PRCMin(PRCGetCasterLevel(oPC), 40); int nMetaMagic = PRCGetMetaMagicFeat(); object oTarget = PRCGetSpellTargetObject(); diff --git a/_haks/poa_exp_spells/sp_nec_erupt.ncs b/_haks/poa_exp_spells/sp_nec_erupt.ncs index 002b728..7b60d56 100644 Binary files a/_haks/poa_exp_spells/sp_nec_erupt.ncs and b/_haks/poa_exp_spells/sp_nec_erupt.ncs differ diff --git a/_haks/poa_exp_spells/sp_nec_erupt.nss b/_haks/poa_exp_spells/sp_nec_erupt.nss index 8ee26e2..d18df17 100644 --- a/_haks/poa_exp_spells/sp_nec_erupt.nss +++ b/_haks/poa_exp_spells/sp_nec_erupt.nss @@ -53,7 +53,7 @@ void main() object oPC = OBJECT_SELF; object oTarget = PRCGetSpellTargetObject(); - int nLevel = min(PRCGetCasterLevel(oPC), 60); + int nLevel = PRCMin(PRCGetCasterLevel(oPC), 60); int nMetaMagic = PRCGetMetaMagicFeat(); PRCSignalSpellEvent(oTarget, TRUE, SPELL_NECROTIC_ERUPTION, oPC); diff --git a/_haks/poa_exp_spells/sp_nec_term.ncs b/_haks/poa_exp_spells/sp_nec_term.ncs index 83c49e3..bd7a89e 100644 Binary files a/_haks/poa_exp_spells/sp_nec_term.ncs and b/_haks/poa_exp_spells/sp_nec_term.ncs differ diff --git a/_haks/poa_exp_spells/sp_nec_term.nss b/_haks/poa_exp_spells/sp_nec_term.nss index 88d24f4..f0a0be6 100644 --- a/_haks/poa_exp_spells/sp_nec_term.nss +++ b/_haks/poa_exp_spells/sp_nec_term.nss @@ -54,7 +54,7 @@ void main() object oPC = OBJECT_SELF; object oTarget = PRCGetSpellTargetObject(); - int nLevel = min(PRCGetCasterLevel(oPC), 80); + int nLevel = PRCMin(PRCGetCasterLevel(oPC), 80); int nMetaMagic = PRCGetMetaMagicFeat(); PRCSignalSpellEvent(oTarget, TRUE, SPELL_NECROTIC_TERMINATION, oPC); diff --git a/_haks/poa_exp_spells/sp_nght_caress.ncs b/_haks/poa_exp_spells/sp_nght_caress.ncs index d2871ae..881587a 100644 Binary files a/_haks/poa_exp_spells/sp_nght_caress.ncs and b/_haks/poa_exp_spells/sp_nght_caress.ncs differ diff --git a/_haks/poa_exp_spells/sp_ot_frz_sphere.ncs b/_haks/poa_exp_spells/sp_ot_frz_sphere.ncs index 7a6a905..7cbb773 100644 Binary files a/_haks/poa_exp_spells/sp_ot_frz_sphere.ncs and b/_haks/poa_exp_spells/sp_ot_frz_sphere.ncs differ diff --git a/_haks/poa_exp_spells/sp_ot_frz_sphere.nss b/_haks/poa_exp_spells/sp_ot_frz_sphere.nss index 29d8fe0..1072eab 100644 --- a/_haks/poa_exp_spells/sp_ot_frz_sphere.nss +++ b/_haks/poa_exp_spells/sp_ot_frz_sphere.nss @@ -52,7 +52,7 @@ void main() object oTarget; location lTarget = PRCGetSpellTargetLocation(); int nCasterLvl = PRCGetCasterLevel(oPC); - int nDice = min(40, nCasterLvl); + int nDice = PRCMin(40, nCasterLvl); int nMetaMagic = PRCGetMetaMagicFeat(); int eDamageType = ChangedElementalDamage(oPC, DAMAGE_TYPE_COLD); int nDC, bIsElemental, nDam; diff --git a/_haks/poa_exp_spells/sp_panacea.ncs b/_haks/poa_exp_spells/sp_panacea.ncs index cf2dc54..df113a8 100644 Binary files a/_haks/poa_exp_spells/sp_panacea.ncs and b/_haks/poa_exp_spells/sp_panacea.ncs differ diff --git a/_haks/poa_exp_spells/sp_phoenix_fire.ncs b/_haks/poa_exp_spells/sp_phoenix_fire.ncs index f75f89e..6d97bc4 100644 Binary files a/_haks/poa_exp_spells/sp_phoenix_fire.ncs and b/_haks/poa_exp_spells/sp_phoenix_fire.ncs differ diff --git a/_haks/poa_exp_spells/sp_phoenix_fire.nss b/_haks/poa_exp_spells/sp_phoenix_fire.nss index 064ec24..55332e7 100644 --- a/_haks/poa_exp_spells/sp_phoenix_fire.nss +++ b/_haks/poa_exp_spells/sp_phoenix_fire.nss @@ -95,11 +95,11 @@ void main() if(GetAlignmentGoodEvil(oTarget) == ALIGNMENT_EVIL) { //Damage = 2d6/level - nDam = d6(min(60, (2 * nCasterLvl))); + nDam = d6(PRCMin(60, (2 * nCasterLvl))); if(nMetaMagic & METAMAGIC_MAXIMIZE) { - nDam = 6 * (min(60, (2 * nCasterLvl))); + nDam = 6 * (PRCMin(60, (2 * nCasterLvl))); } if(nMetaMagic & METAMAGIC_EMPOWER) @@ -126,11 +126,11 @@ void main() else if(GetAlignmentGoodEvil(oTarget) == ALIGNMENT_NEUTRAL) { //Half damage for neutrality, Damage = 1d6 - nDam = d6(min(40,nCasterLvl)); + nDam = d6(PRCMin(40,nCasterLvl)); if(nMetaMagic & METAMAGIC_MAXIMIZE) { - nDam = 6 * (min(40,nCasterLvl)); + nDam = 6 * (PRCMin(40,nCasterLvl)); } if(nMetaMagic & METAMAGIC_EMPOWER) diff --git a/_haks/poa_exp_spells/sp_pnp_frshld.ncs b/_haks/poa_exp_spells/sp_pnp_frshld.ncs index 13e98c8..1dae77a 100644 Binary files a/_haks/poa_exp_spells/sp_pnp_frshld.ncs and b/_haks/poa_exp_spells/sp_pnp_frshld.ncs differ diff --git a/_haks/poa_exp_spells/sp_pnp_frshld.nss b/_haks/poa_exp_spells/sp_pnp_frshld.nss index 1e079ce..d4990c6 100644 --- a/_haks/poa_exp_spells/sp_pnp_frshld.nss +++ b/_haks/poa_exp_spells/sp_pnp_frshld.nss @@ -62,7 +62,7 @@ void main() int nCasterLvl = PRCGetCasterLevel(oPC); int nSpell = GetSpellId(); int nMetaMagic = PRCGetMetaMagicFeat(); - int nDam = min(40,nCasterLvl); + int nDam = PRCMin(40,nCasterLvl); float fDur = RoundsToSeconds(nCasterLvl); effect eShield; effect eVis; diff --git a/_haks/poa_exp_spells/sp_polar_ray.ncs b/_haks/poa_exp_spells/sp_polar_ray.ncs index cd46d41..86db084 100644 Binary files a/_haks/poa_exp_spells/sp_polar_ray.ncs and b/_haks/poa_exp_spells/sp_polar_ray.ncs differ diff --git a/_haks/poa_exp_spells/sp_prism_wallA.ncs b/_haks/poa_exp_spells/sp_prism_wallA.ncs index 2ecc09c..1d365d9 100644 Binary files a/_haks/poa_exp_spells/sp_prism_wallA.ncs and b/_haks/poa_exp_spells/sp_prism_wallA.ncs differ diff --git a/_haks/poa_exp_spells/sp_prismat_ray.ncs b/_haks/poa_exp_spells/sp_prismat_ray.ncs index 36bdd31..38eedf0 100644 Binary files a/_haks/poa_exp_spells/sp_prismat_ray.ncs and b/_haks/poa_exp_spells/sp_prismat_ray.ncs differ diff --git a/_haks/poa_exp_spells/sp_prismt_sphrA.ncs b/_haks/poa_exp_spells/sp_prismt_sphrA.ncs index 8630e0e..1b3f117 100644 Binary files a/_haks/poa_exp_spells/sp_prismt_sphrA.ncs and b/_haks/poa_exp_spells/sp_prismt_sphrA.ncs differ diff --git a/_haks/poa_exp_spells/sp_prot_arrows.ncs b/_haks/poa_exp_spells/sp_prot_arrows.ncs index e6663c2..2e628ea 100644 Binary files a/_haks/poa_exp_spells/sp_prot_arrows.ncs and b/_haks/poa_exp_spells/sp_prot_arrows.ncs differ diff --git a/_haks/poa_exp_spells/sp_prot_arrows.nss b/_haks/poa_exp_spells/sp_prot_arrows.nss index 3f7ef4b..fdc5c57 100644 --- a/_haks/poa_exp_spells/sp_prot_arrows.nss +++ b/_haks/poa_exp_spells/sp_prot_arrows.nss @@ -53,7 +53,7 @@ void main() PRCSignalSpellEvent(oTarget,FALSE, SPELL_PROTECTION_FROM_ARROWS, oPC); // Damage Resistance 10 piercing, max of 100 total - effect eBuff = EffectLinkEffects(EffectDamageResistance(DAMAGE_TYPE_PIERCING, 10+(nCasterLvl/4), min((10 * nCasterLvl), 100)), EffectVisualEffect(VFX_DUR_PROTECTION_ARROWS)); + effect eBuff = EffectLinkEffects(EffectDamageResistance(DAMAGE_TYPE_PIERCING, 10+(nCasterLvl/4), PRCMin((10 * nCasterLvl), 100)), EffectVisualEffect(VFX_DUR_PROTECTION_ARROWS)); SPApplyEffectToObject(DURATION_TYPE_TEMPORARY, eBuff, oTarget, fDur); diff --git a/_haks/poa_exp_spells/sp_rain_btul.ncs b/_haks/poa_exp_spells/sp_rain_btul.ncs index 9a02fa0..d6256d4 100644 Binary files a/_haks/poa_exp_spells/sp_rain_btul.ncs and b/_haks/poa_exp_spells/sp_rain_btul.ncs differ diff --git a/_haks/poa_exp_spells/sp_rain_ember.ncs b/_haks/poa_exp_spells/sp_rain_ember.ncs index fd0117a..b151987 100644 Binary files a/_haks/poa_exp_spells/sp_rain_ember.ncs and b/_haks/poa_exp_spells/sp_rain_ember.ncs differ diff --git a/_haks/poa_exp_spells/sp_rainbow_blast.ncs b/_haks/poa_exp_spells/sp_rainbow_blast.ncs index 9f75759..7b94524 100644 Binary files a/_haks/poa_exp_spells/sp_rainbow_blast.ncs and b/_haks/poa_exp_spells/sp_rainbow_blast.ncs differ diff --git a/_haks/poa_exp_spells/sp_raptr_ruptr.ncs b/_haks/poa_exp_spells/sp_raptr_ruptr.ncs index 833ebab..51c5422 100644 Binary files a/_haks/poa_exp_spells/sp_raptr_ruptr.ncs and b/_haks/poa_exp_spells/sp_raptr_ruptr.ncs differ diff --git a/_haks/poa_exp_spells/sp_right_smt.ncs b/_haks/poa_exp_spells/sp_right_smt.ncs index 22bb2ef..f926fa7 100644 Binary files a/_haks/poa_exp_spells/sp_right_smt.ncs and b/_haks/poa_exp_spells/sp_right_smt.ncs differ diff --git a/_haks/poa_exp_spells/sp_right_smt.nss b/_haks/poa_exp_spells/sp_right_smt.nss index 9dd5e54..bf67fd2 100644 --- a/_haks/poa_exp_spells/sp_right_smt.nss +++ b/_haks/poa_exp_spells/sp_right_smt.nss @@ -63,21 +63,21 @@ void main() if((MyPRCGetRacialType(oTarget) == RACIAL_TYPE_OUTSIDER) && (nAlign == ALIGNMENT_EVIL)) { - nDam = d8(min(nCasterLvl, 20+nCasterLvl)); + nDam = d8(PRCMin(nCasterLvl, 20+nCasterLvl)); if(nMetaMagic & METAMAGIC_MAXIMIZE) { - nDam = 8 * (min(nCasterLvl, 20+nCasterLvl)); + nDam = 8 * (PRCMin(nCasterLvl, 20+nCasterLvl)); } } else { - nDam = d6(min(nCasterLvl, 20+nCasterLvl)); + nDam = d6(PRCMin(nCasterLvl, 20+nCasterLvl)); if(nMetaMagic & METAMAGIC_MAXIMIZE) { - nDam = 6 * (min(nCasterLvl, 20+nCasterLvl)); + nDam = 6 * (PRCMin(nCasterLvl, 20+nCasterLvl)); } } diff --git a/_haks/poa_exp_spells/sp_rightmt.ncs b/_haks/poa_exp_spells/sp_rightmt.ncs index 601f0c5..a2d00bb 100644 Binary files a/_haks/poa_exp_spells/sp_rightmt.ncs and b/_haks/poa_exp_spells/sp_rightmt.ncs differ diff --git a/_haks/poa_exp_spells/sp_ring_bldsC.ncs b/_haks/poa_exp_spells/sp_ring_bldsC.ncs index b7d327a..a52c958 100644 Binary files a/_haks/poa_exp_spells/sp_ring_bldsC.ncs and b/_haks/poa_exp_spells/sp_ring_bldsC.ncs differ diff --git a/_haks/poa_exp_spells/sp_ring_bldsC.nss b/_haks/poa_exp_spells/sp_ring_bldsC.nss index b379138..1aa8c7e 100644 --- a/_haks/poa_exp_spells/sp_ring_bldsC.nss +++ b/_haks/poa_exp_spells/sp_ring_bldsC.nss @@ -60,7 +60,7 @@ void main() { if (spellsIsTarget(oTarget, SPELL_TARGET_STANDARDHOSTILE, oShadow)) { - int nDamage = d6() + min(20, nCasterLvl); + int nDamage = d6() + PRCMin(20, nCasterLvl); ApplyEffectToObject(DURATION_TYPE_INSTANT, PRCEffectDamage(oTarget, DAMAGE_TYPE_SLASHING, nDamage), oTarget); } //Select the next target within the spell shape. diff --git a/_haks/poa_exp_spells/sp_ring_bldsa.ncs b/_haks/poa_exp_spells/sp_ring_bldsa.ncs index 691f843..334ce02 100644 Binary files a/_haks/poa_exp_spells/sp_ring_bldsa.ncs and b/_haks/poa_exp_spells/sp_ring_bldsa.ncs differ diff --git a/_haks/poa_exp_spells/sp_scorch_ray.ncs b/_haks/poa_exp_spells/sp_scorch_ray.ncs index 7157916..aa3cd2d 100644 Binary files a/_haks/poa_exp_spells/sp_scorch_ray.ncs and b/_haks/poa_exp_spells/sp_scorch_ray.ncs differ diff --git a/_haks/poa_exp_spells/sp_seeking_ray.ncs b/_haks/poa_exp_spells/sp_seeking_ray.ncs index e964fae..6cc7463 100644 Binary files a/_haks/poa_exp_spells/sp_seeking_ray.ncs and b/_haks/poa_exp_spells/sp_seeking_ray.ncs differ diff --git a/_haks/poa_exp_spells/sp_seeth_eyebn.ncs b/_haks/poa_exp_spells/sp_seeth_eyebn.ncs index 35391ac..e1a6d2e 100644 Binary files a/_haks/poa_exp_spells/sp_seeth_eyebn.ncs and b/_haks/poa_exp_spells/sp_seeth_eyebn.ncs differ diff --git a/_haks/poa_exp_spells/sp_serp_sigh.ncs b/_haks/poa_exp_spells/sp_serp_sigh.ncs index cd79bda..a46933e 100644 Binary files a/_haks/poa_exp_spells/sp_serp_sigh.ncs and b/_haks/poa_exp_spells/sp_serp_sigh.ncs differ diff --git a/_haks/poa_exp_spells/sp_shock_grasp.ncs b/_haks/poa_exp_spells/sp_shock_grasp.ncs index f3e8db8..f16ce7b 100644 Binary files a/_haks/poa_exp_spells/sp_shock_grasp.ncs and b/_haks/poa_exp_spells/sp_shock_grasp.ncs differ diff --git a/_haks/poa_exp_spells/sp_shock_grasp.nss b/_haks/poa_exp_spells/sp_shock_grasp.nss index b9cd182..3be497d 100644 --- a/_haks/poa_exp_spells/sp_shock_grasp.nss +++ b/_haks/poa_exp_spells/sp_shock_grasp.nss @@ -50,7 +50,7 @@ int DoSpell(object oCaster, object oTarget, int nCasterLevel, int nEvent) { int nMetaMagic = PRCGetMetaMagicFeat(); int nPenetr = nCasterLevel + SPGetPenetr(); - int nDie = min(nCasterLevel, 20); + int nDie = PRCMin(nCasterLevel, 20); object oArmor = GetItemInSlot(INVENTORY_SLOT_CHEST, oTarget); effect eVis = EffectVisualEffect(VFX_DUR_BIGBYS_BIGBLUE_HAND2); diff --git a/_haks/poa_exp_spells/sp_shout.ncs b/_haks/poa_exp_spells/sp_shout.ncs index d81f3e0..ca5b3d7 100644 Binary files a/_haks/poa_exp_spells/sp_shout.ncs and b/_haks/poa_exp_spells/sp_shout.ncs differ diff --git a/_haks/poa_exp_spells/sp_shriveling.ncs b/_haks/poa_exp_spells/sp_shriveling.ncs index 9fb0988..5e7291e 100644 Binary files a/_haks/poa_exp_spells/sp_shriveling.ncs and b/_haks/poa_exp_spells/sp_shriveling.ncs differ diff --git a/_haks/poa_exp_spells/sp_shriveling.nss b/_haks/poa_exp_spells/sp_shriveling.nss index 37334ed..d7dfb91 100644 --- a/_haks/poa_exp_spells/sp_shriveling.nss +++ b/_haks/poa_exp_spells/sp_shriveling.nss @@ -55,12 +55,12 @@ void main() //SR if(!PRCDoResistSpell(oPC, oTarget, nCasterLvl + SPGetPenetr()) && PRCGetIsAliveCreature(oTarget)) { - int nDam = d4(min(nCasterLvl, 20)); + int nDam = d4(PRCMin(nCasterLvl, 20)); //eval metamagic if(nMetaMagic & METAMAGIC_MAXIMIZE) { - nDam = 4 * (min(nCasterLvl, 20)); + nDam = 4 * (PRCMin(nCasterLvl, 20)); } if(nMetaMagic & METAMAGIC_EMPOWER) diff --git a/_haks/poa_exp_spells/sp_slash_displ.ncs b/_haks/poa_exp_spells/sp_slash_displ.ncs index aa5b1e6..6e78c9b 100644 Binary files a/_haks/poa_exp_spells/sp_slash_displ.ncs and b/_haks/poa_exp_spells/sp_slash_displ.ncs differ diff --git a/_haks/poa_exp_spells/sp_slashdark.ncs b/_haks/poa_exp_spells/sp_slashdark.ncs index 455abd3..627a219 100644 Binary files a/_haks/poa_exp_spells/sp_slashdark.ncs and b/_haks/poa_exp_spells/sp_slashdark.ncs differ diff --git a/_haks/poa_exp_spells/sp_snsnow.ncs b/_haks/poa_exp_spells/sp_snsnow.ncs index f30d76c..4cbc1b2 100644 Binary files a/_haks/poa_exp_spells/sp_snsnow.ncs and b/_haks/poa_exp_spells/sp_snsnow.ncs differ diff --git a/_haks/poa_exp_spells/sp_snsnowsw.ncs b/_haks/poa_exp_spells/sp_snsnowsw.ncs index c070894..3a2bf0a 100644 Binary files a/_haks/poa_exp_spells/sp_snsnowsw.ncs and b/_haks/poa_exp_spells/sp_snsnowsw.ncs differ diff --git a/_haks/poa_exp_spells/sp_spiderskin.ncs b/_haks/poa_exp_spells/sp_spiderskin.ncs index a6869a7..23b1069 100644 Binary files a/_haks/poa_exp_spells/sp_spiderskin.ncs and b/_haks/poa_exp_spells/sp_spiderskin.ncs differ diff --git a/_haks/poa_exp_spells/sp_stalagmite.ncs b/_haks/poa_exp_spells/sp_stalagmite.ncs index 7a3eee2..a323c50 100644 Binary files a/_haks/poa_exp_spells/sp_stalagmite.ncs and b/_haks/poa_exp_spells/sp_stalagmite.ncs differ diff --git a/_haks/poa_exp_spells/sp_strm_shard.ncs b/_haks/poa_exp_spells/sp_strm_shard.ncs index 05117f0..c533203 100644 Binary files a/_haks/poa_exp_spells/sp_strm_shard.ncs and b/_haks/poa_exp_spells/sp_strm_shard.ncs differ diff --git a/_haks/poa_exp_spells/sp_strm_shard.nss b/_haks/poa_exp_spells/sp_strm_shard.nss index 36804e6..ea767c3 100644 --- a/_haks/poa_exp_spells/sp_strm_shard.nss +++ b/_haks/poa_exp_spells/sp_strm_shard.nss @@ -62,11 +62,11 @@ void main() SPApplyEffectToObject(DURATION_TYPE_PERMANENT, EffectBlindness(), oTarget); } - int nDam = d6(min(nCasterLvl, 40)); + int nDam = d6(PRCMin(nCasterLvl, 40)); if(nMetaMagic & METAMAGIC_MAXIMIZE) { - nDam = 6 *(min(nCasterLvl, 40)); + nDam = 6 *(PRCMin(nCasterLvl, 40)); } if(nMetaMagic & METAMAGIC_EMPOWER) diff --git a/_haks/poa_exp_spells/sp_sunmantle.ncs b/_haks/poa_exp_spells/sp_sunmantle.ncs index 0ec4529..ac2a438 100644 Binary files a/_haks/poa_exp_spells/sp_sunmantle.ncs and b/_haks/poa_exp_spells/sp_sunmantle.ncs differ diff --git a/_haks/poa_exp_spells/sp_thous_ndls.ncs b/_haks/poa_exp_spells/sp_thous_ndls.ncs index 3e089e2..dd67f82 100644 Binary files a/_haks/poa_exp_spells/sp_thous_ndls.ncs and b/_haks/poa_exp_spells/sp_thous_ndls.ncs differ diff --git a/_haks/poa_exp_spells/sp_touch_fatigue.ncs b/_haks/poa_exp_spells/sp_touch_fatigue.ncs index bacc5d4..bf872cc 100644 Binary files a/_haks/poa_exp_spells/sp_touch_fatigue.ncs and b/_haks/poa_exp_spells/sp_touch_fatigue.ncs differ diff --git a/_haks/poa_exp_spells/sp_touch_fatigue.nss b/_haks/poa_exp_spells/sp_touch_fatigue.nss index 1330705..cbcf20b 100644 --- a/_haks/poa_exp_spells/sp_touch_fatigue.nss +++ b/_haks/poa_exp_spells/sp_touch_fatigue.nss @@ -37,7 +37,7 @@ int DoSpell(object oCaster, object oTarget, int nCasterLevel, int nEvent) { int nMetaMagic = PRCGetMetaMagicFeat(); int nPenetr = nCasterLevel + SPGetPenetr(); - int nDie = min(nCasterLevel, 20); + int nDie = PRCMin(nCasterLevel, 20); object oArmor = GetItemInSlot(INVENTORY_SLOT_CHEST, oTarget); effect eVis = EffectVisualEffect(VFX_DUR_BIGBYS_BIGBLUE_HAND2); diff --git a/_haks/poa_exp_spells/sp_unliv_weap.ncs b/_haks/poa_exp_spells/sp_unliv_weap.ncs index 52ff0ad..fa22bcf 100644 Binary files a/_haks/poa_exp_spells/sp_unliv_weap.ncs and b/_haks/poa_exp_spells/sp_unliv_weap.ncs differ diff --git a/_haks/poa_exp_spells/sp_unliv_weap.nss b/_haks/poa_exp_spells/sp_unliv_weap.nss index 27bfd5c..0b0ee00 100644 --- a/_haks/poa_exp_spells/sp_unliv_weap.nss +++ b/_haks/poa_exp_spells/sp_unliv_weap.nss @@ -82,7 +82,7 @@ void HiImABomb(object oTarget, int nCounter, int nHP, int nCasterLvl, int nMetaM // eSplode = SupernaturalEffect(eSplode); location lLoc = GetLocation(oTarget); - int nDice = min((nCasterLvl/2), 20); + int nDice = PRCMin((nCasterLvl/2), 20); SPApplyEffectToObject(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_FNF_BLINDDEAF), oTarget); diff --git a/_haks/poa_exp_spells/sp_wallfrosta.ncs b/_haks/poa_exp_spells/sp_wallfrosta.ncs index c6f1016..69aa934 100644 Binary files a/_haks/poa_exp_spells/sp_wallfrosta.ncs and b/_haks/poa_exp_spells/sp_wallfrosta.ncs differ diff --git a/_haks/poa_exp_spells/sp_wallfrostc.ncs b/_haks/poa_exp_spells/sp_wallfrostc.ncs index 54ac809..7060f75 100644 Binary files a/_haks/poa_exp_spells/sp_wallfrostc.ncs and b/_haks/poa_exp_spells/sp_wallfrostc.ncs differ diff --git a/_haks/poa_exp_spells/sp_wrtch_blght.ncs b/_haks/poa_exp_spells/sp_wrtch_blght.ncs index c88c970..f98123a 100644 Binary files a/_haks/poa_exp_spells/sp_wrtch_blght.ncs and b/_haks/poa_exp_spells/sp_wrtch_blght.ncs differ diff --git a/_haks/poa_exp_spells/sp_wrtch_blght.nss b/_haks/poa_exp_spells/sp_wrtch_blght.nss index 7eb8888..45b66a8 100644 --- a/_haks/poa_exp_spells/sp_wrtch_blght.nss +++ b/_haks/poa_exp_spells/sp_wrtch_blght.nss @@ -47,7 +47,7 @@ void main() location lLoc = PRCGetSpellTargetLocation(); int nCasterLvl = PRCGetCasterLevel(oPC); int nMetaMagic = PRCGetMetaMagicFeat(); - int nDice = min(nCasterLvl, 60); + int nDice = PRCMin(nCasterLvl, 60); int nAlign; int nDam; int nDC; diff --git a/_haks/poa_exp_spells/x0_s0_acidsplash.ncs b/_haks/poa_exp_spells/x0_s0_acidsplash.ncs index 17549d4..32683e4 100644 Binary files a/_haks/poa_exp_spells/x0_s0_acidsplash.ncs and b/_haks/poa_exp_spells/x0_s0_acidsplash.ncs differ diff --git a/_haks/poa_exp_spells/x0_s0_bigby2.ncs b/_haks/poa_exp_spells/x0_s0_bigby2.ncs index c608061..ef19443 100644 Binary files a/_haks/poa_exp_spells/x0_s0_bigby2.ncs and b/_haks/poa_exp_spells/x0_s0_bigby2.ncs differ diff --git a/_haks/poa_exp_spells/x0_s0_bigby4.ncs b/_haks/poa_exp_spells/x0_s0_bigby4.ncs index 029c345..764fec2 100644 Binary files a/_haks/poa_exp_spells/x0_s0_bigby4.ncs and b/_haks/poa_exp_spells/x0_s0_bigby4.ncs differ diff --git a/_haks/poa_exp_spells/x0_s0_bigby5.ncs b/_haks/poa_exp_spells/x0_s0_bigby5.ncs index 5e93c59..40fbff7 100644 Binary files a/_haks/poa_exp_spells/x0_s0_bigby5.ncs and b/_haks/poa_exp_spells/x0_s0_bigby5.ncs differ diff --git a/_haks/poa_exp_spells/x0_s0_bombard.ncs b/_haks/poa_exp_spells/x0_s0_bombard.ncs index bd30fd5..69826c6 100644 Binary files a/_haks/poa_exp_spells/x0_s0_bombard.ncs and b/_haks/poa_exp_spells/x0_s0_bombard.ncs differ diff --git a/_haks/poa_exp_spells/x0_s0_divfav.ncs b/_haks/poa_exp_spells/x0_s0_divfav.ncs index bd52020..d05ddea 100644 Binary files a/_haks/poa_exp_spells/x0_s0_divfav.ncs and b/_haks/poa_exp_spells/x0_s0_divfav.ncs differ diff --git a/_haks/poa_exp_spells/x0_s0_divfav.nss b/_haks/poa_exp_spells/x0_s0_divfav.nss index 49291fa..c749964 100644 --- a/_haks/poa_exp_spells/x0_s0_divfav.nss +++ b/_haks/poa_exp_spells/x0_s0_divfav.nss @@ -44,7 +44,7 @@ void main() float fDuration = TurnsToSeconds(1); // * Duration 1 turn if(nMetaMagic & METAMAGIC_EXTEND) fDuration *= 2; - int nScale = min(20, max(1, CasterLvl / 3)); + int nScale = PRCMin(20, PRCMax(1, CasterLvl / 3)); effect eVis = EffectVisualEffect(VFX_IMP_HEAD_HOLY); diff --git a/_haks/poa_exp_spells/x0_s0_earthquake.ncs b/_haks/poa_exp_spells/x0_s0_earthquake.ncs index 556060c..732d4b5 100644 Binary files a/_haks/poa_exp_spells/x0_s0_earthquake.ncs and b/_haks/poa_exp_spells/x0_s0_earthquake.ncs differ diff --git a/_haks/poa_exp_spells/x0_s0_elecjolt.ncs b/_haks/poa_exp_spells/x0_s0_elecjolt.ncs index f99690d..68a37b2 100644 Binary files a/_haks/poa_exp_spells/x0_s0_elecjolt.ncs and b/_haks/poa_exp_spells/x0_s0_elecjolt.ncs differ diff --git a/_haks/poa_exp_spells/x0_s0_ether.ncs b/_haks/poa_exp_spells/x0_s0_ether.ncs index 9b73789..bdf8ddb 100644 Binary files a/_haks/poa_exp_spells/x0_s0_ether.ncs and b/_haks/poa_exp_spells/x0_s0_ether.ncs differ diff --git a/_haks/poa_exp_spells/x0_s0_firebrand.ncs b/_haks/poa_exp_spells/x0_s0_firebrand.ncs index 734cd4e..4c4f06f 100644 Binary files a/_haks/poa_exp_spells/x0_s0_firebrand.ncs and b/_haks/poa_exp_spells/x0_s0_firebrand.ncs differ diff --git a/_haks/poa_exp_spells/x0_s0_flare.ncs b/_haks/poa_exp_spells/x0_s0_flare.ncs index e222658..a1b0641 100644 Binary files a/_haks/poa_exp_spells/x0_s0_flare.ncs and b/_haks/poa_exp_spells/x0_s0_flare.ncs differ diff --git a/_haks/poa_exp_spells/x0_s0_gmagicfang.ncs b/_haks/poa_exp_spells/x0_s0_gmagicfang.ncs index 95d17e7..f8a7023 100644 Binary files a/_haks/poa_exp_spells/x0_s0_gmagicfang.ncs and b/_haks/poa_exp_spells/x0_s0_gmagicfang.ncs differ diff --git a/_haks/poa_exp_spells/x0_s0_inferno.ncs b/_haks/poa_exp_spells/x0_s0_inferno.ncs index 2014fd0..71706e3 100644 Binary files a/_haks/poa_exp_spells/x0_s0_inferno.ncs and b/_haks/poa_exp_spells/x0_s0_inferno.ncs differ diff --git a/_haks/poa_exp_spells/x0_s0_magicfang.ncs b/_haks/poa_exp_spells/x0_s0_magicfang.ncs index 6e8256b..e620387 100644 Binary files a/_haks/poa_exp_spells/x0_s0_magicfang.ncs and b/_haks/poa_exp_spells/x0_s0_magicfang.ncs differ diff --git a/_haks/poa_exp_spells/x0_s0_missstorm1.ncs b/_haks/poa_exp_spells/x0_s0_missstorm1.ncs index 7bf35e9..0520d78 100644 Binary files a/_haks/poa_exp_spells/x0_s0_missstorm1.ncs and b/_haks/poa_exp_spells/x0_s0_missstorm1.ncs differ diff --git a/_haks/poa_exp_spells/x0_s0_missstorm2.ncs b/_haks/poa_exp_spells/x0_s0_missstorm2.ncs index a38fd1c..90d05d5 100644 Binary files a/_haks/poa_exp_spells/x0_s0_missstorm2.ncs and b/_haks/poa_exp_spells/x0_s0_missstorm2.ncs differ diff --git a/_haks/poa_exp_spells/x0_s0_quillfire.ncs b/_haks/poa_exp_spells/x0_s0_quillfire.ncs index 7bc476e..fb03328 100644 Binary files a/_haks/poa_exp_spells/x0_s0_quillfire.ncs and b/_haks/poa_exp_spells/x0_s0_quillfire.ncs differ diff --git a/_haks/poa_exp_spells/x0_s0_shieldfait.ncs b/_haks/poa_exp_spells/x0_s0_shieldfait.ncs index 2abfbb0..1e8e2be 100644 Binary files a/_haks/poa_exp_spells/x0_s0_shieldfait.ncs and b/_haks/poa_exp_spells/x0_s0_shieldfait.ncs differ diff --git a/_haks/poa_exp_spells/x0_s0_spikegroen.ncs b/_haks/poa_exp_spells/x0_s0_spikegroen.ncs index c995e8e..e3f4654 100644 Binary files a/_haks/poa_exp_spells/x0_s0_spikegroen.ncs and b/_haks/poa_exp_spells/x0_s0_spikegroen.ncs differ diff --git a/_haks/poa_exp_spells/x0_s0_spikegrohb.ncs b/_haks/poa_exp_spells/x0_s0_spikegrohb.ncs index d18d58b..e17dd06 100644 Binary files a/_haks/poa_exp_spells/x0_s0_spikegrohb.ncs and b/_haks/poa_exp_spells/x0_s0_spikegrohb.ncs differ diff --git a/_haks/poa_exp_spells/x0_s0_sunburst.ncs b/_haks/poa_exp_spells/x0_s0_sunburst.ncs index 1448781..04c361e 100644 Binary files a/_haks/poa_exp_spells/x0_s0_sunburst.ncs and b/_haks/poa_exp_spells/x0_s0_sunburst.ncs differ diff --git a/_haks/poa_exp_spells/x2_s0_acidbrth.ncs b/_haks/poa_exp_spells/x2_s0_acidbrth.ncs index 2051701..263c6e5 100644 Binary files a/_haks/poa_exp_spells/x2_s0_acidbrth.ncs and b/_haks/poa_exp_spells/x2_s0_acidbrth.ncs differ diff --git a/_haks/poa_exp_spells/x2_s0_acidshth.ncs b/_haks/poa_exp_spells/x2_s0_acidshth.ncs index 8fc0a02..825746e 100644 Binary files a/_haks/poa_exp_spells/x2_s0_acidshth.ncs and b/_haks/poa_exp_spells/x2_s0_acidshth.ncs differ diff --git a/_haks/poa_exp_spells/x2_s0_acidshth.nss b/_haks/poa_exp_spells/x2_s0_acidshth.nss index 8f05632..43dffba 100644 --- a/_haks/poa_exp_spells/x2_s0_acidshth.nss +++ b/_haks/poa_exp_spells/x2_s0_acidshth.nss @@ -46,7 +46,7 @@ SetLocalInt(OBJECT_SELF, "X2_L_LAST_SPELLSCHOOL_VAR", SPELL_SCHOOL_CONJURATION); //Declare major variables effect eVis = EffectVisualEffect(448); int nDuration = PRCGetCasterLevel(OBJECT_SELF); - int nDamage = min(nDuration * 2, 40); + int nDamage = PRCMin(nDuration * 2, 40); int nMetaMagic = PRCGetMetaMagicFeat(); object oTarget = OBJECT_SELF; effect eShield = EffectDamageShield(nDamage, 0, ChangedElementalDamage(OBJECT_SELF, DAMAGE_TYPE_ACID)); diff --git a/_haks/poa_exp_spells/x2_s0_balllghtng.ncs b/_haks/poa_exp_spells/x2_s0_balllghtng.ncs index 67b2f0b..18b1f80 100644 Binary files a/_haks/poa_exp_spells/x2_s0_balllghtng.ncs and b/_haks/poa_exp_spells/x2_s0_balllghtng.ncs differ diff --git a/_haks/poa_exp_spells/x2_s0_combust.ncs b/_haks/poa_exp_spells/x2_s0_combust.ncs index 19afbc5..622d0cf 100644 Binary files a/_haks/poa_exp_spells/x2_s0_combust.ncs and b/_haks/poa_exp_spells/x2_s0_combust.ncs differ diff --git a/_haks/poa_exp_spells/x2_s0_crumble.ncs b/_haks/poa_exp_spells/x2_s0_crumble.ncs index a362f93..6156d31 100644 Binary files a/_haks/poa_exp_spells/x2_s0_crumble.ncs and b/_haks/poa_exp_spells/x2_s0_crumble.ncs differ diff --git a/_haks/poa_exp_spells/x2_s0_cureother.ncs b/_haks/poa_exp_spells/x2_s0_cureother.ncs index 30ff219..714450e 100644 Binary files a/_haks/poa_exp_spells/x2_s0_cureother.ncs and b/_haks/poa_exp_spells/x2_s0_cureother.ncs differ diff --git a/_haks/poa_exp_spells/x2_s0_dtharm.ncs b/_haks/poa_exp_spells/x2_s0_dtharm.ncs index 6991782..fee9722 100644 Binary files a/_haks/poa_exp_spells/x2_s0_dtharm.ncs and b/_haks/poa_exp_spells/x2_s0_dtharm.ncs differ diff --git a/_haks/poa_exp_spells/x2_s0_elecloop.ncs b/_haks/poa_exp_spells/x2_s0_elecloop.ncs index c565d07..372801a 100644 Binary files a/_haks/poa_exp_spells/x2_s0_elecloop.ncs and b/_haks/poa_exp_spells/x2_s0_elecloop.ncs differ diff --git a/_haks/poa_exp_spells/x2_s0_horiboom.ncs b/_haks/poa_exp_spells/x2_s0_horiboom.ncs index 112f289..683b587 100644 Binary files a/_haks/poa_exp_spells/x2_s0_horiboom.ncs and b/_haks/poa_exp_spells/x2_s0_horiboom.ncs differ diff --git a/_haks/poa_exp_spells/x2_s0_icedagg.ncs b/_haks/poa_exp_spells/x2_s0_icedagg.ncs index 055038a..d83c5c8 100644 Binary files a/_haks/poa_exp_spells/x2_s0_icedagg.ncs and b/_haks/poa_exp_spells/x2_s0_icedagg.ncs differ diff --git a/_haks/poa_exp_spells/x2_s0_icedagg.nss b/_haks/poa_exp_spells/x2_s0_icedagg.nss index 24f6115..774c68b 100644 --- a/_haks/poa_exp_spells/x2_s0_icedagg.nss +++ b/_haks/poa_exp_spells/x2_s0_icedagg.nss @@ -29,7 +29,7 @@ void main() location lTarget = PRCGetSpellTargetLocation(); int nCasterLvl = PRCGetCasterLevel(oCaster); int nPenetr = nCasterLvl + SPGetPenetr(); - int nDice = min(nCasterLvl, 20); + int nDice = PRCMin(nCasterLvl, 20); int nMetaMagic = PRCGetMetaMagicFeat(); int EleDmg = ChangedElementalDamage(oCaster, DAMAGE_TYPE_COLD); int nSaveType = ChangedSaveType(EleDmg); diff --git a/_haks/poa_exp_spells/x2_s0_magcvest.ncs b/_haks/poa_exp_spells/x2_s0_magcvest.ncs index ad350fc..7e4f704 100644 Binary files a/_haks/poa_exp_spells/x2_s0_magcvest.ncs and b/_haks/poa_exp_spells/x2_s0_magcvest.ncs differ diff --git a/_haks/poa_exp_spells/x2_s0_scntsphere.ncs b/_haks/poa_exp_spells/x2_s0_scntsphere.ncs index 8909e28..d56dbf4 100644 Binary files a/_haks/poa_exp_spells/x2_s0_scntsphere.ncs and b/_haks/poa_exp_spells/x2_s0_scntsphere.ncs differ diff --git a/_haks/poa_exp_spells/x2_s0_tidebattle.ncs b/_haks/poa_exp_spells/x2_s0_tidebattle.ncs index a75cce6..32c0046 100644 Binary files a/_haks/poa_exp_spells/x2_s0_tidebattle.ncs and b/_haks/poa_exp_spells/x2_s0_tidebattle.ncs differ diff --git a/_haks/poa_exp_spells/x2_s0_undeath.ncs b/_haks/poa_exp_spells/x2_s0_undeath.ncs index 63f6419..cb622ba 100644 Binary files a/_haks/poa_exp_spells/x2_s0_undeath.ncs and b/_haks/poa_exp_spells/x2_s0_undeath.ncs differ diff --git a/_module/ncs/darktrigger2a.ncs b/_module/ncs/darktrigger2a.ncs index 025fa0b..0d166dc 100644 Binary files a/_module/ncs/darktrigger2a.ncs and b/_module/ncs/darktrigger2a.ncs differ diff --git a/_module/ncs/give_under_token.ncs b/_module/ncs/give_under_token.ncs index c6d10aa..dd022fa 100644 Binary files a/_module/ncs/give_under_token.ncs and b/_module/ncs/give_under_token.ncs differ diff --git a/_module/ncs/givepcsocket.ncs b/_module/ncs/givepcsocket.ncs index 9382529..d7ceb6d 100644 Binary files a/_module/ncs/givepcsocket.ncs and b/_module/ncs/givepcsocket.ncs differ diff --git a/_module/ncs/givepcsocket2.ncs b/_module/ncs/givepcsocket2.ncs index 9382529..d7ceb6d 100644 Binary files a/_module/ncs/givepcsocket2.ncs and b/_module/ncs/givepcsocket2.ncs differ diff --git a/_module/ncs/sf_wingwand.ncs b/_module/ncs/sf_wingwand.ncs index 43b1f98..edbcd39 100644 Binary files a/_module/ncs/sf_wingwand.ncs and b/_module/ncs/sf_wingwand.ncs differ diff --git a/_module/ncs/sfcs_ac.ncs b/_module/ncs/sfcs_ac.ncs index 9cc9b98..3a6267f 100644 Binary files a/_module/ncs/sfcs_ac.ncs and b/_module/ncs/sfcs_ac.ncs differ diff --git a/_module/ncs/sfcs_acid.ncs b/_module/ncs/sfcs_acid.ncs index 55bc860..ab1e11e 100644 Binary files a/_module/ncs/sfcs_acid.ncs and b/_module/ncs/sfcs_acid.ncs differ diff --git a/_module/ncs/silenttrigger2.ncs b/_module/ncs/silenttrigger2.ncs index 2274260..90e8f4e 100644 Binary files a/_module/ncs/silenttrigger2.ncs and b/_module/ncs/silenttrigger2.ncs differ diff --git a/_module/nss/coloritemcyan.nss b/_module/nss/coloritemcyan.nss index edd15dc..3070201 100644 --- a/_module/nss/coloritemcyan.nss +++ b/_module/nss/coloritemcyan.nss @@ -12,24 +12,24 @@ to the proper color that matches this script's name (ie coloritemwhite script goes on the line which changes the color to white!) -**These GetRGB(#,#,#) are the functions you use to get the proper +**These PRCGetRGB(#,#,#) are the functions you use to get the proper color for the token you are setting on the item name.** - GetRGB() := WHITE // no parameters, default is white - GetRGB(15,15,1):= YELLOW - GetRGB(15,5,1) := ORANGE - GetRGB(15,1,1) := RED - GetRGB(7,7,15) := BLUE - GetRGB(1,15,1) := NEON GREEN - GetRGB(1,11,1) := GREEN - GetRGB(9,6,1) := BROWN - GetRGB(11,9,11):= LIGHT PURPLE - GetRGB(12,10,7):= TAN - GetRGB(8,1,8) := PURPLE - GetRGB(13,9,13):= PLUM - GetRGB(1,7,7) := TEAL - GetRGB(1,15,15):= CYAN - GetRGB(1,1,15) := BRIGHT BLUE + PRCGetRGB() := WHITE // no parameters, default is white + PRCGetRGB(15,15,1):= YELLOW + PRCGetRGB(15,5,1) := ORANGE + PRCGetRGB(15,1,1) := RED + PRCGetRGB(7,7,15) := BLUE + PRCGetRGB(1,15,1) := NEON GREEN + PRCGetRGB(1,11,1) := GREEN + PRCGetRGB(9,6,1) := BROWN + PRCGetRGB(11,9,11):= LIGHT PURPLE + PRCGetRGB(12,10,7):= TAN + PRCGetRGB(8,1,8) := PURPLE + PRCGetRGB(13,9,13):= PLUM + PRCGetRGB(1,7,7) := TEAL + PRCGetRGB(1,15,15):= CYAN + PRCGetRGB(1,1,15) := BRIGHT BLUE */ //////////////////////////////////////////////// @@ -37,7 +37,7 @@ color for the token you are setting on the item name.** //This color system is by Genji, w/ special thanks to //ADAL-Miko & Rich Dersheimer for their help to Genji :) -string GetRGB(int red = 15,int green = 15,int blue = 15); +string PRCGetRGB(int red = 15,int green = 15,int blue = 15); //Main Script// @@ -49,9 +49,9 @@ void main() object oPC = GetPCSpeaker(); string sName = GetLocalString(oPC, "ONNC"); -//string sToken = GetRGB(#,#,#); +//string sToken = PRCGetRGB(#,#,#); //(This is the proper function you need to create below!) -string sToken = GetRGB(1,15,15); //Cyan +string sToken = PRCGetRGB(1,15,15); //Cyan string sMod; @@ -93,7 +93,7 @@ DelayCommand(2.2, DeleteLocalString(oPC, "ONNC")); } //Prototype String Defined -string GetRGB(int red = 15,int green = 15,int blue = 15) +string PRCGetRGB(int red = 15,int green = 15,int blue = 15) { object coloringBook = GetObjectByTag("ColoringBook"); if (coloringBook == OBJECT_INVALID) diff --git a/_module/nss/coloritemgreen.nss b/_module/nss/coloritemgreen.nss index fded45a..57258cb 100644 --- a/_module/nss/coloritemgreen.nss +++ b/_module/nss/coloritemgreen.nss @@ -12,24 +12,24 @@ to the proper color that matches this script's name (ie coloritemwhite script goes on the line which changes the color to white!) -**These GetRGB(#,#,#) are the functions you use to get the proper +**These PRCGetRGB(#,#,#) are the functions you use to get the proper color for the token you are setting on the item name.** - GetRGB() := WHITE // no parameters, default is white - GetRGB(15,15,1):= YELLOW - GetRGB(15,5,1) := ORANGE - GetRGB(15,1,1) := RED - GetRGB(7,7,15) := BLUE - GetRGB(1,15,1) := NEON GREEN - GetRGB(1,11,1) := GREEN - GetRGB(9,6,1) := BROWN - GetRGB(11,9,11):= LIGHT PURPLE - GetRGB(12,10,7):= TAN - GetRGB(8,1,8) := PURPLE - GetRGB(13,9,13):= PLUM - GetRGB(1,7,7) := TEAL - GetRGB(1,15,15):= CYAN - GetRGB(1,1,15) := BRIGHT BLUE + PRCGetRGB() := WHITE // no parameters, default is white + PRCGetRGB(15,15,1):= YELLOW + PRCGetRGB(15,5,1) := ORANGE + PRCGetRGB(15,1,1) := RED + PRCGetRGB(7,7,15) := BLUE + PRCGetRGB(1,15,1) := NEON GREEN + PRCGetRGB(1,11,1) := GREEN + PRCGetRGB(9,6,1) := BROWN + PRCGetRGB(11,9,11):= LIGHT PURPLE + PRCGetRGB(12,10,7):= TAN + PRCGetRGB(8,1,8) := PURPLE + PRCGetRGB(13,9,13):= PLUM + PRCGetRGB(1,7,7) := TEAL + PRCGetRGB(1,15,15):= CYAN + PRCGetRGB(1,1,15) := BRIGHT BLUE */ //////////////////////////////////////////////// @@ -37,7 +37,7 @@ color for the token you are setting on the item name.** //This color system is by Genji, w/ special thanks to //ADAL-Miko & Rich Dersheimer for their help to Genji :) -string GetRGB(int red = 15,int green = 15,int blue = 15); +string PRCGetRGB(int red = 15,int green = 15,int blue = 15); //Main Script// @@ -49,9 +49,9 @@ void main() object oPC = GetPCSpeaker(); string sName = GetLocalString(oPC, "ONNC"); -//string sToken = GetRGB(#,#,#); +//string sToken = PRCGetRGB(#,#,#); //(This is the proper function you need to create below!) -string sToken = GetRGB(1,11,1); //Green +string sToken = PRCGetRGB(1,11,1); //Green string sMod; @@ -93,7 +93,7 @@ DelayCommand(2.2, DeleteLocalString(oPC, "ONNC")); } //Prototype String Defined -string GetRGB(int red = 15,int green = 15,int blue = 15) +string PRCGetRGB(int red = 15,int green = 15,int blue = 15) { object coloringBook = GetObjectByTag("ColoringBook"); if (coloringBook == OBJECT_INVALID) diff --git a/_module/nss/coloritemneongrn.nss b/_module/nss/coloritemneongrn.nss index 21db4a0..9ec3650 100644 --- a/_module/nss/coloritemneongrn.nss +++ b/_module/nss/coloritemneongrn.nss @@ -12,24 +12,24 @@ to the proper color that matches this script's name (ie coloritemwhite script goes on the line which changes the color to white!) -**These GetRGB(#,#,#) are the functions you use to get the proper +**These PRCGetRGB(#,#,#) are the functions you use to get the proper color for the token you are setting on the item name.** - GetRGB() := WHITE // no parameters, default is white - GetRGB(15,15,1):= YELLOW - GetRGB(15,5,1) := ORANGE - GetRGB(15,1,1) := RED - GetRGB(7,7,15) := BLUE - GetRGB(1,15,1) := NEON GREEN - GetRGB(1,11,1) := GREEN - GetRGB(9,6,1) := BROWN - GetRGB(11,9,11):= LIGHT PURPLE - GetRGB(12,10,7):= TAN - GetRGB(8,1,8) := PURPLE - GetRGB(13,9,13):= PLUM - GetRGB(1,7,7) := TEAL - GetRGB(1,15,15):= CYAN - GetRGB(1,1,15) := BRIGHT BLUE + PRCGetRGB() := WHITE // no parameters, default is white + PRCGetRGB(15,15,1):= YELLOW + PRCGetRGB(15,5,1) := ORANGE + PRCGetRGB(15,1,1) := RED + PRCGetRGB(7,7,15) := BLUE + PRCGetRGB(1,15,1) := NEON GREEN + PRCGetRGB(1,11,1) := GREEN + PRCGetRGB(9,6,1) := BROWN + PRCGetRGB(11,9,11):= LIGHT PURPLE + PRCGetRGB(12,10,7):= TAN + PRCGetRGB(8,1,8) := PURPLE + PRCGetRGB(13,9,13):= PLUM + PRCGetRGB(1,7,7) := TEAL + PRCGetRGB(1,15,15):= CYAN + PRCGetRGB(1,1,15) := BRIGHT BLUE */ //////////////////////////////////////////////// @@ -37,7 +37,7 @@ color for the token you are setting on the item name.** //This color system is by Genji, w/ special thanks to //ADAL-Miko & Rich Dersheimer for their help to Genji :) -string GetRGB(int red = 15,int green = 15,int blue = 15); +string PRCGetRGB(int red = 15,int green = 15,int blue = 15); //Main Script// @@ -49,9 +49,9 @@ void main() object oPC = GetPCSpeaker(); string sName = GetLocalString(oPC, "ONNC"); -//string sToken = GetRGB(#,#,#); +//string sToken = PRCGetRGB(#,#,#); //(This is the proper function you need to create below!) -string sToken = GetRGB(1,15,1); //neon green +string sToken = PRCGetRGB(1,15,1); //neon green string sMod; @@ -93,7 +93,7 @@ DelayCommand(2.2, DeleteLocalString(oPC, "ONNC")); } //Prototype String Defined -string GetRGB(int red = 15,int green = 15,int blue = 15) +string PRCGetRGB(int red = 15,int green = 15,int blue = 15) { object coloringBook = GetObjectByTag("ColoringBook"); if (coloringBook == OBJECT_INVALID) diff --git a/_module/nss/coloritemplum.nss b/_module/nss/coloritemplum.nss index 9c1a64f..3344502 100644 --- a/_module/nss/coloritemplum.nss +++ b/_module/nss/coloritemplum.nss @@ -12,24 +12,24 @@ to the proper color that matches this script's name (ie coloritemwhite script goes on the line which changes the color to white!) -**These GetRGB(#,#,#) are the functions you use to get the proper +**These PRCGetRGB(#,#,#) are the functions you use to get the proper color for the token you are setting on the item name.** - GetRGB() := WHITE // no parameters, default is white - GetRGB(15,15,1):= YELLOW - GetRGB(15,5,1) := ORANGE - GetRGB(15,1,1) := RED - GetRGB(7,7,15) := BLUE - GetRGB(1,15,1) := NEON GREEN - GetRGB(1,11,1) := GREEN - GetRGB(9,6,1) := BROWN - GetRGB(11,9,11):= LIGHT PURPLE - GetRGB(12,10,7):= TAN - GetRGB(8,1,8) := PURPLE - GetRGB(13,9,13):= PLUM - GetRGB(1,7,7) := TEAL - GetRGB(1,15,15):= CYAN - GetRGB(1,1,15) := BRIGHT BLUE + PRCGetRGB() := WHITE // no parameters, default is white + PRCGetRGB(15,15,1):= YELLOW + PRCGetRGB(15,5,1) := ORANGE + PRCGetRGB(15,1,1) := RED + PRCGetRGB(7,7,15) := BLUE + PRCGetRGB(1,15,1) := NEON GREEN + PRCGetRGB(1,11,1) := GREEN + PRCGetRGB(9,6,1) := BROWN + PRCGetRGB(11,9,11):= LIGHT PURPLE + PRCGetRGB(12,10,7):= TAN + PRCGetRGB(8,1,8) := PURPLE + PRCGetRGB(13,9,13):= PLUM + PRCGetRGB(1,7,7) := TEAL + PRCGetRGB(1,15,15):= CYAN + PRCGetRGB(1,1,15) := BRIGHT BLUE */ //////////////////////////////////////////////// @@ -37,7 +37,7 @@ color for the token you are setting on the item name.** //This color system is by Genji, w/ special thanks to //ADAL-Miko & Rich Dersheimer for their help to Genji :) -string GetRGB(int red = 15,int green = 15,int blue = 15); +string PRCGetRGB(int red = 15,int green = 15,int blue = 15); //Main Script// @@ -49,9 +49,9 @@ void main() object oPC = GetPCSpeaker(); string sName = GetLocalString(oPC, "ONNC"); -//string sToken = GetRGB(#,#,#); +//string sToken = PRCGetRGB(#,#,#); //(This is the proper function you need to create below!) -string sToken = GetRGB(13,9,13); //Plum +string sToken = PRCGetRGB(13,9,13); //Plum string sMod; @@ -92,7 +92,7 @@ DelayCommand(2.2, DeleteLocalString(oPC, "ONNC")); } //Prototype String Defined -string GetRGB(int red = 15,int green = 15,int blue = 15) +string PRCGetRGB(int red = 15,int green = 15,int blue = 15) { object coloringBook = GetObjectByTag("ColoringBook"); if (coloringBook == OBJECT_INVALID) diff --git a/_module/nss/coloritemred.nss b/_module/nss/coloritemred.nss index e5512fc..9432d75 100644 --- a/_module/nss/coloritemred.nss +++ b/_module/nss/coloritemred.nss @@ -12,24 +12,24 @@ to the proper color that matches this script's name (ie coloritemwhite script goes on the line which changes the color to white!) -**These GetRGB(#,#,#) are the functions you use to get the proper +**These PRCGetRGB(#,#,#) are the functions you use to get the proper color for the token you are setting on the item name.** - GetRGB() := WHITE // no parameters, default is white - GetRGB(15,15,1):= YELLOW - GetRGB(15,5,1) := ORANGE - GetRGB(15,1,1) := RED - GetRGB(7,7,15) := BLUE - GetRGB(1,15,1) := NEON GREEN - GetRGB(1,11,1) := GREEN - GetRGB(9,6,1) := BROWN - GetRGB(11,9,11):= LIGHT PURPLE - GetRGB(12,10,7):= TAN - GetRGB(8,1,8) := PURPLE - GetRGB(13,9,13):= PLUM - GetRGB(1,7,7) := TEAL - GetRGB(1,15,15):= CYAN - GetRGB(1,1,15) := BRIGHT BLUE + PRCGetRGB() := WHITE // no parameters, default is white + PRCGetRGB(15,15,1):= YELLOW + PRCGetRGB(15,5,1) := ORANGE + PRCGetRGB(15,1,1) := RED + PRCGetRGB(7,7,15) := BLUE + PRCGetRGB(1,15,1) := NEON GREEN + PRCGetRGB(1,11,1) := GREEN + PRCGetRGB(9,6,1) := BROWN + PRCGetRGB(11,9,11):= LIGHT PURPLE + PRCGetRGB(12,10,7):= TAN + PRCGetRGB(8,1,8) := PURPLE + PRCGetRGB(13,9,13):= PLUM + PRCGetRGB(1,7,7) := TEAL + PRCGetRGB(1,15,15):= CYAN + PRCGetRGB(1,1,15) := BRIGHT BLUE */ //////////////////////////////////////////////// @@ -37,7 +37,7 @@ color for the token you are setting on the item name.** //This color system is by Genji, w/ special thanks to //ADAL-Miko & Rich Dersheimer for their help to Genji :) -string GetRGB(int red = 15,int green = 15,int blue = 15); +string PRCGetRGB(int red = 15,int green = 15,int blue = 15); //Main Script// @@ -49,9 +49,9 @@ void main() object oPC = GetPCSpeaker(); string sName = GetLocalString(oPC, "ONNC"); -//string sToken = GetRGB(#,#,#); +//string sToken = PRCGetRGB(#,#,#); //(This is the proper function you need to create below!) -string sToken = GetRGB(15,1,1); //Red +string sToken = PRCGetRGB(15,1,1); //Red string sMod; @@ -92,7 +92,7 @@ DelayCommand(2.2, DeleteLocalString(oPC, "ONNC")); } //Prototype String Defined -string GetRGB(int red = 15,int green = 15,int blue = 15) +string PRCGetRGB(int red = 15,int green = 15,int blue = 15) { object coloringBook = GetObjectByTag("ColoringBook"); if (coloringBook == OBJECT_INVALID) diff --git a/_module/nss/coloritemteal.nss b/_module/nss/coloritemteal.nss index 0f5f344..5177654 100644 --- a/_module/nss/coloritemteal.nss +++ b/_module/nss/coloritemteal.nss @@ -12,24 +12,24 @@ to the proper color that matches this script's name (ie coloritemwhite script goes on the line which changes the color to white!) -**These GetRGB(#,#,#) are the functions you use to get the proper +**These PRCGetRGB(#,#,#) are the functions you use to get the proper color for the token you are setting on the item name.** - GetRGB() := WHITE // no parameters, default is white - GetRGB(15,15,1):= YELLOW - GetRGB(15,5,1) := ORANGE - GetRGB(15,1,1) := RED - GetRGB(7,7,15) := BLUE - GetRGB(1,15,1) := NEON GREEN - GetRGB(1,11,1) := GREEN - GetRGB(9,6,1) := BROWN - GetRGB(11,9,11):= LIGHT PURPLE - GetRGB(12,10,7):= TAN - GetRGB(8,1,8) := PURPLE - GetRGB(13,9,13):= PLUM - GetRGB(1,7,7) := TEAL - GetRGB(1,15,15):= CYAN - GetRGB(1,1,15) := BRIGHT BLUE + PRCGetRGB() := WHITE // no parameters, default is white + PRCGetRGB(15,15,1):= YELLOW + PRCGetRGB(15,5,1) := ORANGE + PRCGetRGB(15,1,1) := RED + PRCGetRGB(7,7,15) := BLUE + PRCGetRGB(1,15,1) := NEON GREEN + PRCGetRGB(1,11,1) := GREEN + PRCGetRGB(9,6,1) := BROWN + PRCGetRGB(11,9,11):= LIGHT PURPLE + PRCGetRGB(12,10,7):= TAN + PRCGetRGB(8,1,8) := PURPLE + PRCGetRGB(13,9,13):= PLUM + PRCGetRGB(1,7,7) := TEAL + PRCGetRGB(1,15,15):= CYAN + PRCGetRGB(1,1,15) := BRIGHT BLUE */ //////////////////////////////////////////////// @@ -37,7 +37,7 @@ color for the token you are setting on the item name.** //This color system is by Genji, w/ special thanks to //ADAL-Miko & Rich Dersheimer for their help to Genji :) -string GetRGB(int red = 15,int green = 15,int blue = 15); +string PRCGetRGB(int red = 15,int green = 15,int blue = 15); //Main Script// @@ -49,9 +49,9 @@ void main() object oPC = GetPCSpeaker(); string sName = GetLocalString(oPC, "ONNC"); -//string sToken = GetRGB(#,#,#); +//string sToken = PRCGetRGB(#,#,#); //(This is the proper function you need to create below!) -string sToken = GetRGB(1,7,7); //Teal +string sToken = PRCGetRGB(1,7,7); //Teal string sMod; @@ -93,7 +93,7 @@ DelayCommand(2.2, DeleteLocalString(oPC, "ONNC")); } //Prototype String Defined -string GetRGB(int red = 15,int green = 15,int blue = 15) +string PRCGetRGB(int red = 15,int green = 15,int blue = 15) { object coloringBook = GetObjectByTag("ColoringBook"); if (coloringBook == OBJECT_INVALID) diff --git a/_module/nss/coloritemwhite.nss b/_module/nss/coloritemwhite.nss index 9631ad9..2786e2e 100644 --- a/_module/nss/coloritemwhite.nss +++ b/_module/nss/coloritemwhite.nss @@ -12,24 +12,24 @@ to the proper color that matches this script's name (ie coloritemwhite script goes on the line which changes the color to white!) -**These GetRGB(#,#,#) are the functions you use to get the proper +**These PRCGetRGB(#,#,#) are the functions you use to get the proper color for the token you are setting on the item name.** - GetRGB() := WHITE // no parameters, default is white - GetRGB(15,15,1):= YELLOW - GetRGB(15,5,1) := ORANGE - GetRGB(15,1,1) := RED - GetRGB(7,7,15) := BLUE - GetRGB(1,15,1) := NEON GREEN - GetRGB(1,11,1) := GREEN - GetRGB(9,6,1) := BROWN - GetRGB(11,9,11):= LIGHT PURPLE - GetRGB(12,10,7):= TAN - GetRGB(8,1,8) := PURPLE - GetRGB(13,9,13):= PLUM - GetRGB(1,7,7) := TEAL - GetRGB(1,15,15):= CYAN - GetRGB(1,1,15) := BRIGHT BLUE + PRCGetRGB() := WHITE // no parameters, default is white + PRCGetRGB(15,15,1):= YELLOW + PRCGetRGB(15,5,1) := ORANGE + PRCGetRGB(15,1,1) := RED + PRCGetRGB(7,7,15) := BLUE + PRCGetRGB(1,15,1) := NEON GREEN + PRCGetRGB(1,11,1) := GREEN + PRCGetRGB(9,6,1) := BROWN + PRCGetRGB(11,9,11):= LIGHT PURPLE + PRCGetRGB(12,10,7):= TAN + PRCGetRGB(8,1,8) := PURPLE + PRCGetRGB(13,9,13):= PLUM + PRCGetRGB(1,7,7) := TEAL + PRCGetRGB(1,15,15):= CYAN + PRCGetRGB(1,1,15) := BRIGHT BLUE */ //////////////////////////////////////////////// @@ -37,7 +37,7 @@ color for the token you are setting on the item name.** //This color system is by Genji, w/ special thanks to //ADAL-Miko & Rich Dersheimer for their help to Genji :) -string GetRGB(int red = 15,int green = 15,int blue = 15); +string PRCGetRGB(int red = 15,int green = 15,int blue = 15); //Main Script// @@ -49,9 +49,9 @@ void main() object oPC = GetPCSpeaker(); string sName = GetLocalString(oPC, "ONNC"); -//string sToken = GetRGB(#,#,#); +//string sToken = PRCGetRGB(#,#,#); //(This is the proper function you need to create below!) -string sToken = GetRGB(); //nothing for white.. +string sToken = PRCGetRGB(); //nothing for white.. string sMod; @@ -93,7 +93,7 @@ DelayCommand(2.2, DeleteLocalString(oPC, "ONNC")); } //Prototype String Defined -string GetRGB(int red = 15,int green = 15,int blue = 15) +string PRCGetRGB(int red = 15,int green = 15,int blue = 15) { object coloringBook = GetObjectByTag("ColoringBook"); if (coloringBook == OBJECT_INVALID) diff --git a/_module/nss/coloritemyellow.nss b/_module/nss/coloritemyellow.nss index feaea49..038ae01 100644 --- a/_module/nss/coloritemyellow.nss +++ b/_module/nss/coloritemyellow.nss @@ -12,24 +12,24 @@ to the proper color that matches this script's name (ie coloritemwhite script goes on the line which changes the color to white!) -**These GetRGB(#,#,#) are the functions you use to get the proper +**These PRCGetRGB(#,#,#) are the functions you use to get the proper color for the token you are setting on the item name.** - GetRGB() := WHITE // no parameters, default is white - GetRGB(15,15,1):= YELLOW - GetRGB(15,5,1) := ORANGE - GetRGB(15,1,1) := RED - GetRGB(7,7,15) := BLUE - GetRGB(1,15,1) := NEON GREEN - GetRGB(1,11,1) := GREEN - GetRGB(9,6,1) := BROWN - GetRGB(11,9,11):= LIGHT PURPLE - GetRGB(12,10,7):= TAN - GetRGB(8,1,8) := PURPLE - GetRGB(13,9,13):= PLUM - GetRGB(1,7,7) := TEAL - GetRGB(1,15,15):= CYAN - GetRGB(1,1,15) := BRIGHT BLUE + PRCGetRGB() := WHITE // no parameters, default is white + PRCGetRGB(15,15,1):= YELLOW + PRCGetRGB(15,5,1) := ORANGE + PRCGetRGB(15,1,1) := RED + PRCGetRGB(7,7,15) := BLUE + PRCGetRGB(1,15,1) := NEON GREEN + PRCGetRGB(1,11,1) := GREEN + PRCGetRGB(9,6,1) := BROWN + PRCGetRGB(11,9,11):= LIGHT PURPLE + PRCGetRGB(12,10,7):= TAN + PRCGetRGB(8,1,8) := PURPLE + PRCGetRGB(13,9,13):= PLUM + PRCGetRGB(1,7,7) := TEAL + PRCGetRGB(1,15,15):= CYAN + PRCGetRGB(1,1,15) := BRIGHT BLUE */ //////////////////////////////////////////////// @@ -37,7 +37,7 @@ color for the token you are setting on the item name.** //This color system is by Genji, w/ special thanks to //ADAL-Miko & Rich Dersheimer for their help to Genji :) -string GetRGB(int red = 15,int green = 15,int blue = 15); +string PRCGetRGB(int red = 15,int green = 15,int blue = 15); //Main Script// @@ -49,9 +49,9 @@ void main() object oPC = GetPCSpeaker(); string sName = GetLocalString(oPC, "ONNC"); -//string sToken = GetRGB(#,#,#); +//string sToken = PRCGetRGB(#,#,#); //(This is the proper function you need to create below!) -string sToken = GetRGB(15,15,1); //Yellow +string sToken = PRCGetRGB(15,15,1); //Yellow string sMod; @@ -93,7 +93,7 @@ DelayCommand(2.2, DeleteLocalString(oPC, "ONNC")); } //Prototype String Defined -string GetRGB(int red = 15,int green = 15,int blue = 15) +string PRCGetRGB(int red = 15,int green = 15,int blue = 15) { object coloringBook = GetObjectByTag("ColoringBook"); if (coloringBook == OBJECT_INVALID) diff --git a/_module/nss/gen_chat_inc.nss b/_module/nss/gen_chat_inc.nss index 04d1a8d..86261b2 100644 --- a/_module/nss/gen_chat_inc.nss +++ b/_module/nss/gen_chat_inc.nss @@ -78,7 +78,7 @@ void HandleCommands(object oPC) nInt = GetObjectType(oTarget); int nLvl = GetHitDice(oPC); string sLFG; - sLFG = GetRGB(1,15,15); + sLFG = PRCGetRGB(1,15,15); sLFG += "Level "; sLFG += IntToString(nLvl); sLFG += " Looking For Group!"; diff --git a/_module/nss/gen_inc_color.nss b/_module/nss/gen_inc_color.nss index baea5c8..2f5e566 100644 --- a/_module/nss/gen_inc_color.nss +++ b/_module/nss/gen_inc_color.nss @@ -9,24 +9,24 @@ // simple function to use the name of a item holding escape sequences that, though they will not compile, // they can be interpreted at run time and produce rbg scales between 32 and 255 in increments. // -- allows 3375 colors to be made. -// for example SendMessageToPC(pc,GetRGB(15,15,1)+ "Help, I'm on fire!") will produce yellow text. +// for example SendMessageToPC(pc,PRCGetRGB(15,15,1)+ "Help, I'm on fire!") will produce yellow text. // more examples: /* - GetRGB() := WHITE // no parameters, default is white - GetRGB(15,15,1):= YELLOW - GetRGB(15,5,1) := ORANGE - GetRGB(15,1,1) := RED - GetRGB(7,7,15) := BLUE - GetRGB(1,15,1) := NEON GREEN - GetRGB(1,11,1) := GREEN - GetRGB(9,6,1) := BROWN - GetRGB(11,9,11):= LIGHT PURPLE - GetRGB(12,10,7):= TAN - GetRGB(8,1,8) := PURPLE - GetRGB(13,9,13):= PLUM - GetRGB(1,7,7) := TEAL - GetRGB(1,15,15):= CYAN - GetRGB(1,1,15) := BRIGHT BLUE + PRCGetRGB() := WHITE // no parameters, default is white + PRCGetRGB(15,15,1):= YELLOW + PRCGetRGB(15,5,1) := ORANGE + PRCGetRGB(15,1,1) := RED + PRCGetRGB(7,7,15) := BLUE + PRCGetRGB(1,15,1) := NEON GREEN + PRCGetRGB(1,11,1) := GREEN + PRCGetRGB(9,6,1) := BROWN + PRCGetRGB(11,9,11):= LIGHT PURPLE + PRCGetRGB(12,10,7):= TAN + PRCGetRGB(8,1,8) := PURPLE + PRCGetRGB(13,9,13):= PLUM + PRCGetRGB(1,7,7) := TEAL + PRCGetRGB(1,15,15):= CYAN + PRCGetRGB(1,1,15) := BRIGHT BLUE */ // issues? contact genji@thegenji.com // special thanks to ADAL-Miko and Rich Dersheimer in the bio forums. diff --git a/_module/nss/oncliententer.nss b/_module/nss/oncliententer.nss index efa95e6..07e0cfe 100644 --- a/_module/nss/oncliententer.nss +++ b/_module/nss/oncliententer.nss @@ -86,34 +86,34 @@ string Script = GetLocalString(oPC, "LetoScript"); //Colorful Server Message sent to all PCs when they enter the module.. string sMessage; -sMessage = GetRGB(1,7,7); //The color (See above) +sMessage = PRCGetRGB(1,7,7); //The color (See above) sMessage += "Welcome "; //The text to be colorized by the above color. -sMessage += GetRGB(15,15,1);//The next color. +sMessage += PRCGetRGB(15,15,1);//The next color. sMessage += "to "; //The next text to be colorized by the above color. -sMessage += GetRGB(15,1,1);//etc.. +sMessage += PRCGetRGB(15,1,1);//etc.. sMessage += "the "; -sMessage += GetRGB(7,7,15); +sMessage += PRCGetRGB(7,7,15); sMessage += "CEP 2.1 "; -sMessage += GetRGB(1,15,1); +sMessage += PRCGetRGB(1,15,1); sMessage += "UNDERWORLD "; -sMessage += GetRGB(13,9,13); +sMessage += PRCGetRGB(13,9,13); sMessage += "Created "; -sMessage += GetRGB(12,10,7); +sMessage += PRCGetRGB(12,10,7); sMessage += "Designed & "; -sMessage += GetRGB(); +sMessage += PRCGetRGB(); sMessage += "Scripted by: "; -sMessage += GetRGB(15,5,1); +sMessage += PRCGetRGB(15,5,1); sMessage += "Genisys (Guile) "; -sMessage += GetRGB(12,10,7); +sMessage += PRCGetRGB(12,10,7); sMessage += "from 3/20/07 to 8/29/10."; -string sNewb = GetRGB(1,15,1) + "Be sure to read your journal frequently (press J)."; -string sNewb2 = GetRGB(1,15,1) + "Be sure to examine the Rest Menu carefully."; +string sNewb = PRCGetRGB(1,15,1) + "Be sure to read your journal frequently (press J)."; +string sNewb2 = PRCGetRGB(1,15,1) + "Be sure to examine the Rest Menu carefully."; string sEnter = GetName(oPC) + " / " + GetPCPlayerName(oPC) + " / " + GetPCPublicCDKey(oPC) + " / " + GetPCIPAddress(oPC) + " Entered." ; SendMessageToAllDMs(sEnter); -string sEnter2 = GetRGB(15,5,1) + GetName(oPC) + " / " + GetPCPlayerName(oPC) + " / " + GetPCPublicCDKey(oPC) + " / " + GetPCIPAddress(oPC) + "Has Entered." ; +string sEnter2 = PRCGetRGB(15,5,1) + GetName(oPC) + " / " + GetPCPlayerName(oPC) + " / " + GetPCPublicCDKey(oPC) + " / " + GetPCIPAddress(oPC) + "Has Entered." ; SendMessageToAllPC(sEnter2); AssignCommand(oPC, ActionSpeakString("Greetings everyone!", TALKVOLUME_SHOUT)); diff --git a/_release/Underworld 2 [PRC8-CEP3].7z b/_release/Underworld 2 [PRC8-CEP3].7z index b0e3427..24a74f1 100644 Binary files a/_release/Underworld 2 [PRC8-CEP3].7z and b/_release/Underworld 2 [PRC8-CEP3].7z differ