diff --git a/.gitignore b/.gitignore index 38a1ab62..0deedf6b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ *.log _module/ra_tdog.mod *.mod +*.mod diff --git a/_module/ifo/module.ifo.json b/_module/ifo/module.ifo.json index 8bf4092f..a1ee9e90 100644 --- a/_module/ifo/module.ifo.json +++ b/_module/ifo/module.ifo.json @@ -2200,7 +2200,7 @@ }, "Mod_MinGameVer": { "type": "cexostring", - "value": "1.88" + "value": "1.89" }, "Mod_MinPerHour": { "type": "byte", diff --git a/_module/ncs/10ariver1.ncs b/_module/ncs/10ariver1.ncs index 78e8c78b..4a9e10bc 100644 Binary files a/_module/ncs/10ariver1.ncs and b/_module/ncs/10ariver1.ncs differ diff --git a/_module/ncs/10ariver2.ncs b/_module/ncs/10ariver2.ncs index 53f8da2c..a591495a 100644 Binary files a/_module/ncs/10ariver2.ncs and b/_module/ncs/10ariver2.ncs differ diff --git a/_module/ncs/10ariver3.ncs b/_module/ncs/10ariver3.ncs index b7721f59..36899b42 100644 Binary files a/_module/ncs/10ariver3.ncs and b/_module/ncs/10ariver3.ncs differ diff --git a/_module/ncs/10ariver4.ncs b/_module/ncs/10ariver4.ncs index 5113f06b..749180ae 100644 Binary files a/_module/ncs/10ariver4.ncs and b/_module/ncs/10ariver4.ncs differ diff --git a/_module/ncs/10ariver5.ncs b/_module/ncs/10ariver5.ncs index 216fa3a8..21804cf3 100644 Binary files a/_module/ncs/10ariver5.ncs and b/_module/ncs/10ariver5.ncs differ diff --git a/_module/ncs/10ariver6.ncs b/_module/ncs/10ariver6.ncs index d34d152c..c51797d7 100644 Binary files a/_module/ncs/10ariver6.ncs and b/_module/ncs/10ariver6.ncs differ diff --git a/_module/ncs/10ato9a.ncs b/_module/ncs/10ato9a.ncs index 09c68844..25837054 100644 Binary files a/_module/ncs/10ato9a.ncs and b/_module/ncs/10ato9a.ncs differ diff --git a/_module/ncs/11diving.ncs b/_module/ncs/11diving.ncs index ecab1310..e5a0203e 100644 Binary files a/_module/ncs/11diving.ncs and b/_module/ncs/11diving.ncs differ diff --git a/_module/ncs/11fly1.ncs b/_module/ncs/11fly1.ncs index 1feab3ef..570b0f57 100644 Binary files a/_module/ncs/11fly1.ncs and b/_module/ncs/11fly1.ncs differ diff --git a/_module/ncs/11fly2.ncs b/_module/ncs/11fly2.ncs index 19a30f46..cab36895 100644 Binary files a/_module/ncs/11fly2.ncs and b/_module/ncs/11fly2.ncs differ diff --git a/_module/ncs/11river1.ncs b/_module/ncs/11river1.ncs index ef81c871..15eae049 100644 Binary files a/_module/ncs/11river1.ncs and b/_module/ncs/11river1.ncs differ diff --git a/_module/ncs/11river2.ncs b/_module/ncs/11river2.ncs index 2831aac3..ee1ca9fc 100644 Binary files a/_module/ncs/11river2.ncs and b/_module/ncs/11river2.ncs differ diff --git a/_module/ncs/11river3.ncs b/_module/ncs/11river3.ncs index efb82e8e..aab18fc1 100644 Binary files a/_module/ncs/11river3.ncs and b/_module/ncs/11river3.ncs differ diff --git a/_module/ncs/11river4.ncs b/_module/ncs/11river4.ncs index 4b667b58..b291e0b9 100644 Binary files a/_module/ncs/11river4.ncs and b/_module/ncs/11river4.ncs differ diff --git a/_module/ncs/12ahermit1.ncs b/_module/ncs/12ahermit1.ncs index 2ba4d89a..0c87543c 100644 Binary files a/_module/ncs/12ahermit1.ncs and b/_module/ncs/12ahermit1.ncs differ diff --git a/_module/ncs/12ahermit2.ncs b/_module/ncs/12ahermit2.ncs index e4b26f4f..3520db6d 100644 Binary files a/_module/ncs/12ahermit2.ncs and b/_module/ncs/12ahermit2.ncs differ diff --git a/_module/ncs/1riverto9.ncs b/_module/ncs/1riverto9.ncs index 072485aa..e704bbdb 100644 Binary files a/_module/ncs/1riverto9.ncs and b/_module/ncs/1riverto9.ncs differ diff --git a/_module/ncs/3ato6a.ncs b/_module/ncs/3ato6a.ncs index 2c70d7f9..f5f9c020 100644 Binary files a/_module/ncs/3ato6a.ncs and b/_module/ncs/3ato6a.ncs differ diff --git a/_module/ncs/4ae.ncs b/_module/ncs/4ae.ncs index 1f57abc4..878fc7af 100644 Binary files a/_module/ncs/4ae.ncs and b/_module/ncs/4ae.ncs differ diff --git a/_module/ncs/4ariver1.ncs b/_module/ncs/4ariver1.ncs index 9afe05c7..28f90aed 100644 Binary files a/_module/ncs/4ariver1.ncs and b/_module/ncs/4ariver1.ncs differ diff --git a/_module/ncs/4aw.ncs b/_module/ncs/4aw.ncs index 078ba3f4..3b08e4e0 100644 Binary files a/_module/ncs/4aw.ncs and b/_module/ncs/4aw.ncs differ diff --git a/_module/ncs/69_client_exit.ncs b/_module/ncs/69_client_exit.ncs index 29d4b2c5..3031f546 100644 Binary files a/_module/ncs/69_client_exit.ncs and b/_module/ncs/69_client_exit.ncs differ diff --git a/_module/ncs/69_hen_combat.ncs b/_module/ncs/69_hen_combat.ncs index f7b40749..b816f8f5 100644 Binary files a/_module/ncs/69_hen_combat.ncs and b/_module/ncs/69_hen_combat.ncs differ diff --git a/_module/ncs/69_hen_conv.ncs b/_module/ncs/69_hen_conv.ncs index b40c6ae0..a82fb9d5 100644 Binary files a/_module/ncs/69_hen_conv.ncs and b/_module/ncs/69_hen_conv.ncs differ diff --git a/_module/ncs/69_hen_death.ncs b/_module/ncs/69_hen_death.ncs index 1f82bc60..98cba479 100644 Binary files a/_module/ncs/69_hen_death.ncs and b/_module/ncs/69_hen_death.ncs differ diff --git a/_module/ncs/69_hen_percep.ncs b/_module/ncs/69_hen_percep.ncs index 8587449c..ec953343 100644 Binary files a/_module/ncs/69_hen_percep.ncs and b/_module/ncs/69_hen_percep.ncs differ diff --git a/_module/ncs/69_hench_crtrsmn.ncs b/_module/ncs/69_hench_crtrsmn.ncs index 1bcf18e3..8d9ab23a 100644 Binary files a/_module/ncs/69_hench_crtrsmn.ncs and b/_module/ncs/69_hench_crtrsmn.ncs differ diff --git a/_module/ncs/69_hench_destobj.ncs b/_module/ncs/69_hench_destobj.ncs index b57fd4f5..ace583d5 100644 Binary files a/_module/ncs/69_hench_destobj.ncs and b/_module/ncs/69_hench_destobj.ncs differ diff --git a/_module/ncs/69_hench_eqmelee.ncs b/_module/ncs/69_hench_eqmelee.ncs index 19de2583..ac1d951c 100644 Binary files a/_module/ncs/69_hench_eqmelee.ncs and b/_module/ncs/69_hench_eqmelee.ncs differ diff --git a/_module/ncs/69_hench_eqswap.ncs b/_module/ncs/69_hench_eqswap.ncs index 0a8d2013..28880227 100644 Binary files a/_module/ncs/69_hench_eqswap.ncs and b/_module/ncs/69_hench_eqswap.ncs differ diff --git a/_module/ncs/69_hench_fire.ncs b/_module/ncs/69_hench_fire.ncs index 41c39faf..1d47d7a1 100644 Binary files a/_module/ncs/69_hench_fire.ncs and b/_module/ncs/69_hench_fire.ncs differ diff --git a/_module/ncs/69_hench_gomelee.ncs b/_module/ncs/69_hench_gomelee.ncs index de53e93f..c6edfcaa 100644 Binary files a/_module/ncs/69_hench_gomelee.ncs and b/_module/ncs/69_hench_gomelee.ncs differ diff --git a/_module/ncs/69_hench_heall.ncs b/_module/ncs/69_hench_heall.ncs index 759d716a..14442190 100644 Binary files a/_module/ncs/69_hench_heall.ncs and b/_module/ncs/69_hench_heall.ncs differ diff --git a/_module/ncs/69_hench_hire.ncs b/_module/ncs/69_hench_hire.ncs index 9650e91e..2b92935f 100644 Binary files a/_module/ncs/69_hench_hire.ncs and b/_module/ncs/69_hench_hire.ncs differ diff --git a/_module/ncs/69_hench_pickup.ncs b/_module/ncs/69_hench_pickup.ncs index a57a271c..e34bde09 100644 Binary files a/_module/ncs/69_hench_pickup.ncs and b/_module/ncs/69_hench_pickup.ncs differ diff --git a/_module/ncs/69_hench_quit.ncs b/_module/ncs/69_hench_quit.ncs index 87ba8392..72362f83 100644 Binary files a/_module/ncs/69_hench_quit.ncs and b/_module/ncs/69_hench_quit.ncs differ diff --git a/_module/ncs/69_hench_scout1.ncs b/_module/ncs/69_hench_scout1.ncs index ae39c9dd..ec27b38a 100644 Binary files a/_module/ncs/69_hench_scout1.ncs and b/_module/ncs/69_hench_scout1.ncs differ diff --git a/_module/ncs/69_hench_scout2.ncs b/_module/ncs/69_hench_scout2.ncs index f45b2cf6..07b75d86 100644 Binary files a/_module/ncs/69_hench_scout2.ncs and b/_module/ncs/69_hench_scout2.ncs differ diff --git a/_module/ncs/69_hench_switch.ncs b/_module/ncs/69_hench_switch.ncs index 16aaacbb..0f076e1a 100644 Binary files a/_module/ncs/69_hench_switch.ncs and b/_module/ncs/69_hench_switch.ncs differ diff --git a/_module/ncs/69_henchrt_enter.ncs b/_module/ncs/69_henchrt_enter.ncs index bd251035..7fdca3b4 100644 Binary files a/_module/ncs/69_henchrt_enter.ncs and b/_module/ncs/69_henchrt_enter.ncs differ diff --git a/_module/ncs/69_henchstr_exit.ncs b/_module/ncs/69_henchstr_exit.ncs index 4df0b27d..86eae4af 100644 Binary files a/_module/ncs/69_henchstr_exit.ncs and b/_module/ncs/69_henchstr_exit.ncs differ diff --git a/_module/ncs/69_henchtrans.ncs b/_module/ncs/69_henchtrans.ncs index 6457d19a..d9cfc525 100644 Binary files a/_module/ncs/69_henchtrans.ncs and b/_module/ncs/69_henchtrans.ncs differ diff --git a/_module/ncs/69_o0_death.ncs b/_module/ncs/69_o0_death.ncs index 7df1e15c..5ce1cff0 100644 Binary files a/_module/ncs/69_o0_death.ncs and b/_module/ncs/69_o0_death.ncs differ diff --git a/_module/ncs/69_o0_dying.ncs b/_module/ncs/69_o0_dying.ncs index f2fa8934..c9f1d789 100644 Binary files a/_module/ncs/69_o0_dying.ncs and b/_module/ncs/69_o0_dying.ncs differ diff --git a/_module/ncs/6ato10a.ncs b/_module/ncs/6ato10a.ncs index 810fb92d..e1335ede 100644 Binary files a/_module/ncs/6ato10a.ncs and b/_module/ncs/6ato10a.ncs differ diff --git a/_module/ncs/6ato3a.ncs b/_module/ncs/6ato3a.ncs index 2cd79ed8..39c1ab16 100644 Binary files a/_module/ncs/6ato3a.ncs and b/_module/ncs/6ato3a.ncs differ diff --git a/_module/ncs/7to11a.ncs b/_module/ncs/7to11a.ncs index b82c074d..3923b3b1 100644 Binary files a/_module/ncs/7to11a.ncs and b/_module/ncs/7to11a.ncs differ diff --git a/_module/ncs/7to12.ncs b/_module/ncs/7to12.ncs index d6e74013..e0fc431d 100644 Binary files a/_module/ncs/7to12.ncs and b/_module/ncs/7to12.ncs differ diff --git a/_module/ncs/8river1.ncs b/_module/ncs/8river1.ncs index 6715acce..22d26003 100644 Binary files a/_module/ncs/8river1.ncs and b/_module/ncs/8river1.ncs differ diff --git a/_module/ncs/8river10.ncs b/_module/ncs/8river10.ncs index 201fda3a..d67dcdf6 100644 Binary files a/_module/ncs/8river10.ncs and b/_module/ncs/8river10.ncs differ diff --git a/_module/ncs/8river11.ncs b/_module/ncs/8river11.ncs index db69b3bf..fa4b5696 100644 Binary files a/_module/ncs/8river11.ncs and b/_module/ncs/8river11.ncs differ diff --git a/_module/ncs/8river12.ncs b/_module/ncs/8river12.ncs index 2af7390d..25e18989 100644 Binary files a/_module/ncs/8river12.ncs and b/_module/ncs/8river12.ncs differ diff --git a/_module/ncs/8river13.ncs b/_module/ncs/8river13.ncs index 6d678af9..85975b33 100644 Binary files a/_module/ncs/8river13.ncs and b/_module/ncs/8river13.ncs differ diff --git a/_module/ncs/8river14.ncs b/_module/ncs/8river14.ncs index 0117f2c4..e5c42063 100644 Binary files a/_module/ncs/8river14.ncs and b/_module/ncs/8river14.ncs differ diff --git a/_module/ncs/8river15.ncs b/_module/ncs/8river15.ncs index 9ee8853a..05b6a186 100644 Binary files a/_module/ncs/8river15.ncs and b/_module/ncs/8river15.ncs differ diff --git a/_module/ncs/8river16.ncs b/_module/ncs/8river16.ncs index 342911de..b055acf8 100644 Binary files a/_module/ncs/8river16.ncs and b/_module/ncs/8river16.ncs differ diff --git a/_module/ncs/8river17.ncs b/_module/ncs/8river17.ncs index 2b37d33d..6ba0361d 100644 Binary files a/_module/ncs/8river17.ncs and b/_module/ncs/8river17.ncs differ diff --git a/_module/ncs/8river18.ncs b/_module/ncs/8river18.ncs index c199052d..b47d7136 100644 Binary files a/_module/ncs/8river18.ncs and b/_module/ncs/8river18.ncs differ diff --git a/_module/ncs/8river2.ncs b/_module/ncs/8river2.ncs index 35566d7d..faf93f7e 100644 Binary files a/_module/ncs/8river2.ncs and b/_module/ncs/8river2.ncs differ diff --git a/_module/ncs/8river3.ncs b/_module/ncs/8river3.ncs index f96a4c04..b0a77e74 100644 Binary files a/_module/ncs/8river3.ncs and b/_module/ncs/8river3.ncs differ diff --git a/_module/ncs/8river4.ncs b/_module/ncs/8river4.ncs index 15628ef1..b8e151a6 100644 Binary files a/_module/ncs/8river4.ncs and b/_module/ncs/8river4.ncs differ diff --git a/_module/ncs/8river5.ncs b/_module/ncs/8river5.ncs index 54c87056..f21c4f43 100644 Binary files a/_module/ncs/8river5.ncs and b/_module/ncs/8river5.ncs differ diff --git a/_module/ncs/8river6.ncs b/_module/ncs/8river6.ncs index 1843037e..02d891aa 100644 Binary files a/_module/ncs/8river6.ncs and b/_module/ncs/8river6.ncs differ diff --git a/_module/ncs/8river7.ncs b/_module/ncs/8river7.ncs index fbf91ce7..aa6466d7 100644 Binary files a/_module/ncs/8river7.ncs and b/_module/ncs/8river7.ncs differ diff --git a/_module/ncs/8river8.ncs b/_module/ncs/8river8.ncs index 6ee6a74b..79b75895 100644 Binary files a/_module/ncs/8river8.ncs and b/_module/ncs/8river8.ncs differ diff --git a/_module/ncs/8river9.ncs b/_module/ncs/8river9.ncs index 053000b1..85f50080 100644 Binary files a/_module/ncs/8river9.ncs and b/_module/ncs/8river9.ncs differ diff --git a/_module/ncs/9ariver1.ncs b/_module/ncs/9ariver1.ncs index ab641a00..68c83f3d 100644 Binary files a/_module/ncs/9ariver1.ncs and b/_module/ncs/9ariver1.ncs differ diff --git a/_module/ncs/9ariver10.ncs b/_module/ncs/9ariver10.ncs index 1ef3eeb7..ef72b838 100644 Binary files a/_module/ncs/9ariver10.ncs and b/_module/ncs/9ariver10.ncs differ diff --git a/_module/ncs/9ariver11.ncs b/_module/ncs/9ariver11.ncs index 15203b73..f88b225a 100644 Binary files a/_module/ncs/9ariver11.ncs and b/_module/ncs/9ariver11.ncs differ diff --git a/_module/ncs/9ariver12.ncs b/_module/ncs/9ariver12.ncs index 1660d426..3f536005 100644 Binary files a/_module/ncs/9ariver12.ncs and b/_module/ncs/9ariver12.ncs differ diff --git a/_module/ncs/9ariver2.ncs b/_module/ncs/9ariver2.ncs index 371634d2..6a276bb3 100644 Binary files a/_module/ncs/9ariver2.ncs and b/_module/ncs/9ariver2.ncs differ diff --git a/_module/ncs/9ariver3.ncs b/_module/ncs/9ariver3.ncs index 24c658e8..11ac365b 100644 Binary files a/_module/ncs/9ariver3.ncs and b/_module/ncs/9ariver3.ncs differ diff --git a/_module/ncs/9ariver4.ncs b/_module/ncs/9ariver4.ncs index ca849bce..5d7063fc 100644 Binary files a/_module/ncs/9ariver4.ncs and b/_module/ncs/9ariver4.ncs differ diff --git a/_module/ncs/9ariver5.ncs b/_module/ncs/9ariver5.ncs index 551648df..a61783b4 100644 Binary files a/_module/ncs/9ariver5.ncs and b/_module/ncs/9ariver5.ncs differ diff --git a/_module/ncs/9ariver6.ncs b/_module/ncs/9ariver6.ncs index f14186ef..2d19c94d 100644 Binary files a/_module/ncs/9ariver6.ncs and b/_module/ncs/9ariver6.ncs differ diff --git a/_module/ncs/9ariver7.ncs b/_module/ncs/9ariver7.ncs index 2dfb4520..8dc0f79e 100644 Binary files a/_module/ncs/9ariver7.ncs and b/_module/ncs/9ariver7.ncs differ diff --git a/_module/ncs/9ariver8.ncs b/_module/ncs/9ariver8.ncs index 08e700ef..6ee33ead 100644 Binary files a/_module/ncs/9ariver8.ncs and b/_module/ncs/9ariver8.ncs differ diff --git a/_module/ncs/9ariver9.ncs b/_module/ncs/9ariver9.ncs index 598851e6..f43c3e35 100644 Binary files a/_module/ncs/9ariver9.ncs and b/_module/ncs/9ariver9.ncs differ diff --git a/_module/ncs/9ato10a.ncs b/_module/ncs/9ato10a.ncs index b127aaa2..ec34f133 100644 Binary files a/_module/ncs/9ato10a.ncs and b/_module/ncs/9ato10a.ncs differ diff --git a/_module/ncs/9bdive1.ncs b/_module/ncs/9bdive1.ncs index b178d3fe..f172d30c 100644 Binary files a/_module/ncs/9bdive1.ncs and b/_module/ncs/9bdive1.ncs differ diff --git a/_module/ncs/9bdive3.ncs b/_module/ncs/9bdive3.ncs index cdcce63c..6b75b643 100644 Binary files a/_module/ncs/9bdive3.ncs and b/_module/ncs/9bdive3.ncs differ diff --git a/_module/ncs/9bdive5.ncs b/_module/ncs/9bdive5.ncs index 2d98d2d4..98908523 100644 Binary files a/_module/ncs/9bdive5.ncs and b/_module/ncs/9bdive5.ncs differ diff --git a/_module/ncs/9briver1.ncs b/_module/ncs/9briver1.ncs index 3c361890..5e5cf598 100644 Binary files a/_module/ncs/9briver1.ncs and b/_module/ncs/9briver1.ncs differ diff --git a/_module/ncs/9briver2.ncs b/_module/ncs/9briver2.ncs index 3a8208c6..b69c2242 100644 Binary files a/_module/ncs/9briver2.ncs and b/_module/ncs/9briver2.ncs differ diff --git a/_module/ncs/9bvrokdive.ncs b/_module/ncs/9bvrokdive.ncs index 23e47fbd..65bc6ae3 100644 Binary files a/_module/ncs/9bvrokdive.ncs and b/_module/ncs/9bvrokdive.ncs differ diff --git a/_module/ncs/advanced_ai.ncs b/_module/ncs/advanced_ai.ncs index 6463ed66..35084273 100644 Binary files a/_module/ncs/advanced_ai.ncs and b/_module/ncs/advanced_ai.ncs differ diff --git a/_module/ncs/agycrypt.ncs b/_module/ncs/agycrypt.ncs index 82c5e604..aedc5f4e 100644 Binary files a/_module/ncs/agycrypt.ncs and b/_module/ncs/agycrypt.ncs differ diff --git a/_module/ncs/agypyramid.ncs b/_module/ncs/agypyramid.ncs index a6f96630..0b76b325 100644 Binary files a/_module/ncs/agypyramid.ncs and b/_module/ncs/agypyramid.ncs differ diff --git a/_module/ncs/anaxim_ai.ncs b/_module/ncs/anaxim_ai.ncs index 0cd1a9e9..28028de1 100644 Binary files a/_module/ncs/anaxim_ai.ncs and b/_module/ncs/anaxim_ai.ncs differ diff --git a/_module/ncs/aod_hb.ncs b/_module/ncs/aod_hb.ncs index af568d59..5da43b73 100644 Binary files a/_module/ncs/aod_hb.ncs and b/_module/ncs/aod_hb.ncs differ diff --git a/_module/ncs/array_example.ncs b/_module/ncs/array_example.ncs index 4515ec5d..90adc904 100644 Binary files a/_module/ncs/array_example.ncs and b/_module/ncs/array_example.ncs differ diff --git a/_module/ncs/at_001.ncs b/_module/ncs/at_001.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_001.ncs and b/_module/ncs/at_001.ncs differ diff --git a/_module/ncs/at_002.ncs b/_module/ncs/at_002.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_002.ncs and b/_module/ncs/at_002.ncs differ diff --git a/_module/ncs/at_007.ncs b/_module/ncs/at_007.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_007.ncs and b/_module/ncs/at_007.ncs differ diff --git a/_module/ncs/at_008.ncs b/_module/ncs/at_008.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_008.ncs and b/_module/ncs/at_008.ncs differ diff --git a/_module/ncs/at_009.ncs b/_module/ncs/at_009.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_009.ncs and b/_module/ncs/at_009.ncs differ diff --git a/_module/ncs/at_010.ncs b/_module/ncs/at_010.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_010.ncs and b/_module/ncs/at_010.ncs differ diff --git a/_module/ncs/at_019.ncs b/_module/ncs/at_019.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_019.ncs and b/_module/ncs/at_019.ncs differ diff --git a/_module/ncs/at_020.ncs b/_module/ncs/at_020.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_020.ncs and b/_module/ncs/at_020.ncs differ diff --git a/_module/ncs/at_024.ncs b/_module/ncs/at_024.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_024.ncs and b/_module/ncs/at_024.ncs differ diff --git a/_module/ncs/at_025.ncs b/_module/ncs/at_025.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_025.ncs and b/_module/ncs/at_025.ncs differ diff --git a/_module/ncs/at_032.ncs b/_module/ncs/at_032.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_032.ncs and b/_module/ncs/at_032.ncs differ diff --git a/_module/ncs/at_033.ncs b/_module/ncs/at_033.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_033.ncs and b/_module/ncs/at_033.ncs differ diff --git a/_module/ncs/at_034.ncs b/_module/ncs/at_034.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_034.ncs and b/_module/ncs/at_034.ncs differ diff --git a/_module/ncs/at_035.ncs b/_module/ncs/at_035.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_035.ncs and b/_module/ncs/at_035.ncs differ diff --git a/_module/ncs/at_037.ncs b/_module/ncs/at_037.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_037.ncs and b/_module/ncs/at_037.ncs differ diff --git a/_module/ncs/at_043.ncs b/_module/ncs/at_043.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_043.ncs and b/_module/ncs/at_043.ncs differ diff --git a/_module/ncs/at_044.ncs b/_module/ncs/at_044.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_044.ncs and b/_module/ncs/at_044.ncs differ diff --git a/_module/ncs/at_045.ncs b/_module/ncs/at_045.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_045.ncs and b/_module/ncs/at_045.ncs differ diff --git a/_module/ncs/at_046.ncs b/_module/ncs/at_046.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_046.ncs and b/_module/ncs/at_046.ncs differ diff --git a/_module/ncs/at_048.ncs b/_module/ncs/at_048.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_048.ncs and b/_module/ncs/at_048.ncs differ diff --git a/_module/ncs/at_049.ncs b/_module/ncs/at_049.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_049.ncs and b/_module/ncs/at_049.ncs differ diff --git a/_module/ncs/at_056.ncs b/_module/ncs/at_056.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_056.ncs and b/_module/ncs/at_056.ncs differ diff --git a/_module/ncs/at_057.ncs b/_module/ncs/at_057.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_057.ncs and b/_module/ncs/at_057.ncs differ diff --git a/_module/ncs/at_058.ncs b/_module/ncs/at_058.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_058.ncs and b/_module/ncs/at_058.ncs differ diff --git a/_module/ncs/at_059.ncs b/_module/ncs/at_059.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_059.ncs and b/_module/ncs/at_059.ncs differ diff --git a/_module/ncs/at_060.ncs b/_module/ncs/at_060.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_060.ncs and b/_module/ncs/at_060.ncs differ diff --git a/_module/ncs/at_061.ncs b/_module/ncs/at_061.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_061.ncs and b/_module/ncs/at_061.ncs differ diff --git a/_module/ncs/at_064.ncs b/_module/ncs/at_064.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_064.ncs and b/_module/ncs/at_064.ncs differ diff --git a/_module/ncs/at_069.ncs b/_module/ncs/at_069.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_069.ncs and b/_module/ncs/at_069.ncs differ diff --git a/_module/ncs/at_071.ncs b/_module/ncs/at_071.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_071.ncs and b/_module/ncs/at_071.ncs differ diff --git a/_module/ncs/at_072.ncs b/_module/ncs/at_072.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_072.ncs and b/_module/ncs/at_072.ncs differ diff --git a/_module/ncs/at_073.ncs b/_module/ncs/at_073.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_073.ncs and b/_module/ncs/at_073.ncs differ diff --git a/_module/ncs/at_074.ncs b/_module/ncs/at_074.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_074.ncs and b/_module/ncs/at_074.ncs differ diff --git a/_module/ncs/at_077.ncs b/_module/ncs/at_077.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_077.ncs and b/_module/ncs/at_077.ncs differ diff --git a/_module/ncs/at_080.ncs b/_module/ncs/at_080.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_080.ncs and b/_module/ncs/at_080.ncs differ diff --git a/_module/ncs/at_081.ncs b/_module/ncs/at_081.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_081.ncs and b/_module/ncs/at_081.ncs differ diff --git a/_module/ncs/at_082.ncs b/_module/ncs/at_082.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_082.ncs and b/_module/ncs/at_082.ncs differ diff --git a/_module/ncs/at_086.ncs b/_module/ncs/at_086.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_086.ncs and b/_module/ncs/at_086.ncs differ diff --git a/_module/ncs/at_087.ncs b/_module/ncs/at_087.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_087.ncs and b/_module/ncs/at_087.ncs differ diff --git a/_module/ncs/at_088.ncs b/_module/ncs/at_088.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_088.ncs and b/_module/ncs/at_088.ncs differ diff --git a/_module/ncs/at_089.ncs b/_module/ncs/at_089.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_089.ncs and b/_module/ncs/at_089.ncs differ diff --git a/_module/ncs/at_094.ncs b/_module/ncs/at_094.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_094.ncs and b/_module/ncs/at_094.ncs differ diff --git a/_module/ncs/at_095.ncs b/_module/ncs/at_095.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_095.ncs and b/_module/ncs/at_095.ncs differ diff --git a/_module/ncs/at_096.ncs b/_module/ncs/at_096.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_096.ncs and b/_module/ncs/at_096.ncs differ diff --git a/_module/ncs/at_097.ncs b/_module/ncs/at_097.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_097.ncs and b/_module/ncs/at_097.ncs differ diff --git a/_module/ncs/at_101.ncs b/_module/ncs/at_101.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_101.ncs and b/_module/ncs/at_101.ncs differ diff --git a/_module/ncs/at_104.ncs b/_module/ncs/at_104.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_104.ncs and b/_module/ncs/at_104.ncs differ diff --git a/_module/ncs/at_105.ncs b/_module/ncs/at_105.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_105.ncs and b/_module/ncs/at_105.ncs differ diff --git a/_module/ncs/at_107.ncs b/_module/ncs/at_107.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_107.ncs and b/_module/ncs/at_107.ncs differ diff --git a/_module/ncs/at_108.ncs b/_module/ncs/at_108.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_108.ncs and b/_module/ncs/at_108.ncs differ diff --git a/_module/ncs/at_110.ncs b/_module/ncs/at_110.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_110.ncs and b/_module/ncs/at_110.ncs differ diff --git a/_module/ncs/at_111.ncs b/_module/ncs/at_111.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_111.ncs and b/_module/ncs/at_111.ncs differ diff --git a/_module/ncs/at_112.ncs b/_module/ncs/at_112.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_112.ncs and b/_module/ncs/at_112.ncs differ diff --git a/_module/ncs/at_113.ncs b/_module/ncs/at_113.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_113.ncs and b/_module/ncs/at_113.ncs differ diff --git a/_module/ncs/at_120.ncs b/_module/ncs/at_120.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_120.ncs and b/_module/ncs/at_120.ncs differ diff --git a/_module/ncs/at_121.ncs b/_module/ncs/at_121.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_121.ncs and b/_module/ncs/at_121.ncs differ diff --git a/_module/ncs/at_122.ncs b/_module/ncs/at_122.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_122.ncs and b/_module/ncs/at_122.ncs differ diff --git a/_module/ncs/at_126.ncs b/_module/ncs/at_126.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_126.ncs and b/_module/ncs/at_126.ncs differ diff --git a/_module/ncs/at_127.ncs b/_module/ncs/at_127.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_127.ncs and b/_module/ncs/at_127.ncs differ diff --git a/_module/ncs/at_137.ncs b/_module/ncs/at_137.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_137.ncs and b/_module/ncs/at_137.ncs differ diff --git a/_module/ncs/at_139.ncs b/_module/ncs/at_139.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_139.ncs and b/_module/ncs/at_139.ncs differ diff --git a/_module/ncs/at_140.ncs b/_module/ncs/at_140.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_140.ncs and b/_module/ncs/at_140.ncs differ diff --git a/_module/ncs/at_141.ncs b/_module/ncs/at_141.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_141.ncs and b/_module/ncs/at_141.ncs differ diff --git a/_module/ncs/at_142.ncs b/_module/ncs/at_142.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_142.ncs and b/_module/ncs/at_142.ncs differ diff --git a/_module/ncs/at_148.ncs b/_module/ncs/at_148.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_148.ncs and b/_module/ncs/at_148.ncs differ diff --git a/_module/ncs/at_150.ncs b/_module/ncs/at_150.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_150.ncs and b/_module/ncs/at_150.ncs differ diff --git a/_module/ncs/at_152.ncs b/_module/ncs/at_152.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_152.ncs and b/_module/ncs/at_152.ncs differ diff --git a/_module/ncs/at_155.ncs b/_module/ncs/at_155.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_155.ncs and b/_module/ncs/at_155.ncs differ diff --git a/_module/ncs/at_173.ncs b/_module/ncs/at_173.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_173.ncs and b/_module/ncs/at_173.ncs differ diff --git a/_module/ncs/at_180.ncs b/_module/ncs/at_180.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_180.ncs and b/_module/ncs/at_180.ncs differ diff --git a/_module/ncs/at_196.ncs b/_module/ncs/at_196.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_196.ncs and b/_module/ncs/at_196.ncs differ diff --git a/_module/ncs/at_206.ncs b/_module/ncs/at_206.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_206.ncs and b/_module/ncs/at_206.ncs differ diff --git a/_module/ncs/at_234.ncs b/_module/ncs/at_234.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_234.ncs and b/_module/ncs/at_234.ncs differ diff --git a/_module/ncs/at_236.ncs b/_module/ncs/at_236.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_236.ncs and b/_module/ncs/at_236.ncs differ diff --git a/_module/ncs/at_237.ncs b/_module/ncs/at_237.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_237.ncs and b/_module/ncs/at_237.ncs differ diff --git a/_module/ncs/at_238.ncs b/_module/ncs/at_238.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_238.ncs and b/_module/ncs/at_238.ncs differ diff --git a/_module/ncs/at_239.ncs b/_module/ncs/at_239.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_239.ncs and b/_module/ncs/at_239.ncs differ diff --git a/_module/ncs/at_240.ncs b/_module/ncs/at_240.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_240.ncs and b/_module/ncs/at_240.ncs differ diff --git a/_module/ncs/at_241.ncs b/_module/ncs/at_241.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_241.ncs and b/_module/ncs/at_241.ncs differ diff --git a/_module/ncs/at_243.ncs b/_module/ncs/at_243.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_243.ncs and b/_module/ncs/at_243.ncs differ diff --git a/_module/ncs/at_246.ncs b/_module/ncs/at_246.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_246.ncs and b/_module/ncs/at_246.ncs differ diff --git a/_module/ncs/at_259.ncs b/_module/ncs/at_259.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_259.ncs and b/_module/ncs/at_259.ncs differ diff --git a/_module/ncs/at_260.ncs b/_module/ncs/at_260.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_260.ncs and b/_module/ncs/at_260.ncs differ diff --git a/_module/ncs/at_268.ncs b/_module/ncs/at_268.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/at_268.ncs and b/_module/ncs/at_268.ncs differ diff --git a/_module/ncs/at_back2training.ncs b/_module/ncs/at_back2training.ncs index 0636f216..8484422b 100644 Binary files a/_module/ncs/at_back2training.ncs and b/_module/ncs/at_back2training.ncs differ diff --git a/_module/ncs/at_enter_pc_room.ncs b/_module/ncs/at_enter_pc_room.ncs index 9c8ac9bf..5cb5386e 100644 Binary files a/_module/ncs/at_enter_pc_room.ncs and b/_module/ncs/at_enter_pc_room.ncs differ diff --git a/_module/ncs/at_move2latrene3.ncs b/_module/ncs/at_move2latrene3.ncs index e26896f3..c02520d8 100644 Binary files a/_module/ncs/at_move2latrene3.ncs and b/_module/ncs/at_move2latrene3.ncs differ diff --git a/_module/ncs/at_spn_grn_slime.ncs b/_module/ncs/at_spn_grn_slime.ncs index dcbfd988..c1e43cff 100644 Binary files a/_module/ncs/at_spn_grn_slime.ncs and b/_module/ncs/at_spn_grn_slime.ncs differ diff --git a/_module/ncs/atropal_ai.ncs b/_module/ncs/atropal_ai.ncs index 03c6517b..e19d71ac 100644 Binary files a/_module/ncs/atropal_ai.ncs and b/_module/ncs/atropal_ai.ncs differ diff --git a/_module/ncs/atropaltouch.ncs b/_module/ncs/atropaltouch.ncs index e95b5c7f..af80ab69 100644 Binary files a/_module/ncs/atropaltouch.ncs and b/_module/ncs/atropaltouch.ncs differ diff --git a/_module/ncs/attackpc.ncs b/_module/ncs/attackpc.ncs index b3d755d5..9adca0b9 100644 Binary files a/_module/ncs/attackpc.ncs and b/_module/ncs/attackpc.ncs differ diff --git a/_module/ncs/attpcnofact.ncs b/_module/ncs/attpcnofact.ncs index 445609dd..b094da80 100644 Binary files a/_module/ncs/attpcnofact.ncs and b/_module/ncs/attpcnofact.ncs differ diff --git a/_module/ncs/aura_ai.ncs b/_module/ncs/aura_ai.ncs index fe24db65..955f2f94 100644 Binary files a/_module/ncs/aura_ai.ncs and b/_module/ncs/aura_ai.ncs differ diff --git a/_module/ncs/autoclose_door.ncs b/_module/ncs/autoclose_door.ncs index 72140cca..b5789f53 100644 Binary files a/_module/ncs/autoclose_door.ncs and b/_module/ncs/autoclose_door.ncs differ diff --git a/_module/ncs/belgos.ncs b/_module/ncs/belgos.ncs index ab085c3d..ffa6d6c2 100644 Binary files a/_module/ncs/belgos.ncs and b/_module/ncs/belgos.ncs differ diff --git a/_module/ncs/bld_drain_onhit.ncs b/_module/ncs/bld_drain_onhit.ncs index 924ef75d..4f42929a 100644 Binary files a/_module/ncs/bld_drain_onhit.ncs and b/_module/ncs/bld_drain_onhit.ncs differ diff --git a/_module/ncs/bleakaura1.ncs b/_module/ncs/bleakaura1.ncs index 3524be13..d996f9bf 100644 Binary files a/_module/ncs/bleakaura1.ncs and b/_module/ncs/bleakaura1.ncs differ diff --git a/_module/ncs/bleakaura2.ncs b/_module/ncs/bleakaura2.ncs index 9d99a394..fce3eeaf 100644 Binary files a/_module/ncs/bleakaura2.ncs and b/_module/ncs/bleakaura2.ncs differ diff --git a/_module/ncs/blindonopen.ncs b/_module/ncs/blindonopen.ncs index 27195ad2..0371625a 100644 Binary files a/_module/ncs/blindonopen.ncs and b/_module/ncs/blindonopen.ncs differ diff --git a/_module/ncs/burrow_onspawn.ncs b/_module/ncs/burrow_onspawn.ncs index 48726cd3..90d0c0e0 100644 Binary files a/_module/ncs/burrow_onspawn.ncs and b/_module/ncs/burrow_onspawn.ncs differ diff --git a/_module/ncs/burrow_onuserdef.ncs b/_module/ncs/burrow_onuserdef.ncs index d023571d..b7db570a 100644 Binary files a/_module/ncs/burrow_onuserdef.ncs and b/_module/ncs/burrow_onuserdef.ncs differ diff --git a/_module/ncs/ceonopen.ncs b/_module/ncs/ceonopen.ncs index e5e4e4f1..fc196eea 100644 Binary files a/_module/ncs/ceonopen.ncs and b/_module/ncs/ceonopen.ncs differ diff --git a/_module/ncs/ch_al_ce_onopen.ncs b/_module/ncs/ch_al_ce_onopen.ncs index ac161b60..6d08a0f9 100644 Binary files a/_module/ncs/ch_al_ce_onopen.ncs and b/_module/ncs/ch_al_ce_onopen.ncs differ diff --git a/_module/ncs/cha_drain.ncs b/_module/ncs/cha_drain.ncs index 2ebc4e3b..9e821906 100644 Binary files a/_module/ncs/cha_drain.ncs and b/_module/ncs/cha_drain.ncs differ diff --git a/_module/ncs/charm_aura1.ncs b/_module/ncs/charm_aura1.ncs index fe103a98..125a3ed9 100644 Binary files a/_module/ncs/charm_aura1.ncs and b/_module/ncs/charm_aura1.ncs differ diff --git a/_module/ncs/charm_aura2.ncs b/_module/ncs/charm_aura2.ncs index d4d0f771..1a83cfaf 100644 Binary files a/_module/ncs/charm_aura2.ncs and b/_module/ncs/charm_aura2.ncs differ diff --git a/_module/ncs/chic_ai.ncs b/_module/ncs/chic_ai.ncs index c716fdd9..525473de 100644 Binary files a/_module/ncs/chic_ai.ncs and b/_module/ncs/chic_ai.ncs differ diff --git a/_module/ncs/close_door_10sec.ncs b/_module/ncs/close_door_10sec.ncs index 7b49b175..a68677c5 100644 Binary files a/_module/ncs/close_door_10sec.ncs and b/_module/ncs/close_door_10sec.ncs differ diff --git a/_module/ncs/close_door_20sec.ncs b/_module/ncs/close_door_20sec.ncs index 4ada8c61..48f4db50 100644 Binary files a/_module/ncs/close_door_20sec.ncs and b/_module/ncs/close_door_20sec.ncs differ diff --git a/_module/ncs/codi_heartbeat.ncs b/_module/ncs/codi_heartbeat.ncs index 23cb027c..79fffcf1 100644 Binary files a/_module/ncs/codi_heartbeat.ncs and b/_module/ncs/codi_heartbeat.ncs differ diff --git a/_module/ncs/codi_ondeath.ncs b/_module/ncs/codi_ondeath.ncs index e27d767a..9e1572d0 100644 Binary files a/_module/ncs/codi_ondeath.ncs and b/_module/ncs/codi_ondeath.ncs differ diff --git a/_module/ncs/commoner_creator.ncs b/_module/ncs/commoner_creator.ncs index 9798142a..30029911 100644 Binary files a/_module/ncs/commoner_creator.ncs and b/_module/ncs/commoner_creator.ncs differ diff --git a/_module/ncs/commoner_resume.ncs b/_module/ncs/commoner_resume.ncs index 40759fe5..ff19f975 100644 Binary files a/_module/ncs/commoner_resume.ncs and b/_module/ncs/commoner_resume.ncs differ diff --git a/_module/ncs/constrict.ncs b/_module/ncs/constrict.ncs index 08f73bdc..88648210 100644 Binary files a/_module/ncs/constrict.ncs and b/_module/ncs/constrict.ncs differ diff --git a/_module/ncs/convpbutcher.ncs b/_module/ncs/convpbutcher.ncs index 5a226ea4..452746ef 100644 Binary files a/_module/ncs/convpbutcher.ncs and b/_module/ncs/convpbutcher.ncs differ diff --git a/_module/ncs/convport12aboat.ncs b/_module/ncs/convport12aboat.ncs index 202b2c4d..3b883938 100644 Binary files a/_module/ncs/convport12aboat.ncs and b/_module/ncs/convport12aboat.ncs differ diff --git a/_module/ncs/convport9b1.ncs b/_module/ncs/convport9b1.ncs index 0ea58814..2b8e4920 100644 Binary files a/_module/ncs/convport9b1.ncs and b/_module/ncs/convport9b1.ncs differ diff --git a/_module/ncs/convport9b2.ncs b/_module/ncs/convport9b2.ncs index 0d6ac426..c7bc4317 100644 Binary files a/_module/ncs/convport9b2.ncs and b/_module/ncs/convport9b2.ncs differ diff --git a/_module/ncs/convport9b3.ncs b/_module/ncs/convport9b3.ncs index 93096781..897a63c6 100644 Binary files a/_module/ncs/convport9b3.ncs and b/_module/ncs/convport9b3.ncs differ diff --git a/_module/ncs/convport9b4.ncs b/_module/ncs/convport9b4.ncs index ac449280..24d33f8f 100644 Binary files a/_module/ncs/convport9b4.ncs and b/_module/ncs/convport9b4.ncs differ diff --git a/_module/ncs/convport9b5.ncs b/_module/ncs/convport9b5.ncs index d3dc1c95..e63b108a 100644 Binary files a/_module/ncs/convport9b5.ncs and b/_module/ncs/convport9b5.ncs differ diff --git a/_module/ncs/convport9b6.ncs b/_module/ncs/convport9b6.ncs index 48336d0c..a8f73dbf 100644 Binary files a/_module/ncs/convport9b6.ncs and b/_module/ncs/convport9b6.ncs differ diff --git a/_module/ncs/convportar.ncs b/_module/ncs/convportar.ncs index 064af25a..b492bf81 100644 Binary files a/_module/ncs/convportar.ncs and b/_module/ncs/convportar.ncs differ diff --git a/_module/ncs/convportarag1.ncs b/_module/ncs/convportarag1.ncs index 806f906f..6c7eb5c2 100644 Binary files a/_module/ncs/convportarag1.ncs and b/_module/ncs/convportarag1.ncs differ diff --git a/_module/ncs/convportarag2.ncs b/_module/ncs/convportarag2.ncs index 6e0f2842..c40cf0a6 100644 Binary files a/_module/ncs/convportarag2.ncs and b/_module/ncs/convportarag2.ncs differ diff --git a/_module/ncs/convportfp.ncs b/_module/ncs/convportfp.ncs index 09036b0a..f59ae082 100644 Binary files a/_module/ncs/convportfp.ncs and b/_module/ncs/convportfp.ncs differ diff --git a/_module/ncs/convportgrezn1.ncs b/_module/ncs/convportgrezn1.ncs index 8e0af5d2..001a68f0 100644 Binary files a/_module/ncs/convportgrezn1.ncs and b/_module/ncs/convportgrezn1.ncs differ diff --git a/_module/ncs/convportgrezn2.ncs b/_module/ncs/convportgrezn2.ncs index db4caf6e..d65bcb5a 100644 Binary files a/_module/ncs/convportgrezn2.ncs and b/_module/ncs/convportgrezn2.ncs differ diff --git a/_module/ncs/convportorcus.ncs b/_module/ncs/convportorcus.ncs index 33c44c6b..7520bfb6 100644 Binary files a/_module/ncs/convportorcus.ncs and b/_module/ncs/convportorcus.ncs differ diff --git a/_module/ncs/cpcraterlake1.ncs b/_module/ncs/cpcraterlake1.ncs index 936963b0..e7d3b308 100644 Binary files a/_module/ncs/cpcraterlake1.ncs and b/_module/ncs/cpcraterlake1.ncs differ diff --git a/_module/ncs/cpgoov.ncs b/_module/ncs/cpgoov.ncs index e5f0982a..d339e5c8 100644 Binary files a/_module/ncs/cpgoov.ncs and b/_module/ncs/cpgoov.ncs differ diff --git a/_module/ncs/cpmenak.ncs b/_module/ncs/cpmenak.ncs index e647a35d..fad6f76c 100644 Binary files a/_module/ncs/cpmenak.ncs and b/_module/ncs/cpmenak.ncs differ diff --git a/_module/ncs/cpslavish.ncs b/_module/ncs/cpslavish.ncs index 5e328823..dab33779 100644 Binary files a/_module/ncs/cpslavish.ncs and b/_module/ncs/cpslavish.ncs differ diff --git a/_module/ncs/cptoending.ncs b/_module/ncs/cptoending.ncs index f214c4e3..4d6c9fe0 100644 Binary files a/_module/ncs/cptoending.ncs and b/_module/ncs/cptoending.ncs differ diff --git a/_module/ncs/cr_bite_g_ant_s.ncs b/_module/ncs/cr_bite_g_ant_s.ncs index 787a85e0..3293f186 100644 Binary files a/_module/ncs/cr_bite_g_ant_s.ncs and b/_module/ncs/cr_bite_g_ant_s.ncs differ diff --git a/_module/ncs/cr_claw_ggg_r.ncs b/_module/ncs/cr_claw_ggg_r.ncs index 019c24f7..01b78336 100644 Binary files a/_module/ncs/cr_claw_ggg_r.ncs and b/_module/ncs/cr_claw_ggg_r.ncs differ diff --git a/_module/ncs/cr_dung_slam.ncs b/_module/ncs/cr_dung_slam.ncs index 72f6588e..2d073285 100644 Binary files a/_module/ncs/cr_dung_slam.ncs and b/_module/ncs/cr_dung_slam.ncs differ diff --git a/_module/ncs/cryptchaos.ncs b/_module/ncs/cryptchaos.ncs index 46816e0a..d41d12ae 100644 Binary files a/_module/ncs/cryptchaos.ncs and b/_module/ncs/cryptchaos.ncs differ diff --git a/_module/ncs/cryptevil.ncs b/_module/ncs/cryptevil.ncs index f808cce5..fa4c74c6 100644 Binary files a/_module/ncs/cryptevil.ncs and b/_module/ncs/cryptevil.ncs differ diff --git a/_module/ncs/curseonopen.ncs b/_module/ncs/curseonopen.ncs index d88dfd9b..d26252ac 100644 Binary files a/_module/ncs/curseonopen.ncs and b/_module/ncs/curseonopen.ncs differ diff --git a/_module/ncs/cv_destselfnofx.ncs b/_module/ncs/cv_destselfnofx.ncs index 384fa205..cf686ffb 100644 Binary files a/_module/ncs/cv_destselfnofx.ncs and b/_module/ncs/cv_destselfnofx.ncs differ diff --git a/_module/ncs/cv_port_graveyrd.ncs b/_module/ncs/cv_port_graveyrd.ncs index e5fdb489..baf17324 100644 Binary files a/_module/ncs/cv_port_graveyrd.ncs and b/_module/ncs/cv_port_graveyrd.ncs differ diff --git a/_module/ncs/daernfort.ncs b/_module/ncs/daernfort.ncs index 7c0140ea..e7f0e693 100644 Binary files a/_module/ncs/daernfort.ncs and b/_module/ncs/daernfort.ncs differ diff --git a/_module/ncs/daernstored.ncs b/_module/ncs/daernstored.ncs index da9e194d..bbdacb24 100644 Binary files a/_module/ncs/daernstored.ncs and b/_module/ncs/daernstored.ncs differ diff --git a/_module/ncs/daernwarp.ncs b/_module/ncs/daernwarp.ncs index 7c0140ea..e7f0e693 100644 Binary files a/_module/ncs/daernwarp.ncs and b/_module/ncs/daernwarp.ncs differ diff --git a/_module/ncs/dante_letodel_at.ncs b/_module/ncs/dante_letodel_at.ncs index 70344263..0dfdcbb3 100644 Binary files a/_module/ncs/dante_letodel_at.ncs and b/_module/ncs/dante_letodel_at.ncs differ diff --git a/_module/ncs/death_aura1.ncs b/_module/ncs/death_aura1.ncs index 7dd8ee21..7b8bf301 100644 Binary files a/_module/ncs/death_aura1.ncs and b/_module/ncs/death_aura1.ncs differ diff --git a/_module/ncs/deathonopen.ncs b/_module/ncs/deathonopen.ncs index 4407cfc9..05966fa4 100644 Binary files a/_module/ncs/deathonopen.ncs and b/_module/ncs/deathonopen.ncs differ diff --git a/_module/ncs/deathopen.ncs b/_module/ncs/deathopen.ncs index 2211f9b9..2338bd36 100644 Binary files a/_module/ncs/deathopen.ncs and b/_module/ncs/deathopen.ncs differ diff --git a/_module/ncs/default9_pw_glnd.ncs b/_module/ncs/default9_pw_glnd.ncs index 8f579346..60014631 100644 Binary files a/_module/ncs/default9_pw_glnd.ncs and b/_module/ncs/default9_pw_glnd.ncs differ diff --git a/_module/ncs/default9_pw_stm.ncs b/_module/ncs/default9_pw_stm.ncs index bcebd479..70b5956e 100644 Binary files a/_module/ncs/default9_pw_stm.ncs and b/_module/ncs/default9_pw_stm.ncs differ diff --git a/_module/ncs/demilichcomes.ncs b/_module/ncs/demilichcomes.ncs index 76887a3c..c71c9a8c 100644 Binary files a/_module/ncs/demilichcomes.ncs and b/_module/ncs/demilichcomes.ncs differ diff --git a/_module/ncs/desecrating_aur1.ncs b/_module/ncs/desecrating_aur1.ncs index a1335cc0..6570c741 100644 Binary files a/_module/ncs/desecrating_aur1.ncs and b/_module/ncs/desecrating_aur1.ncs differ diff --git a/_module/ncs/destroyselfnofx.ncs b/_module/ncs/destroyselfnofx.ncs index ea1bd5a5..3fca9b94 100644 Binary files a/_module/ncs/destroyselfnofx.ncs and b/_module/ncs/destroyselfnofx.ncs differ diff --git a/_module/ncs/destroyspeaker.ncs b/_module/ncs/destroyspeaker.ncs index ea1bd5a5..3fca9b94 100644 Binary files a/_module/ncs/destroyspeaker.ncs and b/_module/ncs/destroyspeaker.ncs differ diff --git a/_module/ncs/dive10ato11.ncs b/_module/ncs/dive10ato11.ncs index 647bead6..9ad2a5d3 100644 Binary files a/_module/ncs/dive10ato11.ncs and b/_module/ncs/dive10ato11.ncs differ diff --git a/_module/ncs/dive1warp.ncs b/_module/ncs/dive1warp.ncs index cb8007e7..86792014 100644 Binary files a/_module/ncs/dive1warp.ncs and b/_module/ncs/dive1warp.ncs differ diff --git a/_module/ncs/dive6a8.ncs b/_module/ncs/dive6a8.ncs index 5d12118d..c5984b3f 100644 Binary files a/_module/ncs/dive6a8.ncs and b/_module/ncs/dive6a8.ncs differ diff --git a/_module/ncs/dive6towatr.ncs b/_module/ncs/dive6towatr.ncs index ab58a724..dc6aa2ed 100644 Binary files a/_module/ncs/dive6towatr.ncs and b/_module/ncs/dive6towatr.ncs differ diff --git a/_module/ncs/dive8lake1.ncs b/_module/ncs/dive8lake1.ncs index 77193d4e..0c8258db 100644 Binary files a/_module/ncs/dive8lake1.ncs and b/_module/ncs/dive8lake1.ncs differ diff --git a/_module/ncs/divecrater1.ncs b/_module/ncs/divecrater1.ncs index a4c92d47..c9a8db8e 100644 Binary files a/_module/ncs/divecrater1.ncs and b/_module/ncs/divecrater1.ncs differ diff --git a/_module/ncs/diving1.ncs b/_module/ncs/diving1.ncs index 22e0e08a..2443a3c8 100644 Binary files a/_module/ncs/diving1.ncs and b/_module/ncs/diving1.ncs differ diff --git a/_module/ncs/diving12.ncs b/_module/ncs/diving12.ncs index cef61813..cc9653b0 100644 Binary files a/_module/ncs/diving12.ncs and b/_module/ncs/diving12.ncs differ diff --git a/_module/ncs/diving2.ncs b/_module/ncs/diving2.ncs index 26aabf6c..2ccfbdc4 100644 Binary files a/_module/ncs/diving2.ncs and b/_module/ncs/diving2.ncs differ diff --git a/_module/ncs/diving3.ncs b/_module/ncs/diving3.ncs index c6ba0969..ab6ff432 100644 Binary files a/_module/ncs/diving3.ncs and b/_module/ncs/diving3.ncs differ diff --git a/_module/ncs/diving4.ncs b/_module/ncs/diving4.ncs index ce4df6c9..88514bae 100644 Binary files a/_module/ncs/diving4.ncs and b/_module/ncs/diving4.ncs differ diff --git a/_module/ncs/diving5.ncs b/_module/ncs/diving5.ncs index c27bd0f6..c069ea2b 100644 Binary files a/_module/ncs/diving5.ncs and b/_module/ncs/diving5.ncs differ diff --git a/_module/ncs/diving6.ncs b/_module/ncs/diving6.ncs index e22c88b1..46c9e138 100644 Binary files a/_module/ncs/diving6.ncs and b/_module/ncs/diving6.ncs differ diff --git a/_module/ncs/diving7.ncs b/_module/ncs/diving7.ncs index 405bb58b..b747b10f 100644 Binary files a/_module/ncs/diving7.ncs and b/_module/ncs/diving7.ncs differ diff --git a/_module/ncs/diving8.ncs b/_module/ncs/diving8.ncs index 5fedb542..d94e3686 100644 Binary files a/_module/ncs/diving8.ncs and b/_module/ncs/diving8.ncs differ diff --git a/_module/ncs/divsmlake.ncs b/_module/ncs/divsmlake.ncs index 633b1573..2fbfdec1 100644 Binary files a/_module/ncs/divsmlake.ncs and b/_module/ncs/divsmlake.ncs differ diff --git a/_module/ncs/dmfi_activate.ncs b/_module/ncs/dmfi_activate.ncs index 735cb9fb..274c94fe 100644 Binary files a/_module/ncs/dmfi_activate.ncs and b/_module/ncs/dmfi_activate.ncs differ diff --git a/_module/ncs/dmfi_execute.ncs b/_module/ncs/dmfi_execute.ncs index 63c5d634..aa56c437 100644 Binary files a/_module/ncs/dmfi_execute.ncs and b/_module/ncs/dmfi_execute.ncs differ diff --git a/_module/ncs/dmfi_onrest.ncs b/_module/ncs/dmfi_onrest.ncs index b3759611..e8172772 100644 Binary files a/_module/ncs/dmfi_onrest.ncs and b/_module/ncs/dmfi_onrest.ncs differ diff --git a/_module/ncs/dmfi_plychat_exe.ncs b/_module/ncs/dmfi_plychat_exe.ncs index c0850bab..cd68d78b 100644 Binary files a/_module/ncs/dmfi_plychat_exe.ncs and b/_module/ncs/dmfi_plychat_exe.ncs differ diff --git a/_module/ncs/dmfi_voice1.ncs b/_module/ncs/dmfi_voice1.ncs index c63d715a..5a6aaa78 100644 Binary files a/_module/ncs/dmfi_voice1.ncs and b/_module/ncs/dmfi_voice1.ncs differ diff --git a/_module/ncs/dmfi_x_afflict.ncs b/_module/ncs/dmfi_x_afflict.ncs index 4169a23c..b38e4da4 100644 Binary files a/_module/ncs/dmfi_x_afflict.ncs and b/_module/ncs/dmfi_x_afflict.ncs differ diff --git a/_module/ncs/dmfi_x_emote.ncs b/_module/ncs/dmfi_x_emote.ncs index e2b13f8d..426b3c1e 100644 Binary files a/_module/ncs/dmfi_x_emote.ncs and b/_module/ncs/dmfi_x_emote.ncs differ diff --git a/_module/ncs/dont_look.ncs b/_module/ncs/dont_look.ncs index e964166a..c085f6bf 100644 Binary files a/_module/ncs/dont_look.ncs and b/_module/ncs/dont_look.ncs differ diff --git a/_module/ncs/door_area_trans.ncs b/_module/ncs/door_area_trans.ncs index 5dc59149..5cbeef6d 100644 Binary files a/_module/ncs/door_area_trans.ncs and b/_module/ncs/door_area_trans.ncs differ diff --git a/_module/ncs/doplchange.ncs b/_module/ncs/doplchange.ncs index 52c26a10..acb5333a 100644 Binary files a/_module/ncs/doplchange.ncs and b/_module/ncs/doplchange.ncs differ diff --git a/_module/ncs/dream_ai.ncs b/_module/ncs/dream_ai.ncs index 8980d5c9..7f4334a6 100644 Binary files a/_module/ncs/dream_ai.ncs and b/_module/ncs/dream_ai.ncs differ diff --git a/_module/ncs/drooggong.ncs b/_module/ncs/drooggong.ncs index 881719f7..0900db5d 100644 Binary files a/_module/ncs/drooggong.ncs and b/_module/ncs/drooggong.ncs differ diff --git a/_module/ncs/drowgone.ncs b/_module/ncs/drowgone.ncs index 9b5fc27a..30e69877 100644 Binary files a/_module/ncs/drowgone.ncs and b/_module/ncs/drowgone.ncs differ diff --git a/_module/ncs/drowndoor.ncs b/_module/ncs/drowndoor.ncs index 848779b6..20051a87 100644 Binary files a/_module/ncs/drowndoor.ncs and b/_module/ncs/drowndoor.ncs differ diff --git a/_module/ncs/dspiderbite.ncs b/_module/ncs/dspiderbite.ncs index 65eaaac8..29b169f6 100644 Binary files a/_module/ncs/dspiderbite.ncs and b/_module/ncs/dspiderbite.ncs differ diff --git a/_module/ncs/dungeon_enter.ncs b/_module/ncs/dungeon_enter.ncs index b2b8ae40..9439d0e3 100644 Binary files a/_module/ncs/dungeon_enter.ncs and b/_module/ncs/dungeon_enter.ncs differ diff --git a/_module/ncs/ed3_troll_custom.ncs b/_module/ncs/ed3_troll_custom.ncs index 29e243bd..9d08052c 100644 Binary files a/_module/ncs/ed3_troll_custom.ncs and b/_module/ncs/ed3_troll_custom.ncs differ diff --git a/_module/ncs/ed3_troll_spawn.ncs b/_module/ncs/ed3_troll_spawn.ncs index 324cd8b2..eb4b16a1 100644 Binary files a/_module/ncs/ed3_troll_spawn.ncs and b/_module/ncs/ed3_troll_spawn.ncs differ diff --git a/_module/ncs/entropic_blade.ncs b/_module/ncs/entropic_blade.ncs index 7da2fcae..14cf6674 100644 Binary files a/_module/ncs/entropic_blade.ncs and b/_module/ncs/entropic_blade.ncs differ diff --git a/_module/ncs/fear2_aura1.ncs b/_module/ncs/fear2_aura1.ncs index 1b2e5485..642a3938 100644 Binary files a/_module/ncs/fear2_aura1.ncs and b/_module/ncs/fear2_aura1.ncs differ diff --git a/_module/ncs/fear_aura1.ncs b/_module/ncs/fear_aura1.ncs index 7f2cf600..ffc3d0ef 100644 Binary files a/_module/ncs/fear_aura1.ncs and b/_module/ncs/fear_aura1.ncs differ diff --git a/_module/ncs/flightfireisle.ncs b/_module/ncs/flightfireisle.ncs index 0dbafbe4..ab3f70fc 100644 Binary files a/_module/ncs/flightfireisle.ncs and b/_module/ncs/flightfireisle.ncs differ diff --git a/_module/ncs/flightfireisle2.ncs b/_module/ncs/flightfireisle2.ncs index 4e6ce93e..d11b87f7 100644 Binary files a/_module/ncs/flightfireisle2.ncs and b/_module/ncs/flightfireisle2.ncs differ diff --git a/_module/ncs/floodtraplever.ncs b/_module/ncs/floodtraplever.ncs index 87ffb56b..a09534e4 100644 Binary files a/_module/ncs/floodtraplever.ncs and b/_module/ncs/floodtraplever.ncs differ diff --git a/_module/ncs/flymummy1.ncs b/_module/ncs/flymummy1.ncs index 8791dacb..dec13eb3 100644 Binary files a/_module/ncs/flymummy1.ncs and b/_module/ncs/flymummy1.ncs differ diff --git a/_module/ncs/flymummy2.ncs b/_module/ncs/flymummy2.ncs index a5326fc2..c969209d 100644 Binary files a/_module/ncs/flymummy2.ncs and b/_module/ncs/flymummy2.ncs differ diff --git a/_module/ncs/ghast_stench1.ncs b/_module/ncs/ghast_stench1.ncs index dc5ba098..54f7b26f 100644 Binary files a/_module/ncs/ghast_stench1.ncs and b/_module/ncs/ghast_stench1.ncs differ diff --git a/_module/ncs/ghoul_bite.ncs b/_module/ncs/ghoul_bite.ncs index d78f9ea1..8bc1bd3b 100644 Binary files a/_module/ncs/ghoul_bite.ncs and b/_module/ncs/ghoul_bite.ncs differ diff --git a/_module/ncs/ghoul_claw.ncs b/_module/ncs/ghoul_claw.ncs index ac1c4238..e227fad6 100644 Binary files a/_module/ncs/ghoul_claw.ncs and b/_module/ncs/ghoul_claw.ncs differ diff --git a/_module/ncs/goovport.ncs b/_module/ncs/goovport.ncs index 1752c99c..f5627b49 100644 Binary files a/_module/ncs/goovport.ncs and b/_module/ncs/goovport.ncs differ diff --git a/_module/ncs/grezneckteleport.ncs b/_module/ncs/grezneckteleport.ncs index 7557f266..f90f61fd 100644 Binary files a/_module/ncs/grezneckteleport.ncs and b/_module/ncs/grezneckteleport.ncs differ diff --git a/_module/ncs/gz_chair_use.ncs b/_module/ncs/gz_chair_use.ncs index 23eaed39..e99280e5 100644 Binary files a/_module/ncs/gz_chair_use.ncs and b/_module/ncs/gz_chair_use.ncs differ diff --git a/_module/ncs/hermitquest1.ncs b/_module/ncs/hermitquest1.ncs index 7b47a026..ca79467c 100644 Binary files a/_module/ncs/hermitquest1.ncs and b/_module/ncs/hermitquest1.ncs differ diff --git a/_module/ncs/howl_ai.ncs b/_module/ncs/howl_ai.ncs index a55404ff..3c0f2f9b 100644 Binary files a/_module/ncs/howl_ai.ncs and b/_module/ncs/howl_ai.ncs differ diff --git a/_module/ncs/hputest.ncs b/_module/ncs/hputest.ncs index fc88000a..d2c498ce 100644 Binary files a/_module/ncs/hputest.ncs and b/_module/ncs/hputest.ncs differ diff --git a/_module/ncs/hunefer_rot.ncs b/_module/ncs/hunefer_rot.ncs index f561c7e6..444e9f81 100644 Binary files a/_module/ncs/hunefer_rot.ncs and b/_module/ncs/hunefer_rot.ncs differ diff --git a/_module/ncs/imp_grab.ncs b/_module/ncs/imp_grab.ncs index 787a85e0..3293f186 100644 Binary files a/_module/ncs/imp_grab.ncs and b/_module/ncs/imp_grab.ncs differ diff --git a/_module/ncs/infernal_ai.ncs b/_module/ncs/infernal_ai.ncs index 3a3e3b54..634208c0 100644 Binary files a/_module/ncs/infernal_ai.ncs and b/_module/ncs/infernal_ai.ncs differ diff --git a/_module/ncs/ironflask.ncs b/_module/ncs/ironflask.ncs index 495f44ff..23e3d935 100644 Binary files a/_module/ncs/ironflask.ncs and b/_module/ncs/ironflask.ncs differ diff --git a/_module/ncs/itm_efreetibot01.ncs b/_module/ncs/itm_efreetibot01.ncs index 71830ccd..b6c10f6a 100644 Binary files a/_module/ncs/itm_efreetibot01.ncs and b/_module/ncs/itm_efreetibot01.ncs differ diff --git a/_module/ncs/keepinchair.ncs b/_module/ncs/keepinchair.ncs index 56461c55..2575b6a3 100644 Binary files a/_module/ncs/keepinchair.ncs and b/_module/ncs/keepinchair.ncs differ diff --git a/_module/ncs/lakecryptport.ncs b/_module/ncs/lakecryptport.ncs index 8f0bed21..e0cf38d2 100644 Binary files a/_module/ncs/lakecryptport.ncs and b/_module/ncs/lakecryptport.ncs differ diff --git a/_module/ncs/lakeglopdive.ncs b/_module/ncs/lakeglopdive.ncs index e54788a5..3d038d99 100644 Binary files a/_module/ncs/lakeglopdive.ncs and b/_module/ncs/lakeglopdive.ncs differ diff --git a/_module/ncs/latrene_rope.ncs b/_module/ncs/latrene_rope.ncs index a41a7edd..a9446ebf 100644 Binary files a/_module/ncs/latrene_rope.ncs and b/_module/ncs/latrene_rope.ncs differ diff --git a/_module/ncs/lockflooddoor.ncs b/_module/ncs/lockflooddoor.ncs index 76470401..75c39484 100644 Binary files a/_module/ncs/lockflooddoor.ncs and b/_module/ncs/lockflooddoor.ncs differ diff --git a/_module/ncs/lycan_userdef.ncs b/_module/ncs/lycan_userdef.ncs index 82d9c992..85a8af8e 100644 Binary files a/_module/ncs/lycan_userdef.ncs and b/_module/ncs/lycan_userdef.ncs differ diff --git a/_module/ncs/melody1.ncs b/_module/ncs/melody1.ncs index 8a32221a..c75987f5 100644 Binary files a/_module/ncs/melody1.ncs and b/_module/ncs/melody1.ncs differ diff --git a/_module/ncs/melody2.ncs b/_module/ncs/melody2.ncs index 83d2acf0..6b036faf 100644 Binary files a/_module/ncs/melody2.ncs and b/_module/ncs/melody2.ncs differ diff --git a/_module/ncs/menaktombtel.ncs b/_module/ncs/menaktombtel.ncs index 482e1e7d..a610c69d 100644 Binary files a/_module/ncs/menaktombtel.ncs and b/_module/ncs/menaktombtel.ncs differ diff --git a/_module/ncs/menaktombtel1.ncs b/_module/ncs/menaktombtel1.ncs index 247015c4..bce0e661 100644 Binary files a/_module/ncs/menaktombtel1.ncs and b/_module/ncs/menaktombtel1.ncs differ diff --git a/_module/ncs/meteordoor.ncs b/_module/ncs/meteordoor.ncs index a1fd00a5..aa452ad0 100644 Binary files a/_module/ncs/meteordoor.ncs and b/_module/ncs/meteordoor.ncs differ diff --git a/_module/ncs/mod_gui.ncs b/_module/ncs/mod_gui.ncs index f7952b53..410d992c 100644 Binary files a/_module/ncs/mod_gui.ncs and b/_module/ncs/mod_gui.ncs differ diff --git a/_module/ncs/mod_nui.ncs b/_module/ncs/mod_nui.ncs index bad69785..23a5d549 100644 Binary files a/_module/ncs/mod_nui.ncs and b/_module/ncs/mod_nui.ncs differ diff --git a/_module/ncs/newmenak1.ncs b/_module/ncs/newmenak1.ncs index 060be928..1221a01e 100644 Binary files a/_module/ncs/newmenak1.ncs and b/_module/ncs/newmenak1.ncs differ diff --git a/_module/ncs/no_ai_atk.ncs b/_module/ncs/no_ai_atk.ncs index 51d84088..a50ddc86 100644 Binary files a/_module/ncs/no_ai_atk.ncs and b/_module/ncs/no_ai_atk.ncs differ diff --git a/_module/ncs/no_ai_cmb.ncs b/_module/ncs/no_ai_cmb.ncs index 30e2649b..39ffaa80 100644 Binary files a/_module/ncs/no_ai_cmb.ncs and b/_module/ncs/no_ai_cmb.ncs differ diff --git a/_module/ncs/no_ai_cnv.ncs b/_module/ncs/no_ai_cnv.ncs index 62271e52..162282c0 100644 Binary files a/_module/ncs/no_ai_cnv.ncs and b/_module/ncs/no_ai_cnv.ncs differ diff --git a/_module/ncs/no_ai_dam.ncs b/_module/ncs/no_ai_dam.ncs index 16ac0ff5..4b7f2a78 100644 Binary files a/_module/ncs/no_ai_dam.ncs and b/_module/ncs/no_ai_dam.ncs differ diff --git a/_module/ncs/no_ai_dis.ncs b/_module/ncs/no_ai_dis.ncs index 7c4966b9..fd311dea 100644 Binary files a/_module/ncs/no_ai_dis.ncs and b/_module/ncs/no_ai_dis.ncs differ diff --git a/_module/ncs/no_ai_dth.ncs b/_module/ncs/no_ai_dth.ncs index 9c1b7a5e..098ce1ef 100644 Binary files a/_module/ncs/no_ai_dth.ncs and b/_module/ncs/no_ai_dth.ncs differ diff --git a/_module/ncs/no_ai_hrt.ncs b/_module/ncs/no_ai_hrt.ncs index 870f95ef..8aee74d5 100644 Binary files a/_module/ncs/no_ai_hrt.ncs and b/_module/ncs/no_ai_hrt.ncs differ diff --git a/_module/ncs/no_ai_per.ncs b/_module/ncs/no_ai_per.ncs index fa3ef0e1..5c4334c4 100644 Binary files a/_module/ncs/no_ai_per.ncs and b/_module/ncs/no_ai_per.ncs differ diff --git a/_module/ncs/no_ai_spt.ncs b/_module/ncs/no_ai_spt.ncs index 74508775..3502d01e 100644 Binary files a/_module/ncs/no_ai_spt.ncs and b/_module/ncs/no_ai_spt.ncs differ diff --git a/_module/ncs/no_scr_excorpse.ncs b/_module/ncs/no_scr_excorpse.ncs index dad7af59..ccc1402c 100644 Binary files a/_module/ncs/no_scr_excorpse.ncs and b/_module/ncs/no_scr_excorpse.ncs differ diff --git a/_module/ncs/no_scr_shutdown.ncs b/_module/ncs/no_scr_shutdown.ncs index 84a29f3c..9173d68e 100644 Binary files a/_module/ncs/no_scr_shutdown.ncs and b/_module/ncs/no_scr_shutdown.ncs differ diff --git a/_module/ncs/no_spn_beh.ncs b/_module/ncs/no_spn_beh.ncs index 0ee1a273..fc0fbb7c 100644 Binary files a/_module/ncs/no_spn_beh.ncs and b/_module/ncs/no_spn_beh.ncs differ diff --git a/_module/ncs/no_spn_clr.ncs b/_module/ncs/no_spn_clr.ncs index 17ec8d13..b29f85d6 100644 Binary files a/_module/ncs/no_spn_clr.ncs and b/_module/ncs/no_spn_clr.ncs differ diff --git a/_module/ncs/no_spn_fiend.ncs b/_module/ncs/no_spn_fiend.ncs index bb017cf4..7cd4ca82 100644 Binary files a/_module/ncs/no_spn_fiend.ncs and b/_module/ncs/no_spn_fiend.ncs differ diff --git a/_module/ncs/no_spn_ftr.ncs b/_module/ncs/no_spn_ftr.ncs index 10a595c0..17b1e469 100644 Binary files a/_module/ncs/no_spn_ftr.ncs and b/_module/ncs/no_spn_ftr.ncs differ diff --git a/_module/ncs/no_spn_melcast1.ncs b/_module/ncs/no_spn_melcast1.ncs index aeb0453a..913ad885 100644 Binary files a/_module/ncs/no_spn_melcast1.ncs and b/_module/ncs/no_spn_melcast1.ncs differ diff --git a/_module/ncs/no_spn_melcast2.ncs b/_module/ncs/no_spn_melcast2.ncs index 5c325aaf..ece0da3e 100644 Binary files a/_module/ncs/no_spn_melcast2.ncs and b/_module/ncs/no_spn_melcast2.ncs differ diff --git a/_module/ncs/no_spn_melcast3.ncs b/_module/ncs/no_spn_melcast3.ncs index b5bb4f84..21839deb 100644 Binary files a/_module/ncs/no_spn_melcast3.ncs and b/_module/ncs/no_spn_melcast3.ncs differ diff --git a/_module/ncs/no_spn_melenh.ncs b/_module/ncs/no_spn_melenh.ncs index 3c15354c..300dd07d 100644 Binary files a/_module/ncs/no_spn_melenh.ncs and b/_module/ncs/no_spn_melenh.ncs differ diff --git a/_module/ncs/no_spn_rftr.ncs b/_module/ncs/no_spn_rftr.ncs index 10a595c0..17b1e469 100644 Binary files a/_module/ncs/no_spn_rftr.ncs and b/_module/ncs/no_spn_rftr.ncs differ diff --git a/_module/ncs/no_spn_rftrcast1.ncs b/_module/ncs/no_spn_rftrcast1.ncs index fe3ef7bc..093ce930 100644 Binary files a/_module/ncs/no_spn_rftrcast1.ncs and b/_module/ncs/no_spn_rftrcast1.ncs differ diff --git a/_module/ncs/no_spn_rngcast3.ncs b/_module/ncs/no_spn_rngcast3.ncs index 694ee961..ad6bfa20 100644 Binary files a/_module/ncs/no_spn_rngcast3.ncs and b/_module/ncs/no_spn_rngcast3.ncs differ diff --git a/_module/ncs/no_spn_rog.ncs b/_module/ncs/no_spn_rog.ncs index f76709e9..c3631625 100644 Binary files a/_module/ncs/no_spn_rog.ncs and b/_module/ncs/no_spn_rog.ncs differ diff --git a/_module/ncs/no_spn_rogcast1.ncs b/_module/ncs/no_spn_rogcast1.ncs index 09eb89d6..22037a35 100644 Binary files a/_module/ncs/no_spn_rogcast1.ncs and b/_module/ncs/no_spn_rogcast1.ncs differ diff --git a/_module/ncs/no_spn_rogcast3.ncs b/_module/ncs/no_spn_rogcast3.ncs index 9a6c9457..bdbb1fc3 100644 Binary files a/_module/ncs/no_spn_rogcast3.ncs and b/_module/ncs/no_spn_rogcast3.ncs differ diff --git a/_module/ncs/no_spn_rogenh.ncs b/_module/ncs/no_spn_rogenh.ncs index f92c1af4..4927a0b7 100644 Binary files a/_module/ncs/no_spn_rogenh.ncs and b/_module/ncs/no_spn_rogenh.ncs differ diff --git a/_module/ncs/no_spn_rogtel.ncs b/_module/ncs/no_spn_rogtel.ncs index a28aa1ee..1c92b0c9 100644 Binary files a/_module/ncs/no_spn_rogtel.ncs and b/_module/ncs/no_spn_rogtel.ncs differ diff --git a/_module/ncs/no_spn_summ.ncs b/_module/ncs/no_spn_summ.ncs index 556c28d3..89f312d8 100644 Binary files a/_module/ncs/no_spn_summ.ncs and b/_module/ncs/no_spn_summ.ncs differ diff --git a/_module/ncs/no_spn_wiz.ncs b/_module/ncs/no_spn_wiz.ncs index ece7ba6d..fde39795 100644 Binary files a/_module/ncs/no_spn_wiz.ncs and b/_module/ncs/no_spn_wiz.ncs differ diff --git a/_module/ncs/nui_f_storage.ncs b/_module/ncs/nui_f_storage.ncs index 9cdc8389..3e3dcaf1 100644 Binary files a/_module/ncs/nui_f_storage.ncs and b/_module/ncs/nui_f_storage.ncs differ diff --git a/_module/ncs/nw_ai_cmbtrndend.ncs b/_module/ncs/nw_ai_cmbtrndend.ncs index eeaf5bbf..43e1a44b 100644 Binary files a/_module/ncs/nw_ai_cmbtrndend.ncs and b/_module/ncs/nw_ai_cmbtrndend.ncs differ diff --git a/_module/ncs/nw_ai_heartbeat.ncs b/_module/ncs/nw_ai_heartbeat.ncs index 06e88d73..9adaf44c 100644 Binary files a/_module/ncs/nw_ai_heartbeat.ncs and b/_module/ncs/nw_ai_heartbeat.ncs differ diff --git a/_module/ncs/nw_ai_onattacked.ncs b/_module/ncs/nw_ai_onattacked.ncs index 720f759e..d4eea025 100644 Binary files a/_module/ncs/nw_ai_onattacked.ncs and b/_module/ncs/nw_ai_onattacked.ncs differ diff --git a/_module/ncs/nw_ai_onconvers.ncs b/_module/ncs/nw_ai_onconvers.ncs index 20ecc349..6da2a54d 100644 Binary files a/_module/ncs/nw_ai_onconvers.ncs and b/_module/ncs/nw_ai_onconvers.ncs differ diff --git a/_module/ncs/nw_ai_ondamaged.ncs b/_module/ncs/nw_ai_ondamaged.ncs index ab36d431..967d85f2 100644 Binary files a/_module/ncs/nw_ai_ondamaged.ncs and b/_module/ncs/nw_ai_ondamaged.ncs differ diff --git a/_module/ncs/nw_ai_ondisturb.ncs b/_module/ncs/nw_ai_ondisturb.ncs index dd6ddea4..a8f7e0ae 100644 Binary files a/_module/ncs/nw_ai_ondisturb.ncs and b/_module/ncs/nw_ai_ondisturb.ncs differ diff --git a/_module/ncs/nw_ai_onpercept.ncs b/_module/ncs/nw_ai_onpercept.ncs index 0b26d7a9..c154ad72 100644 Binary files a/_module/ncs/nw_ai_onpercept.ncs and b/_module/ncs/nw_ai_onpercept.ncs differ diff --git a/_module/ncs/nw_ai_onspawn.ncs b/_module/ncs/nw_ai_onspawn.ncs index c5d993fc..84693022 100644 Binary files a/_module/ncs/nw_ai_onspawn.ncs and b/_module/ncs/nw_ai_onspawn.ncs differ diff --git a/_module/ncs/nw_ai_onspellcst.ncs b/_module/ncs/nw_ai_onspellcst.ncs index 28d45e77..afd78c96 100644 Binary files a/_module/ncs/nw_ai_onspellcst.ncs and b/_module/ncs/nw_ai_onspellcst.ncs differ diff --git a/_module/ncs/nw_c2_bossspawn.ncs b/_module/ncs/nw_c2_bossspawn.ncs index 9ed5af09..7330f43b 100644 Binary files a/_module/ncs/nw_c2_bossspawn.ncs and b/_module/ncs/nw_c2_bossspawn.ncs differ diff --git a/_module/ncs/obj_us_chest.ncs b/_module/ncs/obj_us_chest.ncs index 63244d57..2b30867b 100644 Binary files a/_module/ncs/obj_us_chest.ncs and b/_module/ncs/obj_us_chest.ncs differ diff --git a/_module/ncs/on_pubsub.ncs b/_module/ncs/on_pubsub.ncs index 68c830ea..2860bccc 100644 Binary files a/_module/ncs/on_pubsub.ncs and b/_module/ncs/on_pubsub.ncs differ diff --git a/_module/ncs/orcusdoor.ncs b/_module/ncs/orcusdoor.ncs index 978caabf..b28c62f2 100644 Binary files a/_module/ncs/orcusdoor.ncs and b/_module/ncs/orcusdoor.ncs differ diff --git a/_module/ncs/otres_cond.ncs b/_module/ncs/otres_cond.ncs index 2ed8c71c..e6a3b4fa 100644 Binary files a/_module/ncs/otres_cond.ncs and b/_module/ncs/otres_cond.ncs differ diff --git a/_module/ncs/otres_cond2.ncs b/_module/ncs/otres_cond2.ncs index 880d4cf5..a4309fcd 100644 Binary files a/_module/ncs/otres_cond2.ncs and b/_module/ncs/otres_cond2.ncs differ diff --git a/_module/ncs/otres_cond3.ncs b/_module/ncs/otres_cond3.ncs index 1271fe56..7f2dd263 100644 Binary files a/_module/ncs/otres_cond3.ncs and b/_module/ncs/otres_cond3.ncs differ diff --git a/_module/ncs/otres_rand_sc.ncs b/_module/ncs/otres_rand_sc.ncs index 261b4317..76dd09d0 100644 Binary files a/_module/ncs/otres_rand_sc.ncs and b/_module/ncs/otres_rand_sc.ncs differ diff --git a/_module/ncs/otres_set_var_r.ncs b/_module/ncs/otres_set_var_r.ncs index 35581dd9..1f25632e 100644 Binary files a/_module/ncs/otres_set_var_r.ncs and b/_module/ncs/otres_set_var_r.ncs differ diff --git a/_module/ncs/otres_travelcall.ncs b/_module/ncs/otres_travelcall.ncs index 664b24dd..5d0cf2c1 100644 Binary files a/_module/ncs/otres_travelcall.ncs and b/_module/ncs/otres_travelcall.ncs differ diff --git a/_module/ncs/paralyzeonopen.ncs b/_module/ncs/paralyzeonopen.ncs index 876e5bc5..526e80c7 100644 Binary files a/_module/ncs/paralyzeonopen.ncs and b/_module/ncs/paralyzeonopen.ncs differ diff --git a/_module/ncs/phaethon_ai.ncs b/_module/ncs/phaethon_ai.ncs index 358af00d..d0038b96 100644 Binary files a/_module/ncs/phaethon_ai.ncs and b/_module/ncs/phaethon_ai.ncs differ diff --git a/_module/ncs/pillarscript.ncs b/_module/ncs/pillarscript.ncs index aa94ef27..f556c55d 100644 Binary files a/_module/ncs/pillarscript.ncs and b/_module/ncs/pillarscript.ncs differ diff --git a/_module/ncs/plague_blight.ncs b/_module/ncs/plague_blight.ncs index 00116207..2bf99f9f 100644 Binary files a/_module/ncs/plague_blight.ncs and b/_module/ncs/plague_blight.ncs differ diff --git a/_module/ncs/plagueaura1.ncs b/_module/ncs/plagueaura1.ncs index 1a571736..e8e35bd1 100644 Binary files a/_module/ncs/plagueaura1.ncs and b/_module/ncs/plagueaura1.ncs differ diff --git a/_module/ncs/plagueaura2.ncs b/_module/ncs/plagueaura2.ncs index 2ee6dcfd..e489d565 100644 Binary files a/_module/ncs/plagueaura2.ncs and b/_module/ncs/plagueaura2.ncs differ diff --git a/_module/ncs/portarenatopil.ncs b/_module/ncs/portarenatopil.ncs index fe122035..7fc75841 100644 Binary files a/_module/ncs/portarenatopil.ncs and b/_module/ncs/portarenatopil.ncs differ diff --git a/_module/ncs/prism_aura1.ncs b/_module/ncs/prism_aura1.ncs index 2bab6796..159f581e 100644 Binary files a/_module/ncs/prism_aura1.ncs and b/_module/ncs/prism_aura1.ncs differ diff --git a/_module/ncs/prism_aura2.ncs b/_module/ncs/prism_aura2.ncs index 11fae475..e101f94b 100644 Binary files a/_module/ncs/prism_aura2.ncs and b/_module/ncs/prism_aura2.ncs differ diff --git a/_module/ncs/purplewormbite.ncs b/_module/ncs/purplewormbite.ncs index 63367dcf..a6a4b93d 100644 Binary files a/_module/ncs/purplewormbite.ncs and b/_module/ncs/purplewormbite.ncs differ diff --git a/_module/ncs/pw_on_spawn.ncs b/_module/ncs/pw_on_spawn.ncs index e32872c6..c6a4a7bd 100644 Binary files a/_module/ncs/pw_on_spawn.ncs and b/_module/ncs/pw_on_spawn.ncs differ diff --git a/_module/ncs/pw_on_userdef.ncs b/_module/ncs/pw_on_userdef.ncs index ac330b01..64807737 100644 Binary files a/_module/ncs/pw_on_userdef.ncs and b/_module/ncs/pw_on_userdef.ncs differ diff --git a/_module/ncs/pw_stmch_exit.ncs b/_module/ncs/pw_stmch_exit.ncs index 2127d574..aa7f82ab 100644 Binary files a/_module/ncs/pw_stmch_exit.ncs and b/_module/ncs/pw_stmch_exit.ncs differ diff --git a/_module/ncs/pw_stmlng_dth.ncs b/_module/ncs/pw_stmlng_dth.ncs index bc7f8512..4b53e7c2 100644 Binary files a/_module/ncs/pw_stmlng_dth.ncs and b/_module/ncs/pw_stmlng_dth.ncs differ diff --git a/_module/ncs/qst_altar_2nd.ncs b/_module/ncs/qst_altar_2nd.ncs index cdf2d7cc..a211c6c6 100644 Binary files a/_module/ncs/qst_altar_2nd.ncs and b/_module/ncs/qst_altar_2nd.ncs differ diff --git a/_module/ncs/qst_tribitz_end1.ncs b/_module/ncs/qst_tribitz_end1.ncs index db8623cc..e6d38a8f 100644 Binary files a/_module/ncs/qst_tribitz_end1.ncs and b/_module/ncs/qst_tribitz_end1.ncs differ diff --git a/_module/ncs/ra_ai_heartbeat.ncs b/_module/ncs/ra_ai_heartbeat.ncs index cb30e17b..1347fda1 100644 Binary files a/_module/ncs/ra_ai_heartbeat.ncs and b/_module/ncs/ra_ai_heartbeat.ncs differ diff --git a/_module/ncs/ra_ai_ondamaged.ncs b/_module/ncs/ra_ai_ondamaged.ncs index 68df56e6..2d1ca149 100644 Binary files a/_module/ncs/ra_ai_ondamaged.ncs and b/_module/ncs/ra_ai_ondamaged.ncs differ diff --git a/_module/ncs/ra_beggar_hb.ncs b/_module/ncs/ra_beggar_hb.ncs index df8fdb95..72dd8df8 100644 Binary files a/_module/ncs/ra_beggar_hb.ncs and b/_module/ncs/ra_beggar_hb.ncs differ diff --git a/_module/ncs/ra_close_door.ncs b/_module/ncs/ra_close_door.ncs index 1f194772..2876a3e5 100644 Binary files a/_module/ncs/ra_close_door.ncs and b/_module/ncs/ra_close_door.ncs differ diff --git a/_module/ncs/ra_fac_attack_pc.ncs b/_module/ncs/ra_fac_attack_pc.ncs index e15f47a7..29905770 100644 Binary files a/_module/ncs/ra_fac_attack_pc.ncs and b/_module/ncs/ra_fac_attack_pc.ncs differ diff --git a/_module/ncs/ra_lvl01a_onhb.ncs b/_module/ncs/ra_lvl01a_onhb.ncs index 1c4298b0..847a5844 100644 Binary files a/_module/ncs/ra_lvl01a_onhb.ncs and b/_module/ncs/ra_lvl01a_onhb.ncs differ diff --git a/_module/ncs/ra_lycan_userdef.ncs b/_module/ncs/ra_lycan_userdef.ncs index 82d9c992..85a8af8e 100644 Binary files a/_module/ncs/ra_lycan_userdef.ncs and b/_module/ncs/ra_lycan_userdef.ncs differ diff --git a/_module/ncs/ra_mod_onenter.ncs b/_module/ncs/ra_mod_onenter.ncs index 98d974e2..2bec13e4 100644 Binary files a/_module/ncs/ra_mod_onenter.ncs and b/_module/ncs/ra_mod_onenter.ncs differ diff --git a/_module/ncs/ra_npc_attack_pc.ncs b/_module/ncs/ra_npc_attack_pc.ncs index 445609dd..b094da80 100644 Binary files a/_module/ncs/ra_npc_attack_pc.ncs and b/_module/ncs/ra_npc_attack_pc.ncs differ diff --git a/_module/ncs/ra_rnd_train_hb.ncs b/_module/ncs/ra_rnd_train_hb.ncs index 3bae07f7..94c553ec 100644 Binary files a/_module/ncs/ra_rnd_train_hb.ncs and b/_module/ncs/ra_rnd_train_hb.ncs differ diff --git a/_module/ncs/ra_wererat_att1.ncs b/_module/ncs/ra_wererat_att1.ncs index cba2ba8e..10199b4b 100644 Binary files a/_module/ncs/ra_wererat_att1.ncs and b/_module/ncs/ra_wererat_att1.ncs differ diff --git a/_module/ncs/ra_wererat_att2.ncs b/_module/ncs/ra_wererat_att2.ncs index b51340c9..fbf191df 100644 Binary files a/_module/ncs/ra_wererat_att2.ncs and b/_module/ncs/ra_wererat_att2.ncs differ diff --git a/_module/ncs/rakshasachange.ncs b/_module/ncs/rakshasachange.ncs index fa5f9a1c..d7a2f016 100644 Binary files a/_module/ncs/rakshasachange.ncs and b/_module/ncs/rakshasachange.ncs differ diff --git a/_module/ncs/re_common_blkd.ncs b/_module/ncs/re_common_blkd.ncs index b09179b0..db5dc4ce 100644 Binary files a/_module/ncs/re_common_blkd.ncs and b/_module/ncs/re_common_blkd.ncs differ diff --git a/_module/ncs/re_commonspwnrhb.ncs b/_module/ncs/re_commonspwnrhb.ncs index 3c30e263..be522607 100644 Binary files a/_module/ncs/re_commonspwnrhb.ncs and b/_module/ncs/re_commonspwnrhb.ncs differ diff --git a/_module/ncs/re_levspawnerhb.ncs b/_module/ncs/re_levspawnerhb.ncs index 2be39799..caf7316f 100644 Binary files a/_module/ncs/re_levspawnerhb.ncs and b/_module/ncs/re_levspawnerhb.ncs differ diff --git a/_module/ncs/re_mmorpghb.ncs b/_module/ncs/re_mmorpghb.ncs index 072f0a65..72afb909 100644 Binary files a/_module/ncs/re_mmorpghb.ncs and b/_module/ncs/re_mmorpghb.ncs differ diff --git a/_module/ncs/re_onrest.ncs b/_module/ncs/re_onrest.ncs index 8512f3be..5e597e41 100644 Binary files a/_module/ncs/re_onrest.ncs and b/_module/ncs/re_onrest.ncs differ diff --git a/_module/ncs/re_or.ncs b/_module/ncs/re_or.ncs index 4072f43c..edb50520 100644 Binary files a/_module/ncs/re_or.ncs and b/_module/ncs/re_or.ncs differ diff --git a/_module/ncs/re_pwrespawnerhb.ncs b/_module/ncs/re_pwrespawnerhb.ncs index 5739d974..bd55c0f3 100644 Binary files a/_module/ncs/re_pwrespawnerhb.ncs and b/_module/ncs/re_pwrespawnerhb.ncs differ diff --git a/_module/ncs/re_spawnerhb.ncs b/_module/ncs/re_spawnerhb.ncs index 4d1263e5..9a58186d 100644 Binary files a/_module/ncs/re_spawnerhb.ncs and b/_module/ncs/re_spawnerhb.ncs differ diff --git a/_module/ncs/re_spawnerhb_v2.ncs b/_module/ncs/re_spawnerhb_v2.ncs index f61fcc64..4360d346 100644 Binary files a/_module/ncs/re_spawnerhb_v2.ncs and b/_module/ncs/re_spawnerhb_v2.ncs differ diff --git a/_module/ncs/re_widget20.ncs b/_module/ncs/re_widget20.ncs index 166d7317..bb6773ff 100644 Binary files a/_module/ncs/re_widget20.ncs and b/_module/ncs/re_widget20.ncs differ diff --git a/_module/ncs/resptownport.ncs b/_module/ncs/resptownport.ncs index 3a0fab2a..ac082397 100644 Binary files a/_module/ncs/resptownport.ncs and b/_module/ncs/resptownport.ncs differ diff --git a/_module/ncs/river3.ncs b/_module/ncs/river3.ncs index 17cab86b..70d45095 100644 Binary files a/_module/ncs/river3.ncs and b/_module/ncs/river3.ncs differ diff --git a/_module/ncs/river3a1.ncs b/_module/ncs/river3a1.ncs index 635bb6ea..a6571ddc 100644 Binary files a/_module/ncs/river3a1.ncs and b/_module/ncs/river3a1.ncs differ diff --git a/_module/ncs/rotaura1.ncs b/_module/ncs/rotaura1.ncs index 665173dd..362bc9ba 100644 Binary files a/_module/ncs/rotaura1.ncs and b/_module/ncs/rotaura1.ncs differ diff --git a/_module/ncs/rotaura3.ncs b/_module/ncs/rotaura3.ncs index 57971e9d..53834a4d 100644 Binary files a/_module/ncs/rotaura3.ncs and b/_module/ncs/rotaura3.ncs differ diff --git a/_module/ncs/se_door_death.ncs b/_module/ncs/se_door_death.ncs index 5f80da18..12091647 100644 Binary files a/_module/ncs/se_door_death.ncs and b/_module/ncs/se_door_death.ncs differ diff --git a/_module/ncs/slavishfly1.ncs b/_module/ncs/slavishfly1.ncs index 152189be..5d0f0ef2 100644 Binary files a/_module/ncs/slavishfly1.ncs and b/_module/ncs/slavishfly1.ncs differ diff --git a/_module/ncs/slavishfly2.ncs b/_module/ncs/slavishfly2.ncs index 8d73ee0d..bc007818 100644 Binary files a/_module/ncs/slavishfly2.ncs and b/_module/ncs/slavishfly2.ncs differ diff --git a/_module/ncs/slaying_arrow.ncs b/_module/ncs/slaying_arrow.ncs index c86ead2f..add0f922 100644 Binary files a/_module/ncs/slaying_arrow.ncs and b/_module/ncs/slaying_arrow.ncs differ diff --git a/_module/ncs/sleeponopen.ncs b/_module/ncs/sleeponopen.ncs index 3c65576a..ee903ac5 100644 Binary files a/_module/ncs/sleeponopen.ncs and b/_module/ncs/sleeponopen.ncs differ diff --git a/_module/ncs/sm_on_act.ncs b/_module/ncs/sm_on_act.ncs index cd43afc1..196ff4e2 100644 Binary files a/_module/ncs/sm_on_act.ncs and b/_module/ncs/sm_on_act.ncs differ diff --git a/_module/ncs/sm_on_client_ent.ncs b/_module/ncs/sm_on_client_ent.ncs index c83a497a..db58fb42 100644 Binary files a/_module/ncs/sm_on_client_ent.ncs and b/_module/ncs/sm_on_client_ent.ncs differ diff --git a/_module/ncs/sm_on_death.ncs b/_module/ncs/sm_on_death.ncs index 30d59527..d3d7affe 100644 Binary files a/_module/ncs/sm_on_death.ncs and b/_module/ncs/sm_on_death.ncs differ diff --git a/_module/ncs/sm_on_dying.ncs b/_module/ncs/sm_on_dying.ncs index 1e7ec786..61fdfc3b 100644 Binary files a/_module/ncs/sm_on_dying.ncs and b/_module/ncs/sm_on_dying.ncs differ diff --git a/_module/ncs/sm_on_respawn.ncs b/_module/ncs/sm_on_respawn.ncs index d772e198..ab80d447 100644 Binary files a/_module/ncs/sm_on_respawn.ncs and b/_module/ncs/sm_on_respawn.ncs differ diff --git a/_module/ncs/sm_on_rest.ncs b/_module/ncs/sm_on_rest.ncs index fdf08bbb..32a5a9a5 100644 Binary files a/_module/ncs/sm_on_rest.ncs and b/_module/ncs/sm_on_rest.ncs differ diff --git a/_module/ncs/solar_ai.ncs b/_module/ncs/solar_ai.ncs index eaa1da2f..5ed51a36 100644 Binary files a/_module/ncs/solar_ai.ncs and b/_module/ncs/solar_ai.ncs differ diff --git a/_module/ncs/sparky_enter.ncs b/_module/ncs/sparky_enter.ncs index 9126680a..53b4a03d 100644 Binary files a/_module/ncs/sparky_enter.ncs and b/_module/ncs/sparky_enter.ncs differ diff --git a/_module/ncs/sparky_exit.ncs b/_module/ncs/sparky_exit.ncs index c76be1d8..cd819381 100644 Binary files a/_module/ncs/sparky_exit.ncs and b/_module/ncs/sparky_exit.ncs differ diff --git a/_module/ncs/spawn_corpse_dcy.ncs b/_module/ncs/spawn_corpse_dcy.ncs index a33e2b22..1e8a1820 100644 Binary files a/_module/ncs/spawn_corpse_dcy.ncs and b/_module/ncs/spawn_corpse_dcy.ncs differ diff --git a/_module/ncs/spawn_corpse_dth.ncs b/_module/ncs/spawn_corpse_dth.ncs index 84a156ef..29672549 100644 Binary files a/_module/ncs/spawn_corpse_dth.ncs and b/_module/ncs/spawn_corpse_dth.ncs differ diff --git a/_module/ncs/spawn_dist_corps.ncs b/_module/ncs/spawn_dist_corps.ncs index 9cd04616..9d209505 100644 Binary files a/_module/ncs/spawn_dist_corps.ncs and b/_module/ncs/spawn_dist_corps.ncs differ diff --git a/_module/ncs/spawn_oncloscrp.ncs b/_module/ncs/spawn_oncloscrp.ncs index 0b6f461e..9de240b3 100644 Binary files a/_module/ncs/spawn_oncloscrp.ncs and b/_module/ncs/spawn_oncloscrp.ncs differ diff --git a/_module/ncs/spawn_onopencrp.ncs b/_module/ncs/spawn_onopencrp.ncs index 67eda7ce..8fd022db 100644 Binary files a/_module/ncs/spawn_onopencrp.ncs and b/_module/ncs/spawn_onopencrp.ncs differ diff --git a/_module/ncs/spawn_orig_hb.ncs b/_module/ncs/spawn_orig_hb.ncs index 61885442..f8b5215c 100644 Binary files a/_module/ncs/spawn_orig_hb.ncs and b/_module/ncs/spawn_orig_hb.ncs differ diff --git a/_module/ncs/spawn_sample_hb.ncs b/_module/ncs/spawn_sample_hb.ncs index 61885442..f8b5215c 100644 Binary files a/_module/ncs/spawn_sample_hb.ncs and b/_module/ncs/spawn_sample_hb.ncs differ diff --git a/_module/ncs/spawn_sc_cmptrig.ncs b/_module/ncs/spawn_sc_cmptrig.ncs index 488916f6..c86acfba 100644 Binary files a/_module/ncs/spawn_sc_cmptrig.ncs and b/_module/ncs/spawn_sc_cmptrig.ncs differ diff --git a/_module/ncs/spawn_sc_hbeat.ncs b/_module/ncs/spawn_sc_hbeat.ncs index 9da1da9b..e1391375 100644 Binary files a/_module/ncs/spawn_sc_hbeat.ncs and b/_module/ncs/spawn_sc_hbeat.ncs differ diff --git a/_module/ncs/spawn_sc_spawn.ncs b/_module/ncs/spawn_sc_spawn.ncs index 66135680..21ed547b 100644 Binary files a/_module/ncs/spawn_sc_spawn.ncs and b/_module/ncs/spawn_sc_spawn.ncs differ diff --git a/_module/ncs/spawnb_cc_activ.ncs b/_module/ncs/spawnb_cc_activ.ncs index de4d1662..b571555b 100644 Binary files a/_module/ncs/spawnb_cc_activ.ncs and b/_module/ncs/spawnb_cc_activ.ncs differ diff --git a/_module/ncs/spawnb_cc_dactiv.ncs b/_module/ncs/spawnb_cc_dactiv.ncs index 7e94385e..77e80d77 100644 Binary files a/_module/ncs/spawnb_cc_dactiv.ncs and b/_module/ncs/spawnb_cc_dactiv.ncs differ diff --git a/_module/ncs/spawnscramge.ncs b/_module/ncs/spawnscramge.ncs index 13603c29..898fa059 100644 Binary files a/_module/ncs/spawnscramge.ncs and b/_module/ncs/spawnscramge.ncs differ diff --git a/_module/ncs/start_gear_onent.ncs b/_module/ncs/start_gear_onent.ncs index cf73a27c..c9c480ca 100644 Binary files a/_module/ncs/start_gear_onent.ncs and b/_module/ncs/start_gear_onent.ncs differ diff --git a/_module/ncs/stealbreath.ncs b/_module/ncs/stealbreath.ncs index 6c5cc773..75b89f55 100644 Binary files a/_module/ncs/stealbreath.ncs and b/_module/ncs/stealbreath.ncs differ diff --git a/_module/ncs/sumcorrak.ncs b/_module/ncs/sumcorrak.ncs index 320ab103..ee1bdc24 100644 Binary files a/_module/ncs/sumcorrak.ncs and b/_module/ncs/sumcorrak.ncs differ diff --git a/_module/ncs/summon4glabs.ncs b/_module/ncs/summon4glabs.ncs index 887f8309..2ca9448a 100644 Binary files a/_module/ncs/summon4glabs.ncs and b/_module/ncs/summon4glabs.ncs differ diff --git a/_module/ncs/summondemi.ncs b/_module/ncs/summondemi.ncs index c9e4a9b8..0a625e70 100644 Binary files a/_module/ncs/summondemi.ncs and b/_module/ncs/summondemi.ncs differ diff --git a/_module/ncs/summonrtroll.ncs b/_module/ncs/summonrtroll.ncs index 053fee53..9393f3dd 100644 Binary files a/_module/ncs/summonrtroll.ncs and b/_module/ncs/summonrtroll.ncs differ diff --git a/_module/ncs/swm_bloodfly_hb.ncs b/_module/ncs/swm_bloodfly_hb.ncs index 3a16999f..8ce5ffe9 100644 Binary files a/_module/ncs/swm_bloodfly_hb.ncs and b/_module/ncs/swm_bloodfly_hb.ncs differ diff --git a/_module/ncs/tarpitconvport.ncs b/_module/ncs/tarpitconvport.ncs index 5e53261d..8926f555 100644 Binary files a/_module/ncs/tarpitconvport.ncs and b/_module/ncs/tarpitconvport.ncs differ diff --git a/_module/ncs/teleportationsto.ncs b/_module/ncs/teleportationsto.ncs index abd425bc..3f20b204 100644 Binary files a/_module/ncs/teleportationsto.ncs and b/_module/ncs/teleportationsto.ncs differ diff --git a/_module/ncs/temple_assisthb.ncs b/_module/ncs/temple_assisthb.ncs index fc13014c..763a3650 100644 Binary files a/_module/ncs/temple_assisthb.ncs and b/_module/ncs/temple_assisthb.ncs differ diff --git a/_module/ncs/temple_monkhb.ncs b/_module/ncs/temple_monkhb.ncs index eef7beca..4916712a 100644 Binary files a/_module/ncs/temple_monkhb.ncs and b/_module/ncs/temple_monkhb.ncs differ diff --git a/_module/ncs/temple_sbrechb.ncs b/_module/ncs/temple_sbrechb.ncs index fa6320f4..05d5dee6 100644 Binary files a/_module/ncs/temple_sbrechb.ncs and b/_module/ncs/temple_sbrechb.ncs differ diff --git a/_module/ncs/temple_surghb.ncs b/_module/ncs/temple_surghb.ncs index 015abc71..ec4f0f43 100644 Binary files a/_module/ncs/temple_surghb.ncs and b/_module/ncs/temple_surghb.ncs differ diff --git a/_module/ncs/test_ondying.ncs b/_module/ncs/test_ondying.ncs index 800481a7..0f68bc5d 100644 Binary files a/_module/ncs/test_ondying.ncs and b/_module/ncs/test_ondying.ncs differ diff --git a/_module/ncs/testofstrconvp.ncs b/_module/ncs/testofstrconvp.ncs index 064af25a..b492bf81 100644 Binary files a/_module/ncs/testofstrconvp.ncs and b/_module/ncs/testofstrconvp.ncs differ diff --git a/_module/ncs/toship1.ncs b/_module/ncs/toship1.ncs index 19da4507..27aee84b 100644 Binary files a/_module/ncs/toship1.ncs and b/_module/ncs/toship1.ncs differ diff --git a/_module/ncs/tribitzend.ncs b/_module/ncs/tribitzend.ncs index 074e6e67..de47d1b4 100644 Binary files a/_module/ncs/tribitzend.ncs and b/_module/ncs/tribitzend.ncs differ diff --git a/_module/ncs/tz_ed_ondeath.ncs b/_module/ncs/tz_ed_ondeath.ncs index 73453a4a..b8f569da 100644 Binary files a/_module/ncs/tz_ed_ondeath.ncs and b/_module/ncs/tz_ed_ondeath.ncs differ diff --git a/_module/ncs/userdef_troll.ncs b/_module/ncs/userdef_troll.ncs index 149ca85b..b7c5f5be 100644 Binary files a/_module/ncs/userdef_troll.ncs and b/_module/ncs/userdef_troll.ncs differ diff --git a/_module/ncs/vamp_gas_form_hb.ncs b/_module/ncs/vamp_gas_form_hb.ncs index d4b21d34..d205bb72 100644 Binary files a/_module/ncs/vamp_gas_form_hb.ncs and b/_module/ncs/vamp_gas_form_hb.ncs differ diff --git a/_module/ncs/vampscome.ncs b/_module/ncs/vampscome.ncs index d97fa44a..7f9b4a90 100644 Binary files a/_module/ncs/vampscome.ncs and b/_module/ncs/vampscome.ncs differ diff --git a/_module/ncs/warpparty.ncs b/_module/ncs/warpparty.ncs index 8ba54ff0..583e1a3e 100644 Binary files a/_module/ncs/warpparty.ncs and b/_module/ncs/warpparty.ncs differ diff --git a/_module/ncs/wererat_userdef.ncs b/_module/ncs/wererat_userdef.ncs index 257714ac..74c0aee2 100644 Binary files a/_module/ncs/wererat_userdef.ncs and b/_module/ncs/wererat_userdef.ncs differ diff --git a/_module/ncs/wg_training.ncs b/_module/ncs/wg_training.ncs index 024d0641..080c032c 100644 Binary files a/_module/ncs/wg_training.ncs and b/_module/ncs/wg_training.ncs differ diff --git a/_module/ncs/wierdopen.ncs b/_module/ncs/wierdopen.ncs index 299e5fae..7e3f9c3f 100644 Binary files a/_module/ncs/wierdopen.ncs and b/_module/ncs/wierdopen.ncs differ diff --git a/_module/ncs/wisright1.ncs b/_module/ncs/wisright1.ncs index c7504cef..41eaec47 100644 Binary files a/_module/ncs/wisright1.ncs and b/_module/ncs/wisright1.ncs differ diff --git a/_module/ncs/wisright2.ncs b/_module/ncs/wisright2.ncs index 2e576196..346763e0 100644 Binary files a/_module/ncs/wisright2.ncs and b/_module/ncs/wisright2.ncs differ diff --git a/_module/ncs/wisright3.ncs b/_module/ncs/wisright3.ncs index 2bd8b8f7..49f9af2c 100644 Binary files a/_module/ncs/wisright3.ncs and b/_module/ncs/wisright3.ncs differ diff --git a/_module/ncs/wiswrong1.ncs b/_module/ncs/wiswrong1.ncs index 392191af..ad609453 100644 Binary files a/_module/ncs/wiswrong1.ncs and b/_module/ncs/wiswrong1.ncs differ diff --git a/_module/ncs/wiswrong2.ncs b/_module/ncs/wiswrong2.ncs index 2b7a810a..15c3055f 100644 Binary files a/_module/ncs/wiswrong2.ncs and b/_module/ncs/wiswrong2.ncs differ diff --git a/_module/ncs/wiswrong3.ncs b/_module/ncs/wiswrong3.ncs index 3ba2e1e8..8b0e98c8 100644 Binary files a/_module/ncs/wiswrong3.ncs and b/_module/ncs/wiswrong3.ncs differ diff --git a/_module/ncs/wwclaw.ncs b/_module/ncs/wwclaw.ncs index 7400c815..eddc0bbc 100644 Binary files a/_module/ncs/wwclaw.ncs and b/_module/ncs/wwclaw.ncs differ diff --git a/_module/ncs/x2_mod_def_load.ncs b/_module/ncs/x2_mod_def_load.ncs index 8a5e592f..4cf5c1c9 100644 Binary files a/_module/ncs/x2_mod_def_load.ncs and b/_module/ncs/x2_mod_def_load.ncs differ diff --git a/_module/ncs/x2_mod_def_rest.ncs b/_module/ncs/x2_mod_def_rest.ncs index 0b9e55bf..a1523dce 100644 Binary files a/_module/ncs/x2_mod_def_rest.ncs and b/_module/ncs/x2_mod_def_rest.ncs differ diff --git a/_module/ncs/x2_s1_beholdatt.ncs b/_module/ncs/x2_s1_beholdatt.ncs index adafa99d..601f3da1 100644 Binary files a/_module/ncs/x2_s1_beholdatt.ncs and b/_module/ncs/x2_s1_beholdatt.ncs differ diff --git a/_module/ncs/x2_s1_beholdray.ncs b/_module/ncs/x2_s1_beholdray.ncs index 7e82b74a..3f708a70 100644 Binary files a/_module/ncs/x2_s1_beholdray.ncs and b/_module/ncs/x2_s1_beholdray.ncs differ diff --git a/_module/ncs/xix_ai.ncs b/_module/ncs/xix_ai.ncs index a27eb1b6..3eaaaf90 100644 Binary files a/_module/ncs/xix_ai.ncs and b/_module/ncs/xix_ai.ncs differ diff --git a/_module/ncs/xix_hit.ncs b/_module/ncs/xix_hit.ncs index 2b5ebb7f..336325c7 100644 Binary files a/_module/ncs/xix_hit.ncs and b/_module/ncs/xix_hit.ncs differ diff --git a/_module/ncs/zep_shrieker_spw.ncs b/_module/ncs/zep_shrieker_spw.ncs index aa61ab8a..5bb38ce7 100644 Binary files a/_module/ncs/zep_shrieker_spw.ncs and b/_module/ncs/zep_shrieker_spw.ncs differ diff --git a/_module/nss/nwnx_admin.nss b/_module/nss/nwnx_admin.nss index 7cd016e5..86cb319a 100644 --- a/_module/nss/nwnx_admin.nss +++ b/_module/nss/nwnx_admin.nss @@ -2,7 +2,6 @@ /// @brief Various admin related functions /// @{ /// @file nwnx_admin.nss -#include "nwnx" const string NWNX_Administration = "NWNX_Administration"; ///< @private @@ -179,213 +178,161 @@ void NWNX_Administration_SetMaxLevel(int nLevel); string NWNX_Administration_GetPlayerPassword() { - string sFunc = "GetPlayerPassword"; - - NWNX_CallFunction(NWNX_Administration, sFunc); - return NWNX_GetReturnValueString(); + NWNXCall(NWNX_Administration, "GetPlayerPassword"); + return NWNXPopString(); } void NWNX_Administration_SetPlayerPassword(string password) { - string sFunc = "SetPlayerPassword"; - - NWNX_PushArgumentString(password); - NWNX_CallFunction(NWNX_Administration, sFunc); + NWNXPushString(password); + NWNXCall(NWNX_Administration, "SetPlayerPassword"); } void NWNX_Administration_ClearPlayerPassword() { - string sFunc = "ClearPlayerPassword"; - - NWNX_CallFunction(NWNX_Administration, sFunc); + NWNXCall(NWNX_Administration, "ClearPlayerPassword"); } string NWNX_Administration_GetDMPassword() { - string sFunc = "GetDMPassword"; - - NWNX_CallFunction(NWNX_Administration, sFunc); - return NWNX_GetReturnValueString(); + NWNXCall(NWNX_Administration, "GetDMPassword"); + return NWNXPopString(); } void NWNX_Administration_SetDMPassword(string password) { - string sFunc = "SetDMPassword"; - - NWNX_PushArgumentString(password); - NWNX_CallFunction(NWNX_Administration, sFunc); + NWNXPushString(password); + NWNXCall(NWNX_Administration, "SetDMPassword"); } void NWNX_Administration_ShutdownServer() { - string sFunc = "ShutdownServer"; - - NWNX_CallFunction(NWNX_Administration, sFunc); + NWNXCall(NWNX_Administration, "ShutdownServer"); } void NWNX_Administration_DeletePlayerCharacter(object oPC, int bPreserveBackup = TRUE, string sKickMessage = "") { - string sFunc = "DeletePlayerCharacter"; - - NWNX_PushArgumentString(sKickMessage); - NWNX_PushArgumentInt(bPreserveBackup); - NWNX_PushArgumentObject(oPC); - NWNX_CallFunction(NWNX_Administration, sFunc); + NWNXPushString(sKickMessage); + NWNXPushInt(bPreserveBackup); + NWNXPushObject(oPC); + NWNXCall(NWNX_Administration, "DeletePlayerCharacter"); } void NWNX_Administration_AddBannedIP(string ip) { - string sFunc = "AddBannedIP"; - - NWNX_PushArgumentString(ip); - NWNX_CallFunction(NWNX_Administration, sFunc); + NWNXPushString(ip); + NWNXCall(NWNX_Administration, "AddBannedIP"); } void NWNX_Administration_RemoveBannedIP(string ip) { - string sFunc = "RemoveBannedIP"; - - NWNX_PushArgumentString(ip); - NWNX_CallFunction(NWNX_Administration, sFunc); + NWNXPushString(ip); + NWNXCall(NWNX_Administration, "RemoveBannedIP"); } void NWNX_Administration_AddBannedCDKey(string key) { - string sFunc = "AddBannedCDKey"; - - NWNX_PushArgumentString(key); - NWNX_CallFunction(NWNX_Administration, sFunc); + NWNXPushString(key); + NWNXCall(NWNX_Administration, "AddBannedCDKey"); } void NWNX_Administration_RemoveBannedCDKey(string key) { - string sFunc = "RemoveBannedCDKey"; - - NWNX_PushArgumentString(key); - NWNX_CallFunction(NWNX_Administration, sFunc); + NWNXPushString(key); + NWNXCall(NWNX_Administration, "RemoveBannedCDKey"); } void NWNX_Administration_AddBannedPlayerName(string playerName) { - string sFunc = "AddBannedPlayerName"; - - NWNX_PushArgumentString(playerName); - NWNX_CallFunction(NWNX_Administration, sFunc); + NWNXPushString(playerName); + NWNXCall(NWNX_Administration, "AddBannedPlayerName"); } void NWNX_Administration_RemoveBannedPlayerName(string playerName) { - string sFunc = "RemoveBannedPlayerName"; - - NWNX_PushArgumentString(playerName); - NWNX_CallFunction(NWNX_Administration, sFunc); + NWNXPushString(playerName); + NWNXCall(NWNX_Administration, "RemoveBannedPlayerName"); } string NWNX_Administration_GetBannedList() { - string sFunc = "GetBannedList"; - - NWNX_CallFunction(NWNX_Administration, sFunc); - return NWNX_GetReturnValueString(); + NWNXCall(NWNX_Administration, "GetBannedList"); + return NWNXPopString(); } void NWNX_Administration_SetModuleName(string name) { - string sFunc = "SetModuleName"; - - NWNX_PushArgumentString(name); - NWNX_CallFunction(NWNX_Administration, sFunc); + NWNXPushString(name); + NWNXCall(NWNX_Administration, "SetModuleName"); } void NWNX_Administration_SetServerName(string name) { - string sFunc = "SetServerName"; - - NWNX_PushArgumentString(name); - NWNX_CallFunction(NWNX_Administration, sFunc); + NWNXPushString(name); + NWNXCall(NWNX_Administration, "SetServerName"); } string NWNX_Administration_GetServerName() { - string sFunc = "GetServerName"; - NWNX_CallFunction(NWNX_Administration, sFunc); - return NWNX_GetReturnValueString(); + NWNXCall(NWNX_Administration, "GetServerName"); + return NWNXPopString(); } int NWNX_Administration_GetPlayOption(int option) { - string sFunc = "GetPlayOption"; - - NWNX_PushArgumentInt(option); - NWNX_CallFunction(NWNX_Administration, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(option); + NWNXCall(NWNX_Administration, "GetPlayOption"); + return NWNXPopInt(); } void NWNX_Administration_SetPlayOption(int option, int value) { - string sFunc = "SetPlayOption"; - - NWNX_PushArgumentInt(value); - NWNX_PushArgumentInt(option); - NWNX_CallFunction(NWNX_Administration, sFunc); + NWNXPushInt(value); + NWNXPushInt(option); + NWNXCall(NWNX_Administration, "SetPlayOption"); } int NWNX_Administration_DeleteTURD(string playerName, string characterName) { - string sFunc = "DeleteTURD"; - - NWNX_PushArgumentString(characterName); - NWNX_PushArgumentString(playerName); - NWNX_CallFunction(NWNX_Administration, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushString(characterName); + NWNXPushString(playerName); + NWNXCall(NWNX_Administration, "DeleteTURD"); + return NWNXPopInt(); } int NWNX_Administration_GetDebugValue(int type) { - string sFunc = "GetDebugValue"; - - NWNX_PushArgumentInt(type); - NWNX_CallFunction(NWNX_Administration, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(type); + NWNXCall(NWNX_Administration, "GetDebugValue"); + return NWNXPopInt(); } void NWNX_Administration_SetDebugValue(int type, int state) { - string sFunc = "SetDebugValue"; - - NWNX_PushArgumentInt(state); - NWNX_PushArgumentInt(type); - NWNX_CallFunction(NWNX_Administration, sFunc); + NWNXPushInt(state); + NWNXPushInt(type); + NWNXCall(NWNX_Administration, "SetDebugValue"); } void NWNX_Administration_ReloadRules() { - string sFunc = "ReloadRules"; - - NWNX_CallFunction(NWNX_Administration, sFunc); + NWNXCall(NWNX_Administration, "ReloadRules"); } int NWNX_Administration_GetMinLevel() { - string sFunc = "GetMinLevel"; - NWNX_CallFunction(NWNX_Administration, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_Administration, "GetMinLevel"); + return NWNXPopInt(); } void NWNX_Administration_SetMinLevel(int nLevel) { - string sFunc = "SetMinLevel"; - NWNX_PushArgumentInt(nLevel); - NWNX_CallFunction(NWNX_Administration, sFunc); + NWNXPushInt(nLevel); + NWNXCall(NWNX_Administration, "SetMinLevel"); } int NWNX_Administration_GetMaxLevel() { - string sFunc = "GetMaxLevel"; - NWNX_CallFunction(NWNX_Administration, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_Administration, "GetMaxLevel"); + return NWNXPopInt(); } void NWNX_Administration_SetMaxLevel(int nLevel) { - string sFunc = "SetMaxLevel"; - NWNX_PushArgumentInt(nLevel); - NWNX_CallFunction(NWNX_Administration, sFunc); + NWNXPushInt(nLevel); + NWNXCall(NWNX_Administration, "SetMaxLevel"); } diff --git a/_module/nss/nwnx_appearance.nss b/_module/nss/nwnx_appearance.nss index 9e8ed1fd..4c85eb14 100644 --- a/_module/nss/nwnx_appearance.nss +++ b/_module/nss/nwnx_appearance.nss @@ -2,7 +2,6 @@ /// @brief Allows the appearance and some other things of creatures to be overridden per player. /// @{ /// @file nwnx_appearance.nss -#include "nwnx" const string NWNX_Appearance = "NWNX_Appearance"; ///< @private @@ -49,25 +48,18 @@ int NWNX_Appearance_GetOverride(object oPlayer, object oCreature, int nType); void NWNX_Appearance_SetOverride(object oPlayer, object oCreature, int nType, int nValue) { - string sFunc = "SetOverride"; - - NWNX_PushArgumentInt(nValue); - NWNX_PushArgumentInt(nType); - NWNX_PushArgumentObject(oCreature); - NWNX_PushArgumentObject(oPlayer); - - NWNX_CallFunction(NWNX_Appearance, sFunc); + NWNXPushInt(nValue); + NWNXPushInt(nType); + NWNXPushObject(oCreature); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Appearance, "SetOverride"); } int NWNX_Appearance_GetOverride(object oPlayer, object oCreature, int nType) { - string sFunc = "GetOverride"; - - NWNX_PushArgumentInt(nType); - NWNX_PushArgumentObject(oCreature); - NWNX_PushArgumentObject(oPlayer); - - NWNX_CallFunction(NWNX_Appearance, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(nType); + NWNXPushObject(oCreature); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Appearance, "GetOverride"); + return NWNXPopInt(); } diff --git a/_module/nss/nwnx_area.nss b/_module/nss/nwnx_area.nss index cfb90add..d096c8a4 100644 --- a/_module/nss/nwnx_area.nss +++ b/_module/nss/nwnx_area.nss @@ -2,7 +2,6 @@ /// @brief Functions exposing additional area properties as well as creating transitions. /// @{ /// @file nwnx_area.nss -#include "nwnx" const string NWNX_Area = "NWNX_Area"; ///< @private @@ -353,536 +352,396 @@ void NWNX_Area_SetDefaultObjectUiDiscoveryMask(object oArea, int nObjectTypes, i int NWNX_Area_GetNumberOfPlayersInArea(object area) { - string sFunc = "GetNumberOfPlayersInArea"; - - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "GetNumberOfPlayersInArea"); + return NWNXPopInt(); } object NWNX_Area_GetLastEntered(object area) { - string sFunc = "GetLastEntered"; - - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueObject(); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "GetLastEntered"); + return NWNXPopObject(); } object NWNX_Area_GetLastLeft(object area) { - string sFunc = "GetLastLeft"; - - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueObject(); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "GetLastLeft"); + return NWNXPopObject(); } int NWNX_Area_GetPVPSetting(object area) { - string sFunc = "GetPVPSetting"; - - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "GetPVPSetting"); + return NWNXPopInt(); } void NWNX_Area_SetPVPSetting(object area, int pvpSetting) { - string sFunc = "SetPVPSetting"; - - NWNX_PushArgumentInt(pvpSetting); - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); + NWNXPushInt(pvpSetting); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "SetPVPSetting"); } int NWNX_Area_GetAreaSpotModifier(object area) { - string sFunc = "GetAreaSpotModifier"; - - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "GetAreaSpotModifier"); + return NWNXPopInt(); } void NWNX_Area_SetAreaSpotModifier(object area, int spotModifier) { - string sFunc = "SetAreaSpotModifier"; - - NWNX_PushArgumentInt(spotModifier); - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); + NWNXPushInt(spotModifier); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "SetAreaSpotModifier"); } int NWNX_Area_GetAreaListenModifier(object area) { - string sFunc = "GetAreaListenModifier"; - - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "GetAreaListenModifier"); + return NWNXPopInt(); } void NWNX_Area_SetAreaListenModifier(object area, int listenModifier) { - string sFunc = "SetAreaListenModifier"; - - NWNX_PushArgumentInt(listenModifier); - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); + NWNXPushInt(listenModifier); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "SetAreaListenModifier"); } int NWNX_Area_GetNoRestingAllowed(object area) { - string sFunc = "GetNoRestingAllowed"; - - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "GetNoRestingAllowed"); + return NWNXPopInt(); } void NWNX_Area_SetNoRestingAllowed(object area, int bNoRestingAllowed) { - string sFunc = "SetNoRestingAllowed"; - - NWNX_PushArgumentInt(bNoRestingAllowed); - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); + NWNXPushInt(bNoRestingAllowed); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "SetNoRestingAllowed"); } int NWNX_Area_GetWindPower(object area) { - string sFunc = "GetWindPower"; - - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "GetWindPower"); + return NWNXPopInt(); } void NWNX_Area_SetWindPower(object area, int windPower) { - string sFunc = "SetWindPower"; - - NWNX_PushArgumentInt(windPower); - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); + NWNXPushInt(windPower); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "SetWindPower"); } int NWNX_Area_GetWeatherChance(object area, int type) { - string sFunc = "GetWeatherChance"; - - NWNX_PushArgumentInt(type); - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(type); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "GetWeatherChance"); + return NWNXPopInt(); } void NWNX_Area_SetWeatherChance(object area, int type, int chance) { - string sFunc = "SetWeatherChance"; - - NWNX_PushArgumentInt(chance); - NWNX_PushArgumentInt(type); - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); + NWNXPushInt(chance); + NWNXPushInt(type); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "SetWeatherChance"); } float NWNX_Area_GetFogClipDistance(object area) { - string sFunc = "GetFogClipDistance"; - - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueFloat(); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "GetFogClipDistance"); + return NWNXPopFloat(); } void NWNX_Area_SetFogClipDistance(object area, float distance) { - string sFunc = "SetFogClipDistance"; - - NWNX_PushArgumentFloat(distance); - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); + NWNXPushFloat(distance); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "SetFogClipDistance"); } int NWNX_Area_GetShadowOpacity(object area) { - string sFunc = "GetShadowOpacity"; - - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "GetShadowOpacity"); + return NWNXPopInt(); } void NWNX_Area_SetShadowOpacity(object area, int shadowOpacity) { - string sFunc = "SetShadowOpacity"; - - NWNX_PushArgumentInt(shadowOpacity); - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); + NWNXPushInt(shadowOpacity); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "SetShadowOpacity"); } int NWNX_Area_GetDayNightCycle(object area) { - string sFunc = "GetDayNightCycle"; - - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "GetDayNightCycle"); + return NWNXPopInt(); } void NWNX_Area_SetDayNightCycle(object area, int type) { - string sFunc = "SetDayNightCycle"; - - NWNX_PushArgumentInt(type); - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); + NWNXPushInt(type); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "SetDayNightCycle"); } int NWNX_Area_GetSunMoonColors(object area, int type) { - string sFunc = "GetSunMoonColors"; - - NWNX_PushArgumentInt(type); - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(type); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "GetSunMoonColors"); + return NWNXPopInt(); } void NWNX_Area_SetSunMoonColors(object area, int type, int color) { - string sFunc = "SetSunMoonColors"; - - NWNX_PushArgumentInt(color); - NWNX_PushArgumentInt(type); - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); + NWNXPushInt(color); + NWNXPushInt(type); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "SetSunMoonColors"); } object NWNX_Area_CreateTransition(object area, object target, float x, float y, float z, float size = 2.0f, string tag="") { - string sFunc = "CreateTransition"; - - NWNX_PushArgumentString(tag); - NWNX_PushArgumentFloat(size); - NWNX_PushArgumentFloat(z); - NWNX_PushArgumentFloat(y); - NWNX_PushArgumentFloat(x); - NWNX_PushArgumentObject(target); - NWNX_PushArgumentObject(area); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueObject(); + NWNXPushString(tag); + NWNXPushFloat(size); + NWNXPushFloat(z); + NWNXPushFloat(y); + NWNXPushFloat(x); + NWNXPushObject(target); + NWNXPushObject(area); + NWNXCall(NWNX_Area, "CreateTransition"); + return NWNXPopObject(); } int NWNX_Area_GetTileAnimationLoop(object oArea, float fTileX, float fTileY, int nAnimLoop) { - string sFunc = "GetTileAnimationLoop"; + NWNXPushInt(nAnimLoop); + NWNXPushFloat(fTileY); + NWNXPushFloat(fTileX); + NWNXPushObject(oArea); - NWNX_PushArgumentInt(nAnimLoop); - NWNX_PushArgumentFloat(fTileY); - NWNX_PushArgumentFloat(fTileX); - NWNX_PushArgumentObject(oArea); - - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_Area, "GetTileAnimationLoop"); + return NWNXPopInt(); } void NWNX_Area_SetTileAnimationLoop(object oArea, float fTileX, float fTileY, int nAnimLoop, int bEnabled) { - string sFunc = "SetTileAnimationLoop"; - - NWNX_PushArgumentInt(bEnabled); - NWNX_PushArgumentInt(nAnimLoop); - NWNX_PushArgumentFloat(fTileY); - NWNX_PushArgumentFloat(fTileX); - NWNX_PushArgumentObject(oArea); - - NWNX_CallFunction(NWNX_Area, sFunc); + NWNXPushInt(bEnabled); + NWNXPushInt(nAnimLoop); + NWNXPushFloat(fTileY); + NWNXPushFloat(fTileX); + NWNXPushObject(oArea); + NWNXCall(NWNX_Area, "SetTileAnimationLoop"); } string NWNX_Area_GetTileModelResRef(object oArea, float fTileX, float fTileY) { - string sFunc = "GetTileModelResRef"; - NWNX_PushArgumentFloat(fTileY); - NWNX_PushArgumentFloat(fTileX); - NWNX_PushArgumentObject(oArea); - - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueString(); + NWNXPushFloat(fTileY); + NWNXPushFloat(fTileX); + NWNXPushObject(oArea); + NWNXCall(NWNX_Area, "GetTileModelResRef"); + return NWNXPopString(); } int NWNX_Area_TestDirectLine(object oArea, float fStartX, float fStartY, float fEndX, float fEndY, float fPerSpace, float fHeight, int bIgnoreDoors=FALSE) { - string sFunc = "TestDirectLine"; - - NWNX_PushArgumentInt(bIgnoreDoors); - NWNX_PushArgumentFloat(fHeight); - NWNX_PushArgumentFloat(fPerSpace); - NWNX_PushArgumentFloat(fEndY); - NWNX_PushArgumentFloat(fEndX); - NWNX_PushArgumentFloat(fStartY); - NWNX_PushArgumentFloat(fStartX); - NWNX_PushArgumentObject(oArea); - - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(bIgnoreDoors); + NWNXPushFloat(fHeight); + NWNXPushFloat(fPerSpace); + NWNXPushFloat(fEndY); + NWNXPushFloat(fEndX); + NWNXPushFloat(fStartY); + NWNXPushFloat(fStartX); + NWNXPushObject(oArea); + NWNXCall(NWNX_Area, "TestDirectLine"); + return NWNXPopInt(); } int NWNX_Area_GetMusicIsPlaying(object oArea, int bBattleMusic = FALSE) { - string sFunc = "GetMusicIsPlaying"; - - NWNX_PushArgumentInt(bBattleMusic); - NWNX_PushArgumentObject(oArea); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(bBattleMusic); + NWNXPushObject(oArea); + NWNXCall(NWNX_Area, "GetMusicIsPlaying"); + return NWNXPopInt(); } object NWNX_Area_CreateGenericTrigger(object oArea, float fX, float fY, float fZ, string sTag = "", float fSize = 1.0f) { - string sFunc = "CreateGenericTrigger"; - - NWNX_PushArgumentFloat(fSize); - NWNX_PushArgumentString(sTag); - NWNX_PushArgumentFloat(fZ); - NWNX_PushArgumentFloat(fY); - NWNX_PushArgumentFloat(fX); - NWNX_PushArgumentObject(oArea); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueObject(); + NWNXPushFloat(fSize); + NWNXPushString(sTag); + NWNXPushFloat(fZ); + NWNXPushFloat(fY); + NWNXPushFloat(fX); + NWNXPushObject(oArea); + NWNXCall(NWNX_Area, "CreateGenericTrigger"); + return NWNXPopObject(); } void NWNX_Area_AddObjectToExclusionList(object oObject) { - string sFunc = "AddObjectToExclusionList"; - - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Area, sFunc); + NWNXPushObject(oObject); + NWNXCall(NWNX_Area, "AddObjectToExclusionList"); } void NWNX_Area_RemoveObjectFromExclusionList(object oObject) { - string sFunc = "RemoveObjectFromExclusionList"; - - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Area, sFunc); + NWNXPushObject(oObject); + NWNXCall(NWNX_Area, "RemoveObjectFromExclusionList"); } int NWNX_Area_ExportGIT(object oArea, string sFileName = "", int bExportVarTable = TRUE, int bExportUUID = TRUE, int nObjectFilter = 0, string sAlias = "NWNX") { - string sFunc = "ExportGIT"; - - NWNX_PushArgumentString(sAlias); - NWNX_PushArgumentInt(nObjectFilter); - NWNX_PushArgumentInt(bExportUUID); - NWNX_PushArgumentInt(bExportVarTable); - NWNX_PushArgumentString(sFileName); - NWNX_PushArgumentObject(oArea); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushString(sAlias); + NWNXPushInt(nObjectFilter); + NWNXPushInt(bExportUUID); + NWNXPushInt(bExportVarTable); + NWNXPushString(sFileName); + NWNXPushObject(oArea); + NWNXCall(NWNX_Area, "ExportGIT"); + return NWNXPopInt(); } struct NWNX_Area_TileInfo NWNX_Area_GetTileInfo(object oArea, float fTileX, float fTileY) { - string sFunc = "GetTileInfo"; - - NWNX_PushArgumentFloat(fTileY); - NWNX_PushArgumentFloat(fTileX); - NWNX_PushArgumentObject(oArea); - NWNX_CallFunction(NWNX_Area, sFunc); - + NWNXPushFloat(fTileY); + NWNXPushFloat(fTileX); + NWNXPushObject(oArea); + NWNXCall(NWNX_Area, "GetTileInfo"); struct NWNX_Area_TileInfo str; - - str.nGridY = NWNX_GetReturnValueInt(); - str.nGridX = NWNX_GetReturnValueInt(); - str.nOrientation = NWNX_GetReturnValueInt(); - str.nHeight = NWNX_GetReturnValueInt(); - str.nID = NWNX_GetReturnValueInt(); - + str.nGridY = NWNXPopInt(); + str.nGridX = NWNXPopInt(); + str.nOrientation = NWNXPopInt(); + str.nHeight = NWNXPopInt(); + str.nID = NWNXPopInt(); return str; } int NWNX_Area_ExportARE(object oArea, string sFileName, string sNewName = "", string sNewTag = "", string sAlias = "NWNX") { - string sFunc = "ExportARE"; - - NWNX_PushArgumentString(sAlias); - NWNX_PushArgumentString(sNewTag); - NWNX_PushArgumentString(sNewName); - NWNX_PushArgumentString(sFileName); - NWNX_PushArgumentObject(oArea); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushString(sAlias); + NWNXPushString(sNewTag); + NWNXPushString(sNewName); + NWNXPushString(sFileName); + NWNXPushObject(oArea); + NWNXCall(NWNX_Area, "ExportARE"); + return NWNXPopInt(); } int NWNX_Area_GetAmbientSoundDay(object oArea) { - string sFunc = "GetAmbientSoundDay"; - - NWNX_PushArgumentObject(oArea); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oArea); + NWNXCall(NWNX_Area, "GetAmbientSoundDay"); + return NWNXPopInt(); } int NWNX_Area_GetAmbientSoundNight(object oArea) { - string sFunc = "GetAmbientSoundNight"; - - NWNX_PushArgumentObject(oArea); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oArea); + NWNXCall(NWNX_Area, "GetAmbientSoundNight"); + return NWNXPopInt(); } int NWNX_Area_GetAmbientSoundDayVolume(object oArea) { - string sFunc = "GetAmbientSoundDayVolume"; - - NWNX_PushArgumentObject(oArea); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oArea); + NWNXCall(NWNX_Area, "GetAmbientSoundDayVolume"); + return NWNXPopInt(); } int NWNX_Area_GetAmbientSoundNightVolume(object oArea) { - string sFunc = "GetAmbientSoundNightVolume"; - - NWNX_PushArgumentObject(oArea); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oArea); + NWNXCall(NWNX_Area, "GetAmbientSoundNightVolume"); + return NWNXPopInt(); } object NWNX_Area_CreateSoundObject(object oArea, vector vPosition, string sResRef) { - string sFunc = "CreateSoundObject"; - - NWNX_PushArgumentString(sResRef); - NWNX_PushArgumentFloat(vPosition.z); - NWNX_PushArgumentFloat(vPosition.y); - NWNX_PushArgumentFloat(vPosition.x); - NWNX_PushArgumentObject(oArea); - - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueObject(); + NWNXPushString(sResRef); + NWNXPushVector(vPosition); + NWNXPushObject(oArea); + NWNXCall(NWNX_Area, "CreateSoundObject"); + return NWNXPopObject(); } void NWNX_Area_RotateArea(object oArea, int nRotation) { - string sFunc = "RotateArea"; - - NWNX_PushArgumentInt(nRotation); - NWNX_PushArgumentObject(oArea); - - NWNX_CallFunction(NWNX_Area, sFunc); + NWNXPushInt(nRotation); + NWNXPushObject(oArea); + NWNXCall(NWNX_Area, "RotateArea"); } struct NWNX_Area_TileInfo NWNX_Area_GetTileInfoByTileIndex(object oArea, int nIndex) { - string sFunc = "GetTileInfoByTileIndex"; - - NWNX_PushArgumentInt(nIndex); - NWNX_PushArgumentObject(oArea); - NWNX_CallFunction(NWNX_Area, sFunc); - + NWNXPushInt(nIndex); + NWNXPushObject(oArea); + NWNXCall(NWNX_Area, "GetTileInfoByTileIndex"); struct NWNX_Area_TileInfo str; - - str.nGridY = NWNX_GetReturnValueInt(); - str.nGridX = NWNX_GetReturnValueInt(); - str.nOrientation = NWNX_GetReturnValueInt(); - str.nHeight = NWNX_GetReturnValueInt(); - str.nID = NWNX_GetReturnValueInt(); - + str.nGridY = NWNXPopInt(); + str.nGridX = NWNXPopInt(); + str.nOrientation = NWNXPopInt(); + str.nHeight = NWNXPopInt(); + str.nID = NWNXPopInt(); return str; } int NWNX_Area_GetPathExists(object oArea, vector vStartPosition, vector vEndPosition, int nMaxDepth) { - string sFunc = "GetPathExists"; - - NWNX_PushArgumentInt(nMaxDepth); - NWNX_PushArgumentFloat(vEndPosition.y); - NWNX_PushArgumentFloat(vEndPosition.x); - NWNX_PushArgumentFloat(vStartPosition.y); - NWNX_PushArgumentFloat(vStartPosition.x); - NWNX_PushArgumentObject(oArea); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(nMaxDepth); + NWNXPushVector(vEndPosition); + NWNXPushVector(vStartPosition); + NWNXPushObject(oArea); + NWNXCall(NWNX_Area, "GetPathExists"); + return NWNXPopInt(); } int NWNX_Area_GetAreaFlags(object oArea) { - string sFunc = "GetAreaFlags"; - - NWNX_PushArgumentObject(oArea); - NWNX_CallFunction(NWNX_Area, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oArea); + NWNXCall(NWNX_Area, "GetAreaFlags"); + return NWNXPopInt(); } void NWNX_Area_SetAreaFlags(object oArea, int nFlags) { - string sFunc = "SetAreaFlags"; - - NWNX_PushArgumentInt(nFlags); - NWNX_PushArgumentObject(oArea); - NWNX_CallFunction(NWNX_Area, sFunc); + NWNXPushInt(nFlags); + NWNXPushObject(oArea); + NWNXCall(NWNX_Area, "SetAreaFlags"); } struct NWNX_Area_AreaWind NWNX_Area_GetAreaWind(object oArea) { - string sFunc = "GetAreaWind"; struct NWNX_Area_AreaWind data; - - NWNX_PushArgumentObject(oArea); - NWNX_CallFunction(NWNX_Area, sFunc); - - data.fPitch = NWNX_GetReturnValueFloat(); - data.fYaw = NWNX_GetReturnValueFloat(); - data.fMagnitude = NWNX_GetReturnValueFloat(); - data.vDirection.x = NWNX_GetReturnValueFloat(); - data.vDirection.y = NWNX_GetReturnValueFloat(); - data.vDirection.z = NWNX_GetReturnValueFloat(); - + NWNXPushObject(oArea); + NWNXCall(NWNX_Area, "GetAreaWind"); + data.fPitch = NWNXPopFloat(); + data.fYaw = NWNXPopFloat(); + data.fMagnitude = NWNXPopFloat(); + data.vDirection = NWNXPopVector(); return data; } void NWNX_Area_SetDefaultObjectUiDiscoveryMask(object oArea, int nObjectTypes, int nMask, int bForceUpdate = FALSE) { - string sFunc = "SetDefaultObjectUiDiscoveryMask"; - - NWNX_PushArgumentInt(bForceUpdate); - NWNX_PushArgumentInt(nMask); - NWNX_PushArgumentInt(nObjectTypes); - NWNX_PushArgumentObject(oArea); - NWNX_CallFunction(NWNX_Area, sFunc); + NWNXPushInt(bForceUpdate); + NWNXPushInt(nMask); + NWNXPushInt(nObjectTypes); + NWNXPushObject(oArea); + NWNXCall(NWNX_Area, "SetDefaultObjectUiDiscoveryMask"); } diff --git a/_module/nss/nwnx_chat.nss b/_module/nss/nwnx_chat.nss index ffa12df1..538fb2b8 100644 --- a/_module/nss/nwnx_chat.nss +++ b/_module/nss/nwnx_chat.nss @@ -2,7 +2,6 @@ /// @brief Functions related to chat. /// @{ /// @file nwnx_chat.nss -#include "nwnx" const string NWNX_Chat = "NWNX_Chat"; ///< @private @@ -80,79 +79,61 @@ float NWNX_Chat_GetChatHearingDistance(object listener = OBJECT_INVALID, int cha int NWNX_Chat_SendMessage(int channel, string message, object sender = OBJECT_SELF, object target = OBJECT_INVALID) { - string sFunc = "SendMessage"; - - NWNX_PushArgumentObject(target); - NWNX_PushArgumentObject(sender); - NWNX_PushArgumentString(message); - NWNX_PushArgumentInt(channel); - NWNX_CallFunction(NWNX_Chat, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(target); + NWNXPushObject(sender); + NWNXPushString(message); + NWNXPushInt(channel); + NWNXCall(NWNX_Chat, "SendMessage"); + return NWNXPopInt(); } void NWNX_Chat_RegisterChatScript(string script) { - string sFunc = "RegisterChatScript"; - - NWNX_PushArgumentString(script); - NWNX_CallFunction(NWNX_Chat, sFunc); + NWNXPushString(script); + NWNXCall(NWNX_Chat, "RegisterChatScript"); } void NWNX_Chat_SkipMessage() { - string sFunc = "SkipMessage"; - - NWNX_CallFunction(NWNX_Chat, sFunc); + NWNXCall(NWNX_Chat, "SkipMessage"); } int NWNX_Chat_GetChannel() { - string sFunc = "GetChannel"; - - NWNX_CallFunction(NWNX_Chat, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_Chat, "GetChannel"); + return NWNXPopInt(); } string NWNX_Chat_GetMessage() { - string sFunc = "GetMessage"; - - NWNX_CallFunction(NWNX_Chat, sFunc); - return NWNX_GetReturnValueString(); + NWNXCall(NWNX_Chat, "GetMessage"); + return NWNXPopString(); } object NWNX_Chat_GetSender() { - string sFunc = "GetSender"; - - NWNX_CallFunction(NWNX_Chat, sFunc); - return NWNX_GetReturnValueObject(); + NWNXCall(NWNX_Chat, "GetSender"); + return NWNXPopObject(); } object NWNX_Chat_GetTarget() { - string sFunc = "GetTarget"; - - NWNX_CallFunction(NWNX_Chat, sFunc); - return NWNX_GetReturnValueObject(); + NWNXCall(NWNX_Chat, "GetTarget"); + return NWNXPopObject(); } void NWNX_Chat_SetChatHearingDistance(float distance, object listener = OBJECT_INVALID, int channel = NWNX_CHAT_CHANNEL_PLAYER_TALK) { - string sFunc = "SetChatHearingDistance"; - - NWNX_PushArgumentInt(channel); - NWNX_PushArgumentObject(listener); - NWNX_PushArgumentFloat(distance); - NWNX_CallFunction(NWNX_Chat, sFunc); + NWNXPushInt(channel); + NWNXPushObject(listener); + NWNXPushFloat(distance); + NWNXCall(NWNX_Chat, "SetChatHearingDistance"); } float NWNX_Chat_GetChatHearingDistance(object listener = OBJECT_INVALID, int channel = NWNX_CHAT_CHANNEL_PLAYER_TALK) { - string sFunc = "GetChatHearingDistance"; - - NWNX_PushArgumentInt(channel); - NWNX_PushArgumentObject(listener); - NWNX_CallFunction(NWNX_Chat, sFunc); - return NWNX_GetReturnValueFloat(); + NWNXPushInt(channel); + NWNXPushObject(listener); + NWNXCall(NWNX_Chat, "GetChatHearingDistance"); + return NWNXPopFloat(); } diff --git a/_module/nss/nwnx_core.nss b/_module/nss/nwnx_core.nss new file mode 100644 index 00000000..74b02377 --- /dev/null +++ b/_module/nss/nwnx_core.nss @@ -0,0 +1,21 @@ +/// @addtogroup nwnx NWNX +/// @brief Core NWNX Functions. +/// @{ +/// @file nwnx_core.nss + +const string NWNX_Core = "NWNX_Core"; ///< @private + +/// @brief Determines if the given plugin exists and is enabled. +/// @param sPlugin The name of the plugin to check. This is the case sensitive plugin name as used by NWNXCall +/// @note Example usage: NWNX_PluginExists("NWNX_Creature"); +/// @return TRUE if the plugin exists and is enabled, otherwise FALSE. +int NWNX_Core_PluginExists(string sPlugin); + +/// @} + +int NWNX_Core_PluginExists(string sPlugin) +{ + NWNXPushString(sPlugin); + NWNXCall(NWNX_Core, "PluginExists"); + return NWNXPopInt(); +} diff --git a/_module/nss/nwnx_creature.nss b/_module/nss/nwnx_creature.nss index 275638f4..e921e191 100644 --- a/_module/nss/nwnx_creature.nss +++ b/_module/nss/nwnx_creature.nss @@ -2,7 +2,6 @@ /// @brief Functions exposing additional creature properties. /// @{ /// @file nwnx_creature.nss -#include "nwnx" const string NWNX_Creature = "NWNX_Creature"; ///< @private @@ -1007,660 +1006,511 @@ void NWNX_Creature_SetAbilityIncreaseByLevel(object oCreature, int nLevel, int n /// @return The maximum attack range for oCreature to oTarget float NWNX_Creature_GetMaxAttackRange(object oCreature, object oTarget); +/// @brief Returns the creature's multiclass limit. +/// @note Only works on player characters. +/// @param oCreature The creature object. Has to be a player character. +/// @return The PCs multiclass limit. Returns 0 if no limit is set. +int NWNX_Creature_GetMulticlassLimit(object oCreature); + +/// @brief Sets the creature's multiclass limit. +/// @note Only works on player characters and only for future level ups. +/// Classes already taken will continue to be available on level up. +/// The limit must be lower than the server limit set in ruleset.2da MULTICLASS_LIMIT. +/// Setting a value of 0 will remove the limit. +/// @param oCreature The creature object. Has to be a player character. +/// @param nLimit The multiclass limit. +/// @param bPersist Whether the limit should persist to the .bic file. +/// @note Persistence is enabled after a server reset by the first use of this function. +void NWNX_Creature_SetMulticlassLimit(object oCreature, int nLimit, int bPersist = FALSE); + /// @} void NWNX_Creature_AddFeat(object creature, int feat) { - string sFunc = "AddFeat"; - NWNX_PushArgumentInt(feat); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(feat); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "AddFeat"); } void NWNX_Creature_AddFeatByLevel(object creature, int feat, int level) { - string sFunc = "AddFeatByLevel"; - - NWNX_PushArgumentInt(level); - NWNX_PushArgumentInt(feat); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(level); + NWNXPushInt(feat); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "AddFeatByLevel"); } void NWNX_Creature_RemoveFeat(object creature, int feat) { - string sFunc = "RemoveFeat"; - NWNX_PushArgumentInt(feat); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(feat); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "RemoveFeat"); } void NWNX_Creature_RemoveFeatByLevel(object creature, int feat, int level) { - string sFunc = "RemoveFeatByLevel"; - - NWNX_PushArgumentInt(level); - NWNX_PushArgumentInt(feat); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(level); + NWNXPushInt(feat); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "RemoveFeatByLevel"); } int NWNX_Creature_GetKnowsFeat(object creature, int feat) { - string sFunc = "GetKnowsFeat"; - - NWNX_PushArgumentInt(feat); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(feat); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetKnowsFeat"); + return NWNXPopInt(); } int NWNX_Creature_GetFeatCountByLevel(object creature, int level) { - string sFunc = "GetFeatCountByLevel"; - - NWNX_PushArgumentInt(level); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(level); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetFeatCountByLevel"); + return NWNXPopInt(); } int NWNX_Creature_GetFeatByLevel(object creature, int level, int index) { - string sFunc = "GetFeatByLevel"; - - NWNX_PushArgumentInt(index); - NWNX_PushArgumentInt(level); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(index); + NWNXPushInt(level); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetFeatByLevel"); + return NWNXPopInt(); } int NWNX_Creature_GetFeatCount(object creature) { - string sFunc = "GetFeatCount"; - - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetFeatCount"); + return NWNXPopInt(); } int NWNX_Creature_GetFeatGrantLevel(object creature, int feat) { - string sFunc = "GetFeatGrantLevel"; - - NWNX_PushArgumentInt(feat); - NWNX_PushArgumentObject(creature); - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(feat); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetFeatGrantLevel"); + return NWNXPopInt(); } int NWNX_Creature_GetFeatByIndex(object creature, int index) { - string sFunc = "GetFeatByIndex"; - - NWNX_PushArgumentInt(index); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(index); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetFeatByIndex"); + return NWNXPopInt(); } int NWNX_Creature_GetMeetsFeatRequirements(object creature, int feat) { - string sFunc = "GetMeetsFeatRequirements"; - - NWNX_PushArgumentInt(feat); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(feat); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetMeetsFeatRequirements"); + return NWNXPopInt(); } struct NWNX_Creature_SpecialAbility NWNX_Creature_GetSpecialAbility(object creature, int index) { - string sFunc = "GetSpecialAbility"; - struct NWNX_Creature_SpecialAbility ability; - - NWNX_PushArgumentInt(index); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - - ability.level = NWNX_GetReturnValueInt(); - ability.ready = NWNX_GetReturnValueInt(); - ability.id = NWNX_GetReturnValueInt(); - + NWNXPushInt(index); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetSpecialAbility"); + ability.level = NWNXPopInt(); + ability.ready = NWNXPopInt(); + ability.id = NWNXPopInt(); return ability; } int NWNX_Creature_GetSpecialAbilityCount(object creature) { - string sFunc = "GetSpecialAbilityCount"; - - NWNX_PushArgumentObject(creature); - NWNX_CallFunction(NWNX_Creature, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetSpecialAbilityCount"); + return NWNXPopInt(); } void NWNX_Creature_AddSpecialAbility(object creature, struct NWNX_Creature_SpecialAbility ability) { - string sFunc = "AddSpecialAbility"; - - NWNX_PushArgumentInt(ability.id); - NWNX_PushArgumentInt(ability.ready); - NWNX_PushArgumentInt(ability.level); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(ability.id); + NWNXPushInt(ability.ready); + NWNXPushInt(ability.level); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "AddSpecialAbility"); } void NWNX_Creature_RemoveSpecialAbility(object creature, int index) { - string sFunc = "RemoveSpecialAbility"; - - NWNX_PushArgumentInt(index); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(index); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "RemoveSpecialAbility"); } void NWNX_Creature_SetSpecialAbility(object creature, int index, struct NWNX_Creature_SpecialAbility ability) { - string sFunc = "SetSpecialAbility"; - - NWNX_PushArgumentInt(ability.id); - NWNX_PushArgumentInt(ability.ready); - NWNX_PushArgumentInt(ability.level); - NWNX_PushArgumentInt(index); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(ability.id); + NWNXPushInt(ability.ready); + NWNXPushInt(ability.level); + NWNXPushInt(index); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetSpecialAbility"); } int NWNX_Creature_GetClassByLevel(object creature, int level) { - string sFunc = "GetClassByLevel"; - - NWNX_PushArgumentInt(level); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(level); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetClassByLevel"); + return NWNXPopInt(); } void NWNX_Creature_SetBaseAC(object creature, int ac) { - string sFunc = "SetBaseAC"; - - NWNX_PushArgumentInt(ac); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(ac); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetBaseAC"); } int NWNX_Creature_GetBaseAC(object creature) { - string sFunc = "GetBaseAC"; - - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetBaseAC"); + return NWNXPopInt(); } void NWNX_Creature_SetRawAbilityScore(object creature, int ability, int value) { - string sFunc = "SetRawAbilityScore"; - - NWNX_PushArgumentInt(value); - NWNX_PushArgumentInt(ability); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(value); + NWNXPushInt(ability); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetRawAbilityScore"); } int NWNX_Creature_GetRawAbilityScore(object creature, int ability) { - string sFunc = "GetRawAbilityScore"; - - NWNX_PushArgumentInt(ability); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(ability); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetRawAbilityScore"); + return NWNXPopInt(); } void NWNX_Creature_ModifyRawAbilityScore(object creature, int ability, int modifier) { - string sFunc = "ModifyRawAbilityScore"; - - NWNX_PushArgumentInt(modifier); - NWNX_PushArgumentInt(ability); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(modifier); + NWNXPushInt(ability); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "ModifyRawAbilityScore"); } int NWNX_Creature_GetPrePolymorphAbilityScore(object creature, int ability) { - string sFunc = "GetPrePolymorphAbilityScore"; - - NWNX_PushArgumentInt(ability); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(ability); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetPrePolymorphAbilityScore"); + return NWNXPopInt(); } int NWNX_Creature_GetRemainingSpellSlots(object creature, int class, int level) { - string sFunc = "GetRemainingSpellSlots"; - - NWNX_PushArgumentInt(level); - NWNX_PushArgumentInt(class); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(level); + NWNXPushInt(class); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetRemainingSpellSlots"); + return NWNXPopInt(); } void NWNX_Creature_SetRemainingSpellSlots(object creature, int class, int level, int slots) { - string sFunc = "SetRemainingSpellSlots"; - - NWNX_PushArgumentInt(slots); - NWNX_PushArgumentInt(level); - NWNX_PushArgumentInt(class); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(slots); + NWNXPushInt(level); + NWNXPushInt(class); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetRemainingSpellSlots"); } void NWNX_Creature_RemoveKnownSpell(object creature, int class, int level, int spellId) { - string sFunc = "RemoveKnownSpell"; + NWNXPushInt(spellId); + NWNXPushInt(level); + NWNXPushInt(class); + NWNXPushObject(creature); - NWNX_PushArgumentInt(spellId); - NWNX_PushArgumentInt(level); - NWNX_PushArgumentInt(class); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXCall(NWNX_Creature, "RemoveKnownSpell"); } void NWNX_Creature_AddKnownSpell(object creature, int class, int level, int spellId) { - string sFunc = "AddKnownSpell"; - - NWNX_PushArgumentInt(spellId); - NWNX_PushArgumentInt(level); - NWNX_PushArgumentInt(class); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(spellId); + NWNXPushInt(level); + NWNXPushInt(class); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "AddKnownSpell"); } int NWNX_Creature_GetMaxSpellSlots(object creature, int class, int level) { - string sFunc = "GetMaxSpellSlots"; - - NWNX_PushArgumentInt(level); - NWNX_PushArgumentInt(class); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(level); + NWNXPushInt(class); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetMaxSpellSlots"); + return NWNXPopInt(); } int NWNX_Creature_GetMaxHitPointsByLevel(object creature, int level) { - string sFunc = "GetMaxHitPointsByLevel"; - - NWNX_PushArgumentInt(level); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(level); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetMaxHitPointsByLevel"); + return NWNXPopInt(); } void NWNX_Creature_SetMaxHitPointsByLevel(object creature, int level, int value) { - string sFunc = "SetMaxHitPointsByLevel"; - - NWNX_PushArgumentInt(value); - NWNX_PushArgumentInt(level); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(value); + NWNXPushInt(level); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetMaxHitPointsByLevel"); } void NWNX_Creature_SetMovementRate(object creature, int rate) { - string sFunc = "SetMovementRate"; - - NWNX_PushArgumentInt(rate); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(rate); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetMovementRate"); } float NWNX_Creature_GetMovementRateFactor(object creature) { - string sFunc = "GetMovementRateFactor"; - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueFloat(); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetMovementRateFactor"); + return NWNXPopFloat(); } void NWNX_Creature_SetMovementRateFactor(object creature, float factor) { - string sFunc = "SetMovementRateFactor"; - - NWNX_PushArgumentFloat(factor); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushFloat(factor); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetMovementRateFactor"); } float NWNX_Creature_GetMovementRateFactorCap(object creature) { - string sFunc = "GetMovementRateFactorCap"; - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueFloat(); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetMovementRateFactorCap"); + return NWNXPopFloat(); } void NWNX_Creature_SetMovementRateFactorCap(object creature, float cap) { - string sFunc = "SetMovementRateFactorCap"; - - NWNX_PushArgumentFloat(cap); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushFloat(cap); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetMovementRateFactorCap"); } void NWNX_Creature_SetAlignmentGoodEvil(object creature, int value) { - string sFunc = "SetAlignmentGoodEvil"; - - NWNX_PushArgumentInt(value); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(value); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetAlignmentGoodEvil"); } void NWNX_Creature_SetAlignmentLawChaos(object creature, int value) { - string sFunc = "SetAlignmentLawChaos"; - - NWNX_PushArgumentInt(value); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(value); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetAlignmentLawChaos"); } void NWNX_Creature_SetSkillRank(object creature, int skill, int rank) { - string sFunc = "SetSkillRank"; - NWNX_PushArgumentInt(rank); - NWNX_PushArgumentInt(skill); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(rank); + NWNXPushInt(skill); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetSkillRank"); } int NWNX_Creature_GetSkillRankByLevel(object creature, int skill, int level) { - string sFunc = "GetSkillRankByLevel"; - - NWNX_PushArgumentInt(level); - NWNX_PushArgumentInt(skill); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(level); + NWNXPushInt(skill); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetSkillRankByLevel"); + return NWNXPopInt(); } void NWNX_Creature_SetSkillRankByLevel(object creature, int skill, int rank, int level) { - string sFunc = "SetSkillRankByLevel"; - - NWNX_PushArgumentInt(level); - NWNX_PushArgumentInt(rank); - NWNX_PushArgumentInt(skill); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(level); + NWNXPushInt(rank); + NWNXPushInt(skill); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetSkillRankByLevel"); } void NWNX_Creature_SetClassByPosition(object creature, int position, int classID, int bUpdateLevels = TRUE) { - string sFunc = "SetClassByPosition"; - NWNX_PushArgumentInt(bUpdateLevels); - NWNX_PushArgumentInt(classID); - NWNX_PushArgumentInt(position); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(bUpdateLevels); + NWNXPushInt(classID); + NWNXPushInt(position); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetClassByPosition"); } void NWNX_Creature_SetLevelByPosition(object creature, int position, int level) { - string sFunc = "SetLevelByPosition"; - NWNX_PushArgumentInt(level); - NWNX_PushArgumentInt(position); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(level); + NWNXPushInt(position); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetLevelByPosition"); } void NWNX_Creature_SetBaseAttackBonus(object creature, int bab) { - string sFunc = "SetBaseAttackBonus"; - NWNX_PushArgumentInt(bab); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(bab); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetBaseAttackBonus"); } int NWNX_Creature_GetAttacksPerRound(object creature, int bBaseAPR = FALSE) { - string sFunc = "GetAttacksPerRound"; - NWNX_PushArgumentInt(bBaseAPR); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(bBaseAPR); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetAttacksPerRound"); + return NWNXPopInt(); } void NWNX_Creature_RestoreFeats(object creature) { - string sFunc = "RestoreFeats"; - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "RestoreFeats"); } void NWNX_Creature_RestoreSpecialAbilities(object creature) { - string sFunc = "RestoreSpecialAbilities"; - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "RestoreSpecialAbilities"); } void NWNX_Creature_RestoreItems(object creature) { - string sFunc = "RestoreItems"; - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "RestoreItems"); } void NWNX_Creature_SetSize(object creature, int size) { - string sFunc = "SetSize"; - NWNX_PushArgumentInt(size); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(size); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetSize"); } int NWNX_Creature_GetSkillPointsRemaining(object creature) { - string sFunc = "GetSkillPointsRemaining"; - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetSkillPointsRemaining"); + return NWNXPopInt(); } - void NWNX_Creature_SetSkillPointsRemaining(object creature, int skillpoints) { - string sFunc = "SetSkillPointsRemaining"; - NWNX_PushArgumentInt(skillpoints); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(skillpoints); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetSkillPointsRemaining"); } int NWNX_Creature_GetSkillPointsRemainingByLevel(object creature, int level) { - string sFunc = "GetSkillPointsRemainingByLevel"; - - NWNX_PushArgumentInt(level); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(level); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetSkillPointsRemainingByLevel"); + return NWNXPopInt(); } void NWNX_Creature_SetSkillPointsRemainingByLevel(object creature, int level, int value) { - string sFunc = "SetSkillPointsRemainingByLevel"; - - NWNX_PushArgumentInt(value); - NWNX_PushArgumentInt(level); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(value); + NWNXPushInt(level); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetSkillPointsRemainingByLevel"); } void NWNX_Creature_SetRacialType(object creature, int racialtype) { - string sFunc = "SetRacialType"; - NWNX_PushArgumentInt(racialtype); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(racialtype); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetRacialType"); } int NWNX_Creature_GetMovementType(object creature) { - string sFunc = "GetMovementType"; - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetMovementType"); + return NWNXPopInt(); } void NWNX_Creature_SetWalkRateCap(object creature, float fWalkRate = 2000.0f) { - string sFunc = "SetWalkRateCap"; - NWNX_PushArgumentFloat(fWalkRate); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushFloat(fWalkRate); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetWalkRateCap"); } void NWNX_Creature_SetGold(object creature, int gold) { - string sFunc = "SetGold"; - NWNX_PushArgumentInt(gold); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(gold); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetGold"); } void NWNX_Creature_SetCorpseDecayTime(object creature, int nDecayTime) { - string sFunc = "SetCorpseDecayTime"; - NWNX_PushArgumentInt(nDecayTime); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(nDecayTime); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetCorpseDecayTime"); } - int NWNX_Creature_GetBaseSavingThrow(object creature, int which) { - string sFunc = "GetBaseSavingThrow"; - NWNX_PushArgumentInt(which); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(which); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetBaseSavingThrow"); + return NWNXPopInt(); } void NWNX_Creature_SetBaseSavingThrow(object creature, int which, int value) { - string sFunc = "SetBaseSavingThrow"; - NWNX_PushArgumentInt(value); - NWNX_PushArgumentInt(which); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(value); + NWNXPushInt(which); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetBaseSavingThrow"); } void NWNX_Creature_LevelUp(object creature, int class, int count = 1, int package = PACKAGE_INVALID) { - string sFunc = "LevelUp"; - NWNX_PushArgumentInt(package); - NWNX_PushArgumentInt(count); - NWNX_PushArgumentInt(class); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(package); + NWNXPushInt(count); + NWNXPushInt(class); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "LevelUp"); } void NWNX_Creature_LevelDown(object creature, int count=1) { - string sFunc = "LevelDown"; - NWNX_PushArgumentInt(count); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(count); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "LevelDown"); } void NWNX_Creature_SetChallengeRating(object creature, float fCR) { - string sFunc = "SetChallengeRating"; - NWNX_PushArgumentFloat(fCR); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushFloat(fCR); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetChallengeRating"); } int NWNX_Creature_GetAttackBonus(object creature, int isMelee = -1, int isTouchAttack = FALSE, int isOffhand = FALSE, int includeBaseAttackBonus = TRUE) { - string sFunc = "GetAttackBonus"; - if (isMelee == -1) { object oWeapon = GetItemInSlot(INVENTORY_SLOT_RIGHTHAND, creature); @@ -1674,940 +1524,727 @@ int NWNX_Creature_GetAttackBonus(object creature, int isMelee = -1, int isTouchA isMelee = TRUE; } } - - NWNX_PushArgumentInt(includeBaseAttackBonus); - NWNX_PushArgumentInt(isOffhand); - NWNX_PushArgumentInt(isTouchAttack); - NWNX_PushArgumentInt(isMelee); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(includeBaseAttackBonus); + NWNXPushInt(isOffhand); + NWNXPushInt(isTouchAttack); + NWNXPushInt(isMelee); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetAttackBonus"); + return NWNXPopInt(); } int NWNX_Creature_GetHighestLevelOfFeat(object creature, int feat) { - string sFunc = "GetHighestLevelOfFeat"; - - NWNX_PushArgumentInt(feat); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(feat); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetHighestLevelOfFeat"); + return NWNXPopInt(); } int NWNX_Creature_GetFeatRemainingUses(object creature, int feat) { - string sFunc = "GetFeatRemainingUses"; - - NWNX_PushArgumentInt(feat); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(feat); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetFeatRemainingUses"); + return NWNXPopInt(); } int NWNX_Creature_GetFeatTotalUses(object creature, int feat) { - string sFunc = "GetFeatTotalUses"; - - NWNX_PushArgumentInt(feat); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(feat); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetFeatTotalUses"); + return NWNXPopInt(); } void NWNX_Creature_SetFeatRemainingUses(object creature, int feat, int uses) { - string sFunc = "SetFeatRemainingUses"; - - NWNX_PushArgumentInt(uses); - NWNX_PushArgumentInt(feat); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(uses); + NWNXPushInt(feat); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetFeatRemainingUses"); } int NWNX_Creature_GetTotalEffectBonus(object creature, int bonusType=NWNX_CREATURE_BONUS_TYPE_ATTACK, object target=OBJECT_INVALID, int isElemental=0, int isForceMax=0, int savetype=-1, int saveSpecificType=-1, int skill=-1, int abilityScore=-1, int isOffhand=FALSE) { - string sFunc = "GetTotalEffectBonus"; - - NWNX_PushArgumentInt(isOffhand); - NWNX_PushArgumentInt(abilityScore); - NWNX_PushArgumentInt(skill); - NWNX_PushArgumentInt(saveSpecificType); - NWNX_PushArgumentInt(savetype); - NWNX_PushArgumentInt(isForceMax); - NWNX_PushArgumentInt(isElemental); - NWNX_PushArgumentObject(target); - NWNX_PushArgumentInt(bonusType); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(isOffhand); + NWNXPushInt(abilityScore); + NWNXPushInt(skill); + NWNXPushInt(saveSpecificType); + NWNXPushInt(savetype); + NWNXPushInt(isForceMax); + NWNXPushInt(isElemental); + NWNXPushObject(target); + NWNXPushInt(bonusType); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetTotalEffectBonus"); + return NWNXPopInt(); } void NWNX_Creature_SetOriginalName(object creature, string name, int isLastName) { - string sFunc = "SetOriginalName"; - - NWNX_PushArgumentInt(isLastName); - NWNX_PushArgumentString(name); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(isLastName); + NWNXPushString(name); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetOriginalName"); } string NWNX_Creature_GetOriginalName(object creature, int isLastName) { - string sFunc = "GetOriginalName"; - - NWNX_PushArgumentInt(isLastName); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueString(); + NWNXPushInt(isLastName); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetOriginalName"); + return NWNXPopString(); } void NWNX_Creature_SetSpellResistance(object creature, int sr) { - string sFunc = "SetSpellResistance"; - - NWNX_PushArgumentInt(sr); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(sr); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetSpellResistance"); } void NWNX_Creature_SetAnimalCompanionCreatureType(object creature, int type) { - string sFunc = "SetAnimalCompanionCreatureType"; - - NWNX_PushArgumentInt(type); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(type); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetAnimalCompanionCreatureType"); } void NWNX_Creature_SetFamiliarCreatureType(object creature, int type) { - string sFunc = "SetFamiliarCreatureType"; - - NWNX_PushArgumentInt(type); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(type); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetFamiliarCreatureType"); } void NWNX_Creature_SetAnimalCompanionName(object creature, string name) { - string sFunc = "SetAnimalCompanionName"; - - NWNX_PushArgumentString(name); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushString(name); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetAnimalCompanionName"); } void NWNX_Creature_SetFamiliarName(object creature, string name) { - string sFunc = "SetFamiliarName"; - - NWNX_PushArgumentString(name); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushString(name); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetFamiliarName"); } int NWNX_Creature_GetDisarmable(object creature) { - string sFunc = "GetDisarmable"; - - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "GetDisarmable"); + return NWNXPopInt(); } void NWNX_Creature_SetDisarmable(object creature, int disarmable) { - string sFunc = "SetDisarmable"; - - NWNX_PushArgumentInt(disarmable); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(disarmable); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetDisarmable"); } void NWNX_Creature_SetDomain(object creature, int class, int index, int domain) { - string sFunc = "SetDomain"; - - NWNX_PushArgumentInt(domain); - NWNX_PushArgumentInt(index); - NWNX_PushArgumentInt(class); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(domain); + NWNXPushInt(index); + NWNXPushInt(class); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetDomain"); } void NWNX_Creature_SetSpecialization(object creature, int class, int school) { - string sFunc = "SetSpecialization"; - - NWNX_PushArgumentInt(school); - NWNX_PushArgumentInt(class); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(school); + NWNXPushInt(class); + NWNXPushObject(creature); + NWNXCall(NWNX_Creature, "SetSpecialization"); } void NWNX_Creature_SetFaction(object oCreature, int nFactionId) { - string sFunc = "SetFaction"; - NWNX_PushArgumentInt(nFactionId); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(nFactionId); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetFaction"); } int NWNX_Creature_GetFaction(object oCreature) { - string sFunc = "GetFaction"; - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetFaction"); + return NWNXPopInt(); } int NWNX_Creature_GetFlatFooted(object oCreature) { - string sFunc = "GetFlatFooted"; - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetFlatFooted"); + return NWNXPopInt(); } string NWNX_Creature_SerializeQuickbar(object oCreature) { - string sFunc = "SerializeQuickbar"; - - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - - return NWNX_GetReturnValueString(); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SerializeQuickbar"); + return NWNXPopString(); } int NWNX_Creature_DeserializeQuickbar(object oCreature, string sSerializedQuickbar) { - string sFunc = "DeserializeQuickbar"; - - NWNX_PushArgumentString(sSerializedQuickbar); - NWNX_PushArgumentObject(oCreature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushString(sSerializedQuickbar); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "DeserializeQuickbar"); + return NWNXPopInt(); } void NWNX_Creature_SetCasterLevelModifier(object oCreature, int nClass, int nModifier, int bPersist = FALSE) { - string sFunc = "SetCasterLevelModifier"; - - NWNX_PushArgumentInt(bPersist); - NWNX_PushArgumentInt(nModifier); - NWNX_PushArgumentInt(nClass); - NWNX_PushArgumentObject(oCreature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(bPersist); + NWNXPushInt(nModifier); + NWNXPushInt(nClass); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetCasterLevelModifier"); } int NWNX_Creature_GetCasterLevelModifier(object oCreature, int nClass) { - string sFunc = "GetCasterLevelModifier"; - - NWNX_PushArgumentInt(nClass); - NWNX_PushArgumentObject(oCreature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(nClass); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetCasterLevelModifier"); + return NWNXPopInt(); } void NWNX_Creature_SetCasterLevelOverride(object oCreature, int nClass, int nCasterLevel, int bPersist = FALSE) { - string sFunc = "SetCasterLevelOverride"; - - NWNX_PushArgumentInt(bPersist); - NWNX_PushArgumentInt(nCasterLevel); - NWNX_PushArgumentInt(nClass); - NWNX_PushArgumentObject(oCreature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(bPersist); + NWNXPushInt(nCasterLevel); + NWNXPushInt(nClass); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetCasterLevelOverride"); } int NWNX_Creature_GetCasterLevelOverride(object oCreature, int nClass) { - string sFunc = "GetCasterLevelOverride"; - - NWNX_PushArgumentInt(nClass); - NWNX_PushArgumentObject(oCreature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(nClass); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetCasterLevelOverride"); + return NWNXPopInt(); } void NWNX_Creature_JumpToLimbo(object oCreature) { - string sFunc = "JumpToLimbo"; - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "JumpToLimbo"); } void NWNX_Creature_SetCriticalMultiplierModifier(object oCreature, int nModifier, int nHand = 0, int bPersist = FALSE, int nBaseItem = -1) { - string sFunc = "SetCriticalMultiplierModifier"; - - NWNX_PushArgumentInt(nBaseItem); - NWNX_PushArgumentInt(bPersist); - NWNX_PushArgumentInt(nHand); - NWNX_PushArgumentInt(nModifier); - NWNX_PushArgumentObject(oCreature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(nBaseItem); + NWNXPushInt(bPersist); + NWNXPushInt(nHand); + NWNXPushInt(nModifier); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetCriticalMultiplierModifier"); } int NWNX_Creature_GetCriticalMultiplierModifier(object oCreature, int nHand = 0, int nBaseItem = -1) { - string sFunc = "GetCriticalMultiplierModifier"; - - NWNX_PushArgumentInt(nBaseItem); - NWNX_PushArgumentInt(nHand); - NWNX_PushArgumentObject(oCreature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(nBaseItem); + NWNXPushInt(nHand); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetCriticalMultiplierModifier"); + return NWNXPopInt(); } void NWNX_Creature_SetCriticalMultiplierOverride(object oCreature, int nOverride, int nHand = 0, int bPersist = FALSE, int nBaseItem = -1) { - string sFunc = "SetCriticalMultiplierOverride"; - - NWNX_PushArgumentInt(nBaseItem); - NWNX_PushArgumentInt(bPersist); - NWNX_PushArgumentInt(nHand); - NWNX_PushArgumentInt(nOverride); - NWNX_PushArgumentObject(oCreature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(nBaseItem); + NWNXPushInt(bPersist); + NWNXPushInt(nHand); + NWNXPushInt(nOverride); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetCriticalMultiplierOverride"); } int NWNX_Creature_GetCriticalMultiplierOverride(object oCreature, int nHand = 0, int nBaseItem = -1) { - string sFunc = "GetCriticalMultiplierOverride"; - - NWNX_PushArgumentInt(nBaseItem); - NWNX_PushArgumentInt(nHand); - NWNX_PushArgumentObject(oCreature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(nBaseItem); + NWNXPushInt(nHand); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetCriticalMultiplierOverride"); + return NWNXPopInt(); } void NWNX_Creature_SetCriticalRangeModifier(object oCreature, int nModifier, int nHand = 0, int bPersist = FALSE, int nBaseItem = -1) { - string sFunc = "SetCriticalRangeModifier"; - - NWNX_PushArgumentInt(nBaseItem); - NWNX_PushArgumentInt(bPersist); - NWNX_PushArgumentInt(nHand); - NWNX_PushArgumentInt(nModifier); - NWNX_PushArgumentObject(oCreature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(nBaseItem); + NWNXPushInt(bPersist); + NWNXPushInt(nHand); + NWNXPushInt(nModifier); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetCriticalRangeModifier"); } int NWNX_Creature_GetCriticalRangeModifier(object oCreature, int nHand = 0, int nBaseItem = -1) { - string sFunc = "GetCriticalRangeModifier"; + NWNXPushInt(nBaseItem); + NWNXPushInt(nHand); + NWNXPushObject(oCreature); - NWNX_PushArgumentInt(nBaseItem); - NWNX_PushArgumentInt(nHand); - NWNX_PushArgumentObject(oCreature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_Creature, "GetCriticalRangeModifier"); + return NWNXPopInt(); } void NWNX_Creature_SetCriticalRangeOverride(object oCreature, int nOverride, int nHand = 0, int bPersist = FALSE, int nBaseItem = -1) { - string sFunc = "SetCriticalRangeOverride"; - - NWNX_PushArgumentInt(nBaseItem); - NWNX_PushArgumentInt(bPersist); - NWNX_PushArgumentInt(nHand); - NWNX_PushArgumentInt(nOverride); - NWNX_PushArgumentObject(oCreature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(nBaseItem); + NWNXPushInt(bPersist); + NWNXPushInt(nHand); + NWNXPushInt(nOverride); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetCriticalRangeOverride"); } int NWNX_Creature_GetCriticalRangeOverride(object oCreature, int nHand = 0, int nBaseItem = -1) { - string sFunc = "GetCriticalRangeOverride"; + NWNXPushInt(nBaseItem); + NWNXPushInt(nHand); + NWNXPushObject(oCreature); - NWNX_PushArgumentInt(nBaseItem); - NWNX_PushArgumentInt(nHand); - NWNX_PushArgumentObject(oCreature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_Creature, "GetCriticalRangeOverride"); + return NWNXPopInt(); } void NWNX_Creature_AddAssociate(object oCreature, object oAssociate, int nAssociateType) { - string sFunc = "AddAssociate"; + NWNXPushInt(nAssociateType); + NWNXPushObject(oAssociate); + NWNXPushObject(oCreature); - NWNX_PushArgumentInt(nAssociateType); - NWNX_PushArgumentObject(oAssociate); - NWNX_PushArgumentObject(oCreature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXCall(NWNX_Creature, "AddAssociate"); } void NWNX_Creature_OverrideDamageLevel(object oCreature, int nDamageLevel) { - string sFunc = "OverrideDamageLevel"; - - NWNX_PushArgumentInt(nDamageLevel); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(nDamageLevel); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "OverrideDamageLevel"); } void NWNX_Creature_SetEncounter(object oCreature, object oEncounter) { - string sFunc = "SetEncounter"; - - NWNX_PushArgumentObject(oEncounter); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushObject(oEncounter); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetEncounter"); } object NWNX_Creature_GetEncounter(object oCreature) { - string sFunc = "GetEncounter"; - - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - - return NWNX_GetReturnValueObject(); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetEncounter"); + return NWNXPopObject(); } int NWNX_Creature_GetIsBartering(object oCreature) { - string sFunc = "GetIsBartering"; - - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetIsBartering"); + return NWNXPopInt(); } void NWNX_Creature_SetLastItemCasterLevel(object oCreature, int nCasterLvl) { - string sFunc = "SetLastItemCasterLevel"; - NWNX_PushArgumentInt(nCasterLvl); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(nCasterLvl); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetLastItemCasterLevel"); } int NWNX_Creature_GetLastItemCasterLevel(object oCreature) { - string sFunc = "GetLastItemCasterLevel"; - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetLastItemCasterLevel"); + return NWNXPopInt(); } int NWNX_Creature_GetArmorClassVersus(object oAttacked, object oVersus, int nTouch=FALSE) { - string sFunc = "GetArmorClassVersus"; - NWNX_PushArgumentInt(nTouch); - NWNX_PushArgumentObject(oVersus); - NWNX_PushArgumentObject(oAttacked); - NWNX_CallFunction(NWNX_Creature, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(nTouch); + NWNXPushObject(oVersus); + NWNXPushObject(oAttacked); + NWNXCall(NWNX_Creature, "GetArmorClassVersus"); + return NWNXPopInt(); } int NWNX_Creature_GetWalkAnimation(object oCreature) { - string sFunc = "GetWalkAnimation"; - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetWalkAnimation"); + return NWNXPopInt(); } void NWNX_Creature_SetWalkAnimation(object oCreature, int nAnimation) { - string sFunc = "SetWalkAnimation"; - NWNX_PushArgumentInt(nAnimation); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(nAnimation); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetWalkAnimation"); } void NWNX_Creature_SetAttackRollOverride(object oCreature, int nRoll, int nModifier) { - string sFunc = "SetAttackRollOverride"; - NWNX_PushArgumentInt(nModifier); - NWNX_PushArgumentInt(nRoll); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(nModifier); + NWNXPushInt(nRoll); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetAttackRollOverride"); } void NWNX_Creature_SetParryAllAttacks(object oCreature, int bParry) { - string sFunc = "SetParryAllAttacks"; - NWNX_PushArgumentInt(bParry); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(bParry); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetParryAllAttacks"); } int NWNX_Creature_GetNoPermanentDeath(object oCreature) { - string sFunc = "GetNoPermanentDeath"; - - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetNoPermanentDeath"); + return NWNXPopInt(); } void NWNX_Creature_SetNoPermanentDeath(object oCreature, int bNoPermanentDeath) { - string sFunc = "SetNoPermanentDeath"; - - NWNX_PushArgumentInt(bNoPermanentDeath); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(bNoPermanentDeath); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetNoPermanentDeath"); } vector NWNX_Creature_ComputeSafeLocation(object oCreature, vector vPosition, float fRadius = 20.0f, int bWalkStraightLineRequired = TRUE) { - string sFunc = "ComputeSafeLocation"; - - NWNX_PushArgumentInt(bWalkStraightLineRequired); - NWNX_PushArgumentFloat(fRadius); - NWNX_PushArgumentFloat(vPosition.x); - NWNX_PushArgumentFloat(vPosition.y); - NWNX_PushArgumentFloat(vPosition.z); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - - vector v; - v.z = NWNX_GetReturnValueFloat(); - v.y = NWNX_GetReturnValueFloat(); - v.x = NWNX_GetReturnValueFloat(); - - return v; + NWNXPushInt(bWalkStraightLineRequired); + NWNXPushFloat(fRadius); + NWNXPushVector(vPosition); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "ComputeSafeLocation"); + return NWNXPopVector(); } void NWNX_Creature_DoPerceptionUpdateOnCreature(object oCreature, object oTargetCreature) { - string sFunc = "DoPerceptionUpdateOnCreature"; - - NWNX_PushArgumentObject(oTargetCreature); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushObject(oTargetCreature); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "DoPerceptionUpdateOnCreature"); } float NWNX_Creature_GetPersonalSpace(object oCreature) { - string sFunc = "GetPersonalSpace"; - - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - - return NWNX_GetReturnValueFloat(); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetPersonalSpace"); + return NWNXPopFloat(); } void NWNX_Creature_SetPersonalSpace(object oCreature, float fPerspace) { - string sFunc = "SetPersonalSpace"; - - NWNX_PushArgumentFloat(fPerspace); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushFloat(fPerspace); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetPersonalSpace"); } float NWNX_Creature_GetCreaturePersonalSpace(object oCreature) { - string sFunc = "GetCreaturePersonalSpace"; - - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - - return NWNX_GetReturnValueFloat(); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetCreaturePersonalSpace"); + return NWNXPopFloat(); } void NWNX_Creature_SetCreaturePersonalSpace(object oCreature, float fCrePerspace) { - string sFunc = "SetCreaturePersonalSpace"; - - NWNX_PushArgumentFloat(fCrePerspace); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushFloat(fCrePerspace); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetCreaturePersonalSpace"); } float NWNX_Creature_GetHeight(object oCreature) { - string sFunc = "GetHeight"; - - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - - return NWNX_GetReturnValueFloat(); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetHeight"); + return NWNXPopFloat(); } void NWNX_Creature_SetHeight(object oCreature, float fHeight) { - string sFunc = "SetHeight"; - - NWNX_PushArgumentFloat(fHeight); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushFloat(fHeight); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetHeight"); } float NWNX_Creature_GetHitDistance(object oCreature) { - string sFunc = "GetHitDistance"; - - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - - return NWNX_GetReturnValueFloat(); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetHitDistance"); + return NWNXPopFloat(); } void NWNX_Creature_SetHitDistance(object oCreature, float fHitDist) { - string sFunc = "SetHitDistance"; - - NWNX_PushArgumentFloat(fHitDist); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushFloat(fHitDist); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetHitDistance"); } float NWNX_Creature_GetPreferredAttackDistance(object oCreature) { - string sFunc = "GetPreferredAttackDistance"; - - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - - return NWNX_GetReturnValueFloat(); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetPreferredAttackDistance"); + return NWNXPopFloat(); } void NWNX_Creature_SetPreferredAttackDistance(object oCreature, float fPrefAtckDist) { - string sFunc = "SetPreferredAttackDistance"; - - NWNX_PushArgumentFloat(fPrefAtckDist); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushFloat(fPrefAtckDist); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetPreferredAttackDistance"); } int NWNX_Creature_GetArmorCheckPenalty(object oCreature) { - string sFunc = "GetArmorCheckPenalty"; - - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetArmorCheckPenalty"); + return NWNXPopInt(); } int NWNX_Creature_GetShieldCheckPenalty(object oCreature) { - string sFunc = "GetShieldCheckPenalty"; - - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetShieldCheckPenalty"); + return NWNXPopInt(); } void NWNX_Creature_SetBypassEffectImmunity(object oCreature, int nImmunityType, int nChance = 100, int bPersist = FALSE) { - string sFunc = "SetBypassEffectImmunity"; - - NWNX_PushArgumentInt(bPersist); - NWNX_PushArgumentInt(nChance); - NWNX_PushArgumentInt(nImmunityType); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(bPersist); + NWNXPushInt(nChance); + NWNXPushInt(nImmunityType); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetBypassEffectImmunity"); } int NWNX_Creature_GetBypassEffectImmunity(object oCreature, int nImmunityType) { - string sFunc = "GetBypassEffectImmunity"; - - NWNX_PushArgumentInt(nImmunityType); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(nImmunityType); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetBypassEffectImmunity"); + return NWNXPopInt(); } void NWNX_Creature_SetLastKiller(object oCreature, object oKiller) { - string sFunc = "SetLastKiller"; - - NWNX_PushArgumentObject(oKiller); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushObject(oKiller); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetLastKiller"); } void NWNX_Creature_DoItemCastSpell(object oCreature, object oTarget, location locTarget, int nSpellID, int nCasterLevel, float fProjectileTime, int nProjectilePathType = PROJECTILE_PATH_TYPE_DEFAULT, int nProjectileSpellID = -1, object oItem = OBJECT_INVALID, string sImpactScript = "") { - string sFunc = "DoItemCastSpell"; - - object oArea = GetAreaFromLocation(locTarget); - vector vPosition = GetPositionFromLocation(locTarget); - - NWNX_PushArgumentString(sImpactScript); - NWNX_PushArgumentObject(oItem); - NWNX_PushArgumentInt(nProjectileSpellID); - NWNX_PushArgumentInt(nProjectilePathType); - NWNX_PushArgumentFloat(fProjectileTime); - NWNX_PushArgumentInt(nCasterLevel); - NWNX_PushArgumentInt(nSpellID); - NWNX_PushArgumentFloat(vPosition.z); - NWNX_PushArgumentFloat(vPosition.y); - NWNX_PushArgumentFloat(vPosition.x); - NWNX_PushArgumentObject(oArea); - NWNX_PushArgumentObject(oTarget); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushString(sImpactScript); + NWNXPushObject(oItem); + NWNXPushInt(nProjectileSpellID); + NWNXPushInt(nProjectilePathType); + NWNXPushFloat(fProjectileTime); + NWNXPushInt(nCasterLevel); + NWNXPushInt(nSpellID); + NWNXPushLocation(locTarget); + NWNXPushObject(oTarget); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "DoItemCastSpell"); } int NWNX_Creature_RunEquip(object oCreature, object oItem, int nInventorySlot) { - string sFunc = "RunEquip"; - - NWNX_PushArgumentInt(nInventorySlot); - NWNX_PushArgumentObject(oItem); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(nInventorySlot); + NWNXPushObject(oItem); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "RunEquip"); + return NWNXPopInt(); } int NWNX_Creature_RunUnequip(object oCreature, object oItem) { - string sFunc = "RunUnequip"; - - NWNX_PushArgumentObject(oItem); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oItem); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "RunUnequip"); + return NWNXPopInt(); } void NWNX_Creature_OverrideRangedProjectileVFX(object oCreature, int nProjectileVFX, int bPersist = FALSE) { - string sFunc = "OverrideRangedProjectileVFX"; - - NWNX_PushArgumentInt(bPersist); - NWNX_PushArgumentInt(nProjectileVFX); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(bPersist); + NWNXPushInt(nProjectileVFX); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "OverrideRangedProjectileVFX"); } void NWNX_Creature_SetInitiativeModifier(object oCreature, int nMod, int bPersist = FALSE) { - string sFunc = "SetInitiativeModifier"; - - NWNX_PushArgumentInt(bPersist); - NWNX_PushArgumentInt(nMod); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(bPersist); + NWNXPushInt(nMod); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetInitiativeModifier"); } int NWNX_Creature_GetInitiativeModifier(object oCreature) { - string sFunc = "GetInitiativeModifier"; - - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetInitiativeModifier"); + return NWNXPopInt(); } object NWNX_Creature_GetBodyBag(object oCreature) { - string sFunc = "GetBodyBag"; - - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueObject(); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetBodyBag"); + return NWNXPopObject(); } int NWNX_Creature_AddCastSpellActions(object oCreature, object oTarget, vector vTargetLocation, int nSpellID, int nMultiClass, int nMetaMagic = METAMAGIC_NONE, int nDomainLevel = 0, int nProjectilePathType = PROJECTILE_PATH_TYPE_DEFAULT, int bInstant = FALSE, int bClearActions = FALSE, int bAddToFront = FALSE) { - string sFunc = "AddCastSpellActions"; - - NWNX_PushArgumentInt(bAddToFront); - NWNX_PushArgumentInt(bClearActions); - NWNX_PushArgumentInt(bInstant); - NWNX_PushArgumentInt(nProjectilePathType); - NWNX_PushArgumentInt(nDomainLevel); - NWNX_PushArgumentInt(nMetaMagic); - NWNX_PushArgumentInt(nMultiClass); - NWNX_PushArgumentInt(nSpellID); - NWNX_PushArgumentFloat(vTargetLocation.z); - NWNX_PushArgumentFloat(vTargetLocation.y); - NWNX_PushArgumentFloat(vTargetLocation.x); - NWNX_PushArgumentObject(oTarget); - NWNX_PushArgumentObject(oCreature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(bAddToFront); + NWNXPushInt(bClearActions); + NWNXPushInt(bInstant); + NWNXPushInt(nProjectilePathType); + NWNXPushInt(nDomainLevel); + NWNXPushInt(nMetaMagic); + NWNXPushInt(nMultiClass); + NWNXPushInt(nSpellID); + NWNXPushVector(vTargetLocation); + NWNXPushObject(oTarget); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "AddCastSpellActions"); + return NWNXPopInt(); } int NWNX_Creature_GetIsFlanking(object oCreature, object oTargetCreature) { - string sFunc = "GetIsFlanking"; - - NWNX_PushArgumentObject(oTargetCreature); - NWNX_PushArgumentObject(oCreature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(oTargetCreature); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetIsFlanking"); + return NWNXPopInt(); } void NWNX_Creature_DecrementRemainingSpellSlots(object oCreature, int nClass, int nSpellLevel) { - string sFunc = "DecrementRemainingSpellSlots"; - - NWNX_PushArgumentInt(nSpellLevel); - NWNX_PushArgumentInt(nClass); - NWNX_PushArgumentObject(oCreature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(nSpellLevel); + NWNXPushInt(nClass); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "DecrementRemainingSpellSlots"); } void NWNX_Creature_IncrementRemainingSpellSlots(object oCreature, int nClass, int nSpellLevel) { - string sFunc = "IncrementRemainingSpellSlots"; - - NWNX_PushArgumentInt(nSpellLevel); - NWNX_PushArgumentInt(nClass); - NWNX_PushArgumentObject(oCreature); - - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(nSpellLevel); + NWNXPushInt(nClass); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "IncrementRemainingSpellSlots"); } int NWNX_Creature_GetMaximumBonusAttacks(object oCreature) { - string sFunc = "GetMaximumBonusAttacks"; - - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetMaximumBonusAttacks"); + return NWNXPopInt(); } void NWNX_Creature_SetMaximumBonusAttacks(object oCreature, int nMaxBonusAttacks, int bPersist = FALSE) { - string sFunc = "SetMaximumBonusAttacks"; - - NWNX_PushArgumentInt(bPersist); - NWNX_PushArgumentInt(nMaxBonusAttacks); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(bPersist); + NWNXPushInt(nMaxBonusAttacks); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetMaximumBonusAttacks"); } void NWNX_Creature_DoCleaveAttack(object oCreature) { - string sFunc = "DoCleaveAttack"; - - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "DoCleaveAttack"); } object NWNX_Creature_GetLockOrientationToObject(object oCreature) { - string sFunc = "GetLockOrientationToObject"; - - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - - return NWNX_GetReturnValueObject(); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetLockOrientationToObject"); + return NWNXPopObject(); } void NWNX_Creature_SetLockOrientationToObject(object oCreature, object oTarget) { - string sFunc = "SetLockOrientationToObject"; - - NWNX_PushArgumentObject(oTarget); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushObject(oTarget); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetLockOrientationToObject"); } void NWNX_Creature_BroadcastAttackOfOpportunity(object oCreature, object oSingleCreature = OBJECT_INVALID, int bMovement = FALSE) { - string sFunc = "BroadcastAttackOfOpportunity"; - - NWNX_PushArgumentInt(bMovement); - NWNX_PushArgumentObject(oSingleCreature); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(bMovement); + NWNXPushObject(oSingleCreature); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "BroadcastAttackOfOpportunity"); } int NWNX_Creature_GetMaxSellToStorePriceOverride(object oCreature, object oStore) { - string sFunc = "GetMaxSellToStorePriceOverride"; + NWNXPushObject(oStore); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetMaxSellToStorePriceOverride"); - NWNX_PushArgumentObject(oStore); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - - return NWNX_GetReturnValueInt(); + return NWNXPopInt(); } void NWNX_Creature_SetMaxSellToStorePriceOverride(object oCreature, object oStore, int nMaxSellToPrice) { - string sFunc = "SetMaxSellToStorePriceOverride"; - - NWNX_PushArgumentInt(nMaxSellToPrice); - NWNX_PushArgumentObject(oStore); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(nMaxSellToPrice); + NWNXPushObject(oStore); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetMaxSellToStorePriceOverride"); } int NWNX_Creature_GetAbilityIncreaseByLevel(object oCreature, int nLevel) { - string sFunc = "GetAbilityIncreaseByLevel"; - - NWNX_PushArgumentInt(nLevel); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(nLevel); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetAbilityIncreaseByLevel"); + return NWNXPopInt(); } void NWNX_Creature_SetAbilityIncreaseByLevel(object oCreature, int nLevel, int nAbility) { - string sFunc = "SetAbilityIncreaseByLevel"; - - NWNX_PushArgumentInt(nAbility); - NWNX_PushArgumentInt(nLevel); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); + NWNXPushInt(nAbility); + NWNXPushInt(nLevel); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetAbilityIncreaseByLevel"); } float NWNX_Creature_GetMaxAttackRange(object oCreature, object oTarget) { - string sFunc = "GetMaxAttackRange"; - - NWNX_PushArgumentObject(oTarget); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); - - return NWNX_GetReturnValueFloat(); + NWNXPushObject(oTarget); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetMaxAttackRange"); + return NWNXPopFloat(); +} + +int NWNX_Creature_GetMulticlassLimit(object oCreature) +{ + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "GetMulticlassLimit"); + return NWNXPopInt(); +} + + +void NWNX_Creature_SetMulticlassLimit(object oCreature, int nLimit, int bPersist = FALSE) +{ + NWNXPushInt(bPersist); + NWNXPushInt(nLimit); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Creature, "SetMulticlassLimit"); } diff --git a/_module/nss/nwnx_damage.nss b/_module/nss/nwnx_damage.nss index 352d810c..1f4d13ce 100644 --- a/_module/nss/nwnx_damage.nss +++ b/_module/nss/nwnx_damage.nss @@ -2,7 +2,6 @@ /// @brief Run a script before damage and attack events allowing for modification. Includes function to arbitrarily apply damage. /// @{ /// @file nwnx_damage.nss -#include "nwnx" const string NWNX_Damage = "NWNX_Damage"; ///< @private @@ -174,245 +173,223 @@ void NWNX_Damage_DealDamage(struct NWNX_Damage_DamageData data, object oTarget, void NWNX_Damage_SetDamageEventScript(string sScript, object oOwner=OBJECT_INVALID) { - string sFunc = "SetEventScript"; - - NWNX_PushArgumentObject(oOwner); - NWNX_PushArgumentString(sScript); - NWNX_PushArgumentString("DAMAGE"); - - NWNX_CallFunction(NWNX_Damage, sFunc); + NWNXPushObject(oOwner); + NWNXPushString(sScript); + NWNXPushString("DAMAGE"); + NWNXCall(NWNX_Damage, "SetEventScript"); } struct NWNX_Damage_DamageEventData NWNX_Damage_GetDamageEventData() { - string sFunc = "GetDamageEventData"; struct NWNX_Damage_DamageEventData data; - - NWNX_CallFunction(NWNX_Damage, sFunc); - - data.oDamager = NWNX_GetReturnValueObject(); - data.iBludgeoning = NWNX_GetReturnValueInt(); - data.iPierce = NWNX_GetReturnValueInt(); - data.iSlash = NWNX_GetReturnValueInt(); - data.iMagical = NWNX_GetReturnValueInt(); - data.iAcid = NWNX_GetReturnValueInt(); - data.iCold = NWNX_GetReturnValueInt(); - data.iDivine = NWNX_GetReturnValueInt(); - data.iElectrical = NWNX_GetReturnValueInt(); - data.iFire = NWNX_GetReturnValueInt(); - data.iNegative = NWNX_GetReturnValueInt(); - data.iPositive = NWNX_GetReturnValueInt(); - data.iSonic = NWNX_GetReturnValueInt(); - data.iBase = NWNX_GetReturnValueInt(); - data.iCustom1 = NWNX_GetReturnValueInt(); - data.iCustom2 = NWNX_GetReturnValueInt(); - data.iCustom3 = NWNX_GetReturnValueInt(); - data.iCustom4 = NWNX_GetReturnValueInt(); - data.iCustom5 = NWNX_GetReturnValueInt(); - data.iCustom6 = NWNX_GetReturnValueInt(); - data.iCustom7 = NWNX_GetReturnValueInt(); - data.iCustom8 = NWNX_GetReturnValueInt(); - data.iCustom9 = NWNX_GetReturnValueInt(); - data.iCustom10 = NWNX_GetReturnValueInt(); - data.iCustom11 = NWNX_GetReturnValueInt(); - data.iCustom12 = NWNX_GetReturnValueInt(); - data.iCustom13 = NWNX_GetReturnValueInt(); - data.iCustom14 = NWNX_GetReturnValueInt(); - data.iCustom15 = NWNX_GetReturnValueInt(); - data.iCustom16 = NWNX_GetReturnValueInt(); - data.iCustom17 = NWNX_GetReturnValueInt(); - data.iCustom18 = NWNX_GetReturnValueInt(); - data.iCustom19 = NWNX_GetReturnValueInt(); - data.iSpellId = NWNX_GetReturnValueInt(); - + NWNXCall(NWNX_Damage, "GetDamageEventData"); + data.oDamager = NWNXPopObject(); + data.iBludgeoning = NWNXPopInt(); + data.iPierce = NWNXPopInt(); + data.iSlash = NWNXPopInt(); + data.iMagical = NWNXPopInt(); + data.iAcid = NWNXPopInt(); + data.iCold = NWNXPopInt(); + data.iDivine = NWNXPopInt(); + data.iElectrical = NWNXPopInt(); + data.iFire = NWNXPopInt(); + data.iNegative = NWNXPopInt(); + data.iPositive = NWNXPopInt(); + data.iSonic = NWNXPopInt(); + data.iBase = NWNXPopInt(); + data.iCustom1 = NWNXPopInt(); + data.iCustom2 = NWNXPopInt(); + data.iCustom3 = NWNXPopInt(); + data.iCustom4 = NWNXPopInt(); + data.iCustom5 = NWNXPopInt(); + data.iCustom6 = NWNXPopInt(); + data.iCustom7 = NWNXPopInt(); + data.iCustom8 = NWNXPopInt(); + data.iCustom9 = NWNXPopInt(); + data.iCustom10 = NWNXPopInt(); + data.iCustom11 = NWNXPopInt(); + data.iCustom12 = NWNXPopInt(); + data.iCustom13 = NWNXPopInt(); + data.iCustom14 = NWNXPopInt(); + data.iCustom15 = NWNXPopInt(); + data.iCustom16 = NWNXPopInt(); + data.iCustom17 = NWNXPopInt(); + data.iCustom18 = NWNXPopInt(); + data.iCustom19 = NWNXPopInt(); + data.iSpellId = NWNXPopInt(); return data; } void NWNX_Damage_SetDamageEventData(struct NWNX_Damage_DamageEventData data) { - string sFunc = "SetDamageEventData"; + NWNXPushInt(data.iCustom19); + NWNXPushInt(data.iCustom18); + NWNXPushInt(data.iCustom17); + NWNXPushInt(data.iCustom16); + NWNXPushInt(data.iCustom15); + NWNXPushInt(data.iCustom14); + NWNXPushInt(data.iCustom13); + NWNXPushInt(data.iCustom12); + NWNXPushInt(data.iCustom11); + NWNXPushInt(data.iCustom10); + NWNXPushInt(data.iCustom9); + NWNXPushInt(data.iCustom8); + NWNXPushInt(data.iCustom7); + NWNXPushInt(data.iCustom6); + NWNXPushInt(data.iCustom5); + NWNXPushInt(data.iCustom4); + NWNXPushInt(data.iCustom3); + NWNXPushInt(data.iCustom2); + NWNXPushInt(data.iCustom1); + NWNXPushInt(data.iBase); + NWNXPushInt(data.iSonic); + NWNXPushInt(data.iPositive); + NWNXPushInt(data.iNegative); + NWNXPushInt(data.iFire); + NWNXPushInt(data.iElectrical); + NWNXPushInt(data.iDivine); + NWNXPushInt(data.iCold); + NWNXPushInt(data.iAcid); + NWNXPushInt(data.iMagical); + NWNXPushInt(data.iSlash); + NWNXPushInt(data.iPierce); + NWNXPushInt(data.iBludgeoning); - NWNX_PushArgumentInt(data.iCustom19); - NWNX_PushArgumentInt(data.iCustom18); - NWNX_PushArgumentInt(data.iCustom17); - NWNX_PushArgumentInt(data.iCustom16); - NWNX_PushArgumentInt(data.iCustom15); - NWNX_PushArgumentInt(data.iCustom14); - NWNX_PushArgumentInt(data.iCustom13); - NWNX_PushArgumentInt(data.iCustom12); - NWNX_PushArgumentInt(data.iCustom11); - NWNX_PushArgumentInt(data.iCustom10); - NWNX_PushArgumentInt(data.iCustom9); - NWNX_PushArgumentInt(data.iCustom8); - NWNX_PushArgumentInt(data.iCustom7); - NWNX_PushArgumentInt(data.iCustom6); - NWNX_PushArgumentInt(data.iCustom5); - NWNX_PushArgumentInt(data.iCustom4); - NWNX_PushArgumentInt(data.iCustom3); - NWNX_PushArgumentInt(data.iCustom2); - NWNX_PushArgumentInt(data.iCustom1); - NWNX_PushArgumentInt(data.iBase); - NWNX_PushArgumentInt(data.iSonic); - NWNX_PushArgumentInt(data.iPositive); - NWNX_PushArgumentInt(data.iNegative); - NWNX_PushArgumentInt(data.iFire); - NWNX_PushArgumentInt(data.iElectrical); - NWNX_PushArgumentInt(data.iDivine); - NWNX_PushArgumentInt(data.iCold); - NWNX_PushArgumentInt(data.iAcid); - NWNX_PushArgumentInt(data.iMagical); - NWNX_PushArgumentInt(data.iSlash); - NWNX_PushArgumentInt(data.iPierce); - NWNX_PushArgumentInt(data.iBludgeoning); - - NWNX_CallFunction(NWNX_Damage, sFunc); + NWNXCall(NWNX_Damage, "SetDamageEventData"); } void NWNX_Damage_SetAttackEventScript(string sScript, object oOwner=OBJECT_INVALID) { - string sFunc = "SetEventScript"; - - NWNX_PushArgumentObject(oOwner); - NWNX_PushArgumentString(sScript); - NWNX_PushArgumentString("ATTACK"); - - NWNX_CallFunction(NWNX_Damage, sFunc); + NWNXPushObject(oOwner); + NWNXPushString(sScript); + NWNXPushString("ATTACK"); + NWNXCall(NWNX_Damage, "SetEventScript"); } struct NWNX_Damage_AttackEventData NWNX_Damage_GetAttackEventData() { - string sFunc = "GetAttackEventData"; struct NWNX_Damage_AttackEventData data; - - NWNX_CallFunction(NWNX_Damage, sFunc); - - data.oTarget = NWNX_GetReturnValueObject(); - data.iBludgeoning = NWNX_GetReturnValueInt(); - data.iPierce = NWNX_GetReturnValueInt(); - data.iSlash = NWNX_GetReturnValueInt(); - data.iMagical = NWNX_GetReturnValueInt(); - data.iAcid = NWNX_GetReturnValueInt(); - data.iCold = NWNX_GetReturnValueInt(); - data.iDivine = NWNX_GetReturnValueInt(); - data.iElectrical = NWNX_GetReturnValueInt(); - data.iFire = NWNX_GetReturnValueInt(); - data.iNegative = NWNX_GetReturnValueInt(); - data.iPositive = NWNX_GetReturnValueInt(); - data.iSonic = NWNX_GetReturnValueInt(); - data.iBase = NWNX_GetReturnValueInt(); - data.iCustom1 = NWNX_GetReturnValueInt(); - data.iCustom2 = NWNX_GetReturnValueInt(); - data.iCustom3 = NWNX_GetReturnValueInt(); - data.iCustom4 = NWNX_GetReturnValueInt(); - data.iCustom5 = NWNX_GetReturnValueInt(); - data.iCustom6 = NWNX_GetReturnValueInt(); - data.iCustom7 = NWNX_GetReturnValueInt(); - data.iCustom8 = NWNX_GetReturnValueInt(); - data.iCustom9 = NWNX_GetReturnValueInt(); - data.iCustom10 = NWNX_GetReturnValueInt(); - data.iCustom11 = NWNX_GetReturnValueInt(); - data.iCustom12 = NWNX_GetReturnValueInt(); - data.iCustom13 = NWNX_GetReturnValueInt(); - data.iCustom14 = NWNX_GetReturnValueInt(); - data.iCustom15 = NWNX_GetReturnValueInt(); - data.iCustom16 = NWNX_GetReturnValueInt(); - data.iCustom17 = NWNX_GetReturnValueInt(); - data.iCustom18 = NWNX_GetReturnValueInt(); - data.iCustom19 = NWNX_GetReturnValueInt(); - data.iAttackNumber = NWNX_GetReturnValueInt(); - data.iAttackResult = NWNX_GetReturnValueInt(); - data.iWeaponAttackType = NWNX_GetReturnValueInt(); - data.iSneakAttack = NWNX_GetReturnValueInt(); - data.bKillingBlow = NWNX_GetReturnValueInt(); - data.iAttackType = NWNX_GetReturnValueInt(); - data.iToHitRoll = NWNX_GetReturnValueInt(); - data.iToHitModifier = NWNX_GetReturnValueInt(); - + NWNXCall(NWNX_Damage, "GetAttackEventData"); + data.oTarget = NWNXPopObject(); + data.iBludgeoning = NWNXPopInt(); + data.iPierce = NWNXPopInt(); + data.iSlash = NWNXPopInt(); + data.iMagical = NWNXPopInt(); + data.iAcid = NWNXPopInt(); + data.iCold = NWNXPopInt(); + data.iDivine = NWNXPopInt(); + data.iElectrical = NWNXPopInt(); + data.iFire = NWNXPopInt(); + data.iNegative = NWNXPopInt(); + data.iPositive = NWNXPopInt(); + data.iSonic = NWNXPopInt(); + data.iBase = NWNXPopInt(); + data.iCustom1 = NWNXPopInt(); + data.iCustom2 = NWNXPopInt(); + data.iCustom3 = NWNXPopInt(); + data.iCustom4 = NWNXPopInt(); + data.iCustom5 = NWNXPopInt(); + data.iCustom6 = NWNXPopInt(); + data.iCustom7 = NWNXPopInt(); + data.iCustom8 = NWNXPopInt(); + data.iCustom9 = NWNXPopInt(); + data.iCustom10 = NWNXPopInt(); + data.iCustom11 = NWNXPopInt(); + data.iCustom12 = NWNXPopInt(); + data.iCustom13 = NWNXPopInt(); + data.iCustom14 = NWNXPopInt(); + data.iCustom15 = NWNXPopInt(); + data.iCustom16 = NWNXPopInt(); + data.iCustom17 = NWNXPopInt(); + data.iCustom18 = NWNXPopInt(); + data.iCustom19 = NWNXPopInt(); + data.iAttackNumber = NWNXPopInt(); + data.iAttackResult = NWNXPopInt(); + data.iWeaponAttackType = NWNXPopInt(); + data.iSneakAttack = NWNXPopInt(); + data.bKillingBlow = NWNXPopInt(); + data.iAttackType = NWNXPopInt(); + data.iToHitRoll = NWNXPopInt(); + data.iToHitModifier = NWNXPopInt(); return data; } void NWNX_Damage_SetAttackEventData(struct NWNX_Damage_AttackEventData data) { - string sFunc = "SetAttackEventData"; - - NWNX_PushArgumentInt(data.iSneakAttack); - NWNX_PushArgumentInt(data.iAttackResult); - NWNX_PushArgumentInt(data.iCustom19); - NWNX_PushArgumentInt(data.iCustom18); - NWNX_PushArgumentInt(data.iCustom17); - NWNX_PushArgumentInt(data.iCustom16); - NWNX_PushArgumentInt(data.iCustom15); - NWNX_PushArgumentInt(data.iCustom14); - NWNX_PushArgumentInt(data.iCustom13); - NWNX_PushArgumentInt(data.iCustom12); - NWNX_PushArgumentInt(data.iCustom11); - NWNX_PushArgumentInt(data.iCustom10); - NWNX_PushArgumentInt(data.iCustom9); - NWNX_PushArgumentInt(data.iCustom8); - NWNX_PushArgumentInt(data.iCustom7); - NWNX_PushArgumentInt(data.iCustom6); - NWNX_PushArgumentInt(data.iCustom5); - NWNX_PushArgumentInt(data.iCustom4); - NWNX_PushArgumentInt(data.iCustom3); - NWNX_PushArgumentInt(data.iCustom2); - NWNX_PushArgumentInt(data.iCustom1); - NWNX_PushArgumentInt(data.iBase); - NWNX_PushArgumentInt(data.iSonic); - NWNX_PushArgumentInt(data.iPositive); - NWNX_PushArgumentInt(data.iNegative); - NWNX_PushArgumentInt(data.iFire); - NWNX_PushArgumentInt(data.iElectrical); - NWNX_PushArgumentInt(data.iDivine); - NWNX_PushArgumentInt(data.iCold); - NWNX_PushArgumentInt(data.iAcid); - NWNX_PushArgumentInt(data.iMagical); - NWNX_PushArgumentInt(data.iSlash); - NWNX_PushArgumentInt(data.iPierce); - NWNX_PushArgumentInt(data.iBludgeoning); - - NWNX_CallFunction(NWNX_Damage, sFunc); + NWNXPushInt(data.iSneakAttack); + NWNXPushInt(data.iAttackResult); + NWNXPushInt(data.iCustom19); + NWNXPushInt(data.iCustom18); + NWNXPushInt(data.iCustom17); + NWNXPushInt(data.iCustom16); + NWNXPushInt(data.iCustom15); + NWNXPushInt(data.iCustom14); + NWNXPushInt(data.iCustom13); + NWNXPushInt(data.iCustom12); + NWNXPushInt(data.iCustom11); + NWNXPushInt(data.iCustom10); + NWNXPushInt(data.iCustom9); + NWNXPushInt(data.iCustom8); + NWNXPushInt(data.iCustom7); + NWNXPushInt(data.iCustom6); + NWNXPushInt(data.iCustom5); + NWNXPushInt(data.iCustom4); + NWNXPushInt(data.iCustom3); + NWNXPushInt(data.iCustom2); + NWNXPushInt(data.iCustom1); + NWNXPushInt(data.iBase); + NWNXPushInt(data.iSonic); + NWNXPushInt(data.iPositive); + NWNXPushInt(data.iNegative); + NWNXPushInt(data.iFire); + NWNXPushInt(data.iElectrical); + NWNXPushInt(data.iDivine); + NWNXPushInt(data.iCold); + NWNXPushInt(data.iAcid); + NWNXPushInt(data.iMagical); + NWNXPushInt(data.iSlash); + NWNXPushInt(data.iPierce); + NWNXPushInt(data.iBludgeoning); + NWNXCall(NWNX_Damage, "SetAttackEventData"); } void NWNX_Damage_DealDamage(struct NWNX_Damage_DamageData data, object oTarget, object oSource, int iRanged = FALSE) { - string sFunc = "DealDamage"; - - NWNX_PushArgumentInt(iRanged); - NWNX_PushArgumentInt(data.iPower); - NWNX_PushArgumentInt(data.iCustom19); - NWNX_PushArgumentInt(data.iCustom18); - NWNX_PushArgumentInt(data.iCustom17); - NWNX_PushArgumentInt(data.iCustom16); - NWNX_PushArgumentInt(data.iCustom15); - NWNX_PushArgumentInt(data.iCustom14); - NWNX_PushArgumentInt(data.iCustom13); - NWNX_PushArgumentInt(data.iCustom12); - NWNX_PushArgumentInt(data.iCustom11); - NWNX_PushArgumentInt(data.iCustom10); - NWNX_PushArgumentInt(data.iCustom9); - NWNX_PushArgumentInt(data.iCustom8); - NWNX_PushArgumentInt(data.iCustom7); - NWNX_PushArgumentInt(data.iCustom6); - NWNX_PushArgumentInt(data.iCustom5); - NWNX_PushArgumentInt(data.iCustom4); - NWNX_PushArgumentInt(data.iCustom3); - NWNX_PushArgumentInt(data.iCustom2); - NWNX_PushArgumentInt(data.iCustom1); - NWNX_PushArgumentInt(0);// Padding for Base Damage - NWNX_PushArgumentInt(data.iSonic); - NWNX_PushArgumentInt(data.iPositive); - NWNX_PushArgumentInt(data.iNegative); - NWNX_PushArgumentInt(data.iFire); - NWNX_PushArgumentInt(data.iElectrical); - NWNX_PushArgumentInt(data.iDivine); - NWNX_PushArgumentInt(data.iCold); - NWNX_PushArgumentInt(data.iAcid); - NWNX_PushArgumentInt(data.iMagical); - NWNX_PushArgumentInt(data.iSlash); - NWNX_PushArgumentInt(data.iPierce); - NWNX_PushArgumentInt(data.iBludgeoning); - NWNX_PushArgumentObject(oTarget); - NWNX_PushArgumentObject(oSource); - - NWNX_CallFunction(NWNX_Damage, sFunc); + NWNXPushInt(iRanged); + NWNXPushInt(data.iPower); + NWNXPushInt(data.iCustom19); + NWNXPushInt(data.iCustom18); + NWNXPushInt(data.iCustom17); + NWNXPushInt(data.iCustom16); + NWNXPushInt(data.iCustom15); + NWNXPushInt(data.iCustom14); + NWNXPushInt(data.iCustom13); + NWNXPushInt(data.iCustom12); + NWNXPushInt(data.iCustom11); + NWNXPushInt(data.iCustom10); + NWNXPushInt(data.iCustom9); + NWNXPushInt(data.iCustom8); + NWNXPushInt(data.iCustom7); + NWNXPushInt(data.iCustom6); + NWNXPushInt(data.iCustom5); + NWNXPushInt(data.iCustom4); + NWNXPushInt(data.iCustom3); + NWNXPushInt(data.iCustom2); + NWNXPushInt(data.iCustom1); + NWNXPushInt(0);// Padding for Base Damage + NWNXPushInt(data.iSonic); + NWNXPushInt(data.iPositive); + NWNXPushInt(data.iNegative); + NWNXPushInt(data.iFire); + NWNXPushInt(data.iElectrical); + NWNXPushInt(data.iDivine); + NWNXPushInt(data.iCold); + NWNXPushInt(data.iAcid); + NWNXPushInt(data.iMagical); + NWNXPushInt(data.iSlash); + NWNXPushInt(data.iPierce); + NWNXPushInt(data.iBludgeoning); + NWNXPushObject(oTarget); + NWNXPushObject(oSource); + NWNXCall(NWNX_Damage, "DealDamage"); } diff --git a/_module/nss/nwnx_dialog.nss b/_module/nss/nwnx_dialog.nss index 83c5efb6..f270c5cc 100644 --- a/_module/nss/nwnx_dialog.nss +++ b/_module/nss/nwnx_dialog.nss @@ -3,8 +3,6 @@ /// @{ /// @file nwnx_dialog.nss -#include "nwnx" - const string NWNX_Dialog = "NWNX_Dialog"; ///< @private /// @name Dialog Node Types @@ -80,60 +78,46 @@ void NWNX_Dialog_End(object oObject); int NWNX_Dialog_GetCurrentNodeType() { - string sFunc = "GetCurrentNodeType"; - - NWNX_CallFunction(NWNX_Dialog, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_Dialog, "GetCurrentNodeType"); + return NWNXPopInt(); } int NWNX_Dialog_GetCurrentScriptType() { - string sFunc = "GetCurrentScriptType"; - - NWNX_CallFunction(NWNX_Dialog, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_Dialog, "GetCurrentScriptType"); + return NWNXPopInt(); } int NWNX_Dialog_GetCurrentNodeID() { - string sFunc = "GetCurrentNodeID"; - - NWNX_CallFunction(NWNX_Dialog, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_Dialog, "GetCurrentNodeID"); + return NWNXPopInt(); } int NWNX_Dialog_GetCurrentNodeIndex() { - string sFunc = "GetCurrentNodeIndex"; - - NWNX_CallFunction(NWNX_Dialog, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_Dialog, "GetCurrentNodeIndex"); + return NWNXPopInt(); } string NWNX_Dialog_GetCurrentNodeText(int language=NWNX_DIALOG_LANGUAGE_ENGLISH, int gender=GENDER_MALE) { - string sFunc = "GetCurrentNodeText"; - - NWNX_PushArgumentInt(gender); - NWNX_PushArgumentInt(language); - NWNX_CallFunction(NWNX_Dialog, sFunc); - return NWNX_GetReturnValueString(); + NWNXPushInt(gender); + NWNXPushInt(language); + NWNXCall(NWNX_Dialog, "GetCurrentNodeText"); + return NWNXPopString(); } void NWNX_Dialog_SetCurrentNodeText(string text, int language=NWNX_DIALOG_LANGUAGE_ENGLISH, int gender=GENDER_MALE) { - string sFunc = "SetCurrentNodeText"; - - NWNX_PushArgumentInt(gender); - NWNX_PushArgumentInt(language); - NWNX_PushArgumentString(text); - NWNX_CallFunction(NWNX_Dialog, sFunc); + NWNXPushInt(gender); + NWNXPushInt(language); + NWNXPushString(text); + NWNXCall(NWNX_Dialog, "SetCurrentNodeText"); } void NWNX_Dialog_End(object oObject) { - string sFunc = "End"; - - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Dialog, sFunc); + NWNXPushObject(oObject); + NWNXCall(NWNX_Dialog, "End"); } diff --git a/_module/nss/nwnx_effect.nss b/_module/nss/nwnx_effect.nss index ffb619ba..1107db35 100644 --- a/_module/nss/nwnx_effect.nss +++ b/_module/nss/nwnx_effect.nss @@ -2,7 +2,6 @@ /// @brief Utility functions to manipulate the builtin effect type. /// @{ /// @file nwnx_effect.nss -#include "nwnx" const string NWNX_Effect = "NWNX_Effect"; ///< @private @@ -143,52 +142,46 @@ effect NWNX_Effect_GetAppliedEffect(object oObject, int nNth); /// @} -struct NWNX_EffectUnpacked __NWNX_Effect_ResolveUnpack(string sFunc, int bLink=TRUE) +struct NWNX_EffectUnpacked __NWNX_Effect_ResolveUnpack(int bLink=TRUE) { struct NWNX_EffectUnpacked n; - n.sItemProp = NWNX_GetReturnValueString(); + n.sItemProp = NWNXPopString(); - n.sTag = NWNX_GetReturnValueString(); + n.sTag = NWNXPopString(); - float fZ = NWNX_GetReturnValueFloat(); - float fY = NWNX_GetReturnValueFloat(); - float fX = NWNX_GetReturnValueFloat(); - n.vParam1 = Vector(fX, fY, fZ); - fZ = NWNX_GetReturnValueFloat(); - fY = NWNX_GetReturnValueFloat(); - fX = NWNX_GetReturnValueFloat(); - n.vParam0 = Vector(fX, fY, fZ); - n.oParam3 = NWNX_GetReturnValueObject(); - n.oParam2 = NWNX_GetReturnValueObject(); - n.oParam1 = NWNX_GetReturnValueObject(); - n.oParam0 = NWNX_GetReturnValueObject(); - n.sParam5 = NWNX_GetReturnValueString(); - n.sParam4 = NWNX_GetReturnValueString(); - n.sParam3 = NWNX_GetReturnValueString(); - n.sParam2 = NWNX_GetReturnValueString(); - n.sParam1 = NWNX_GetReturnValueString(); - n.sParam0 = NWNX_GetReturnValueString(); - n.fParam3 = NWNX_GetReturnValueFloat(); - n.fParam2 = NWNX_GetReturnValueFloat(); - n.fParam1 = NWNX_GetReturnValueFloat(); - n.fParam0 = NWNX_GetReturnValueFloat(); - n.nParam7 = NWNX_GetReturnValueInt(); - n.nParam6 = NWNX_GetReturnValueInt(); - n.nParam5 = NWNX_GetReturnValueInt(); - n.nParam4 = NWNX_GetReturnValueInt(); - n.nParam3 = NWNX_GetReturnValueInt(); - n.nParam2 = NWNX_GetReturnValueInt(); - n.nParam1 = NWNX_GetReturnValueInt(); - n.nParam0 = NWNX_GetReturnValueInt(); - n.nNumIntegers = NWNX_GetReturnValueInt(); + n.vParam1 = NWNXPopVector(); + n.vParam0 = NWNXPopVector(); + n.oParam3 = NWNXPopObject(); + n.oParam2 = NWNXPopObject(); + n.oParam1 = NWNXPopObject(); + n.oParam0 = NWNXPopObject(); + n.sParam5 = NWNXPopString(); + n.sParam4 = NWNXPopString(); + n.sParam3 = NWNXPopString(); + n.sParam2 = NWNXPopString(); + n.sParam1 = NWNXPopString(); + n.sParam0 = NWNXPopString(); + n.fParam3 = NWNXPopFloat(); + n.fParam2 = NWNXPopFloat(); + n.fParam1 = NWNXPopFloat(); + n.fParam0 = NWNXPopFloat(); + n.nParam7 = NWNXPopInt(); + n.nParam6 = NWNXPopInt(); + n.nParam5 = NWNXPopInt(); + n.nParam4 = NWNXPopInt(); + n.nParam3 = NWNXPopInt(); + n.nParam2 = NWNXPopInt(); + n.nParam1 = NWNXPopInt(); + n.nParam0 = NWNXPopInt(); + n.nNumIntegers = NWNXPopInt(); if(bLink) { - n.bLinkRightValid = NWNX_GetReturnValueInt(); - n.eLinkRight = NWNX_GetReturnValueEffect(); - n.bLinkLeftValid = NWNX_GetReturnValueInt(); - n.eLinkLeft = NWNX_GetReturnValueEffect(); + n.bLinkRightValid = NWNXPopInt(); + n.eLinkRight = NWNXPopEffect(); + n.bLinkLeftValid = NWNXPopInt(); + n.eLinkLeft = NWNXPopEffect(); } else { @@ -196,207 +189,166 @@ struct NWNX_EffectUnpacked __NWNX_Effect_ResolveUnpack(string sFunc, int bLink=T n.bLinkLeftValid = FALSE; } - n.nCasterLevel = NWNX_GetReturnValueInt(); - n.bShowIcon = NWNX_GetReturnValueInt(); - n.bExpose = NWNX_GetReturnValueInt(); - n.nSpellId = NWNX_GetReturnValueInt(); - n.oCreator = NWNX_GetReturnValueObject(); + n.nCasterLevel = NWNXPopInt(); + n.bShowIcon = NWNXPopInt(); + n.bExpose = NWNXPopInt(); + n.nSpellId = NWNXPopInt(); + n.oCreator = NWNXPopObject(); - n.nExpiryTimeOfDay = NWNX_GetReturnValueInt(); - n.nExpiryCalendarDay = NWNX_GetReturnValueInt(); - n.fDuration = NWNX_GetReturnValueFloat(); + n.nExpiryTimeOfDay = NWNXPopInt(); + n.nExpiryCalendarDay = NWNXPopInt(); + n.fDuration = NWNXPopFloat(); - n.nSubType = NWNX_GetReturnValueInt(); - n.nType = NWNX_GetReturnValueInt(); - n.sID = NWNX_GetReturnValueString(); + n.nSubType = NWNXPopInt(); + n.nType = NWNXPopInt(); + n.sID = NWNXPopString(); return n; } -void __NWNX_Effect_ResolvePack(string sFunc, struct NWNX_EffectUnpacked e, int bReplace=FALSE) +void __NWNX_Effect_ResolvePack(struct NWNX_EffectUnpacked e, int bReplace=FALSE) { if(!bReplace) - NWNX_PushArgumentInt(e.nType); + NWNXPushInt(e.nType); - NWNX_PushArgumentInt(e.nSubType); + NWNXPushInt(e.nSubType); - NWNX_PushArgumentFloat(e.fDuration); - NWNX_PushArgumentInt(e.nExpiryCalendarDay); - NWNX_PushArgumentInt(e.nExpiryTimeOfDay); + NWNXPushFloat(e.fDuration); + NWNXPushInt(e.nExpiryCalendarDay); + NWNXPushInt(e.nExpiryTimeOfDay); - NWNX_PushArgumentObject(e.oCreator); - NWNX_PushArgumentInt(e.nSpellId); - NWNX_PushArgumentInt(e.bExpose); - NWNX_PushArgumentInt(e.bShowIcon); - NWNX_PushArgumentInt(e.nCasterLevel); + NWNXPushObject(e.oCreator); + NWNXPushInt(e.nSpellId); + NWNXPushInt(e.bExpose); + NWNXPushInt(e.bShowIcon); + NWNXPushInt(e.nCasterLevel); if(!bReplace) { - NWNX_PushArgumentEffect(e.eLinkLeft); - NWNX_PushArgumentInt(e.bLinkLeftValid); - NWNX_PushArgumentEffect(e.eLinkRight); - NWNX_PushArgumentInt(e.bLinkRightValid); + NWNXPushEffect(e.eLinkLeft); + NWNXPushInt(e.bLinkLeftValid); + NWNXPushEffect(e.eLinkRight); + NWNXPushInt(e.bLinkRightValid); } - NWNX_PushArgumentInt(e.nNumIntegers); - NWNX_PushArgumentInt(e.nParam0); - NWNX_PushArgumentInt(e.nParam1); - NWNX_PushArgumentInt(e.nParam2); - NWNX_PushArgumentInt(e.nParam3); - NWNX_PushArgumentInt(e.nParam4); - NWNX_PushArgumentInt(e.nParam5); - NWNX_PushArgumentInt(e.nParam6); - NWNX_PushArgumentInt(e.nParam7); - NWNX_PushArgumentFloat(e.fParam0); - NWNX_PushArgumentFloat(e.fParam1); - NWNX_PushArgumentFloat(e.fParam2); - NWNX_PushArgumentFloat(e.fParam3); - NWNX_PushArgumentString(e.sParam0); - NWNX_PushArgumentString(e.sParam1); - NWNX_PushArgumentString(e.sParam2); - NWNX_PushArgumentString(e.sParam3); - NWNX_PushArgumentString(e.sParam4); - NWNX_PushArgumentString(e.sParam5); - NWNX_PushArgumentObject(e.oParam0); - NWNX_PushArgumentObject(e.oParam1); - NWNX_PushArgumentObject(e.oParam2); - NWNX_PushArgumentObject(e.oParam3); + NWNXPushInt(e.nNumIntegers); + NWNXPushInt(e.nParam0); + NWNXPushInt(e.nParam1); + NWNXPushInt(e.nParam2); + NWNXPushInt(e.nParam3); + NWNXPushInt(e.nParam4); + NWNXPushInt(e.nParam5); + NWNXPushInt(e.nParam6); + NWNXPushInt(e.nParam7); + NWNXPushFloat(e.fParam0); + NWNXPushFloat(e.fParam1); + NWNXPushFloat(e.fParam2); + NWNXPushFloat(e.fParam3); + NWNXPushString(e.sParam0); + NWNXPushString(e.sParam1); + NWNXPushString(e.sParam2); + NWNXPushString(e.sParam3); + NWNXPushString(e.sParam4); + NWNXPushString(e.sParam5); + NWNXPushObject(e.oParam0); + NWNXPushObject(e.oParam1); + NWNXPushObject(e.oParam2); + NWNXPushObject(e.oParam3); - NWNX_PushArgumentFloat(e.vParam0.x); - NWNX_PushArgumentFloat(e.vParam0.y); - NWNX_PushArgumentFloat(e.vParam0.z); + NWNXPushVector(e.vParam0); + NWNXPushVector(e.vParam1); - NWNX_PushArgumentFloat(e.vParam1.x); - NWNX_PushArgumentFloat(e.vParam1.y); - NWNX_PushArgumentFloat(e.vParam1.z); + NWNXPushString(e.sTag); - NWNX_PushArgumentString(e.sTag); - - NWNX_PushArgumentString(e.sItemProp); + NWNXPushString(e.sItemProp); } struct NWNX_EffectUnpacked NWNX_Effect_UnpackEffect(effect e) { - string sFunc = "UnpackEffect"; - - NWNX_PushArgumentEffect(e); - NWNX_CallFunction(NWNX_Effect, sFunc); - - return __NWNX_Effect_ResolveUnpack(sFunc); + NWNXPushEffect(e); + NWNXCall(NWNX_Effect, "UnpackEffect"); + return __NWNX_Effect_ResolveUnpack(); } effect NWNX_Effect_PackEffect(struct NWNX_EffectUnpacked e) { - string sFunc = "PackEffect"; - - __NWNX_Effect_ResolvePack(sFunc, e); - - NWNX_CallFunction(NWNX_Effect, sFunc); - return NWNX_GetReturnValueEffect(); + __NWNX_Effect_ResolvePack(e); + NWNXCall(NWNX_Effect, "PackEffect"); + return NWNXPopEffect(); } int NWNX_Effect_ReplaceEffect(object obj, effect eOld, effect eNew) { - string sFunc = "ReplaceEffect"; - - NWNX_PushArgumentEffect(eNew); - NWNX_PushArgumentEffect(eOld); - NWNX_PushArgumentObject(obj); - - NWNX_CallFunction(NWNX_Effect, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushEffect(eNew); + NWNXPushEffect(eOld); + NWNXPushObject(obj); + NWNXCall(NWNX_Effect, "ReplaceEffect"); + return NWNXPopInt(); } int NWNX_Effect_GetTrueEffectCount(object oObject) { - string sFunc = "GetTrueEffectCount"; - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Effect, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oObject); + NWNXCall(NWNX_Effect, "GetTrueEffectCount"); + return NWNXPopInt(); } struct NWNX_EffectUnpacked NWNX_Effect_GetTrueEffect(object oObject, int nIndex) { - string sFunc = "GetTrueEffect"; - NWNX_PushArgumentInt(nIndex); - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Effect, sFunc); - - return __NWNX_Effect_ResolveUnpack(sFunc, FALSE); + NWNXPushInt(nIndex); + NWNXPushObject(oObject); + NWNXCall(NWNX_Effect, "GetTrueEffect"); + return __NWNX_Effect_ResolveUnpack(FALSE); } void NWNX_Effect_ReplaceEffectByIndex(object oObject, int nIndex, struct NWNX_EffectUnpacked e) { - string sFunc = "ReplaceEffectByIndex"; - - __NWNX_Effect_ResolvePack(sFunc, e, TRUE); - - NWNX_PushArgumentInt(nIndex); - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Effect, sFunc); + __NWNX_Effect_ResolvePack(e, TRUE); + NWNXPushInt(nIndex); + NWNXPushObject(oObject); + NWNXCall(NWNX_Effect, "ReplaceEffectByIndex"); } int NWNX_Effect_RemoveEffectById(object oObject, string sID) { - string sFunc = "RemoveEffectById"; - NWNX_PushArgumentString(sID); - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Effect, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushString(sID); + NWNXPushObject(oObject); + NWNXCall(NWNX_Effect, "RemoveEffectById"); + return NWNXPopInt(); } void NWNX_Effect_Apply(effect eEffect, object oObject) { - string sFunc = "Apply"; - NWNX_PushArgumentObject(oObject); - NWNX_PushArgumentEffect(eEffect); - NWNX_CallFunction(NWNX_Effect, sFunc); + NWNXPushObject(oObject); + NWNXPushEffect(eEffect); + NWNXCall(NWNX_Effect, "Apply"); } effect NWNX_Effect_SetEffectCreator(effect eEffect, object oObject) { - string sFunc = "SetEffectCreator"; - - NWNX_PushArgumentObject(oObject); - NWNX_PushArgumentEffect(eEffect); - - NWNX_CallFunction(NWNX_Effect, sFunc); - - return NWNX_GetReturnValueEffect(); + NWNXPushObject(oObject); + NWNXPushEffect(eEffect); + NWNXCall(NWNX_Effect, "SetEffectCreator"); + return NWNXPopEffect(); } int NWNX_Effect_GetIsEffectValid(effect eEffect) { - string sFunc = "GetIsEffectValid"; - - NWNX_PushArgumentEffect(eEffect); - - NWNX_CallFunction(NWNX_Effect, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushEffect(eEffect); + NWNXCall(NWNX_Effect, "GetIsEffectValid"); + return NWNXPopInt(); } int NWNX_Effect_GetAppliedEffectCount(object oObject) { - string sFunc = "GetAppliedEffectCount"; - - NWNX_PushArgumentObject(oObject); - - NWNX_CallFunction(NWNX_Effect, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oObject); + NWNXCall(NWNX_Effect, "GetAppliedEffectCount"); + return NWNXPopInt(); } effect NWNX_Effect_GetAppliedEffect(object oObject, int nNth) { - string sFunc = "GetAppliedEffect"; - - NWNX_PushArgumentInt(nNth); - NWNX_PushArgumentObject(oObject); - - NWNX_CallFunction(NWNX_Effect, sFunc); - - return NWNX_GetReturnValueEffect(); + NWNXPushInt(nNth); + NWNXPushObject(oObject); + NWNXCall(NWNX_Effect, "GetAppliedEffect"); + return NWNXPopEffect(); } diff --git a/_module/nss/nwnx_elc.nss b/_module/nss/nwnx_elc.nss index 362bac2e..57bb7fbf 100644 --- a/_module/nss/nwnx_elc.nss +++ b/_module/nss/nwnx_elc.nss @@ -2,7 +2,6 @@ /// @brief Replacement for ValidateCharacter: ELC & ILR /// @{ /// @file nwnx_elc.nss -#include "nwnx" const string NWNX_ELC = "NWNX_ELC"; ///< @private @@ -147,95 +146,71 @@ int NWNX_ELC_GetValidationFailureSpellID(); void NWNX_ELC_SetELCScript(string sScript) { - string sFunc = "SetELCScript"; - - NWNX_PushArgumentString(sScript); - NWNX_CallFunction(NWNX_ELC, sFunc); + NWNXPushString(sScript); + NWNXCall(NWNX_ELC, "SetELCScript"); } void NWNX_ELC_EnableCustomELCCheck(int bEnabled) { - string sFunc = "EnableCustomELCCheck"; - - NWNX_PushArgumentInt(bEnabled); - NWNX_CallFunction(NWNX_ELC, sFunc); + NWNXPushInt(bEnabled); + NWNXCall(NWNX_ELC, "EnableCustomELCCheck"); } void NWNX_ELC_SkipValidationFailure() { - string sFunc = "SkipValidationFailure"; - - NWNX_CallFunction(NWNX_ELC, sFunc); + NWNXCall(NWNX_ELC, "SkipValidationFailure"); } int NWNX_ELC_GetValidationFailureType() { - string sFunc = "GetValidationFailureType"; - - NWNX_CallFunction(NWNX_ELC, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_ELC, "GetValidationFailureType"); + return NWNXPopInt(); } int NWNX_ELC_GetValidationFailureSubType() { - string sFunc = "GetValidationFailureSubType"; - - NWNX_CallFunction(NWNX_ELC, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_ELC, "GetValidationFailureSubType"); + return NWNXPopInt(); } int NWNX_ELC_GetValidationFailureMessageStrRef() { - string sFunc = "GetValidationFailureMessageStrRef"; - - NWNX_CallFunction(NWNX_ELC, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_ELC, "GetValidationFailureMessageStrRef"); + return NWNXPopInt(); } void NWNX_ELC_SetValidationFailureMessageStrRef(int nStrRef) { - string sFunc = "SetValidationFailureMessageStrRef"; - - NWNX_PushArgumentInt(nStrRef); - NWNX_CallFunction(NWNX_ELC, sFunc); + NWNXPushInt(nStrRef); + NWNXCall(NWNX_ELC, "SetValidationFailureMessageStrRef"); } object NWNX_ELC_GetValidationFailureItem() { - string sFunc = "GetValidationFailureItem"; - - NWNX_CallFunction(NWNX_ELC, sFunc); - return NWNX_GetReturnValueObject(); + NWNXCall(NWNX_ELC, "GetValidationFailureItem"); + return NWNXPopObject(); } int NWNX_ELC_GetValidationFailureLevel() { - string sFunc = "GetValidationFailureLevel"; - - NWNX_CallFunction(NWNX_ELC, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_ELC, "GetValidationFailureLevel"); + return NWNXPopInt(); } int NWNX_ELC_GetValidationFailureSkillID() { - string sFunc = "GetValidationFailureSkillID"; - - NWNX_CallFunction(NWNX_ELC, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_ELC, "GetValidationFailureSkillID"); + return NWNXPopInt(); } int NWNX_ELC_GetValidationFailureFeatID() { - string sFunc = "GetValidationFailureFeatID"; - - NWNX_CallFunction(NWNX_ELC, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_ELC, "GetValidationFailureFeatID"); + return NWNXPopInt(); } int NWNX_ELC_GetValidationFailureSpellID() { - string sFunc = "GetValidationFailureSpellID"; - - NWNX_CallFunction(NWNX_ELC, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_ELC, "GetValidationFailureSpellID"); + return NWNXPopInt(); } diff --git a/_module/nss/nwnx_encounter.nss b/_module/nss/nwnx_encounter.nss index c067de31..8aadcabe 100644 --- a/_module/nss/nwnx_encounter.nss +++ b/_module/nss/nwnx_encounter.nss @@ -2,7 +2,6 @@ /// @brief Functions exposing additional encounter properties. /// @{ /// @file nwnx_encounter.nss -#include "nwnx" const string NWNX_Encounter = "NWNX_Encounter"; ///< @private @@ -122,205 +121,146 @@ void NWNX_Encounter_SetGeometry(object oTrigger, string sGeometry); void NWNX_Encounter_Destroy(object encounter) { - string sFunc = "Destroy"; - - NWNX_PushArgumentObject(encounter); - NWNX_CallFunction(NWNX_Encounter, sFunc); + NWNXPushObject(encounter); + NWNXCall(NWNX_Encounter, "Destroy"); } int NWNX_Encounter_GetNumberOfCreaturesInEncounterList(object encounter) { - string sFunc = "GetNumberOfCreaturesInEncounterList"; - - NWNX_PushArgumentObject(encounter); - NWNX_CallFunction(NWNX_Encounter, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(encounter); + NWNXCall(NWNX_Encounter, "GetNumberOfCreaturesInEncounterList"); + return NWNXPopInt(); } struct NWNX_Encounter_CreatureListEntry NWNX_Encounter_GetEncounterCreatureByIndex(object encounter, int index) { - string sFunc = "GetEncounterCreatureByIndex"; struct NWNX_Encounter_CreatureListEntry creatureEntry; - - NWNX_PushArgumentInt(index); - NWNX_PushArgumentObject(encounter); - - NWNX_CallFunction(NWNX_Encounter, sFunc); - - creatureEntry.alreadyUsed = NWNX_GetReturnValueInt(); - creatureEntry.unique = NWNX_GetReturnValueInt(); - creatureEntry.challengeRating = NWNX_GetReturnValueFloat(); - creatureEntry.resref = NWNX_GetReturnValueString(); - + NWNXPushInt(index); + NWNXPushObject(encounter); + NWNXCall(NWNX_Encounter, "GetEncounterCreatureByIndex"); + creatureEntry.alreadyUsed = NWNXPopInt(); + creatureEntry.unique = NWNXPopInt(); + creatureEntry.challengeRating = NWNXPopFloat(); + creatureEntry.resref = NWNXPopString(); return creatureEntry; } void NWNX_Encounter_SetEncounterCreatureByIndex(object encounter, int index, struct NWNX_Encounter_CreatureListEntry creatureEntry) { - string sFunc = "SetEncounterCreatureByIndex"; - - NWNX_PushArgumentInt(creatureEntry.alreadyUsed); - NWNX_PushArgumentInt(creatureEntry.unique); - NWNX_PushArgumentFloat(creatureEntry.challengeRating); - NWNX_PushArgumentString(creatureEntry.resref); - NWNX_PushArgumentInt(index); - NWNX_PushArgumentObject(encounter); - - NWNX_CallFunction(NWNX_Encounter, sFunc); + NWNXPushInt(creatureEntry.alreadyUsed); + NWNXPushInt(creatureEntry.unique); + NWNXPushFloat(creatureEntry.challengeRating); + NWNXPushString(creatureEntry.resref); + NWNXPushInt(index); + NWNXPushObject(encounter); + NWNXCall(NWNX_Encounter, "SetEncounterCreatureByIndex"); } int NWNX_Encounter_GetFactionId(object encounter) { - string sFunc = "GetFactionId"; - - NWNX_PushArgumentObject(encounter); - NWNX_CallFunction(NWNX_Encounter, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(encounter); + NWNXCall(NWNX_Encounter, "GetFactionId"); + return NWNXPopInt(); } void NWNX_Encounter_SetFactionId(object encounter, int factionId) { - string sFunc = "SetFactionId"; - - NWNX_PushArgumentInt(factionId); - NWNX_PushArgumentObject(encounter); - - NWNX_CallFunction(NWNX_Encounter, sFunc); + NWNXPushInt(factionId); + NWNXPushObject(encounter); + NWNXCall(NWNX_Encounter, "SetFactionId"); } int NWNX_Encounter_GetPlayerTriggeredOnly(object encounter) { - string sFunc = "GetPlayerTriggeredOnly"; - - NWNX_PushArgumentObject(encounter); - NWNX_CallFunction(NWNX_Encounter, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(encounter); + NWNXCall(NWNX_Encounter, "GetPlayerTriggeredOnly"); + return NWNXPopInt(); } void NWNX_Encounter_SetPlayerTriggeredOnly(object encounter, int playerTriggeredOnly) { - string sFunc = "SetPlayerTriggeredOnly"; - NWNX_PushArgumentInt(playerTriggeredOnly); - NWNX_PushArgumentObject(encounter); - - NWNX_CallFunction(NWNX_Encounter, sFunc); + NWNXPushInt(playerTriggeredOnly); + NWNXPushObject(encounter); + NWNXCall(NWNX_Encounter, "SetPlayerTriggeredOnly"); } int NWNX_Encounter_GetCanReset(object encounter) { - string sFunc = "GetCanReset"; - - NWNX_PushArgumentObject(encounter); - NWNX_CallFunction(NWNX_Encounter, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(encounter); + NWNXCall(NWNX_Encounter, "GetCanReset"); + return NWNXPopInt(); } void NWNX_Encounter_SetCanReset(object encounter, int reset) { - string sFunc = "SetCanReset"; - - NWNX_PushArgumentInt(reset); - NWNX_PushArgumentObject(encounter); - - NWNX_CallFunction(NWNX_Encounter, sFunc); + NWNXPushInt(reset); + NWNXPushObject(encounter); + NWNXCall(NWNX_Encounter, "SetCanReset"); } int NWNX_Encounter_GetResetTime(object encounter) { - string sFunc = "GetResetTime"; - - NWNX_PushArgumentObject(encounter); - NWNX_CallFunction(NWNX_Encounter, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(encounter); + NWNXCall(NWNX_Encounter, "GetResetTime"); + return NWNXPopInt(); } void NWNX_Encounter_SetResetTime(object encounter, int resetTime) { - string sFunc = "SetResetTime"; - - NWNX_PushArgumentInt(resetTime); - NWNX_PushArgumentObject(encounter); - - NWNX_CallFunction(NWNX_Encounter, sFunc); + NWNXPushInt(resetTime); + NWNXPushObject(encounter); + NWNXCall(NWNX_Encounter, "SetResetTime"); } int NWNX_Encounter_GetNumberOfSpawnPoints(object encounter) { - string sFunc = "GetNumberOfSpawnPoints"; - - NWNX_PushArgumentObject(encounter); - NWNX_CallFunction(NWNX_Encounter, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(encounter); + NWNXCall(NWNX_Encounter, "GetNumberOfSpawnPoints"); + return NWNXPopInt(); } location NWNX_Encounter_GetSpawnPointByIndex(object encounter, int index) { - string sFunc = "GetSpawnPointByIndex"; - - NWNX_PushArgumentInt(index); - NWNX_PushArgumentObject(encounter); - NWNX_CallFunction(NWNX_Encounter, sFunc); - - float o = NWNX_GetReturnValueFloat(); - float z = NWNX_GetReturnValueFloat(); - float y = NWNX_GetReturnValueFloat(); - float x = NWNX_GetReturnValueFloat(); - - return Location(GetArea(encounter), Vector(x, y, z), o); + NWNXPushInt(index); + NWNXPushObject(encounter); + NWNXCall(NWNX_Encounter, "GetSpawnPointByIndex"); + float fOrientation = NWNXPopFloat(); + vector vPosition = NWNXPopVector(); + return Location(GetArea(encounter), vPosition, fOrientation); } int NWNX_Encounter_GetMinNumSpawned(object encounter) { - string sFunc = "GetMinNumSpawned"; - - NWNX_PushArgumentObject(encounter); - NWNX_CallFunction(NWNX_Encounter, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(encounter); + NWNXCall(NWNX_Encounter, "GetMinNumSpawned"); + return NWNXPopInt(); } int NWNX_Encounter_GetMaxNumSpawned(object encounter) { - string sFunc = "GetMaxNumSpawned"; - - NWNX_PushArgumentObject(encounter); - NWNX_CallFunction(NWNX_Encounter, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(encounter); + NWNXCall(NWNX_Encounter, "GetMaxNumSpawned"); + return NWNXPopInt(); } int NWNX_Encounter_GetCurrentNumSpawned(object encounter) { - string sFunc = "GetCurrentNumSpawned"; - - NWNX_PushArgumentObject(encounter); - NWNX_CallFunction(NWNX_Encounter, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(encounter); + NWNXCall(NWNX_Encounter, "GetCurrentNumSpawned"); + return NWNXPopInt(); } string NWNX_Encounter_GetGeometry(object oEncounter) { - string sFunc = "GetGeometry"; - - NWNX_PushArgumentObject(oEncounter); - NWNX_CallFunction(NWNX_Encounter, sFunc); - - return NWNX_GetReturnValueString(); + NWNXPushObject(oEncounter); + NWNXCall(NWNX_Encounter, "GetGeometry"); + return NWNXPopString(); } void NWNX_Encounter_SetGeometry(object oEncounter, string sGeometry) { - string sFunc = "SetGeometry"; - - NWNX_PushArgumentString(sGeometry); - NWNX_PushArgumentObject(oEncounter); - NWNX_CallFunction(NWNX_Encounter, sFunc); + NWNXPushString(sGeometry); + NWNXPushObject(oEncounter); + NWNXCall(NWNX_Encounter, "SetGeometry"); } diff --git a/_module/nss/nwnx_events.nss b/_module/nss/nwnx_events.nss index cd6ce5c8..41c0f476 100644 --- a/_module/nss/nwnx_events.nss +++ b/_module/nss/nwnx_events.nss @@ -2,7 +2,6 @@ /// @brief Provides an interface for plugins to create event-based systems, and exposes some events through that interface. /// @{ /// @file nwnx_events.nss -#include "nwnx" const string NWNX_Events = "NWNX_Events"; ///< @private @@ -562,6 +561,11 @@ _______________________________________ `OBJECT_SELF` = The player disconnecting from the server + Event Data Tag | Type | Notes + ----------------------|--------|------- + PLAYER_NAME | string | Player name of the disconnecting client + CDKEY | string | Public cdkey of the disconnecting client + @note This event also runs when a player connects to the server but cancels out of character select. OBJECT_SELF will be OBJECT_INVALID in this case. @@ -1650,6 +1654,18 @@ _______________________________________ NWNX_Events_AddIDToWhitelist("NWNX_ON_BROADCAST_SAFE_PROJECTILE_SPELL", SPELL_*); \endcode `TARGET_OBJECT_ID` will be `OBJECT_INVALID` if the projectile is cast at a location +_______________________________________ + ## SetExperience Events + - NWNX_ON_SET_EXPERIENCE_BEFORE + - NWNX_ON_SET_EXPERIENCE_AFTER + + `OBJECT_SELF` = The player the xp is being set on + + Event Data Tag | Type | Notes + ----------------------|--------|------- + XP | int | The xp value to be set. | + + @note To set a different xp value in the BEFORE event: Skip the event and call NWNX_Events_SetEventResult() with the new value. _______________________________________ ## Broadcast Attack of Opportunity Events - NWNX_ON_BROADCAST_ATTACK_OF_OPPORTUNITY_BEFORE @@ -2282,6 +2298,7 @@ string NWNX_Events_GetEventData(string tag); /// - Broadcast Safe Projectile event /// - Attack of Opportunity events /// - Creature Jump events +/// - SetExperience Events void NWNX_Events_SkipEvent(); /// Set the return value of the event. @@ -2355,163 +2372,127 @@ int NWNX_Events_GetNumSubscribers(string sEvent); void NWNX_Events_SubscribeEvent(string evt, string script) { - string sFunc = "SubscribeEvent"; - - NWNX_PushArgumentString(script); - NWNX_PushArgumentString(evt); - NWNX_CallFunction(NWNX_Events, sFunc); + NWNXPushString(script); + NWNXPushString(evt); + NWNXCall(NWNX_Events, "SubscribeEvent"); } void NWNX_Events_UnsubscribeEvent(string evt, string script) { - string sFunc = "UnsubscribeEvent"; - - NWNX_PushArgumentString(script); - NWNX_PushArgumentString(evt); - NWNX_CallFunction(NWNX_Events, sFunc); + NWNXPushString(script); + NWNXPushString(evt); + NWNXCall(NWNX_Events, "UnsubscribeEvent"); } void NWNX_Events_UnsubscribeAllStartingWith(string prefix) { - string sFunc = "UnsubscribeAllStartingWith"; - - NWNX_PushArgumentString(prefix); - NWNX_CallFunction(NWNX_Events, sFunc); + NWNXPushString(prefix); + NWNXCall(NWNX_Events, "UnsubscribeAllStartingWith"); } void NWNX_Events_SubscribeEventScriptChunk(string sEvent, string sScriptChunk, int bWrapIntoMain = TRUE) { - string sFunc = "SubscribeEventScriptChunk"; - - NWNX_PushArgumentInt(bWrapIntoMain); - NWNX_PushArgumentString(sScriptChunk); - NWNX_PushArgumentString(sEvent); - NWNX_CallFunction(NWNX_Events, sFunc); + NWNXPushInt(bWrapIntoMain); + NWNXPushString(sScriptChunk); + NWNXPushString(sEvent); + NWNXCall(NWNX_Events, "SubscribeEventScriptChunk"); } void NWNX_Events_UnsubscribeEventScriptChunk(string sEvent, string sScriptChunk, int bWrapIntoMain = TRUE) { - string sFunc = "UnsubscribeEventScriptChunk"; - - NWNX_PushArgumentInt(bWrapIntoMain); - NWNX_PushArgumentString(sScriptChunk); - NWNX_PushArgumentString(sEvent); - NWNX_CallFunction(NWNX_Events, sFunc); + NWNXPushInt(bWrapIntoMain); + NWNXPushString(sScriptChunk); + NWNXPushString(sEvent); + NWNXCall(NWNX_Events, "UnsubscribeEventScriptChunk"); } void NWNX_Events_PushEventData(string tag, string data) { - string sFunc = "PushEventData"; - - NWNX_PushArgumentString(data); - NWNX_PushArgumentString(tag); - NWNX_CallFunction(NWNX_Events, sFunc); + NWNXPushString(data); + NWNXPushString(tag); + NWNXCall(NWNX_Events, "PushEventData"); } int NWNX_Events_SignalEvent(string evt, object target) { - string sFunc = "SignalEvent"; - - NWNX_PushArgumentObject(target); - NWNX_PushArgumentString(evt); - NWNX_CallFunction(NWNX_Events, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(target); + NWNXPushString(evt); + NWNXCall(NWNX_Events, "SignalEvent"); + return NWNXPopInt(); } string NWNX_Events_GetEventData(string tag) { - string sFunc = "GetEventData"; - - NWNX_PushArgumentString(tag); - NWNX_CallFunction(NWNX_Events, sFunc); - return NWNX_GetReturnValueString(); + NWNXPushString(tag); + NWNXCall(NWNX_Events, "GetEventData"); + return NWNXPopString(); } void NWNX_Events_SkipEvent() { - string sFunc = "SkipEvent"; - - NWNX_CallFunction(NWNX_Events, sFunc); + NWNXCall(NWNX_Events, "SkipEvent"); } void NWNX_Events_SetEventResult(string data) { - string sFunc = "SetEventResult"; - - NWNX_PushArgumentString(data); - NWNX_CallFunction(NWNX_Events, sFunc); + NWNXPushString(data); + NWNXCall(NWNX_Events, "SetEventResult"); } string NWNX_Events_GetCurrentEvent() { - string sFunc = "GetCurrentEvent"; - - NWNX_CallFunction(NWNX_Events, sFunc); - return NWNX_GetReturnValueString(); + NWNXCall(NWNX_Events, "GetCurrentEvent"); + return NWNXPopString(); } void NWNX_Events_ToggleDispatchListMode(string sEvent, string sScriptOrChunk, int bEnable) { - string sFunc = "ToggleDispatchListMode"; - - NWNX_PushArgumentInt(bEnable); - NWNX_PushArgumentString(sScriptOrChunk); - NWNX_PushArgumentString(sEvent); - NWNX_CallFunction(NWNX_Events, sFunc); + NWNXPushInt(bEnable); + NWNXPushString(sScriptOrChunk); + NWNXPushString(sEvent); + NWNXCall(NWNX_Events, "ToggleDispatchListMode"); } void NWNX_Events_AddObjectToDispatchList(string sEvent, string sScriptOrChunk, object oObject) { - string sFunc = "AddObjectToDispatchList"; - - NWNX_PushArgumentObject(oObject); - NWNX_PushArgumentString(sScriptOrChunk); - NWNX_PushArgumentString(sEvent); - NWNX_CallFunction(NWNX_Events, sFunc); + NWNXPushObject(oObject); + NWNXPushString(sScriptOrChunk); + NWNXPushString(sEvent); + NWNXCall(NWNX_Events, "AddObjectToDispatchList"); } void NWNX_Events_RemoveObjectFromDispatchList(string sEvent, string sScriptOrChunk, object oObject) { - string sFunc = "RemoveObjectFromDispatchList"; - - NWNX_PushArgumentObject(oObject); - NWNX_PushArgumentString(sScriptOrChunk); - NWNX_PushArgumentString(sEvent); - NWNX_CallFunction(NWNX_Events, sFunc); + NWNXPushObject(oObject); + NWNXPushString(sScriptOrChunk); + NWNXPushString(sEvent); + NWNXCall(NWNX_Events, "RemoveObjectFromDispatchList"); } void NWNX_Events_ToggleIDWhitelist(string sEvent, int bEnable) { - string sFunc = "ToggleIDWhitelist"; - - NWNX_PushArgumentInt(bEnable); - NWNX_PushArgumentString(sEvent); - NWNX_CallFunction(NWNX_Events, sFunc); + NWNXPushInt(bEnable); + NWNXPushString(sEvent); + NWNXCall(NWNX_Events, "ToggleIDWhitelist"); } void NWNX_Events_AddIDToWhitelist(string sEvent, int nID) { - string sFunc = "AddIDToWhitelist"; - - NWNX_PushArgumentInt(nID); - NWNX_PushArgumentString(sEvent); - NWNX_CallFunction(NWNX_Events, sFunc); + NWNXPushInt(nID); + NWNXPushString(sEvent); + NWNXCall(NWNX_Events, "AddIDToWhitelist"); } void NWNX_Events_RemoveIDFromWhitelist(string sEvent, int nID) { - string sFunc = "RemoveIDFromWhitelist"; - - NWNX_PushArgumentInt(nID); - NWNX_PushArgumentString(sEvent); - NWNX_CallFunction(NWNX_Events, sFunc); + NWNXPushInt(nID); + NWNXPushString(sEvent); + NWNXCall(NWNX_Events, "RemoveIDFromWhitelist"); } int NWNX_Events_GetNumSubscribers(string sEvent) { - string sFunc = "GetNumSubscribers"; - - NWNX_PushArgumentString(sEvent); - NWNX_CallFunction(NWNX_Events, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushString(sEvent); + NWNXCall(NWNX_Events, "GetNumSubscribers"); + return NWNXPopInt(); } diff --git a/_module/nss/nwnx_feat.nss b/_module/nss/nwnx_feat.nss index 19746a6d..8b9468ea 100644 --- a/_module/nss/nwnx_feat.nss +++ b/_module/nss/nwnx_feat.nss @@ -2,7 +2,6 @@ /// @brief Define feat bonuses/penalties /// @{ /// @file nwnx_feat.nss -#include "nwnx" const string NWNX_Feat = "NWNX_Feat"; ///< @private @@ -53,14 +52,11 @@ void NWNX_Feat_SetFeatModifier(int iFeat, int iMod, int iParam1 = 0xDEADBEEF, in void NWNX_Feat_SetFeatModifier(int iFeat, int iMod, int iParam1 = 0xDEADBEEF, int iParam2 = 0xDEADBEEF, int iParam3 = 0xDEADBEEF, int iParam4 = 0xDEADBEEF) { - string sFunc = "SetFeatModifier"; - - NWNX_PushArgumentInt(iParam4); - NWNX_PushArgumentInt(iParam3); - NWNX_PushArgumentInt(iParam2); - NWNX_PushArgumentInt(iParam1); - NWNX_PushArgumentInt(iMod); - NWNX_PushArgumentInt(iFeat); - - NWNX_CallFunction(NWNX_Feat, sFunc); + NWNXPushInt(iParam4); + NWNXPushInt(iParam3); + NWNXPushInt(iParam2); + NWNXPushInt(iParam1); + NWNXPushInt(iMod); + NWNXPushInt(iFeat); + NWNXCall(NWNX_Feat, "SetFeatModifier"); } diff --git a/_module/nss/nwnx_feedback.nss b/_module/nss/nwnx_feedback.nss index 3e56e075..daf3280c 100644 --- a/_module/nss/nwnx_feedback.nss +++ b/_module/nss/nwnx_feedback.nss @@ -10,7 +10,6 @@ /// * -1 = Personal state is not set for Message /// @{ /// @file nwnx_feedback.nss -#include "nwnx" const string NWNX_Feedback = "NWNX_Feedback"; ///< @private @@ -402,95 +401,69 @@ void NWNX_Feedback_SetCombatLogMessageMode(int bWhitelist); int NWNX_Feedback_GetFeedbackMessageHidden(int nMessage, object oPC = OBJECT_INVALID) { - string sFunc = "GetMessageHidden"; - int nMessageType = 0; - - NWNX_PushArgumentInt(nMessage); - NWNX_PushArgumentInt(nMessageType); - NWNX_PushArgumentObject(oPC); - NWNX_CallFunction(NWNX_Feedback, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(nMessage); + NWNXPushInt(0); + NWNXPushObject(oPC); + NWNXCall(NWNX_Feedback, "GetMessageHidden"); + return NWNXPopInt(); } void NWNX_Feedback_SetFeedbackMessageHidden(int nMessage, int isHidden, object oPC = OBJECT_INVALID) { - string sFunc = "SetMessageHidden"; - int nMessageType = 0; - - NWNX_PushArgumentInt(isHidden); - NWNX_PushArgumentInt(nMessage); - NWNX_PushArgumentInt(nMessageType); - NWNX_PushArgumentObject(oPC); - NWNX_CallFunction(NWNX_Feedback, sFunc); + NWNXPushInt(isHidden); + NWNXPushInt(nMessage); + NWNXPushInt(0); + NWNXPushObject(oPC); + NWNXCall(NWNX_Feedback, "SetMessageHidden"); } int NWNX_Feedback_GetCombatLogMessageHidden(int nMessage, object oPC = OBJECT_INVALID) { - string sFunc = "GetMessageHidden"; - int nMessageType = 1; + NWNXPushInt(nMessage); + NWNXPushInt(1); + NWNXPushObject(oPC); + NWNXCall(NWNX_Feedback, "GetMessageHidden"); - NWNX_PushArgumentInt(nMessage); - NWNX_PushArgumentInt(nMessageType); - NWNX_PushArgumentObject(oPC); - NWNX_CallFunction(NWNX_Feedback, sFunc); - - return NWNX_GetReturnValueInt(); + return NWNXPopInt(); } void NWNX_Feedback_SetCombatLogMessageHidden(int nMessage, int isHidden, object oPC = OBJECT_INVALID) { - string sFunc = "SetMessageHidden"; - int nMessageType = 1; - - NWNX_PushArgumentInt(isHidden); - NWNX_PushArgumentInt(nMessage); - NWNX_PushArgumentInt(nMessageType); - NWNX_PushArgumentObject(oPC); - NWNX_CallFunction(NWNX_Feedback, sFunc); + NWNXPushInt(isHidden); + NWNXPushInt(nMessage); + NWNXPushInt(1); + NWNXPushObject(oPC); + NWNXCall(NWNX_Feedback, "SetMessageHidden"); } int NWNX_Feedback_GetJournalUpdatedMessageHidden(object oPC = OBJECT_INVALID) { - string sFunc = "GetMessageHidden"; - int nMessageType = 2; - - NWNX_PushArgumentInt(0); - NWNX_PushArgumentInt(nMessageType); - NWNX_PushArgumentObject(oPC); - NWNX_CallFunction(NWNX_Feedback, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(0); + NWNXPushInt(2); + NWNXPushObject(oPC); + NWNXCall(NWNX_Feedback, "GetMessageHidden"); + return NWNXPopInt(); } void NWNX_Feedback_SetJournalUpdatedMessageHidden(int isHidden, object oPC = OBJECT_INVALID) { - string sFunc = "SetMessageHidden"; - int nMessageType = 2; - - NWNX_PushArgumentInt(isHidden); - NWNX_PushArgumentInt(0); - NWNX_PushArgumentInt(nMessageType); - NWNX_PushArgumentObject(oPC); - NWNX_CallFunction(NWNX_Feedback, sFunc); + NWNXPushInt(isHidden); + NWNXPushInt(0); + NWNXPushInt(2); + NWNXPushObject(oPC); + NWNXCall(NWNX_Feedback, "SetMessageHidden"); } void NWNX_Feedback_SetFeedbackMessageMode(int bWhitelist) { - string sFunc = "SetFeedbackMode"; - int nMessageType = 0; - - NWNX_PushArgumentInt(bWhitelist); - NWNX_PushArgumentInt(nMessageType); - NWNX_CallFunction(NWNX_Feedback, sFunc); + NWNXPushInt(bWhitelist); + NWNXPushInt(0); + NWNXCall(NWNX_Feedback, "SetFeedbackMode"); } void NWNX_Feedback_SetCombatLogMessageMode(int bWhitelist) { - string sFunc = "SetFeedbackMode"; - int nMessageType = 1; - - NWNX_PushArgumentInt(bWhitelist); - NWNX_PushArgumentInt(nMessageType); - NWNX_CallFunction(NWNX_Feedback, sFunc); + NWNXPushInt(bWhitelist); + NWNXPushInt(1); + NWNXCall(NWNX_Feedback, "SetFeedbackMode"); } diff --git a/_module/nss/nwnx_httpclient.nss b/_module/nss/nwnx_httpclient.nss new file mode 100644 index 00000000..878dc3dd --- /dev/null +++ b/_module/nss/nwnx_httpclient.nss @@ -0,0 +1,107 @@ +/// @addtogroup httpclient HTTPClient +/// @brief NWNX HTTPClient +/// @{ +/// @file nwnx_httpclient.nss + +const string NWNX_HTTPClient = "NWNX_HTTPClient"; ///< @private + +/// @name Request Types +/// @anchor request_types +/// +/// @{ +const int NWNX_HTTPCLIENT_REQUEST_METHOD_GET = 0; +const int NWNX_HTTPCLIENT_REQUEST_METHOD_POST = 1; +const int NWNX_HTTPCLIENT_REQUEST_METHOD_DELETE = 2; +const int NWNX_HTTPCLIENT_REQUEST_METHOD_PATCH = 3; +const int NWNX_HTTPCLIENT_REQUEST_METHOD_PUT = 4; +const int NWNX_HTTPCLIENT_REQUEST_METHOD_OPTION = 5; +const int NWNX_HTTPCLIENT_REQUEST_METHOD_HEAD = 6; +///@} + +/// @name Content Types +/// @anchor content_types +/// +/// @{ +const int NWNX_HTTPCLIENT_CONTENT_TYPE_HTML = 0; +const int NWNX_HTTPCLIENT_CONTENT_TYPE_PLAINTEXT = 1; +const int NWNX_HTTPCLIENT_CONTENT_TYPE_JSON = 2; +const int NWNX_HTTPCLIENT_CONTENT_TYPE_FORM_URLENCODED = 3; +const int NWNX_HTTPCLIENT_CONTENT_TYPE_XML = 4; +///@} + +/// @name HTTP Authentication Types +/// @anchor auth_types +/// +/// @{ +const int NWNX_HTTPCLIENT_AUTH_TYPE_NONE = 0; +const int NWNX_HTTPCLIENT_AUTH_TYPE_BASIC = 1; +const int NWNX_HTTPCLIENT_AUTH_TYPE_DIGEST = 2; +const int NWNX_HTTPCLIENT_AUTH_TYPE_BEARER_TOKEN = 3; +///@} + +/// A structure for an HTTP Client Request +struct NWNX_HTTPClient_Request +{ + int nRequestMethod; ///< A @ref request_types "Request Type" + string sTag; ///< A unique tag for this request + string sHost; ///< The host domain name/IP address + string sPath; ///< The path for the url (include the leading /) + string sData; ///< The data being sent + int nContentType; ///< A @ref content_types "Content Type" + int nAuthType; ///< An @ref auth_types "Authentication Type" + string sAuthUserOrToken; ///< The authentication username or token + string sAuthPassword; ///< The authentication password (ignored if just using a token) + int nPort; ///< The host port + string sHeaders; ///< Pipe (|) delimited header pairs, e.g. "User-Agent: My NWNX HTTP Client|Accept: application/vnd.github.v3+json" +}; + +/// @brief Sends an http method to the given host. +/// @param s The structured NWNX_HTTPClient_Request information. +/// @return A unique identifier for the request for later access in the REQUEST_ID event data. +int NWNX_HTTPClient_SendRequest(struct NWNX_HTTPClient_Request s); + +/// @brief Returns an NWNX_HTTP_Client_Request structure +/// @param nRequestId The request id returned from NWNX_HTTPClient_SendRequest() +/// @return The structured NWNX_HTTPClient_Request information +struct NWNX_HTTPClient_Request NWNX_HTTPClient_GetRequest(int nRequestId); + +/// @} + +int NWNX_HTTPClient_SendRequest(struct NWNX_HTTPClient_Request s) +{ + NWNXPushString(s.sHeaders); + NWNXPushInt(s.nPort); + NWNXPushString(s.sAuthPassword); + NWNXPushString(s.sAuthUserOrToken); + NWNXPushInt(s.nAuthType); + NWNXPushString(s.sData); + NWNXPushInt(s.nContentType); + NWNXPushString(s.sPath); + NWNXPushString(s.sHost); + NWNXPushInt(s.nRequestMethod); + NWNXPushString(s.sTag); + NWNXCall(NWNX_HTTPClient, "SendRequest"); + return NWNXPopInt(); +} + +struct NWNX_HTTPClient_Request NWNX_HTTPClient_GetRequest(int nRequestId) +{ + NWNXPushInt(nRequestId); + NWNXCall(NWNX_HTTPClient, "GetRequest"); + + struct NWNX_HTTPClient_Request s; + + s.sTag = NWNXPopString(); + s.nRequestMethod = NWNXPopInt(); + s.sHost = NWNXPopString(); + s.sPath = NWNXPopString(); + s.nContentType = NWNXPopInt(); + s.sData = NWNXPopString(); + s.nAuthType = NWNXPopInt(); + s.sAuthUserOrToken = NWNXPopString(); + s.sAuthPassword = NWNXPopString(); + s.nPort = NWNXPopInt(); + s.sHeaders = NWNXPopString(); + + return s; +} diff --git a/_module/nss/nwnx_item.nss b/_module/nss/nwnx_item.nss index 01cd4ac0..c1d8779c 100644 --- a/_module/nss/nwnx_item.nss +++ b/_module/nss/nwnx_item.nss @@ -2,7 +2,6 @@ /// @brief Functions exposing additional item properties. /// @{ /// @file nwnx_item.nss -#include "nwnx" const string NWNX_Item = "NWNX_Item"; ///< @private @@ -134,169 +133,120 @@ int NWNX_Item_GetMinEquipLevelOverride(object oItem); void NWNX_Item_SetWeight(object oItem, int w) { - string sFunc = "SetWeight"; - - NWNX_PushArgumentInt(w); - NWNX_PushArgumentObject(oItem); - - NWNX_CallFunction(NWNX_Item, sFunc); + NWNXPushInt(w); + NWNXPushObject(oItem); + NWNXCall(NWNX_Item, "SetWeight"); } void NWNX_Item_SetBaseGoldPieceValue(object oItem, int g) { - string sFunc = "SetBaseGoldPieceValue"; - - NWNX_PushArgumentInt(g); - NWNX_PushArgumentObject(oItem); - - NWNX_CallFunction(NWNX_Item, sFunc); + NWNXPushInt(g); + NWNXPushObject(oItem); + NWNXCall(NWNX_Item, "SetBaseGoldPieceValue"); } void NWNX_Item_SetAddGoldPieceValue(object oItem, int g) { - string sFunc = "SetAddGoldPieceValue"; - - NWNX_PushArgumentInt(g); - NWNX_PushArgumentObject(oItem); - - NWNX_CallFunction(NWNX_Item, sFunc); + NWNXPushInt(g); + NWNXPushObject(oItem); + NWNXCall(NWNX_Item, "SetAddGoldPieceValue"); } int NWNX_Item_GetBaseGoldPieceValue(object oItem) { - string sFunc = "GetBaseGoldPieceValue"; - - NWNX_PushArgumentObject(oItem); - - NWNX_CallFunction(NWNX_Item, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(oItem); + NWNXCall(NWNX_Item, "GetBaseGoldPieceValue"); + return NWNXPopInt(); } int NWNX_Item_GetAddGoldPieceValue(object oItem) { - string sFunc = "GetAddGoldPieceValue"; - - NWNX_PushArgumentObject(oItem); - - NWNX_CallFunction(NWNX_Item, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(oItem); + NWNXCall(NWNX_Item, "GetAddGoldPieceValue"); + return NWNXPopInt(); } void NWNX_Item_SetBaseItemType(object oItem, int nBaseItem) { - string sFunc = "SetBaseItemType"; - - NWNX_PushArgumentInt(nBaseItem); - NWNX_PushArgumentObject(oItem); - - NWNX_CallFunction(NWNX_Item, sFunc); + NWNXPushInt(nBaseItem); + NWNXPushObject(oItem); + NWNXCall(NWNX_Item, "SetBaseItemType"); } void NWNX_Item_SetItemAppearance(object oItem, int nType, int nIndex, int nValue, int bUpdateCreatureAppearance = FALSE) { - string sFunc = "SetItemAppearance"; - - NWNX_PushArgumentInt(bUpdateCreatureAppearance); - NWNX_PushArgumentInt(nValue); - NWNX_PushArgumentInt(nIndex); - NWNX_PushArgumentInt(nType); - NWNX_PushArgumentObject(oItem); - - NWNX_CallFunction(NWNX_Item, sFunc); - + NWNXPushInt(bUpdateCreatureAppearance); + NWNXPushInt(nValue); + NWNXPushInt(nIndex); + NWNXPushInt(nType); + NWNXPushObject(oItem); + NWNXCall(NWNX_Item, "SetItemAppearance"); } string NWNX_Item_GetEntireItemAppearance(object oItem) { - string sFunc = "GetEntireItemAppearance"; - - NWNX_PushArgumentObject(oItem); - - NWNX_CallFunction(NWNX_Item, sFunc); - return NWNX_GetReturnValueString(); + NWNXPushObject(oItem); + NWNXCall(NWNX_Item, "GetEntireItemAppearance"); + return NWNXPopString(); } void NWNX_Item_RestoreItemAppearance(object oItem, string sApp) { - string sFunc = "RestoreItemAppearance"; - - NWNX_PushArgumentString(sApp); - NWNX_PushArgumentObject(oItem); - - NWNX_CallFunction(NWNX_Item, sFunc); + NWNXPushString(sApp); + NWNXPushObject(oItem); + NWNXCall(NWNX_Item, "RestoreItemAppearance"); } int NWNX_Item_GetBaseArmorClass(object oItem) { - string sFunc = "GetBaseArmorClass"; - - NWNX_PushArgumentObject(oItem); - - NWNX_CallFunction(NWNX_Item, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(oItem); + NWNXCall(NWNX_Item, "GetBaseArmorClass"); + return NWNXPopInt(); } int NWNX_Item_GetMinEquipLevel(object oItem) { - string sFunc = "GetMinEquipLevel"; - - NWNX_PushArgumentObject(oItem); - - NWNX_CallFunction(NWNX_Item, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(oItem); + NWNXCall(NWNX_Item, "GetMinEquipLevel"); + return NWNXPopInt(); } int NWNX_Item_MoveTo(object oItem, object oTarget, int bHideAllFeedback = FALSE) { - string sFunc = "MoveTo"; - - NWNX_PushArgumentInt(bHideAllFeedback); - NWNX_PushArgumentObject(oTarget); - NWNX_PushArgumentObject(oItem); - - NWNX_CallFunction(NWNX_Item, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(bHideAllFeedback); + NWNXPushObject(oTarget); + NWNXPushObject(oItem); + NWNXCall(NWNX_Item, "MoveTo"); + return NWNXPopInt(); } void NWNX_Item_SetMinEquipLevelModifier(object oItem, int nModifier, int bPersist = TRUE) { - string sFunc = "SetMinEquipLevelModifier"; - - NWNX_PushArgumentInt(bPersist); - NWNX_PushArgumentInt(nModifier); - NWNX_PushArgumentObject(oItem); - - NWNX_CallFunction(NWNX_Item, sFunc); + NWNXPushInt(bPersist); + NWNXPushInt(nModifier); + NWNXPushObject(oItem); + NWNXCall(NWNX_Item, "SetMinEquipLevelModifier"); } int NWNX_Item_GetMinEquipLevelModifier(object oItem) { - string sFunc = "GetMinEquipLevelModifier"; - - NWNX_PushArgumentObject(oItem); - - NWNX_CallFunction(NWNX_Item, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(oItem); + NWNXCall(NWNX_Item, "GetMinEquipLevelModifier"); + return NWNXPopInt(); } void NWNX_Item_SetMinEquipLevelOverride(object oItem, int nOverride, int bPersist = TRUE) { - string sFunc = "SetMinEquipLevelOverride"; - NWNX_PushArgumentInt(bPersist); - NWNX_PushArgumentInt(nOverride); - NWNX_PushArgumentObject(oItem); - - NWNX_CallFunction(NWNX_Item, sFunc); + NWNXPushInt(bPersist); + NWNXPushInt(nOverride); + NWNXPushObject(oItem); + NWNXCall(NWNX_Item, "SetMinEquipLevelOverride"); } int NWNX_Item_GetMinEquipLevelOverride(object oItem) { - string sFunc = "GetMinEquipLevelOverride"; - - NWNX_PushArgumentObject(oItem); - - NWNX_CallFunction(NWNX_Item, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(oItem); + NWNXCall(NWNX_Item, "GetMinEquipLevelOverride"); + return NWNXPopInt(); } diff --git a/_module/nss/nwnx_itemprop.nss b/_module/nss/nwnx_itemprop.nss index 2e84b3f0..d956add0 100644 --- a/_module/nss/nwnx_itemprop.nss +++ b/_module/nss/nwnx_itemprop.nss @@ -2,7 +2,6 @@ /// @brief Utility functions to manipulate the builtin itemproperty type. /// @{ /// @file nwnx_itemprop.nss -#include "nwnx" const string NWNX_ItemProperty = "NWNX_ItemProperty"; ///< @private @@ -44,70 +43,58 @@ struct NWNX_IPUnpacked NWNX_ItemProperty_GetActiveProperty(object oItem, int nIn struct NWNX_IPUnpacked NWNX_ItemProperty_UnpackIP(itemproperty ip) { - string sFunc = "UnpackIP"; - - NWNX_PushArgumentItemProperty(ip); - NWNX_CallFunction(NWNX_ItemProperty, sFunc); - + NWNXPushItemProperty(ip); + NWNXCall(NWNX_ItemProperty, "UnpackIP"); struct NWNX_IPUnpacked n; - - n.sID = NWNX_GetReturnValueString(); - n.nProperty = NWNX_GetReturnValueInt(); - n.nSubType = NWNX_GetReturnValueInt(); - n.nCostTable = NWNX_GetReturnValueInt(); - n.nCostTableValue = NWNX_GetReturnValueInt(); - n.nParam1 = NWNX_GetReturnValueInt(); - n.nParam1Value = NWNX_GetReturnValueInt(); - n.nUsesPerDay = NWNX_GetReturnValueInt(); - n.nChanceToAppear = NWNX_GetReturnValueInt(); - n.bUsable = NWNX_GetReturnValueInt(); - n.nSpellId = NWNX_GetReturnValueInt(); - n.oCreator = NWNX_GetReturnValueObject(); - n.sTag = NWNX_GetReturnValueString(); - + n.sID = NWNXPopString(); + n.nProperty = NWNXPopInt(); + n.nSubType = NWNXPopInt(); + n.nCostTable = NWNXPopInt(); + n.nCostTableValue = NWNXPopInt(); + n.nParam1 = NWNXPopInt(); + n.nParam1Value = NWNXPopInt(); + n.nUsesPerDay = NWNXPopInt(); + n.nChanceToAppear = NWNXPopInt(); + n.bUsable = NWNXPopInt(); + n.nSpellId = NWNXPopInt(); + n.oCreator = NWNXPopObject(); + n.sTag = NWNXPopString(); return n; } itemproperty NWNX_ItemProperty_PackIP(struct NWNX_IPUnpacked n) { - string sFunc = "PackIP"; - - NWNX_PushArgumentString(n.sTag); - NWNX_PushArgumentObject(n.oCreator); - NWNX_PushArgumentInt(n.nSpellId); - NWNX_PushArgumentInt(n.bUsable); - NWNX_PushArgumentInt(n.nChanceToAppear); - NWNX_PushArgumentInt(n.nUsesPerDay); - NWNX_PushArgumentInt(n.nParam1Value); - NWNX_PushArgumentInt(n.nParam1); - NWNX_PushArgumentInt(n.nCostTableValue); - NWNX_PushArgumentInt(n.nCostTable); - NWNX_PushArgumentInt(n.nSubType); - NWNX_PushArgumentInt(n.nProperty); - - NWNX_CallFunction(NWNX_ItemProperty, sFunc); - return NWNX_GetReturnValueItemProperty(); + NWNXPushString(n.sTag); + NWNXPushObject(n.oCreator); + NWNXPushInt(n.nSpellId); + NWNXPushInt(n.bUsable); + NWNXPushInt(n.nChanceToAppear); + NWNXPushInt(n.nUsesPerDay); + NWNXPushInt(n.nParam1Value); + NWNXPushInt(n.nParam1); + NWNXPushInt(n.nCostTableValue); + NWNXPushInt(n.nCostTable); + NWNXPushInt(n.nSubType); + NWNXPushInt(n.nProperty); + NWNXCall(NWNX_ItemProperty, "PackIP"); + return NWNXPopItemProperty(); } struct NWNX_IPUnpacked NWNX_ItemProperty_GetActiveProperty(object oItem, int nIndex) { - string sFunc = "GetActiveProperty"; - NWNX_PushArgumentInt(nIndex); - NWNX_PushArgumentObject(oItem); - NWNX_CallFunction(NWNX_ItemProperty, sFunc); - + NWNXPushInt(nIndex); + NWNXPushObject(oItem); + NWNXCall(NWNX_ItemProperty, "GetActiveProperty"); struct NWNX_IPUnpacked n; - - n.nProperty = NWNX_GetReturnValueInt(); - n.nSubType = NWNX_GetReturnValueInt(); - n.nCostTable = NWNX_GetReturnValueInt(); - n.nCostTableValue = NWNX_GetReturnValueInt(); - n.nParam1 = NWNX_GetReturnValueInt(); - n.nParam1Value = NWNX_GetReturnValueInt(); - n.nUsesPerDay = NWNX_GetReturnValueInt(); - n.nChanceToAppear = NWNX_GetReturnValueInt(); - n.bUsable = NWNX_GetReturnValueInt(); - n.sTag = NWNX_GetReturnValueString(); - + n.nProperty = NWNXPopInt(); + n.nSubType = NWNXPopInt(); + n.nCostTable = NWNXPopInt(); + n.nCostTableValue = NWNXPopInt(); + n.nParam1 = NWNXPopInt(); + n.nParam1Value = NWNXPopInt(); + n.nUsesPerDay = NWNXPopInt(); + n.nChanceToAppear = NWNXPopInt(); + n.bUsable = NWNXPopInt(); + n.sTag = NWNXPopString(); return n; } diff --git a/_module/nss/nwnx_lua.nss b/_module/nss/nwnx_lua.nss index 60a645ae..42bf158e 100644 --- a/_module/nss/nwnx_lua.nss +++ b/_module/nss/nwnx_lua.nss @@ -2,7 +2,6 @@ /// @brief Execute Lua code and generate events in NWScript /// @{ /// @file nwnx_lua.nss -#include "nwnx" const string NWNX_Lua = "NWNX_Lua"; ///< @private @@ -25,27 +24,21 @@ void NWNX_Lua_RunEvent(string sEvent, object oObject, string sExtra=""); void NWNX_Lua_EvalVoid(string sCode) { - string sFunc = "EvalVoid"; - - NWNX_PushArgumentString(sCode); - NWNX_CallFunction(NWNX_Lua, sFunc); + NWNXPushString(sCode); + NWNXCall(NWNX_Lua, "EvalVoid"); } string NWNX_Lua_Eval(string sCode) { - string sFunc = "Eval"; - - NWNX_PushArgumentString(sCode); - NWNX_CallFunction(NWNX_Lua, sFunc); - return NWNX_GetReturnValueString(); + NWNXPushString(sCode); + NWNXCall(NWNX_Lua, "Eval"); + return NWNXPopString(); } void NWNX_Lua_RunEvent(string sEvent, object oObject, string sExtra="") { - string sFunc = "RunEvent"; - - NWNX_PushArgumentString(sExtra); - NWNX_PushArgumentObject(oObject); - NWNX_PushArgumentString(sEvent); - NWNX_CallFunction(NWNX_Lua, sFunc); + NWNXPushString(sExtra); + NWNXPushObject(oObject); + NWNXPushString(sEvent); + NWNXCall(NWNX_Lua, "RunEvent"); } diff --git a/_module/nss/nwnx_nostack.nss b/_module/nss/nwnx_nostack.nss index 23a55e1b..159214f9 100644 --- a/_module/nss/nwnx_nostack.nss +++ b/_module/nss/nwnx_nostack.nss @@ -2,7 +2,6 @@ /// @brief Functions to allow more control over ability/skill/bonuses stacking. /// @{ /// @file nwnx_nostack.nss -#include "nwnx" const string NWNX_NoStack = "NWNX_NoStack"; ///< @private @@ -31,10 +30,7 @@ void NWNX_NoStack_SetSpellBonusType(int spell, int type); void NWNX_NoStack_SetSpellBonusType(int spell, int type) { - string sFunc = "SetSpellBonusType"; - - NWNX_PushArgumentInt(type); - NWNX_PushArgumentInt(spell); - - NWNX_CallFunction(NWNX_NoStack, sFunc); + NWNXPushInt(type); + NWNXPushInt(spell); + NWNXCall(NWNX_NoStack, "SetSpellBonusType"); } diff --git a/_module/nss/nwnx_nwsqliteext.nss b/_module/nss/nwnx_nwsqliteext.nss index b4b6b717..953a863a 100644 --- a/_module/nss/nwnx_nwsqliteext.nss +++ b/_module/nss/nwnx_nwsqliteext.nss @@ -2,7 +2,6 @@ /// @brief Various extensions for the game's built-in sqlite database. /// @{ /// @file nwnx_nwsqliteext.nss -#include "nwnx" const string NWNX_NWSQLiteExtensions = "NWNX_NWSQLiteExtensions"; ///< @private @@ -17,9 +16,9 @@ int NWNX_NWSQLiteExtensions_CreateVirtual2DATable(string s2DA, string sColumnTyp int NWNX_NWSQLiteExtensions_CreateVirtual2DATable(string s2DA, string sColumnTypeHints = "", string sTableName = "") { - NWNX_PushArgumentString(sTableName); - NWNX_PushArgumentString(sColumnTypeHints); - NWNX_PushArgumentString(s2DA); - NWNX_CallFunction(NWNX_NWSQLiteExtensions, "CreateVirtual2DATable"); - return NWNX_GetReturnValueInt(); + NWNXPushString(sTableName); + NWNXPushString(sColumnTypeHints); + NWNXPushString(s2DA); + NWNXCall(NWNX_NWSQLiteExtensions, "CreateVirtual2DATable"); + return NWNXPopInt(); } diff --git a/_module/nss/nwnx_object.nss b/_module/nss/nwnx_object.nss index acab7d82..9e51a5ea 100644 --- a/_module/nss/nwnx_object.nss +++ b/_module/nss/nwnx_object.nss @@ -2,7 +2,6 @@ /// @brief Functions exposing additional object properties. /// @{ /// @file nwnx_object.nss -#include "nwnx" const string NWNX_Object = "NWNX_Object"; ///< @private @@ -437,641 +436,475 @@ void NWNX_Object_SetLocalizedName(object oObject, string sName, int nLanguage, i int NWNX_Object_GetLocalVariableCount(object obj) { - string sFunc = "GetLocalVariableCount"; - - NWNX_PushArgumentObject(obj); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(obj); + NWNXCall(NWNX_Object, "GetLocalVariableCount"); + return NWNXPopInt(); } struct NWNX_Object_LocalVariable NWNX_Object_GetLocalVariable(object obj, int index) { - string sFunc = "GetLocalVariable"; - - NWNX_PushArgumentInt(index); - NWNX_PushArgumentObject(obj); - NWNX_CallFunction(NWNX_Object, sFunc); - + NWNXPushInt(index); + NWNXPushObject(obj); + NWNXCall(NWNX_Object, "GetLocalVariable"); struct NWNX_Object_LocalVariable var; - var.key = NWNX_GetReturnValueString(); - var.type = NWNX_GetReturnValueInt(); + var.key = NWNXPopString(); + var.type = NWNXPopInt(); return var; } void NWNX_Object_SetPosition(object oObject, vector vPosition, int bUpdateSubareas = TRUE) { - string sFunc = "SetPosition"; - - NWNX_PushArgumentInt(bUpdateSubareas); - NWNX_PushArgumentFloat(vPosition.x); - NWNX_PushArgumentFloat(vPosition.y); - NWNX_PushArgumentFloat(vPosition.z); - NWNX_PushArgumentObject(oObject); - - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushInt(bUpdateSubareas); + NWNXPushVector(vPosition); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "SetPosition"); } int NWNX_Object_GetCurrentHitPoints(object creature) { - string sFunc = "GetCurrentHitPoints"; - - NWNX_PushArgumentObject(creature); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(creature); + NWNXCall(NWNX_Object, "GetCurrentHitPoints"); + return NWNXPopInt(); } void NWNX_Object_SetCurrentHitPoints(object creature, int hp) { - string sFunc = "SetCurrentHitPoints"; - - NWNX_PushArgumentInt(hp); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushInt(hp); + NWNXPushObject(creature); + NWNXCall(NWNX_Object, "SetCurrentHitPoints"); } void NWNX_Object_SetMaxHitPoints(object creature, int hp) { - string sFunc = "SetMaxHitPoints"; - - NWNX_PushArgumentInt(hp); - NWNX_PushArgumentObject(creature); - - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushInt(hp); + NWNXPushObject(creature); + NWNXCall(NWNX_Object, "SetMaxHitPoints"); } string NWNX_Object_Serialize(object obj) { - string sFunc = "Serialize"; - - NWNX_PushArgumentObject(obj); - - NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueString(); + NWNXPushObject(obj); + NWNXCall(NWNX_Object, "Serialize"); + return NWNXPopString(); } object NWNX_Object_Deserialize(string serialized) { - string sFunc = "Deserialize"; - - NWNX_PushArgumentString(serialized); - - NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueObject(); + NWNXPushString(serialized); + NWNXCall(NWNX_Object, "Deserialize"); + return NWNXPopObject(); } string NWNX_Object_GetDialogResref(object obj) { - string sFunc = "GetDialogResref"; - - NWNX_PushArgumentObject(obj); - - NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueString(); + NWNXPushObject(obj); + NWNXCall(NWNX_Object, "GetDialogResref"); + return NWNXPopString(); } void NWNX_Object_SetDialogResref(object obj, string dialog) { - string sFunc = "SetDialogResref"; - - NWNX_PushArgumentString(dialog); - NWNX_PushArgumentObject(obj); - - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushString(dialog); + NWNXPushObject(obj); + NWNXCall(NWNX_Object, "SetDialogResref"); } void NWNX_Object_SetAppearance(object oPlaceable, int nAppearance) { - string sFunc = "SetAppearance"; - - NWNX_PushArgumentInt(nAppearance); - NWNX_PushArgumentObject(oPlaceable); - - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushInt(nAppearance); + NWNXPushObject(oPlaceable); + NWNXCall(NWNX_Object, "SetAppearance"); } int NWNX_Object_GetAppearance(object oPlaceable) { - string sFunc = "GetAppearance"; - - NWNX_PushArgumentObject(oPlaceable); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oPlaceable); + NWNXCall(NWNX_Object, "GetAppearance"); + return NWNXPopInt(); } int NWNX_Object_GetHasVisualEffect(object obj, int nVFX) { - string sFunc = "GetHasVisualEffect"; - - NWNX_PushArgumentInt(nVFX); - NWNX_PushArgumentObject(obj); - - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(nVFX); + NWNXPushObject(obj); + NWNXCall(NWNX_Object, "GetHasVisualEffect"); + return NWNXPopInt(); } int NWNX_Object_GetDamageImmunity(object obj, int damageType) { - string sFunc = "GetDamageImmunity"; - - NWNX_PushArgumentInt(damageType); - NWNX_PushArgumentObject(obj); - - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(damageType); + NWNXPushObject(obj); + NWNXCall(NWNX_Object, "GetDamageImmunity"); + return NWNXPopInt(); } void NWNX_Object_AddToArea(object obj, object area, vector pos) { - string sFunc = "AddToArea"; - - NWNX_PushArgumentFloat(pos.z); - NWNX_PushArgumentFloat(pos.y); - NWNX_PushArgumentFloat(pos.x); - NWNX_PushArgumentObject(area); - NWNX_PushArgumentObject(obj); - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushVector(pos); + NWNXPushObject(area); + NWNXPushObject(obj); + NWNXCall(NWNX_Object, "AddToArea"); } int NWNX_Object_GetPlaceableIsStatic(object obj) { - string sFunc = "GetPlaceableIsStatic"; - - NWNX_PushArgumentObject(obj); - - NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(obj); + NWNXCall(NWNX_Object, "GetPlaceableIsStatic"); + return NWNXPopInt(); } void NWNX_Object_SetPlaceableIsStatic(object obj, int isStatic) { - string sFunc = "SetPlaceableIsStatic"; - - NWNX_PushArgumentInt(isStatic); - NWNX_PushArgumentObject(obj); - - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushInt(isStatic); + NWNXPushObject(obj); + NWNXCall(NWNX_Object, "SetPlaceableIsStatic"); } int NWNX_Object_GetAutoRemoveKey(object obj) { - string sFunc = "GetAutoRemoveKey"; - - NWNX_PushArgumentObject(obj); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(obj); + NWNXCall(NWNX_Object, "GetAutoRemoveKey"); + return NWNXPopInt(); } void NWNX_Object_SetAutoRemoveKey(object obj, int bRemoveKey) { - string sFunc = "SetAutoRemoveKey"; - - NWNX_PushArgumentInt(bRemoveKey); - NWNX_PushArgumentObject(obj); - - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushInt(bRemoveKey); + NWNXPushObject(obj); + NWNXCall(NWNX_Object, "SetAutoRemoveKey"); } string NWNX_Object_GetTriggerGeometry(object oTrigger) { - string sFunc = "GetTriggerGeometry"; - - NWNX_PushArgumentObject(oTrigger); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueString(); + NWNXPushObject(oTrigger); + NWNXCall(NWNX_Object, "GetTriggerGeometry"); + return NWNXPopString(); } void NWNX_Object_SetTriggerGeometry(object oTrigger, string sGeometry) { - string sFunc = "SetTriggerGeometry"; - - NWNX_PushArgumentString(sGeometry); - NWNX_PushArgumentObject(oTrigger); - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushString(sGeometry); + NWNXPushObject(oTrigger); + NWNXCall(NWNX_Object, "SetTriggerGeometry"); } void NWNX_Object_Export(object oObject, string sFileName, string sAlias = "NWNX") { - string sFunc = "Export"; - - NWNX_PushArgumentString(sAlias); - NWNX_PushArgumentString(sFileName); - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushString(sAlias); + NWNXPushString(sFileName); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "Export"); } int NWNX_Object_GetInt(object oObject, string sVarName) { - string sFunc = "GetInt"; - - NWNX_PushArgumentString(sVarName); - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushString(sVarName); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "GetInt"); + return NWNXPopInt(); } void NWNX_Object_SetInt(object oObject, string sVarName, int nValue, int bPersist) { - string sFunc = "SetInt"; - - NWNX_PushArgumentInt(bPersist); - NWNX_PushArgumentInt(nValue); - NWNX_PushArgumentString(sVarName); - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushInt(bPersist); + NWNXPushInt(nValue); + NWNXPushString(sVarName); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "SetInt"); } void NWNX_Object_DeleteInt(object oObject, string sVarName) { - string sFunc = "DeleteInt"; - - NWNX_PushArgumentString(sVarName); - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushString(sVarName); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "DeleteInt"); } string NWNX_Object_GetString(object oObject, string sVarName) { - string sFunc = "GetString"; - - NWNX_PushArgumentString(sVarName); - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueString(); + NWNXPushString(sVarName); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "GetString"); + return NWNXPopString(); } void NWNX_Object_SetString(object oObject, string sVarName, string sValue, int bPersist) { - string sFunc = "SetString"; - - NWNX_PushArgumentInt(bPersist); - NWNX_PushArgumentString(sValue); - NWNX_PushArgumentString(sVarName); - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushInt(bPersist); + NWNXPushString(sValue); + NWNXPushString(sVarName); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "SetString"); } void NWNX_Object_DeleteString(object oObject, string sVarName) { - string sFunc = "DeleteString"; - - NWNX_PushArgumentString(sVarName); - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushString(sVarName); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "DeleteString"); } float NWNX_Object_GetFloat(object oObject, string sVarName) { - string sFunc = "GetFloat"; - - NWNX_PushArgumentString(sVarName); - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueFloat(); + NWNXPushString(sVarName); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "GetFloat"); + return NWNXPopFloat(); } void NWNX_Object_SetFloat(object oObject, string sVarName, float fValue, int bPersist) { - string sFunc = "SetFloat"; - - NWNX_PushArgumentInt(bPersist); - NWNX_PushArgumentFloat(fValue); - NWNX_PushArgumentString(sVarName); - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushInt(bPersist); + NWNXPushFloat(fValue); + NWNXPushString(sVarName); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "SetFloat"); } void NWNX_Object_DeleteFloat(object oObject, string sVarName) { - string sFunc = "DeleteFloat"; - - NWNX_PushArgumentString(sVarName); - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushString(sVarName); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "DeleteFloat"); } void NWNX_Object_DeleteVarRegex(object oObject, string sRegex) { - string sFunc = "DeleteVarRegex"; - - NWNX_PushArgumentString(sRegex); - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushString(sRegex); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "DeleteVarRegex"); } int NWNX_Object_GetPositionIsInTrigger(object oTrigger, vector vPosition) { - string sFunc = "GetPositionIsInTrigger"; - - NWNX_PushArgumentFloat(vPosition.z); - NWNX_PushArgumentFloat(vPosition.y); - NWNX_PushArgumentFloat(vPosition.x); - NWNX_PushArgumentObject(oTrigger); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushVector(vPosition); + NWNXPushObject(oTrigger); + NWNXCall(NWNX_Object, "GetPositionIsInTrigger"); + return NWNXPopInt(); } int NWNX_Object_GetInternalObjectType(object oObject) { - string sFunc = "GetInternalObjectType"; - - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "GetInternalObjectType"); + return NWNXPopInt(); } int NWNX_Object_AcquireItem(object oObject, object oItem) { - string sFunc = "AcquireItem"; - - NWNX_PushArgumentObject(oItem); - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oItem); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "AcquireItem"); + return NWNXPopInt(); } void NWNX_Object_ClearSpellEffectsOnOthers(object oObject) { - string sFunc = "ClearSpellEffectsOnOthers"; - - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "ClearSpellEffectsOnOthers"); } string NWNX_Object_PeekUUID(object oObject) { - string sFunc = "PeekUUID"; - - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueString(); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "PeekUUID"); + return NWNXPopString(); } int NWNX_Object_GetDoorHasVisibleModel(object oDoor) { - string sFunc = "GetDoorHasVisibleModel"; - - NWNX_PushArgumentObject(oDoor); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oDoor); + NWNXCall(NWNX_Object, "GetDoorHasVisibleModel"); + return NWNXPopInt(); } int NWNX_Object_GetIsDestroyable(object oObject) { - string sFunc = "GetIsDestroyable"; - - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "GetIsDestroyable"); + return NWNXPopInt(); } int NWNX_Object_DoSpellImmunity(object oDefender, object oCaster, int nSpellId=-1) { - string sFunc = "DoSpellImmunity"; - NWNX_PushArgumentInt(nSpellId); - NWNX_PushArgumentObject(oCaster); - NWNX_PushArgumentObject(oDefender); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(nSpellId); + NWNXPushObject(oCaster); + NWNXPushObject(oDefender); + NWNXCall(NWNX_Object, "DoSpellImmunity"); + return NWNXPopInt(); } int NWNX_Object_DoSpellLevelAbsorption(object oDefender, object oCaster, int nSpellId=-1, int nSpellLevel=-1, int nSpellSchool=-1) { - string sFunc = "DoSpellLevelAbsorption"; - NWNX_PushArgumentInt(nSpellSchool); - NWNX_PushArgumentInt(nSpellLevel); - NWNX_PushArgumentInt(nSpellId); - NWNX_PushArgumentObject(oCaster); - NWNX_PushArgumentObject(oDefender); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(nSpellSchool); + NWNXPushInt(nSpellLevel); + NWNXPushInt(nSpellId); + NWNXPushObject(oCaster); + NWNXPushObject(oDefender); + NWNXCall(NWNX_Object, "DoSpellLevelAbsorption"); + return NWNXPopInt(); } void NWNX_Object_SetHasInventory(object obj, int bHasInventory) { - string sFunc = "SetHasInventory"; - - NWNX_PushArgumentInt(bHasInventory); - NWNX_PushArgumentObject(obj); - - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushInt(bHasInventory); + NWNXPushObject(obj); + NWNXCall(NWNX_Object, "SetHasInventory"); } int NWNX_Object_GetCurrentAnimation(object oObject) { - string sFunc = "GetCurrentAnimation"; - - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "GetCurrentAnimation"); + return NWNXPopInt(); } int NWNX_Object_GetAILevel(object oObject) { - string sFunc = "GetAILevel"; - - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "GetAILevel"); + return NWNXPopInt(); } void NWNX_Object_SetAILevel(object oObject, int nLevel) { - string sFunc = "SetAILevel"; - - NWNX_PushArgumentInt(nLevel); - NWNX_PushArgumentObject(oObject); - - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushInt(nLevel); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "SetAILevel"); } string NWNX_Object_GetMapNote(object oObject, int nID = 0, int nGender = 0) { - string sFunc = "GetMapNote"; - - NWNX_PushArgumentInt(nGender); - NWNX_PushArgumentInt(nID); - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueString(); + NWNXPushInt(nGender); + NWNXPushInt(nID); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "GetMapNote"); + return NWNXPopString(); } void NWNX_Object_SetMapNote(object oObject, string sMapNote, int nID = 0, int nGender = 0) { - string sFunc = "SetMapNote"; - - NWNX_PushArgumentInt(nGender); - NWNX_PushArgumentInt(nID); - NWNX_PushArgumentString(sMapNote); - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushInt(nGender); + NWNXPushInt(nID); + NWNXPushString(sMapNote); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "SetMapNote"); } int NWNX_Object_GetLastSpellCastFeat(object oObject) { - string sFunc = "GetLastSpellCastFeat"; - - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "GetLastSpellCastFeat"); + return NWNXPopInt(); } void NWNX_Object_SetLastTriggered(object oObject, object oLast) { - string sFunc = "SetLastTriggered"; - - NWNX_PushArgumentObject(oLast); - NWNX_PushArgumentObject(oObject); - - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushObject(oLast); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "SetLastTriggered"); } float NWNX_Object_GetAoEObjectDurationRemaining(object oAoE) { - string sFunc = "GetAoEObjectDurationRemaining"; - - NWNX_PushArgumentObject(oAoE); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueFloat(); + NWNXPushObject(oAoE); + NWNXCall(NWNX_Object, "GetAoEObjectDurationRemaining"); + return NWNXPopFloat(); } void NWNX_Object_SetConversationPrivate(object oObject, int bPrivate) { - string sFunc = "SetConversationPrivate"; - - NWNX_PushArgumentInt(bPrivate); - NWNX_PushArgumentObject(oObject); - - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushInt(bPrivate); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "SetConversationPrivate"); } void NWNX_Object_SetAoEObjectRadius(object oAoE, float fRadius) { - string sFunc = "SetAoEObjectRadius"; - - NWNX_PushArgumentFloat(fRadius); - NWNX_PushArgumentObject(oAoE); - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushFloat(fRadius); + NWNXPushObject(oAoE); + NWNXCall(NWNX_Object, "SetAoEObjectRadius"); } float NWNX_Object_GetAoEObjectRadius(object oAoE) { - string sFunc = "GetAoEObjectRadius"; - - NWNX_PushArgumentObject(oAoE); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueFloat(); + NWNXPushObject(oAoE); + NWNXCall(NWNX_Object, "GetAoEObjectRadius"); + return NWNXPopFloat(); } int NWNX_Object_GetLastSpellCastSpontaneous(object oObject) { - string sFunc = "GetLastSpellCastSpontaneous"; - - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "GetLastSpellCastSpontaneous"); + return NWNXPopInt(); } int NWNX_Object_GetLastSpellCastDomainLevel(object oObject) { - string sFunc = "GetLastSpellCastDomainLevel"; - - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "GetLastSpellCastDomainLevel"); + return NWNXPopInt(); } void NWNX_Object_ForceAssignUUID(object oObject, string sUUID) { - string sFunc = "ForceAssignUUID"; - - NWNX_PushArgumentString(sUUID); - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushString(sUUID); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "ForceAssignUUID"); } int NWNX_Object_GetInventoryItemCount(object oObject) { - string sFunc = "GetInventoryItemCount"; - - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "GetInventoryItemCount"); + return NWNXPopInt(); } void NWNX_Object_OverrideSpellProjectileVFX(object oCreature, int nProjectileType = -1, int nProjectilePathType = -1, int nSpellID = -1, int bPersist = FALSE) { - string sFunc = "OverrideSpellProjectileVFX"; - - NWNX_PushArgumentInt(bPersist); - NWNX_PushArgumentInt(nSpellID); - NWNX_PushArgumentInt(nProjectilePathType); - NWNX_PushArgumentInt(nProjectileType); - NWNX_PushArgumentObject(oCreature); - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushInt(bPersist); + NWNXPushInt(nSpellID); + NWNXPushInt(nProjectilePathType); + NWNXPushInt(nProjectileType); + NWNXPushObject(oCreature); + NWNXCall(NWNX_Object, "OverrideSpellProjectileVFX"); } int NWNX_Object_GetLastSpellInstant() { - string sFunc = "GetLastSpellInstant"; - NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_Object, "GetLastSpellInstant"); + return NWNXPopInt(); } void NWNX_Object_SetTrapCreator(object oObject, object oCreator) { - string sFunc = "SetTrapCreator"; - NWNX_PushArgumentObject(oCreator); - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXPushObject(oCreator); + NWNXPushObject(oObject); + NWNXCall(NWNX_Object, "SetTrapCreator"); } string NWNX_Object_GetLocalizedName(object oObject, int nLanguage, int nGender = 0) { string sFunc = "GetLocalizedName"; - NWNX_PushArgumentInt(nGender); - NWNX_PushArgumentInt(nLanguage); - NWNX_PushArgumentObject(oObject); + NWNXPushInt(nGender); + NWNXPushInt(nLanguage); + NWNXPushObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueString(); + NWNXCall(NWNX_Object, sFunc); + return NWNXPopString(); } void NWNX_Object_SetLocalizedName(object oObject, string sName, int nLanguage, int nGender = 0) { string sFunc = "SetLocalizedName"; - NWNX_PushArgumentInt(nGender); - NWNX_PushArgumentInt(nLanguage); - NWNX_PushArgumentString(sName); - NWNX_PushArgumentObject(oObject); + NWNXPushInt(nGender); + NWNXPushInt(nLanguage); + NWNXPushString(sName); + NWNXPushObject(oObject); - NWNX_CallFunction(NWNX_Object, sFunc); + NWNXCall(NWNX_Object, sFunc); } diff --git a/_module/nss/nwnx_player.nss b/_module/nss/nwnx_player.nss index 3f4ab659..95d0bcd9 100644 --- a/_module/nss/nwnx_player.nss +++ b/_module/nss/nwnx_player.nss @@ -2,7 +2,6 @@ /// @brief Functions exposing additional player properties. /// @{ /// @file nwnx_player.nss -#include "nwnx" const string NWNX_Player = "NWNX_Player"; ///< @private @@ -458,22 +457,16 @@ void NWNX_Player_ReloadColorPalettes(object oPlayer); void NWNX_Player_ForcePlaceableExamineWindow(object player, object placeable) { - string sFunc = "ForcePlaceableExamineWindow"; - - NWNX_PushArgumentObject(placeable); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushObject(placeable); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "ForcePlaceableExamineWindow"); } void NWNX_Player_ForcePlaceableInventoryWindow(object player, object placeable) { - string sFunc = "ForcePlaceableInventoryWindow"; - - NWNX_PushArgumentObject(placeable); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushObject(placeable); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "ForcePlaceableInventoryWindow"); } void NWNX_Player_INTERNAL_StopGuiTimingBar(object player, string script = "", int id = -1) ///< @private @@ -482,17 +475,12 @@ void NWNX_Player_INTERNAL_StopGuiTimingBar(object player, string script = "", in // Either the timing event was never started, or it already finished. if (activeId == 0) return; - // If id != -1, we ended up here through DelayCommand. Make sure it's for the right ID if (id != -1 && id != activeId) return; - DeleteLocalInt(player, "NWNX_PLAYER_GUI_TIMING_ACTIVE"); - - string sFunc = "StopGuiTimingBar"; - NWNX_PushArgumentObject(player); - NWNX_CallFunction(NWNX_Player, sFunc); - + NWNXPushObject(player); + NWNXCall(NWNX_Player, "StopGuiTimingBar"); if(script != "") { ExecuteScript(script, player); @@ -503,18 +491,13 @@ void NWNX_Player_StartGuiTimingBar(object player, float seconds, string script = { if (GetLocalInt(player, "NWNX_PLAYER_GUI_TIMING_ACTIVE")) return; - - string sFunc = "StartGuiTimingBar"; - NWNX_PushArgumentInt(type); - NWNX_PushArgumentFloat(seconds); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); - + NWNXPushInt(type); + NWNXPushFloat(seconds); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "StartGuiTimingBar"); int id = GetLocalInt(player, "NWNX_PLAYER_GUI_TIMING_ID") + 1; SetLocalInt(player, "NWNX_PLAYER_GUI_TIMING_ACTIVE", id); SetLocalInt(player, "NWNX_PLAYER_GUI_TIMING_ID", id); - DelayCommand(seconds, NWNX_Player_INTERNAL_StopGuiTimingBar(player, script, id)); } @@ -525,638 +508,471 @@ void NWNX_Player_StopGuiTimingBar(object player, string script = "") void NWNX_Player_SetAlwaysWalk(object player, int bWalk=TRUE) { - string sFunc = "SetAlwaysWalk"; - - NWNX_PushArgumentInt(bWalk); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(bWalk); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "SetAlwaysWalk"); } struct NWNX_Player_QuickBarSlot NWNX_Player_GetQuickBarSlot(object player, int slot) { - string sFunc = "GetQuickBarSlot"; struct NWNX_Player_QuickBarSlot qbs; - - NWNX_PushArgumentInt(slot); - NWNX_PushArgumentObject(player); - NWNX_CallFunction(NWNX_Player, sFunc); - - qbs.oAssociate = NWNX_GetReturnValueObject(); - qbs.nAssociateType = NWNX_GetReturnValueInt(); - qbs.nDomainLevel = NWNX_GetReturnValueInt(); - qbs.nMetaType = NWNX_GetReturnValueInt(); - qbs.nINTParam1 = NWNX_GetReturnValueInt(); - qbs.sToolTip = NWNX_GetReturnValueString(); - qbs.sCommandLine = NWNX_GetReturnValueString(); - qbs.sCommandLabel = NWNX_GetReturnValueString(); - qbs.sResRef = NWNX_GetReturnValueString(); - qbs.nMultiClass = NWNX_GetReturnValueInt(); - qbs.nObjectType = NWNX_GetReturnValueInt(); - qbs.oSecondaryItem = NWNX_GetReturnValueObject(); - qbs.oItem = NWNX_GetReturnValueObject(); - + NWNXPushInt(slot); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "GetQuickBarSlot"); + qbs.oAssociate = NWNXPopObject(); + qbs.nAssociateType = NWNXPopInt(); + qbs.nDomainLevel = NWNXPopInt(); + qbs.nMetaType = NWNXPopInt(); + qbs.nINTParam1 = NWNXPopInt(); + qbs.sToolTip = NWNXPopString(); + qbs.sCommandLine = NWNXPopString(); + qbs.sCommandLabel = NWNXPopString(); + qbs.sResRef = NWNXPopString(); + qbs.nMultiClass = NWNXPopInt(); + qbs.nObjectType = NWNXPopInt(); + qbs.oSecondaryItem = NWNXPopObject(); + qbs.oItem = NWNXPopObject(); return qbs; } void NWNX_Player_SetQuickBarSlot(object player, int slot, struct NWNX_Player_QuickBarSlot qbs) { - string sFunc = "SetQuickBarSlot"; - - NWNX_PushArgumentObject(qbs.oItem); - NWNX_PushArgumentObject(qbs.oSecondaryItem); - NWNX_PushArgumentInt(qbs.nObjectType); - NWNX_PushArgumentInt(qbs.nMultiClass); - NWNX_PushArgumentString(qbs.sResRef); - NWNX_PushArgumentString(qbs.sCommandLabel); - NWNX_PushArgumentString(qbs.sCommandLine); - NWNX_PushArgumentString(qbs.sToolTip); - NWNX_PushArgumentInt(qbs.nINTParam1); - NWNX_PushArgumentInt(qbs.nMetaType); - NWNX_PushArgumentInt(qbs.nDomainLevel); - NWNX_PushArgumentInt(qbs.nAssociateType); - NWNX_PushArgumentObject(qbs.oAssociate); - - NWNX_PushArgumentInt(slot); - NWNX_PushArgumentObject(player); - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushObject(qbs.oItem); + NWNXPushObject(qbs.oSecondaryItem); + NWNXPushInt(qbs.nObjectType); + NWNXPushInt(qbs.nMultiClass); + NWNXPushString(qbs.sResRef); + NWNXPushString(qbs.sCommandLabel); + NWNXPushString(qbs.sCommandLine); + NWNXPushString(qbs.sToolTip); + NWNXPushInt(qbs.nINTParam1); + NWNXPushInt(qbs.nMetaType); + NWNXPushInt(qbs.nDomainLevel); + NWNXPushInt(qbs.nAssociateType); + NWNXPushObject(qbs.oAssociate); + NWNXPushInt(slot); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "SetQuickBarSlot"); } string NWNX_Player_GetBicFileName(object player) { - string sFunc = "GetBicFileName"; - - NWNX_PushArgumentObject(player); - NWNX_CallFunction(NWNX_Player, sFunc); - return NWNX_GetReturnValueString(); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "GetBicFileName"); + return NWNXPopString(); } void NWNX_Player_ShowVisualEffect(object player, int effectId, vector position, float scale=1.0f, vector translate=[], vector rotate=[]) { - string sFunc = "ShowVisualEffect"; - - NWNX_PushArgumentFloat(rotate.x); - NWNX_PushArgumentFloat(rotate.y); - NWNX_PushArgumentFloat(rotate.z); - NWNX_PushArgumentFloat(translate.x); - NWNX_PushArgumentFloat(translate.y); - NWNX_PushArgumentFloat(translate.z); - NWNX_PushArgumentFloat(scale); - NWNX_PushArgumentFloat(position.x); - NWNX_PushArgumentFloat(position.y); - NWNX_PushArgumentFloat(position.z); - NWNX_PushArgumentInt(effectId); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushVector(rotate); + NWNXPushVector(translate); + NWNXPushFloat(scale); + NWNXPushVector(position); + NWNXPushInt(effectId); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "ShowVisualEffect"); } void NWNX_Player_MusicBackgroundChangeDay(object player, int track) { - string sFunc = "ChangeBackgroundMusic"; - - NWNX_PushArgumentInt(track); - NWNX_PushArgumentInt(TRUE); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(track); + NWNXPushInt(TRUE); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "ChangeBackgroundMusic"); } void NWNX_Player_MusicBackgroundChangeNight(object player, int track) { - string sFunc = "ChangeBackgroundMusic"; - - NWNX_PushArgumentInt(track); - NWNX_PushArgumentInt(FALSE); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(track); + NWNXPushInt(FALSE); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "ChangeBackgroundMusic"); } void NWNX_Player_MusicBackgroundStart(object player) { - string sFunc = "PlayBackgroundMusic"; - - NWNX_PushArgumentInt(TRUE); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(TRUE); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "PlayBackgroundMusic"); } void NWNX_Player_MusicBackgroundStop(object player) { - string sFunc = "PlayBackgroundMusic"; - - NWNX_PushArgumentInt(FALSE); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(FALSE); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "PlayBackgroundMusic"); } void NWNX_Player_MusicBattleChange(object player, int track) { - string sFunc = "ChangeBattleMusic"; - - NWNX_PushArgumentInt(track); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(track); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "ChangeBattleMusic"); } void NWNX_Player_MusicBattleStart(object player) { - string sFunc = "PlayBattleMusic"; - - NWNX_PushArgumentInt(TRUE); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(TRUE); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "PlayBattleMusic"); } void NWNX_Player_MusicBattleStop(object player) { - string sFunc = "PlayBattleMusic"; - - NWNX_PushArgumentInt(FALSE); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(FALSE); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "PlayBattleMusic"); } void NWNX_Player_PlaySound(object player, string sound, object target = OBJECT_INVALID) { - string sFunc = "PlaySound"; - - NWNX_PushArgumentObject(target); - NWNX_PushArgumentString(sound); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushObject(target); + NWNXPushString(sound); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "PlaySound"); } void NWNX_Player_SetPlaceableUsable(object player, object placeable, int usable) { - string sFunc = "SetPlaceableUsable"; - - NWNX_PushArgumentInt(usable); - NWNX_PushArgumentObject(placeable); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(usable); + NWNXPushObject(placeable); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "SetPlaceableUsable"); } void NWNX_Player_SetRestDuration(object player, int duration) { - string sFunc = "SetRestDuration"; - - NWNX_PushArgumentInt(duration); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(duration); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "SetRestDuration"); } void NWNX_Player_ApplyInstantVisualEffectToObject(object player, object target, int visualeffect, float scale=1.0f, vector translate=[], vector rotate=[]) { - string sFunc = "ApplyInstantVisualEffectToObject"; - - NWNX_PushArgumentFloat(rotate.z); - NWNX_PushArgumentFloat(rotate.y); - NWNX_PushArgumentFloat(rotate.x); - NWNX_PushArgumentFloat(translate.z); - NWNX_PushArgumentFloat(translate.y); - NWNX_PushArgumentFloat(translate.x); - NWNX_PushArgumentFloat(scale); - NWNX_PushArgumentInt(visualeffect); - NWNX_PushArgumentObject(target); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushVector(rotate); + NWNXPushVector(translate); + NWNXPushFloat(scale); + NWNXPushInt(visualeffect); + NWNXPushObject(target); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "ApplyInstantVisualEffectToObject"); } void NWNX_Player_UpdateCharacterSheet(object player) { - string sFunc = "UpdateCharacterSheet"; - - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "UpdateCharacterSheet"); } void NWNX_Player_OpenInventory(object player, object target, int open = TRUE) { - string sFunc = "OpenInventory"; - - NWNX_PushArgumentInt(open); - NWNX_PushArgumentObject(target); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(open); + NWNXPushObject(target); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "OpenInventory"); } string NWNX_Player_GetAreaExplorationState(object player, object area) { - string sFunc = "GetAreaExplorationState"; - - NWNX_PushArgumentObject(area); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); - return NWNX_GetReturnValueString(); + NWNXPushObject(area); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "GetAreaExplorationState"); + return NWNXPopString(); } void NWNX_Player_SetAreaExplorationState(object player, object area, string str) { - string sFunc = "SetAreaExplorationState"; - - NWNX_PushArgumentString(str); - NWNX_PushArgumentObject(area); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushString(str); + NWNXPushObject(area); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "SetAreaExplorationState"); } void NWNX_Player_SetRestAnimation(object oPlayer, int nAnimation) { - string sFunc = "SetRestAnimation"; - - NWNX_PushArgumentInt(nAnimation); - NWNX_PushArgumentObject(oPlayer); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(nAnimation); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "SetRestAnimation"); } void NWNX_Player_SetObjectVisualTransformOverride(object oPlayer, object oObject, int nTransform, float fValue) { - string sFunc = "SetObjectVisualTransformOverride"; - - NWNX_PushArgumentFloat(fValue); - NWNX_PushArgumentInt(nTransform); - NWNX_PushArgumentObject(oObject); - NWNX_PushArgumentObject(oPlayer); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushFloat(fValue); + NWNXPushInt(nTransform); + NWNXPushObject(oObject); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "SetObjectVisualTransformOverride"); } void NWNX_Player_ApplyLoopingVisualEffectToObject(object player, object target, int visualeffect) { - string sFunc = "ApplyLoopingVisualEffectToObject"; - - NWNX_PushArgumentInt(visualeffect); - NWNX_PushArgumentObject(target); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(visualeffect); + NWNXPushObject(target); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "ApplyLoopingVisualEffectToObject"); } void NWNX_Player_SetPlaceableNameOverride(object player, object placeable, string name) { - string sFunc = "SetPlaceableNameOverride"; - - NWNX_PushArgumentString(name); - NWNX_PushArgumentObject(placeable); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushString(name); + NWNXPushObject(placeable); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "SetPlaceableNameOverride"); } int NWNX_Player_GetQuestCompleted(object player, string sQuestName) { - string sFunc = "GetQuestCompleted"; - - NWNX_PushArgumentString(sQuestName); - NWNX_PushArgumentObject(player); - - NWNX_CallFunction(NWNX_Player, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushString(sQuestName); + NWNXPushObject(player); + NWNXCall(NWNX_Player, "GetQuestCompleted"); + return NWNXPopInt(); } void NWNX_Player_SetPersistentLocation(string sCDKeyOrCommunityName, string sBicFileName, object oWP, int bFirstConnectOnly = TRUE) { - string sFunc = "SetPersistentLocation"; - - NWNX_PushArgumentInt(bFirstConnectOnly); - NWNX_PushArgumentObject(oWP); - NWNX_PushArgumentString(sBicFileName); - NWNX_PushArgumentString(sCDKeyOrCommunityName); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(bFirstConnectOnly); + NWNXPushObject(oWP); + NWNXPushString(sBicFileName); + NWNXPushString(sCDKeyOrCommunityName); + NWNXCall(NWNX_Player, "SetPersistentLocation"); } void NWNX_Player_UpdateItemName(object oPlayer, object oItem) { - string sFunc = "UpdateItemName"; - - NWNX_PushArgumentObject(oItem); - NWNX_PushArgumentObject(oPlayer); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushObject(oItem); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "UpdateItemName"); } int NWNX_Player_PossessCreature(object oPossessor, object oPossessed, int bMindImmune = TRUE, int bCreateDefaultQB = FALSE) { - string sFunc = "PossessCreature"; - - NWNX_PushArgumentInt(bCreateDefaultQB); - NWNX_PushArgumentInt(bMindImmune); - NWNX_PushArgumentObject(oPossessed); - NWNX_PushArgumentObject(oPossessor); - - NWNX_CallFunction(NWNX_Player, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(bCreateDefaultQB); + NWNXPushInt(bMindImmune); + NWNXPushObject(oPossessed); + NWNXPushObject(oPossessor); + NWNXCall(NWNX_Player, "PossessCreature"); + return NWNXPopInt(); } int NWNX_Player_GetPlatformId(object oPlayer) { - string sFunc = "GetPlatformId"; - - NWNX_PushArgumentObject(oPlayer); - - NWNX_CallFunction(NWNX_Player, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "GetPlatformId"); + return NWNXPopInt(); } int NWNX_Player_GetLanguage(object oPlayer) { - string sFunc = "GetLanguage"; - - NWNX_PushArgumentObject(oPlayer); - - NWNX_CallFunction(NWNX_Player, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "GetLanguage"); + return NWNXPopInt(); } void NWNX_Player_SetResManOverride(object oPlayer, int nResType, string sOldResName, string sNewResName) { - string sFunc = "SetResManOverride"; - - NWNX_PushArgumentString(sNewResName); - NWNX_PushArgumentString(sOldResName); - NWNX_PushArgumentInt(nResType); - NWNX_PushArgumentObject(oPlayer); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushString(sNewResName); + NWNXPushString(sOldResName); + NWNXPushInt(nResType); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "SetResManOverride"); } void NWNX_Player_SetCustomToken(object oPlayer, int nCustomTokenNumber, string sTokenValue) { - string sFunc = "SetCustomToken"; - - NWNX_PushArgumentString(sTokenValue); - NWNX_PushArgumentInt(nCustomTokenNumber); - NWNX_PushArgumentObject(oPlayer); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushString(sTokenValue); + NWNXPushInt(nCustomTokenNumber); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "SetCustomToken"); } void NWNX_Player_SetCreatureNameOverride(object oPlayer, object oCreature, string sName) { - string sFunc = "SetCreatureNameOverride"; - - NWNX_PushArgumentString(sName); - NWNX_PushArgumentObject(oCreature); - NWNX_PushArgumentObject(oPlayer); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushString(sName); + NWNXPushObject(oCreature); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "SetCreatureNameOverride"); } void NWNX_Player_FloatingTextStringOnCreature(object oPlayer, object oCreature, string sText, int bChatWindow = TRUE) { - string sFunc = "FloatingTextStringOnCreature"; - - NWNX_PushArgumentInt(bChatWindow); - NWNX_PushArgumentString(sText); - NWNX_PushArgumentObject(oCreature); - NWNX_PushArgumentObject(oPlayer); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(bChatWindow); + NWNXPushString(sText); + NWNXPushObject(oCreature); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "FloatingTextStringOnCreature"); } void NWNX_Player_ToggleDM(object oPlayer, int bIsDM) { - string sFunc = "ToggleDM"; - - NWNX_PushArgumentInt(bIsDM); - NWNX_PushArgumentObject(oPlayer); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(bIsDM); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "ToggleDM"); } void NWNX_Player_SetObjectMouseCursorOverride(object oPlayer, object oObject, int nCursor) { - string sFunc = "SetObjectMouseCursorOverride"; - - NWNX_PushArgumentInt(nCursor); - NWNX_PushArgumentObject(oObject); - NWNX_PushArgumentObject(oPlayer); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(nCursor); + NWNXPushObject(oObject); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "SetObjectMouseCursorOverride"); } void NWNX_Player_SetObjectHiliteColorOverride(object oPlayer, object oObject, int nColor) { - string sFunc = "SetObjectHiliteColorOverride"; - - NWNX_PushArgumentInt(nColor); - NWNX_PushArgumentObject(oObject); - NWNX_PushArgumentObject(oPlayer); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(nColor); + NWNXPushObject(oObject); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "SetObjectHiliteColorOverride"); } void NWNX_Player_RemoveEffectFromTURD(object oPlayer, string sEffectTag) { - string sFunc = "RemoveEffectFromTURD"; - - NWNX_PushArgumentString(sEffectTag); - NWNX_PushArgumentObject(oPlayer); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushString(sEffectTag); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "RemoveEffectFromTURD"); } void NWNX_Player_SetSpawnLocation(object oPlayer, location locSpawn) { - string sFunc = "SetSpawnLocation"; - - vector vPosition = GetPositionFromLocation(locSpawn); - - NWNX_PushArgumentFloat(GetFacingFromLocation(locSpawn)); - NWNX_PushArgumentFloat(vPosition.z); - NWNX_PushArgumentFloat(vPosition.y); - NWNX_PushArgumentFloat(vPosition.x); - NWNX_PushArgumentObject(GetAreaFromLocation(locSpawn)); - NWNX_PushArgumentObject(oPlayer); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushLocation(locSpawn); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "SetSpawnLocation"); } void NWNX_Player_SendDMAllCreatorLists(object oPlayer) { - string sFunc = "SendDMAllCreatorLists"; - NWNX_PushArgumentObject(oPlayer); - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "SendDMAllCreatorLists"); } int NWNX_Player_AddCustomJournalEntry(object oPlayer, struct NWNX_Player_JournalEntry journalEntry, int nSilentUpdate = 0) { - string sFunc = "AddCustomJournalEntry"; - NWNX_PushArgumentInt(nSilentUpdate); - NWNX_PushArgumentInt(journalEntry.nTimeOfDay); - NWNX_PushArgumentInt(journalEntry.nCalendarDay); - NWNX_PushArgumentInt(journalEntry.nUpdated); - NWNX_PushArgumentInt(journalEntry.nQuestDisplayed); - NWNX_PushArgumentInt(journalEntry.nQuestCompleted); - NWNX_PushArgumentInt(journalEntry.nPriority); - NWNX_PushArgumentInt(journalEntry.nState); - NWNX_PushArgumentString(journalEntry.sTag); - NWNX_PushArgumentString(journalEntry.sText); - NWNX_PushArgumentString(journalEntry.sName); - NWNX_PushArgumentObject(oPlayer); - NWNX_CallFunction(NWNX_Player, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(nSilentUpdate); + NWNXPushInt(journalEntry.nTimeOfDay); + NWNXPushInt(journalEntry.nCalendarDay); + NWNXPushInt(journalEntry.nUpdated); + NWNXPushInt(journalEntry.nQuestDisplayed); + NWNXPushInt(journalEntry.nQuestCompleted); + NWNXPushInt(journalEntry.nPriority); + NWNXPushInt(journalEntry.nState); + NWNXPushString(journalEntry.sTag); + NWNXPushString(journalEntry.sText); + NWNXPushString(journalEntry.sName); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "AddCustomJournalEntry"); + return NWNXPopInt(); } struct NWNX_Player_JournalEntry NWNX_Player_GetJournalEntry(object oPlayer, string questTag) { - string sFunc = "GetJournalEntry"; struct NWNX_Player_JournalEntry entry; - - NWNX_PushArgumentString(questTag); - NWNX_PushArgumentObject(oPlayer); - NWNX_CallFunction(NWNX_Player, sFunc); - - entry.nUpdated = NWNX_GetReturnValueInt(); + NWNXPushString(questTag); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "GetJournalEntry"); + entry.nUpdated = NWNXPopInt(); if(entry.nUpdated == -1) // -1 set as an indicator to say that the entry was not found { return entry; } - entry.nQuestDisplayed = NWNX_GetReturnValueInt(); - entry.nQuestCompleted = NWNX_GetReturnValueInt(); - entry.nPriority = NWNX_GetReturnValueInt(); - entry.nState = NWNX_GetReturnValueInt(); - entry.nTimeOfDay = NWNX_GetReturnValueInt(); - entry.nCalendarDay = NWNX_GetReturnValueInt(); - entry.sName = NWNX_GetReturnValueString(); - entry.sText = NWNX_GetReturnValueString(); + entry.nQuestDisplayed = NWNXPopInt(); + entry.nQuestCompleted = NWNXPopInt(); + entry.nPriority = NWNXPopInt(); + entry.nState = NWNXPopInt(); + entry.nTimeOfDay = NWNXPopInt(); + entry.nCalendarDay = NWNXPopInt(); + entry.sName = NWNXPopString(); + entry.sText = NWNXPopString(); entry.sTag = questTag; return entry; } void NWNX_Player_CloseStore(object oPlayer) { - string sFunc = "CloseStore"; - - NWNX_PushArgumentObject(oPlayer); - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "CloseStore"); } void NWNX_Player_SetTlkOverride(object oPlayer, int nStrRef, string sOverride, int bRestoreGlobal = TRUE) { - string sFunc = "SetTlkOverride"; - - NWNX_PushArgumentInt(bRestoreGlobal); - NWNX_PushArgumentString(sOverride); - NWNX_PushArgumentInt(nStrRef); - NWNX_PushArgumentObject(oPlayer); - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(bRestoreGlobal); + NWNXPushString(sOverride); + NWNXPushInt(nStrRef); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "SetTlkOverride"); } void NWNX_Player_ReloadTlk(object oPlayer) { - string sFunc = "ReloadTlk"; - - NWNX_PushArgumentObject(oPlayer); - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "ReloadTlk"); } void NWNX_Player_UpdateWind(object oPlayer, vector vDirection, float fMagnitude, float fYaw, float fPitch) { - string sFunc = "UpdateWind"; - - NWNX_PushArgumentFloat(fPitch); - NWNX_PushArgumentFloat(fYaw); - NWNX_PushArgumentFloat(fMagnitude); - NWNX_PushArgumentFloat(vDirection.x); - NWNX_PushArgumentFloat(vDirection.y); - NWNX_PushArgumentFloat(vDirection.z); - NWNX_PushArgumentObject(oPlayer); - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushFloat(fPitch); + NWNXPushFloat(fYaw); + NWNXPushFloat(fMagnitude); + NWNXPushVector(vDirection); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "UpdateWind"); } void NWNX_Player_UpdateSkyBox(object oPlayer, int nSkyBox) { - string sFunc = "UpdateSkyBox"; - - NWNX_PushArgumentInt(nSkyBox); - NWNX_PushArgumentObject(oPlayer); - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(nSkyBox); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "UpdateSkyBox"); } void NWNX_Player_UpdateFogColor(object oPlayer, int nSunFogColor, int nMoonFogColor) { - string sFunc = "UpdateFogColor"; - - NWNX_PushArgumentInt(nMoonFogColor); - NWNX_PushArgumentInt(nSunFogColor); - NWNX_PushArgumentObject(oPlayer); - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(nMoonFogColor); + NWNXPushInt(nSunFogColor); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "UpdateFogColor"); } void NWNX_Player_UpdateFogAmount(object oPlayer, int nSunFogAmount, int nMoonFogAmount) { - string sFunc = "UpdateFogAmount"; - - NWNX_PushArgumentInt(nMoonFogAmount); - NWNX_PushArgumentInt(nSunFogAmount); - NWNX_PushArgumentObject(oPlayer); - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(nMoonFogAmount); + NWNXPushInt(nSunFogAmount); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "UpdateFogAmount"); } object NWNX_Player_GetGameObject(object oPlayer) { - string sFunc = "GetGameObject"; - - NWNX_PushArgumentObject(oPlayer); - NWNX_CallFunction(NWNX_Player, sFunc); - return NWNX_GetReturnValueObject(); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "GetGameObject"); + return NWNXPopObject(); } void NWNX_Player_SetObjectUiDiscoveryMaskOverride(object oPlayer, object oObject, int nMask) { - string sFunc = "SetObjectUiDiscoveryMaskOverride"; - - NWNX_PushArgumentInt(nMask); - NWNX_PushArgumentObject(oObject); - NWNX_PushArgumentObject(oPlayer); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(nMask); + NWNXPushObject(oObject); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "SetObjectUiDiscoveryMaskOverride"); } void NWNX_Player_SendPartyInvite(object oPlayer, object oInviter, int bForceInvite = FALSE, int bHideDialog = FALSE) { - string sFunc = "SendPartyInvite"; - - NWNX_PushArgumentInt(bHideDialog); - NWNX_PushArgumentInt(bForceInvite); - NWNX_PushArgumentObject(oInviter); - NWNX_PushArgumentObject(oPlayer); - - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushInt(bHideDialog); + NWNXPushInt(bForceInvite); + NWNXPushObject(oInviter); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "SendPartyInvite"); } object NWNX_Player_GetTURD(object oPlayer) { - string sFunc = "GetTURD"; - - NWNX_PushArgumentObject(oPlayer); - NWNX_CallFunction(NWNX_Player, sFunc); - - return NWNX_GetReturnValueObject(); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "GetTURD"); + return NWNXPopObject(); } void NWNX_Player_ReloadColorPalettes(object oPlayer) { - string sFunc = "ReloadColorPalettes"; - - NWNX_PushArgumentObject(oPlayer); - NWNX_CallFunction(NWNX_Player, sFunc); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Player, "ReloadColorPalettes"); } diff --git a/_module/nss/nwnx_profiler.nss b/_module/nss/nwnx_profiler.nss index 9f641068..9eba0729 100644 --- a/_module/nss/nwnx_profiler.nss +++ b/_module/nss/nwnx_profiler.nss @@ -3,7 +3,6 @@ /// @remark These functions are for advanced users. /// @{ /// @file nwnx_profiler.nss -#include "nwnx" const string NWNX_Profiler = "NWNX_Profiler"; ///< @private @@ -39,22 +38,17 @@ void NWNX_Profiler_PopPerfScope(); void NWNX_Profiler_PushPerfScope(string name, string tag0_tag = "", string tag0_value = "") { - string sFunc = "PushPerfScope"; - - NWNX_PushArgumentString(name); - if (tag0_value != "" && tag0_tag != "") { - NWNX_PushArgumentString(tag0_value); - NWNX_PushArgumentString(tag0_tag); + NWNXPushString(tag0_value); + NWNXPushString(tag0_tag); } - - NWNX_CallFunction(NWNX_Profiler, sFunc); + NWNXPushString(name); + NWNXCall(NWNX_Profiler, "PushPerfScope"); } void NWNX_Profiler_PopPerfScope() { - string sFunc = "PopPerfScope"; + NWNXCall(NWNX_Profiler, "PopPerfScope"); +} - NWNX_CallFunction(NWNX_Profiler, sFunc); -} \ No newline at end of file diff --git a/_module/nss/nwnx_race.nss b/_module/nss/nwnx_race.nss index de8c636c..3b892283 100644 --- a/_module/nss/nwnx_race.nss +++ b/_module/nss/nwnx_race.nss @@ -2,7 +2,6 @@ /// @brief Define racial and subrace characteristics. /// @{ /// @file nwnx_race.nss -#include "nwnx" const string NWNX_Race = "NWNX_Race"; ///< @private @@ -54,37 +53,50 @@ int NWNX_Race_GetParentRace(int iRace); /// or Favored Enemy: Wild Elf void NWNX_Race_SetFavoredEnemyFeat(int iRace, int iFeat); +/// @brief Removes any nwnx_race 'Effects' on the targeted creature. Suppression lasts until levelup, next login, or Reactivated by function. +/// @param oCreature The creature to suppress +/// @note Not all nwnx_race modifiers are achieved via effect. Those that are not directly consider the creatures current race. +void NWNX_Race_SuppressCreatureRaceEffects(object oCreature); + +/// @brief Reactivates the nwnx_race 'Effects' on the targeted creature after they were Suppressed. +/// @param oCreature The creature to reactive +/// @note Safe to use on non-suppressed creatures - Triggers a refresh of effects but won't stack. +void NWNX_Race_ReactivateCreatureRaceEffects(object oCreature); + /// @} void NWNX_Race_SetRacialModifier(int iRace, int iMod, int iParam1, int iParam2 = 0xDEADBEEF, int iParam3 = 0xDEADBEEF) { - string sFunc = "SetRacialModifier"; - - NWNX_PushArgumentInt(iParam3); - NWNX_PushArgumentInt(iParam2); - NWNX_PushArgumentInt(iParam1); - NWNX_PushArgumentInt(iMod); - NWNX_PushArgumentInt(iRace); - - NWNX_CallFunction(NWNX_Race, sFunc); + NWNXPushInt(iParam3); + NWNXPushInt(iParam2); + NWNXPushInt(iParam1); + NWNXPushInt(iMod); + NWNXPushInt(iRace); + NWNXCall(NWNX_Race, "SetRacialModifier"); } int NWNX_Race_GetParentRace(int iRace) { - string sFunc = "GetParentRace"; - - NWNX_PushArgumentInt(iRace); - - NWNX_CallFunction(NWNX_Race, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(iRace); + NWNXCall(NWNX_Race, "GetParentRace"); + return NWNXPopInt(); } void NWNX_Race_SetFavoredEnemyFeat(int iRace, int iFeat) { - string sFunc = "SetFavoredEnemyFeat"; - - NWNX_PushArgumentInt(iFeat); - NWNX_PushArgumentInt(iRace); - - NWNX_CallFunction(NWNX_Race, sFunc); + NWNXPushInt(iFeat); + NWNXPushInt(iRace); + NWNXCall(NWNX_Race, "SetFavoredEnemyFeat"); +} + +void NWNX_Race_SuppressCreatureRaceEffects(object creature) +{ + NWNXPushObject(creature); + NWNXCall(NWNX_Race, "SuppressCreatureRaceEffects"); +} + +void NWNX_Race_ReactivateCreatureRaceEffects(object oCreature) +{ + NWNXPushObject(oCreature); + NWNXCall(NWNX_Race, "ReactivateCreatureRaceEffects"); } diff --git a/_module/nss/nwnx_redis.nss b/_module/nss/nwnx_redis.nss index 26c97a5b..0ead8152 100644 --- a/_module/nss/nwnx_redis.nss +++ b/_module/nss/nwnx_redis.nss @@ -3,7 +3,6 @@ /// @{ /// @file nwnx_redis.nss /// @name Redis Commands -#include "nwnx" #include "nwnx_redis_lib" @@ -3235,32 +3234,32 @@ int NWNX_Redis_APPEND( string key, string value ) { - NWNX_PushArgumentString("APPEND"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("APPEND"); + NWNXPushString(key); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_AUTH( string password ) { - NWNX_PushArgumentString("AUTH"); - NWNX_PushArgumentString(password); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("AUTH"); + NWNXPushString(password); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_BGREWRITEAOF() { - NWNX_PushArgumentString("BGREWRITEAOF"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BGREWRITEAOF"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_BGSAVE() { - NWNX_PushArgumentString("BGSAVE"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BGSAVE"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_BITCOUNT( @@ -3270,12 +3269,12 @@ int NWNX_Redis_BITCOUNT( // Redis type: integer int end = 0 ) { - NWNX_PushArgumentString("BITCOUNT"); - NWNX_PushArgumentString(key); - if (start != 0) NWNX_PushArgumentString(IntToString(start)); - if (end != 0) NWNX_PushArgumentString(IntToString(end)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BITCOUNT"); + NWNXPushString(key); + if (start != 0) NWNXPushString(IntToString(start)); + if (end != 0) NWNXPushString(IntToString(end)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_BITFIELD( @@ -3297,18 +3296,18 @@ int NWNX_Redis_BITFIELD( // Redis type: integer int incrby_increment = 0 ) { - NWNX_PushArgumentString("BITFIELD"); - NWNX_PushArgumentString(key); - if (get_type != "") NWNX_PushArgumentString(get_type); - if (get_offset != 0) NWNX_PushArgumentString(IntToString(get_offset)); - if (set_type != "") NWNX_PushArgumentString(set_type); - if (set_offset != 0) NWNX_PushArgumentString(IntToString(set_offset)); - if (set_value != 0) NWNX_PushArgumentString(IntToString(set_value)); - if (incrby_type != "") NWNX_PushArgumentString(incrby_type); - if (incrby_offset != 0) NWNX_PushArgumentString(IntToString(incrby_offset)); - if (incrby_increment != 0) NWNX_PushArgumentString(IntToString(incrby_increment)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BITFIELD"); + NWNXPushString(key); + if (get_type != "") NWNXPushString(get_type); + if (get_offset != 0) NWNXPushString(IntToString(get_offset)); + if (set_type != "") NWNXPushString(set_type); + if (set_offset != 0) NWNXPushString(IntToString(set_offset)); + if (set_value != 0) NWNXPushString(IntToString(set_value)); + if (incrby_type != "") NWNXPushString(incrby_type); + if (incrby_offset != 0) NWNXPushString(IntToString(incrby_offset)); + if (incrby_increment != 0) NWNXPushString(IntToString(incrby_increment)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_BITOP( @@ -3317,12 +3316,12 @@ int NWNX_Redis_BITOP( string destkey, string key ) { - NWNX_PushArgumentString("BITOP"); - NWNX_PushArgumentString(operation); - NWNX_PushArgumentString(destkey); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BITOP"); + NWNXPushString(operation); + NWNXPushString(destkey); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_BITPOS( @@ -3334,13 +3333,13 @@ int NWNX_Redis_BITPOS( // Redis type: integer int end = 0 ) { - NWNX_PushArgumentString("BITPOS"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(bit)); - if (start != 0) NWNX_PushArgumentString(IntToString(start)); - if (end != 0) NWNX_PushArgumentString(IntToString(end)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BITPOS"); + NWNXPushString(key); + NWNXPushString(IntToString(bit)); + if (start != 0) NWNXPushString(IntToString(start)); + if (end != 0) NWNXPushString(IntToString(end)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_BLPOP( @@ -3348,11 +3347,11 @@ int NWNX_Redis_BLPOP( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("BLPOP"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(timeout)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BLPOP"); + NWNXPushString(key); + NWNXPushString(IntToString(timeout)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_BRPOP( @@ -3360,11 +3359,11 @@ int NWNX_Redis_BRPOP( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("BRPOP"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(timeout)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BRPOP"); + NWNXPushString(key); + NWNXPushString(IntToString(timeout)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_BRPOPLPUSH( @@ -3375,12 +3374,12 @@ int NWNX_Redis_BRPOPLPUSH( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("BRPOPLPUSH"); - NWNX_PushArgumentString(source); - NWNX_PushArgumentString(destination); - NWNX_PushArgumentString(IntToString(timeout)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BRPOPLPUSH"); + NWNXPushString(source); + NWNXPushString(destination); + NWNXPushString(IntToString(timeout)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_BZPOPMIN( @@ -3388,11 +3387,11 @@ int NWNX_Redis_BZPOPMIN( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("BZPOPMIN"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(timeout)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BZPOPMIN"); + NWNXPushString(key); + NWNXPushString(IntToString(timeout)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_BZPOPMAX( @@ -3400,17 +3399,17 @@ int NWNX_Redis_BZPOPMAX( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("BZPOPMAX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(timeout)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BZPOPMAX"); + NWNXPushString(key); + NWNXPushString(IntToString(timeout)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLIENT_ID() { - NWNX_PushArgumentString("CLIENT_ID"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLIENT_ID"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLIENT_KILL( @@ -3420,54 +3419,54 @@ int NWNX_Redis_CLIENT_KILL( string addr_ip_port = "", string skipme_yes_no = "" ) { - NWNX_PushArgumentString("CLIENT_KILL"); - if (ip_port != "") NWNX_PushArgumentString(ip_port); - if (id_client_id != 0) NWNX_PushArgumentString(IntToString(id_client_id)); - if (addr_ip_port != "") NWNX_PushArgumentString(addr_ip_port); - if (skipme_yes_no != "") NWNX_PushArgumentString(skipme_yes_no); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLIENT_KILL"); + if (ip_port != "") NWNXPushString(ip_port); + if (id_client_id != 0) NWNXPushString(IntToString(id_client_id)); + if (addr_ip_port != "") NWNXPushString(addr_ip_port); + if (skipme_yes_no != "") NWNXPushString(skipme_yes_no); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLIENT_LIST() { - NWNX_PushArgumentString("CLIENT_LIST"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLIENT_LIST"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLIENT_GETNAME() { - NWNX_PushArgumentString("CLIENT_GETNAME"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLIENT_GETNAME"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLIENT_PAUSE( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("CLIENT_PAUSE"); - NWNX_PushArgumentString(IntToString(timeout)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLIENT_PAUSE"); + NWNXPushString(IntToString(timeout)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLIENT_REPLY( // Redis type: enum string reply_mode ) { - NWNX_PushArgumentString("CLIENT_REPLY"); - NWNX_PushArgumentString(reply_mode); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLIENT_REPLY"); + NWNXPushString(reply_mode); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLIENT_SETNAME( string connection_name ) { - NWNX_PushArgumentString("CLIENT_SETNAME"); - NWNX_PushArgumentString(connection_name); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLIENT_SETNAME"); + NWNXPushString(connection_name); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLIENT_UNBLOCK( @@ -3475,69 +3474,69 @@ int NWNX_Redis_CLIENT_UNBLOCK( // Redis type: enum string unblock_type = "" ) { - NWNX_PushArgumentString("CLIENT_UNBLOCK"); - NWNX_PushArgumentString(client_id); - if (unblock_type != "") NWNX_PushArgumentString(unblock_type); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLIENT_UNBLOCK"); + NWNXPushString(client_id); + if (unblock_type != "") NWNXPushString(unblock_type); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLUSTER_ADDSLOTS( // Redis type: integer int slot ) { - NWNX_PushArgumentString("CLUSTER_ADDSLOTS"); - NWNX_PushArgumentString(IntToString(slot)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_ADDSLOTS"); + NWNXPushString(IntToString(slot)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLUSTER_COUNT_FAILURE_REPORTS( string node_id ) { - NWNX_PushArgumentString("CLUSTER_COUNT_FAILURE_REPORTS"); - NWNX_PushArgumentString(node_id); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_COUNT_FAILURE_REPORTS"); + NWNXPushString(node_id); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLUSTER_COUNTKEYSINSLOT( // Redis type: integer int slot ) { - NWNX_PushArgumentString("CLUSTER_COUNTKEYSINSLOT"); - NWNX_PushArgumentString(IntToString(slot)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_COUNTKEYSINSLOT"); + NWNXPushString(IntToString(slot)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLUSTER_DELSLOTS( // Redis type: integer int slot ) { - NWNX_PushArgumentString("CLUSTER_DELSLOTS"); - NWNX_PushArgumentString(IntToString(slot)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_DELSLOTS"); + NWNXPushString(IntToString(slot)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLUSTER_FAILOVER( // Redis type: enum string options = "" ) { - NWNX_PushArgumentString("CLUSTER_FAILOVER"); - if (options != "") NWNX_PushArgumentString(options); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_FAILOVER"); + if (options != "") NWNXPushString(options); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLUSTER_FORGET( string node_id ) { - NWNX_PushArgumentString("CLUSTER_FORGET"); - NWNX_PushArgumentString(node_id); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_FORGET"); + NWNXPushString(node_id); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLUSTER_GETKEYSINSLOT( @@ -3546,26 +3545,26 @@ int NWNX_Redis_CLUSTER_GETKEYSINSLOT( // Redis type: integer int count ) { - NWNX_PushArgumentString("CLUSTER_GETKEYSINSLOT"); - NWNX_PushArgumentString(IntToString(slot)); - NWNX_PushArgumentString(IntToString(count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_GETKEYSINSLOT"); + NWNXPushString(IntToString(slot)); + NWNXPushString(IntToString(count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLUSTER_INFO() { - NWNX_PushArgumentString("CLUSTER_INFO"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_INFO"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLUSTER_KEYSLOT( string key ) { - NWNX_PushArgumentString("CLUSTER_KEYSLOT"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_KEYSLOT"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLUSTER_MEET( @@ -3573,52 +3572,52 @@ int NWNX_Redis_CLUSTER_MEET( // Redis type: integer int port ) { - NWNX_PushArgumentString("CLUSTER_MEET"); - NWNX_PushArgumentString(ip); - NWNX_PushArgumentString(IntToString(port)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_MEET"); + NWNXPushString(ip); + NWNXPushString(IntToString(port)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLUSTER_NODES() { - NWNX_PushArgumentString("CLUSTER_NODES"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_NODES"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLUSTER_REPLICATE( string node_id ) { - NWNX_PushArgumentString("CLUSTER_REPLICATE"); - NWNX_PushArgumentString(node_id); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_REPLICATE"); + NWNXPushString(node_id); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLUSTER_RESET( // Redis type: enum string reset_type = "" ) { - NWNX_PushArgumentString("CLUSTER_RESET"); - if (reset_type != "") NWNX_PushArgumentString(reset_type); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_RESET"); + if (reset_type != "") NWNXPushString(reset_type); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLUSTER_SAVECONFIG() { - NWNX_PushArgumentString("CLUSTER_SAVECONFIG"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_SAVECONFIG"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLUSTER_SET_CONFIG_EPOCH( // Redis type: integer int config_epoch ) { - NWNX_PushArgumentString("CLUSTER_SET_CONFIG_EPOCH"); - NWNX_PushArgumentString(IntToString(config_epoch)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_SET_CONFIG_EPOCH"); + NWNXPushString(IntToString(config_epoch)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLUSTER_SETSLOT( @@ -3628,125 +3627,125 @@ int NWNX_Redis_CLUSTER_SETSLOT( string subcommand, string node_id = "" ) { - NWNX_PushArgumentString("CLUSTER_SETSLOT"); - NWNX_PushArgumentString(IntToString(slot)); - NWNX_PushArgumentString(subcommand); - if (node_id != "") NWNX_PushArgumentString(node_id); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_SETSLOT"); + NWNXPushString(IntToString(slot)); + NWNXPushString(subcommand); + if (node_id != "") NWNXPushString(node_id); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLUSTER_SLAVES( string node_id ) { - NWNX_PushArgumentString("CLUSTER_SLAVES"); - NWNX_PushArgumentString(node_id); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_SLAVES"); + NWNXPushString(node_id); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLUSTER_REPLICAS( string node_id ) { - NWNX_PushArgumentString("CLUSTER_REPLICAS"); - NWNX_PushArgumentString(node_id); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_REPLICAS"); + NWNXPushString(node_id); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CLUSTER_SLOTS() { - NWNX_PushArgumentString("CLUSTER_SLOTS"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_SLOTS"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_COMMAND() { - NWNX_PushArgumentString("COMMAND"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("COMMAND"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_COMMAND_COUNT() { - NWNX_PushArgumentString("COMMAND_COUNT"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("COMMAND_COUNT"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_COMMAND_GETKEYS() { - NWNX_PushArgumentString("COMMAND_GETKEYS"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("COMMAND_GETKEYS"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_COMMAND_INFO( string command_name ) { - NWNX_PushArgumentString("COMMAND_INFO"); - NWNX_PushArgumentString(command_name); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("COMMAND_INFO"); + NWNXPushString(command_name); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CONFIG_GET( string parameter ) { - NWNX_PushArgumentString("CONFIG_GET"); - NWNX_PushArgumentString(parameter); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CONFIG_GET"); + NWNXPushString(parameter); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CONFIG_REWRITE() { - NWNX_PushArgumentString("CONFIG_REWRITE"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CONFIG_REWRITE"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CONFIG_SET( string parameter, string value ) { - NWNX_PushArgumentString("CONFIG_SET"); - NWNX_PushArgumentString(parameter); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CONFIG_SET"); + NWNXPushString(parameter); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_CONFIG_RESETSTAT() { - NWNX_PushArgumentString("CONFIG_RESETSTAT"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CONFIG_RESETSTAT"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_DBSIZE() { - NWNX_PushArgumentString("DBSIZE"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("DBSIZE"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_DEBUG_OBJECT( string key ) { - NWNX_PushArgumentString("DEBUG_OBJECT"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("DEBUG_OBJECT"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_DEBUG_SEGFAULT() { - NWNX_PushArgumentString("DEBUG_SEGFAULT"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("DEBUG_SEGFAULT"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_DECR( string key ) { - NWNX_PushArgumentString("DECR"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("DECR"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_DECRBY( @@ -3754,44 +3753,44 @@ int NWNX_Redis_DECRBY( // Redis type: integer int decrement ) { - NWNX_PushArgumentString("DECRBY"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(decrement)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("DECRBY"); + NWNXPushString(key); + NWNXPushString(IntToString(decrement)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_DEL( string key ) { - NWNX_PushArgumentString("DEL"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("DEL"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_DISCARD() { - NWNX_PushArgumentString("DISCARD"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("DISCARD"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_DUMP( string key ) { - NWNX_PushArgumentString("DUMP"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("DUMP"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ECHO( string message ) { - NWNX_PushArgumentString("ECHO"); - NWNX_PushArgumentString(message); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ECHO"); + NWNXPushString(message); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_EVAL( @@ -3801,13 +3800,13 @@ int NWNX_Redis_EVAL( string key, string arg ) { - NWNX_PushArgumentString("EVAL"); - NWNX_PushArgumentString(script); - NWNX_PushArgumentString(IntToString(numkeys)); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(arg); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("EVAL"); + NWNXPushString(script); + NWNXPushString(IntToString(numkeys)); + NWNXPushString(key); + NWNXPushString(arg); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_EVALSHA( @@ -3817,28 +3816,28 @@ int NWNX_Redis_EVALSHA( string key, string arg ) { - NWNX_PushArgumentString("EVALSHA"); - NWNX_PushArgumentString(sha1); - NWNX_PushArgumentString(IntToString(numkeys)); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(arg); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("EVALSHA"); + NWNXPushString(sha1); + NWNXPushString(IntToString(numkeys)); + NWNXPushString(key); + NWNXPushString(arg); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_EXEC() { - NWNX_PushArgumentString("EXEC"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("EXEC"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_EXISTS( string key ) { - NWNX_PushArgumentString("EXISTS"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("EXISTS"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_EXPIRE( @@ -3846,11 +3845,11 @@ int NWNX_Redis_EXPIRE( // Redis type: integer int seconds ) { - NWNX_PushArgumentString("EXPIRE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(seconds)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("EXPIRE"); + NWNXPushString(key); + NWNXPushString(IntToString(seconds)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_EXPIREAT( @@ -3858,31 +3857,31 @@ int NWNX_Redis_EXPIREAT( // Redis type: posix time string timestamp ) { - NWNX_PushArgumentString("EXPIREAT"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(timestamp); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("EXPIREAT"); + NWNXPushString(key); + NWNXPushString(timestamp); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_FLUSHALL( // Redis type: enum string async = "" ) { - NWNX_PushArgumentString("FLUSHALL"); - if (async != "") NWNX_PushArgumentString(async); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("FLUSHALL"); + if (async != "") NWNXPushString(async); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_FLUSHDB( // Redis type: enum string async = "" ) { - NWNX_PushArgumentString("FLUSHDB"); - if (async != "") NWNX_PushArgumentString(async); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("FLUSHDB"); + if (async != "") NWNXPushString(async); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_GEOADD( @@ -3893,35 +3892,35 @@ int NWNX_Redis_GEOADD( float latitude, string member ) { - NWNX_PushArgumentString("GEOADD"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(FloatToString(longitude, 0)); - NWNX_PushArgumentString(FloatToString(latitude, 0)); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("GEOADD"); + NWNXPushString(key); + NWNXPushString(FloatToString(longitude, 0)); + NWNXPushString(FloatToString(latitude, 0)); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_GEOHASH( string key, string member ) { - NWNX_PushArgumentString("GEOHASH"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("GEOHASH"); + NWNXPushString(key); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_GEOPOS( string key, string member ) { - NWNX_PushArgumentString("GEOPOS"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("GEOPOS"); + NWNXPushString(key); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_GEODIST( @@ -3930,13 +3929,13 @@ int NWNX_Redis_GEODIST( string member2, string unit = "" ) { - NWNX_PushArgumentString("GEODIST"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member1); - NWNX_PushArgumentString(member2); - if (unit != "") NWNX_PushArgumentString(unit); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("GEODIST"); + NWNXPushString(key); + NWNXPushString(member1); + NWNXPushString(member2); + if (unit != "") NWNXPushString(unit); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_GEORADIUS( @@ -3964,21 +3963,21 @@ int NWNX_Redis_GEORADIUS( // Redis type: key string storedist_key = "" ) { - NWNX_PushArgumentString("GEORADIUS"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(FloatToString(longitude, 0)); - NWNX_PushArgumentString(FloatToString(latitude, 0)); - NWNX_PushArgumentString(FloatToString(radius, 0)); - NWNX_PushArgumentString(unit); - if (withcoord != "") NWNX_PushArgumentString(withcoord); - if (withdist != "") NWNX_PushArgumentString(withdist); - if (withhash != "") NWNX_PushArgumentString(withhash); - if (count_count != 0) NWNX_PushArgumentString(IntToString(count_count)); - if (order != "") NWNX_PushArgumentString(order); - if (store_key != "") NWNX_PushArgumentString(store_key); - if (storedist_key != "") NWNX_PushArgumentString(storedist_key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("GEORADIUS"); + NWNXPushString(key); + NWNXPushString(FloatToString(longitude, 0)); + NWNXPushString(FloatToString(latitude, 0)); + NWNXPushString(FloatToString(radius, 0)); + NWNXPushString(unit); + if (withcoord != "") NWNXPushString(withcoord); + if (withdist != "") NWNXPushString(withdist); + if (withhash != "") NWNXPushString(withhash); + if (count_count != 0) NWNXPushString(IntToString(count_count)); + if (order != "") NWNXPushString(order); + if (store_key != "") NWNXPushString(store_key); + if (storedist_key != "") NWNXPushString(storedist_key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_GEORADIUSBYMEMBER( @@ -4003,29 +4002,29 @@ int NWNX_Redis_GEORADIUSBYMEMBER( // Redis type: key string storedist_key = "" ) { - NWNX_PushArgumentString("GEORADIUSBYMEMBER"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member); - NWNX_PushArgumentString(FloatToString(radius, 0)); - NWNX_PushArgumentString(unit); - if (withcoord != "") NWNX_PushArgumentString(withcoord); - if (withdist != "") NWNX_PushArgumentString(withdist); - if (withhash != "") NWNX_PushArgumentString(withhash); - if (count_count != 0) NWNX_PushArgumentString(IntToString(count_count)); - if (order != "") NWNX_PushArgumentString(order); - if (store_key != "") NWNX_PushArgumentString(store_key); - if (storedist_key != "") NWNX_PushArgumentString(storedist_key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("GEORADIUSBYMEMBER"); + NWNXPushString(key); + NWNXPushString(member); + NWNXPushString(FloatToString(radius, 0)); + NWNXPushString(unit); + if (withcoord != "") NWNXPushString(withcoord); + if (withdist != "") NWNXPushString(withdist); + if (withhash != "") NWNXPushString(withhash); + if (count_count != 0) NWNXPushString(IntToString(count_count)); + if (order != "") NWNXPushString(order); + if (store_key != "") NWNXPushString(store_key); + if (storedist_key != "") NWNXPushString(storedist_key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_GET( string key ) { - NWNX_PushArgumentString("GET"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("GET"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_GETBIT( @@ -4033,11 +4032,11 @@ int NWNX_Redis_GETBIT( // Redis type: integer int offset ) { - NWNX_PushArgumentString("GETBIT"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(offset)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("GETBIT"); + NWNXPushString(key); + NWNXPushString(IntToString(offset)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_GETRANGE( @@ -4047,65 +4046,65 @@ int NWNX_Redis_GETRANGE( // Redis type: integer int end ) { - NWNX_PushArgumentString("GETRANGE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(start)); - NWNX_PushArgumentString(IntToString(end)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("GETRANGE"); + NWNXPushString(key); + NWNXPushString(IntToString(start)); + NWNXPushString(IntToString(end)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_GETSET( string key, string value ) { - NWNX_PushArgumentString("GETSET"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("GETSET"); + NWNXPushString(key); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_HDEL( string key, string field ) { - NWNX_PushArgumentString("HDEL"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(field); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HDEL"); + NWNXPushString(key); + NWNXPushString(field); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_HEXISTS( string key, string field ) { - NWNX_PushArgumentString("HEXISTS"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(field); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HEXISTS"); + NWNXPushString(key); + NWNXPushString(field); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_HGET( string key, string field ) { - NWNX_PushArgumentString("HGET"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(field); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HGET"); + NWNXPushString(key); + NWNXPushString(field); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_HGETALL( string key ) { - NWNX_PushArgumentString("HGETALL"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HGETALL"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_HINCRBY( @@ -4114,12 +4113,12 @@ int NWNX_Redis_HINCRBY( // Redis type: integer int increment ) { - NWNX_PushArgumentString("HINCRBY"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(field); - NWNX_PushArgumentString(IntToString(increment)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HINCRBY"); + NWNXPushString(key); + NWNXPushString(field); + NWNXPushString(IntToString(increment)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_HINCRBYFLOAT( @@ -4128,41 +4127,41 @@ int NWNX_Redis_HINCRBYFLOAT( // Redis type: double float increment ) { - NWNX_PushArgumentString("HINCRBYFLOAT"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(field); - NWNX_PushArgumentString(FloatToString(increment, 0)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HINCRBYFLOAT"); + NWNXPushString(key); + NWNXPushString(field); + NWNXPushString(FloatToString(increment, 0)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_HKEYS( string key ) { - NWNX_PushArgumentString("HKEYS"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HKEYS"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_HLEN( string key ) { - NWNX_PushArgumentString("HLEN"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HLEN"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_HMGET( string key, string field ) { - NWNX_PushArgumentString("HMGET"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(field); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HMGET"); + NWNXPushString(key); + NWNXPushString(field); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_HMSET( @@ -4170,12 +4169,12 @@ int NWNX_Redis_HMSET( string field, string value ) { - NWNX_PushArgumentString("HMSET"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(field); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HMSET"); + NWNXPushString(key); + NWNXPushString(field); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_HSET( @@ -4183,12 +4182,12 @@ int NWNX_Redis_HSET( string field, string value ) { - NWNX_PushArgumentString("HSET"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(field); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HSET"); + NWNXPushString(key); + NWNXPushString(field); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_HSETNX( @@ -4196,41 +4195,41 @@ int NWNX_Redis_HSETNX( string field, string value ) { - NWNX_PushArgumentString("HSETNX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(field); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HSETNX"); + NWNXPushString(key); + NWNXPushString(field); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_HSTRLEN( string key, string field ) { - NWNX_PushArgumentString("HSTRLEN"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(field); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HSTRLEN"); + NWNXPushString(key); + NWNXPushString(field); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_HVALS( string key ) { - NWNX_PushArgumentString("HVALS"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HVALS"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_INCR( string key ) { - NWNX_PushArgumentString("INCR"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("INCR"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_INCRBY( @@ -4238,11 +4237,11 @@ int NWNX_Redis_INCRBY( // Redis type: integer int increment ) { - NWNX_PushArgumentString("INCRBY"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(increment)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("INCRBY"); + NWNXPushString(key); + NWNXPushString(IntToString(increment)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_INCRBYFLOAT( @@ -4250,35 +4249,35 @@ int NWNX_Redis_INCRBYFLOAT( // Redis type: double float increment ) { - NWNX_PushArgumentString("INCRBYFLOAT"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(FloatToString(increment, 0)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("INCRBYFLOAT"); + NWNXPushString(key); + NWNXPushString(FloatToString(increment, 0)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_INFO( string section = "" ) { - NWNX_PushArgumentString("INFO"); - if (section != "") NWNX_PushArgumentString(section); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("INFO"); + if (section != "") NWNXPushString(section); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_KEYS( string pattern ) { - NWNX_PushArgumentString("KEYS"); - NWNX_PushArgumentString(pattern); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("KEYS"); + NWNXPushString(pattern); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_LASTSAVE() { - NWNX_PushArgumentString("LASTSAVE"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LASTSAVE"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_LINDEX( @@ -4286,11 +4285,11 @@ int NWNX_Redis_LINDEX( // Redis type: integer int index ) { - NWNX_PushArgumentString("LINDEX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(index)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LINDEX"); + NWNXPushString(key); + NWNXPushString(IntToString(index)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_LINSERT( @@ -4300,53 +4299,53 @@ int NWNX_Redis_LINSERT( string pivot, string value ) { - NWNX_PushArgumentString("LINSERT"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(where); - NWNX_PushArgumentString(pivot); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LINSERT"); + NWNXPushString(key); + NWNXPushString(where); + NWNXPushString(pivot); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_LLEN( string key ) { - NWNX_PushArgumentString("LLEN"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LLEN"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_LPOP( string key ) { - NWNX_PushArgumentString("LPOP"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LPOP"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_LPUSH( string key, string value ) { - NWNX_PushArgumentString("LPUSH"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LPUSH"); + NWNXPushString(key); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_LPUSHX( string key, string value ) { - NWNX_PushArgumentString("LPUSHX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LPUSHX"); + NWNXPushString(key); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_LRANGE( @@ -4356,12 +4355,12 @@ int NWNX_Redis_LRANGE( // Redis type: integer int stop ) { - NWNX_PushArgumentString("LRANGE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(start)); - NWNX_PushArgumentString(IntToString(stop)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LRANGE"); + NWNXPushString(key); + NWNXPushString(IntToString(start)); + NWNXPushString(IntToString(stop)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_LREM( @@ -4370,12 +4369,12 @@ int NWNX_Redis_LREM( int count, string value ) { - NWNX_PushArgumentString("LREM"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(count)); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LREM"); + NWNXPushString(key); + NWNXPushString(IntToString(count)); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_LSET( @@ -4384,12 +4383,12 @@ int NWNX_Redis_LSET( int index, string value ) { - NWNX_PushArgumentString("LSET"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(index)); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LSET"); + NWNXPushString(key); + NWNXPushString(IntToString(index)); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_LTRIM( @@ -4399,42 +4398,42 @@ int NWNX_Redis_LTRIM( // Redis type: integer int stop ) { - NWNX_PushArgumentString("LTRIM"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(start)); - NWNX_PushArgumentString(IntToString(stop)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LTRIM"); + NWNXPushString(key); + NWNXPushString(IntToString(start)); + NWNXPushString(IntToString(stop)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_MEMORY_DOCTOR() { - NWNX_PushArgumentString("MEMORY_DOCTOR"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MEMORY_DOCTOR"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_MEMORY_HELP() { - NWNX_PushArgumentString("MEMORY_HELP"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MEMORY_HELP"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_MEMORY_MALLOC_STATS() { - NWNX_PushArgumentString("MEMORY_MALLOC_STATS"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MEMORY_MALLOC_STATS"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_MEMORY_PURGE() { - NWNX_PushArgumentString("MEMORY_PURGE"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MEMORY_PURGE"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_MEMORY_STATS() { - NWNX_PushArgumentString("MEMORY_STATS"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MEMORY_STATS"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_MEMORY_USAGE( @@ -4442,20 +4441,20 @@ int NWNX_Redis_MEMORY_USAGE( // Redis type: integer int samples_count = 0 ) { - NWNX_PushArgumentString("MEMORY_USAGE"); - NWNX_PushArgumentString(key); - if (samples_count != 0) NWNX_PushArgumentString(IntToString(samples_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MEMORY_USAGE"); + NWNXPushString(key); + if (samples_count != 0) NWNXPushString(IntToString(samples_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_MGET( string key ) { - NWNX_PushArgumentString("MGET"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MGET"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_MIGRATE( @@ -4475,24 +4474,24 @@ int NWNX_Redis_MIGRATE( // Redis type: key string keys_key = "" ) { - NWNX_PushArgumentString("MIGRATE"); - NWNX_PushArgumentString(host); - NWNX_PushArgumentString(port); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(destination_db)); - NWNX_PushArgumentString(IntToString(timeout)); - if (copy != "") NWNX_PushArgumentString(copy); - if (replace != "") NWNX_PushArgumentString(replace); - if (auth_password != "") NWNX_PushArgumentString(auth_password); - if (keys_key != "") NWNX_PushArgumentString(keys_key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MIGRATE"); + NWNXPushString(host); + NWNXPushString(port); + NWNXPushString(key); + NWNXPushString(IntToString(destination_db)); + NWNXPushString(IntToString(timeout)); + if (copy != "") NWNXPushString(copy); + if (replace != "") NWNXPushString(replace); + if (auth_password != "") NWNXPushString(auth_password); + if (keys_key != "") NWNXPushString(keys_key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_MONITOR() { - NWNX_PushArgumentString("MONITOR"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MONITOR"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_MOVE( @@ -4500,59 +4499,59 @@ int NWNX_Redis_MOVE( // Redis type: integer int db ) { - NWNX_PushArgumentString("MOVE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(db)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MOVE"); + NWNXPushString(key); + NWNXPushString(IntToString(db)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_MSET( string key, string value ) { - NWNX_PushArgumentString("MSET"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MSET"); + NWNXPushString(key); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_MSETNX( string key, string value ) { - NWNX_PushArgumentString("MSETNX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MSETNX"); + NWNXPushString(key); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_MULTI() { - NWNX_PushArgumentString("MULTI"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MULTI"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_OBJECT( string subcommand, string arguments = "" ) { - NWNX_PushArgumentString("OBJECT"); - NWNX_PushArgumentString(subcommand); - if (arguments != "") NWNX_PushArgumentString(arguments); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("OBJECT"); + NWNXPushString(subcommand); + if (arguments != "") NWNXPushString(arguments); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_PERSIST( string key ) { - NWNX_PushArgumentString("PERSIST"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PERSIST"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_PEXPIRE( @@ -4560,11 +4559,11 @@ int NWNX_Redis_PEXPIRE( // Redis type: integer int milliseconds ) { - NWNX_PushArgumentString("PEXPIRE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(milliseconds)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PEXPIRE"); + NWNXPushString(key); + NWNXPushString(IntToString(milliseconds)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_PEXPIREAT( @@ -4572,31 +4571,31 @@ int NWNX_Redis_PEXPIREAT( // Redis type: posix time string milliseconds_timestamp ) { - NWNX_PushArgumentString("PEXPIREAT"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(milliseconds_timestamp); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PEXPIREAT"); + NWNXPushString(key); + NWNXPushString(milliseconds_timestamp); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_PFADD( string key, string element ) { - NWNX_PushArgumentString("PFADD"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(element); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PFADD"); + NWNXPushString(key); + NWNXPushString(element); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_PFCOUNT( string key ) { - NWNX_PushArgumentString("PFCOUNT"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PFCOUNT"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_PFMERGE( @@ -4605,20 +4604,20 @@ int NWNX_Redis_PFMERGE( // Redis type: key string sourcekey ) { - NWNX_PushArgumentString("PFMERGE"); - NWNX_PushArgumentString(destkey); - NWNX_PushArgumentString(sourcekey); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PFMERGE"); + NWNXPushString(destkey); + NWNXPushString(sourcekey); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_PING( string message = "" ) { - NWNX_PushArgumentString("PING"); - if (message != "") NWNX_PushArgumentString(message); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PING"); + if (message != "") NWNXPushString(message); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_PSETEX( @@ -4627,67 +4626,67 @@ int NWNX_Redis_PSETEX( int milliseconds, string value ) { - NWNX_PushArgumentString("PSETEX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(milliseconds)); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PSETEX"); + NWNXPushString(key); + NWNXPushString(IntToString(milliseconds)); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_PUBSUB( string subcommand, string argument = "" ) { - NWNX_PushArgumentString("PUBSUB"); - NWNX_PushArgumentString(subcommand); - if (argument != "") NWNX_PushArgumentString(argument); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PUBSUB"); + NWNXPushString(subcommand); + if (argument != "") NWNXPushString(argument); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_PTTL( string key ) { - NWNX_PushArgumentString("PTTL"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PTTL"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_PUBLISH( string channel, string message ) { - NWNX_PushArgumentString("PUBLISH"); - NWNX_PushArgumentString(channel); - NWNX_PushArgumentString(message); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PUBLISH"); + NWNXPushString(channel); + NWNXPushString(message); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_QUIT() { - NWNX_PushArgumentString("QUIT"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("QUIT"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_RANDOMKEY() { - NWNX_PushArgumentString("RANDOMKEY"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("RANDOMKEY"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_READONLY() { - NWNX_PushArgumentString("READONLY"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("READONLY"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_READWRITE() { - NWNX_PushArgumentString("READWRITE"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("READWRITE"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_RENAME( @@ -4695,11 +4694,11 @@ int NWNX_Redis_RENAME( // Redis type: key string newkey ) { - NWNX_PushArgumentString("RENAME"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(newkey); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("RENAME"); + NWNXPushString(key); + NWNXPushString(newkey); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_RENAMENX( @@ -4707,11 +4706,11 @@ int NWNX_Redis_RENAMENX( // Redis type: key string newkey ) { - NWNX_PushArgumentString("RENAMENX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(newkey); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("RENAMENX"); + NWNXPushString(key); + NWNXPushString(newkey); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_RESTORE( @@ -4728,31 +4727,31 @@ int NWNX_Redis_RESTORE( // Redis type: integer int freq_frequency = 0 ) { - NWNX_PushArgumentString("RESTORE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(ttl)); - NWNX_PushArgumentString(serialized_value); - if (replace != "") NWNX_PushArgumentString(replace); - if (absttl != "") NWNX_PushArgumentString(absttl); - if (idletime_seconds != 0) NWNX_PushArgumentString(IntToString(idletime_seconds)); - if (freq_frequency != 0) NWNX_PushArgumentString(IntToString(freq_frequency)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("RESTORE"); + NWNXPushString(key); + NWNXPushString(IntToString(ttl)); + NWNXPushString(serialized_value); + if (replace != "") NWNXPushString(replace); + if (absttl != "") NWNXPushString(absttl); + if (idletime_seconds != 0) NWNXPushString(IntToString(idletime_seconds)); + if (freq_frequency != 0) NWNXPushString(IntToString(freq_frequency)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ROLE() { - NWNX_PushArgumentString("ROLE"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ROLE"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_RPOP( string key ) { - NWNX_PushArgumentString("RPOP"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("RPOP"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_RPOPLPUSH( @@ -4761,108 +4760,108 @@ int NWNX_Redis_RPOPLPUSH( // Redis type: key string destination ) { - NWNX_PushArgumentString("RPOPLPUSH"); - NWNX_PushArgumentString(source); - NWNX_PushArgumentString(destination); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("RPOPLPUSH"); + NWNXPushString(source); + NWNXPushString(destination); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_RPUSH( string key, string value ) { - NWNX_PushArgumentString("RPUSH"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("RPUSH"); + NWNXPushString(key); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_RPUSHX( string key, string value ) { - NWNX_PushArgumentString("RPUSHX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("RPUSHX"); + NWNXPushString(key); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SADD( string key, string member ) { - NWNX_PushArgumentString("SADD"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SADD"); + NWNXPushString(key); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SAVE() { - NWNX_PushArgumentString("SAVE"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SAVE"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SCARD( string key ) { - NWNX_PushArgumentString("SCARD"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SCARD"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SCRIPT_DEBUG( // Redis type: enum string mode ) { - NWNX_PushArgumentString("SCRIPT_DEBUG"); - NWNX_PushArgumentString(mode); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SCRIPT_DEBUG"); + NWNXPushString(mode); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SCRIPT_EXISTS( string sha1 ) { - NWNX_PushArgumentString("SCRIPT_EXISTS"); - NWNX_PushArgumentString(sha1); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SCRIPT_EXISTS"); + NWNXPushString(sha1); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SCRIPT_FLUSH() { - NWNX_PushArgumentString("SCRIPT_FLUSH"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SCRIPT_FLUSH"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SCRIPT_KILL() { - NWNX_PushArgumentString("SCRIPT_KILL"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SCRIPT_KILL"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SCRIPT_LOAD( string script ) { - NWNX_PushArgumentString("SCRIPT_LOAD"); - NWNX_PushArgumentString(script); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SCRIPT_LOAD"); + NWNXPushString(script); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SDIFF( string key ) { - NWNX_PushArgumentString("SDIFF"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SDIFF"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SDIFFSTORE( @@ -4870,21 +4869,21 @@ int NWNX_Redis_SDIFFSTORE( string destination, string key ) { - NWNX_PushArgumentString("SDIFFSTORE"); - NWNX_PushArgumentString(destination); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SDIFFSTORE"); + NWNXPushString(destination); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SELECT( // Redis type: integer int index ) { - NWNX_PushArgumentString("SELECT"); - NWNX_PushArgumentString(IntToString(index)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SELECT"); + NWNXPushString(IntToString(index)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SET( @@ -4893,12 +4892,12 @@ int NWNX_Redis_SET( // Redis type: enum string condition = "" ) { - NWNX_PushArgumentString("SET"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(value); - if (condition != "") NWNX_PushArgumentString(condition); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SET"); + NWNXPushString(key); + NWNXPushString(value); + if (condition != "") NWNXPushString(condition); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SETBIT( @@ -4907,12 +4906,12 @@ int NWNX_Redis_SETBIT( int offset, string value ) { - NWNX_PushArgumentString("SETBIT"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(offset)); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SETBIT"); + NWNXPushString(key); + NWNXPushString(IntToString(offset)); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SETEX( @@ -4921,23 +4920,23 @@ int NWNX_Redis_SETEX( int seconds, string value ) { - NWNX_PushArgumentString("SETEX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(seconds)); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SETEX"); + NWNXPushString(key); + NWNXPushString(IntToString(seconds)); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SETNX( string key, string value ) { - NWNX_PushArgumentString("SETNX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SETNX"); + NWNXPushString(key); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SETRANGE( @@ -4946,31 +4945,31 @@ int NWNX_Redis_SETRANGE( int offset, string value ) { - NWNX_PushArgumentString("SETRANGE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(offset)); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SETRANGE"); + NWNXPushString(key); + NWNXPushString(IntToString(offset)); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SHUTDOWN( // Redis type: enum string save_mode = "" ) { - NWNX_PushArgumentString("SHUTDOWN"); - if (save_mode != "") NWNX_PushArgumentString(save_mode); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SHUTDOWN"); + if (save_mode != "") NWNXPushString(save_mode); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SINTER( string key ) { - NWNX_PushArgumentString("SINTER"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SINTER"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SINTERSTORE( @@ -4978,64 +4977,64 @@ int NWNX_Redis_SINTERSTORE( string destination, string key ) { - NWNX_PushArgumentString("SINTERSTORE"); - NWNX_PushArgumentString(destination); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SINTERSTORE"); + NWNXPushString(destination); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SISMEMBER( string key, string member ) { - NWNX_PushArgumentString("SISMEMBER"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SISMEMBER"); + NWNXPushString(key); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SLAVEOF( string host, string port ) { - NWNX_PushArgumentString("SLAVEOF"); - NWNX_PushArgumentString(host); - NWNX_PushArgumentString(port); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SLAVEOF"); + NWNXPushString(host); + NWNXPushString(port); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_REPLICAOF( string host, string port ) { - NWNX_PushArgumentString("REPLICAOF"); - NWNX_PushArgumentString(host); - NWNX_PushArgumentString(port); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("REPLICAOF"); + NWNXPushString(host); + NWNXPushString(port); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SLOWLOG( string subcommand, string argument = "" ) { - NWNX_PushArgumentString("SLOWLOG"); - NWNX_PushArgumentString(subcommand); - if (argument != "") NWNX_PushArgumentString(argument); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SLOWLOG"); + NWNXPushString(subcommand); + if (argument != "") NWNXPushString(argument); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SMEMBERS( string key ) { - NWNX_PushArgumentString("SMEMBERS"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SMEMBERS"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SMOVE( @@ -5045,12 +5044,12 @@ int NWNX_Redis_SMOVE( string destination, string member ) { - NWNX_PushArgumentString("SMOVE"); - NWNX_PushArgumentString(source); - NWNX_PushArgumentString(destination); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SMOVE"); + NWNXPushString(source); + NWNXPushString(destination); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SORT( @@ -5069,17 +5068,17 @@ int NWNX_Redis_SORT( // Redis type: key string store_destination = "" ) { - NWNX_PushArgumentString("SORT"); - NWNX_PushArgumentString(key); - if (by_pattern != "") NWNX_PushArgumentString(by_pattern); - if (limit_offset != 0) NWNX_PushArgumentString(IntToString(limit_offset)); - if (limit_count != 0) NWNX_PushArgumentString(IntToString(limit_count)); - if (get_pattern != "") NWNX_PushArgumentString(get_pattern); - if (order != "") NWNX_PushArgumentString(order); - if (sorting != "") NWNX_PushArgumentString(sorting); - if (store_destination != "") NWNX_PushArgumentString(store_destination); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SORT"); + NWNXPushString(key); + if (by_pattern != "") NWNXPushString(by_pattern); + if (limit_offset != 0) NWNXPushString(IntToString(limit_offset)); + if (limit_count != 0) NWNXPushString(IntToString(limit_count)); + if (get_pattern != "") NWNXPushString(get_pattern); + if (order != "") NWNXPushString(order); + if (sorting != "") NWNXPushString(sorting); + if (store_destination != "") NWNXPushString(store_destination); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SPOP( @@ -5087,11 +5086,11 @@ int NWNX_Redis_SPOP( // Redis type: integer int count = 0 ) { - NWNX_PushArgumentString("SPOP"); - NWNX_PushArgumentString(key); - if (count != 0) NWNX_PushArgumentString(IntToString(count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SPOP"); + NWNXPushString(key); + if (count != 0) NWNXPushString(IntToString(count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SRANDMEMBER( @@ -5099,40 +5098,40 @@ int NWNX_Redis_SRANDMEMBER( // Redis type: integer int count = 0 ) { - NWNX_PushArgumentString("SRANDMEMBER"); - NWNX_PushArgumentString(key); - if (count != 0) NWNX_PushArgumentString(IntToString(count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SRANDMEMBER"); + NWNXPushString(key); + if (count != 0) NWNXPushString(IntToString(count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SREM( string key, string member ) { - NWNX_PushArgumentString("SREM"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SREM"); + NWNXPushString(key); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_STRLEN( string key ) { - NWNX_PushArgumentString("STRLEN"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("STRLEN"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SUNION( string key ) { - NWNX_PushArgumentString("SUNION"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SUNION"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SUNIONSTORE( @@ -5140,11 +5139,11 @@ int NWNX_Redis_SUNIONSTORE( string destination, string key ) { - NWNX_PushArgumentString("SUNIONSTORE"); - NWNX_PushArgumentString(destination); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SUNIONSTORE"); + NWNXPushString(destination); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SWAPDB( @@ -5153,65 +5152,65 @@ int NWNX_Redis_SWAPDB( // Redis type: integer int index_1 ) { - NWNX_PushArgumentString("SWAPDB"); - NWNX_PushArgumentString(IntToString(index)); - NWNX_PushArgumentString(IntToString(index_1)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SWAPDB"); + NWNXPushString(IntToString(index)); + NWNXPushString(IntToString(index_1)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SYNC() { - NWNX_PushArgumentString("SYNC"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SYNC"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_TIME() { - NWNX_PushArgumentString("TIME"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("TIME"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_TOUCH( string key ) { - NWNX_PushArgumentString("TOUCH"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("TOUCH"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_TTL( string key ) { - NWNX_PushArgumentString("TTL"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("TTL"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_TYPE( string key ) { - NWNX_PushArgumentString("TYPE"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("TYPE"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_UNLINK( string key ) { - NWNX_PushArgumentString("UNLINK"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("UNLINK"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_UNWATCH() { - NWNX_PushArgumentString("UNWATCH"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("UNWATCH"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_WAIT( @@ -5220,20 +5219,20 @@ int NWNX_Redis_WAIT( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("WAIT"); - NWNX_PushArgumentString(IntToString(numreplicas)); - NWNX_PushArgumentString(IntToString(timeout)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("WAIT"); + NWNXPushString(IntToString(numreplicas)); + NWNXPushString(IntToString(timeout)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_WATCH( string key ) { - NWNX_PushArgumentString("WATCH"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("WATCH"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZADD( @@ -5248,24 +5247,24 @@ int NWNX_Redis_ZADD( float score = 0.0, string member = "" ) { - NWNX_PushArgumentString("ZADD"); - NWNX_PushArgumentString(key); - if (condition != "") NWNX_PushArgumentString(condition); - if (change != "") NWNX_PushArgumentString(change); - if (increment != "") NWNX_PushArgumentString(increment); - NWNX_PushArgumentString(FloatToString(score, 0)); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZADD"); + NWNXPushString(key); + if (condition != "") NWNXPushString(condition); + if (change != "") NWNXPushString(change); + if (increment != "") NWNXPushString(increment); + NWNXPushString(FloatToString(score, 0)); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZCARD( string key ) { - NWNX_PushArgumentString("ZCARD"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZCARD"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZCOUNT( @@ -5275,12 +5274,12 @@ int NWNX_Redis_ZCOUNT( // Redis type: double float max ) { - NWNX_PushArgumentString("ZCOUNT"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(FloatToString(min, 0)); - NWNX_PushArgumentString(FloatToString(max, 0)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZCOUNT"); + NWNXPushString(key); + NWNXPushString(FloatToString(min, 0)); + NWNXPushString(FloatToString(max, 0)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZINCRBY( @@ -5289,12 +5288,12 @@ int NWNX_Redis_ZINCRBY( int increment, string member ) { - NWNX_PushArgumentString("ZINCRBY"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(increment)); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZINCRBY"); + NWNXPushString(key); + NWNXPushString(IntToString(increment)); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZINTERSTORE( @@ -5308,14 +5307,14 @@ int NWNX_Redis_ZINTERSTORE( // Redis type: enum string aggregate_aggregate = "" ) { - NWNX_PushArgumentString("ZINTERSTORE"); - NWNX_PushArgumentString(destination); - NWNX_PushArgumentString(IntToString(numkeys)); - NWNX_PushArgumentString(key); - if (weights_weight != 0) NWNX_PushArgumentString(IntToString(weights_weight)); - if (aggregate_aggregate != "") NWNX_PushArgumentString(aggregate_aggregate); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZINTERSTORE"); + NWNXPushString(destination); + NWNXPushString(IntToString(numkeys)); + NWNXPushString(key); + if (weights_weight != 0) NWNXPushString(IntToString(weights_weight)); + if (aggregate_aggregate != "") NWNXPushString(aggregate_aggregate); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZLEXCOUNT( @@ -5323,12 +5322,12 @@ int NWNX_Redis_ZLEXCOUNT( string min, string max ) { - NWNX_PushArgumentString("ZLEXCOUNT"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(min); - NWNX_PushArgumentString(max); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZLEXCOUNT"); + NWNXPushString(key); + NWNXPushString(min); + NWNXPushString(max); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZPOPMAX( @@ -5336,11 +5335,11 @@ int NWNX_Redis_ZPOPMAX( // Redis type: integer int count = 0 ) { - NWNX_PushArgumentString("ZPOPMAX"); - NWNX_PushArgumentString(key); - if (count != 0) NWNX_PushArgumentString(IntToString(count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZPOPMAX"); + NWNXPushString(key); + if (count != 0) NWNXPushString(IntToString(count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZPOPMIN( @@ -5348,11 +5347,11 @@ int NWNX_Redis_ZPOPMIN( // Redis type: integer int count = 0 ) { - NWNX_PushArgumentString("ZPOPMIN"); - NWNX_PushArgumentString(key); - if (count != 0) NWNX_PushArgumentString(IntToString(count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZPOPMIN"); + NWNXPushString(key); + if (count != 0) NWNXPushString(IntToString(count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZRANGE( @@ -5364,13 +5363,13 @@ int NWNX_Redis_ZRANGE( // Redis type: enum string withscores = "" ) { - NWNX_PushArgumentString("ZRANGE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(start)); - NWNX_PushArgumentString(IntToString(stop)); - if (withscores != "") NWNX_PushArgumentString(withscores); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZRANGE"); + NWNXPushString(key); + NWNXPushString(IntToString(start)); + NWNXPushString(IntToString(stop)); + if (withscores != "") NWNXPushString(withscores); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZRANGEBYLEX( @@ -5382,14 +5381,14 @@ int NWNX_Redis_ZRANGEBYLEX( // Redis type: integer int limit_count = 0 ) { - NWNX_PushArgumentString("ZRANGEBYLEX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(min); - NWNX_PushArgumentString(max); - if (limit_offset != 0) NWNX_PushArgumentString(IntToString(limit_offset)); - if (limit_count != 0) NWNX_PushArgumentString(IntToString(limit_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZRANGEBYLEX"); + NWNXPushString(key); + NWNXPushString(min); + NWNXPushString(max); + if (limit_offset != 0) NWNXPushString(IntToString(limit_offset)); + if (limit_count != 0) NWNXPushString(IntToString(limit_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZREVRANGEBYLEX( @@ -5401,14 +5400,14 @@ int NWNX_Redis_ZREVRANGEBYLEX( // Redis type: integer int limit_count = 0 ) { - NWNX_PushArgumentString("ZREVRANGEBYLEX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(max); - NWNX_PushArgumentString(min); - if (limit_offset != 0) NWNX_PushArgumentString(IntToString(limit_offset)); - if (limit_count != 0) NWNX_PushArgumentString(IntToString(limit_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZREVRANGEBYLEX"); + NWNXPushString(key); + NWNXPushString(max); + NWNXPushString(min); + if (limit_offset != 0) NWNXPushString(IntToString(limit_offset)); + if (limit_count != 0) NWNXPushString(IntToString(limit_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZRANGEBYSCORE( @@ -5424,37 +5423,37 @@ int NWNX_Redis_ZRANGEBYSCORE( // Redis type: integer int limit_count = 0 ) { - NWNX_PushArgumentString("ZRANGEBYSCORE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(FloatToString(min, 0)); - NWNX_PushArgumentString(FloatToString(max, 0)); - if (withscores != "") NWNX_PushArgumentString(withscores); - if (limit_offset != 0) NWNX_PushArgumentString(IntToString(limit_offset)); - if (limit_count != 0) NWNX_PushArgumentString(IntToString(limit_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZRANGEBYSCORE"); + NWNXPushString(key); + NWNXPushString(FloatToString(min, 0)); + NWNXPushString(FloatToString(max, 0)); + if (withscores != "") NWNXPushString(withscores); + if (limit_offset != 0) NWNXPushString(IntToString(limit_offset)); + if (limit_count != 0) NWNXPushString(IntToString(limit_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZRANK( string key, string member ) { - NWNX_PushArgumentString("ZRANK"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZRANK"); + NWNXPushString(key); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZREM( string key, string member ) { - NWNX_PushArgumentString("ZREM"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZREM"); + NWNXPushString(key); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZREMRANGEBYLEX( @@ -5462,12 +5461,12 @@ int NWNX_Redis_ZREMRANGEBYLEX( string min, string max ) { - NWNX_PushArgumentString("ZREMRANGEBYLEX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(min); - NWNX_PushArgumentString(max); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZREMRANGEBYLEX"); + NWNXPushString(key); + NWNXPushString(min); + NWNXPushString(max); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZREMRANGEBYRANK( @@ -5477,12 +5476,12 @@ int NWNX_Redis_ZREMRANGEBYRANK( // Redis type: integer int stop ) { - NWNX_PushArgumentString("ZREMRANGEBYRANK"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(start)); - NWNX_PushArgumentString(IntToString(stop)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZREMRANGEBYRANK"); + NWNXPushString(key); + NWNXPushString(IntToString(start)); + NWNXPushString(IntToString(stop)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZREMRANGEBYSCORE( @@ -5492,12 +5491,12 @@ int NWNX_Redis_ZREMRANGEBYSCORE( // Redis type: double float max ) { - NWNX_PushArgumentString("ZREMRANGEBYSCORE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(FloatToString(min, 0)); - NWNX_PushArgumentString(FloatToString(max, 0)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZREMRANGEBYSCORE"); + NWNXPushString(key); + NWNXPushString(FloatToString(min, 0)); + NWNXPushString(FloatToString(max, 0)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZREVRANGE( @@ -5509,13 +5508,13 @@ int NWNX_Redis_ZREVRANGE( // Redis type: enum string withscores = "" ) { - NWNX_PushArgumentString("ZREVRANGE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(start)); - NWNX_PushArgumentString(IntToString(stop)); - if (withscores != "") NWNX_PushArgumentString(withscores); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZREVRANGE"); + NWNXPushString(key); + NWNXPushString(IntToString(start)); + NWNXPushString(IntToString(stop)); + if (withscores != "") NWNXPushString(withscores); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZREVRANGEBYSCORE( @@ -5531,37 +5530,37 @@ int NWNX_Redis_ZREVRANGEBYSCORE( // Redis type: integer int limit_count = 0 ) { - NWNX_PushArgumentString("ZREVRANGEBYSCORE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(FloatToString(max, 0)); - NWNX_PushArgumentString(FloatToString(min, 0)); - if (withscores != "") NWNX_PushArgumentString(withscores); - if (limit_offset != 0) NWNX_PushArgumentString(IntToString(limit_offset)); - if (limit_count != 0) NWNX_PushArgumentString(IntToString(limit_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZREVRANGEBYSCORE"); + NWNXPushString(key); + NWNXPushString(FloatToString(max, 0)); + NWNXPushString(FloatToString(min, 0)); + if (withscores != "") NWNXPushString(withscores); + if (limit_offset != 0) NWNXPushString(IntToString(limit_offset)); + if (limit_count != 0) NWNXPushString(IntToString(limit_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZREVRANK( string key, string member ) { - NWNX_PushArgumentString("ZREVRANK"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZREVRANK"); + NWNXPushString(key); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZSCORE( string key, string member ) { - NWNX_PushArgumentString("ZSCORE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZSCORE"); + NWNXPushString(key); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZUNIONSTORE( @@ -5575,14 +5574,14 @@ int NWNX_Redis_ZUNIONSTORE( // Redis type: enum string aggregate_aggregate = "" ) { - NWNX_PushArgumentString("ZUNIONSTORE"); - NWNX_PushArgumentString(destination); - NWNX_PushArgumentString(IntToString(numkeys)); - NWNX_PushArgumentString(key); - if (weights_weight != 0) NWNX_PushArgumentString(IntToString(weights_weight)); - if (aggregate_aggregate != "") NWNX_PushArgumentString(aggregate_aggregate); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZUNIONSTORE"); + NWNXPushString(destination); + NWNXPushString(IntToString(numkeys)); + NWNXPushString(key); + if (weights_weight != 0) NWNXPushString(IntToString(weights_weight)); + if (aggregate_aggregate != "") NWNXPushString(aggregate_aggregate); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SCAN( @@ -5594,13 +5593,13 @@ int NWNX_Redis_SCAN( int count_count = 0, string type_type = "" ) { - NWNX_PushArgumentString("SCAN"); - NWNX_PushArgumentString(IntToString(cursor)); - if (match_pattern != "") NWNX_PushArgumentString(match_pattern); - if (count_count != 0) NWNX_PushArgumentString(IntToString(count_count)); - if (type_type != "") NWNX_PushArgumentString(type_type); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SCAN"); + NWNXPushString(IntToString(cursor)); + if (match_pattern != "") NWNXPushString(match_pattern); + if (count_count != 0) NWNXPushString(IntToString(count_count)); + if (type_type != "") NWNXPushString(type_type); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_SSCAN( @@ -5612,13 +5611,13 @@ int NWNX_Redis_SSCAN( // Redis type: integer int count_count = 0 ) { - NWNX_PushArgumentString("SSCAN"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(cursor)); - if (match_pattern != "") NWNX_PushArgumentString(match_pattern); - if (count_count != 0) NWNX_PushArgumentString(IntToString(count_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SSCAN"); + NWNXPushString(key); + NWNXPushString(IntToString(cursor)); + if (match_pattern != "") NWNXPushString(match_pattern); + if (count_count != 0) NWNXPushString(IntToString(count_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_HSCAN( @@ -5630,13 +5629,13 @@ int NWNX_Redis_HSCAN( // Redis type: integer int count_count = 0 ) { - NWNX_PushArgumentString("HSCAN"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(cursor)); - if (match_pattern != "") NWNX_PushArgumentString(match_pattern); - if (count_count != 0) NWNX_PushArgumentString(IntToString(count_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HSCAN"); + NWNXPushString(key); + NWNXPushString(IntToString(cursor)); + if (match_pattern != "") NWNXPushString(match_pattern); + if (count_count != 0) NWNXPushString(IntToString(count_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_ZSCAN( @@ -5648,13 +5647,13 @@ int NWNX_Redis_ZSCAN( // Redis type: integer int count_count = 0 ) { - NWNX_PushArgumentString("ZSCAN"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(cursor)); - if (match_pattern != "") NWNX_PushArgumentString(match_pattern); - if (count_count != 0) NWNX_PushArgumentString(IntToString(count_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZSCAN"); + NWNXPushString(key); + NWNXPushString(IntToString(cursor)); + if (match_pattern != "") NWNXPushString(match_pattern); + if (count_count != 0) NWNXPushString(IntToString(count_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_XINFO( @@ -5668,14 +5667,14 @@ int NWNX_Redis_XINFO( // Redis type: enum string help = "" ) { - NWNX_PushArgumentString("XINFO"); - if (consumers_key != "") NWNX_PushArgumentString(consumers_key); - if (consumers_groupname != "") NWNX_PushArgumentString(consumers_groupname); - if (groups_key != "") NWNX_PushArgumentString(groups_key); - if (stream_key != "") NWNX_PushArgumentString(stream_key); - if (help != "") NWNX_PushArgumentString(help); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XINFO"); + if (consumers_key != "") NWNXPushString(consumers_key); + if (consumers_groupname != "") NWNXPushString(consumers_groupname); + if (groups_key != "") NWNXPushString(groups_key); + if (stream_key != "") NWNXPushString(stream_key); + if (help != "") NWNXPushString(help); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_XADD( @@ -5685,13 +5684,13 @@ int NWNX_Redis_XADD( string field, string str ) { - NWNX_PushArgumentString("XADD"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(ID); - NWNX_PushArgumentString(field); - NWNX_PushArgumentString(str); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XADD"); + NWNXPushString(key); + NWNXPushString(ID); + NWNXPushString(field); + NWNXPushString(str); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_XTRIM( @@ -5703,24 +5702,24 @@ int NWNX_Redis_XTRIM( // Redis type: integer int count = 0 ) { - NWNX_PushArgumentString("XTRIM"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(strategy); - if (approx != "") NWNX_PushArgumentString(approx); - NWNX_PushArgumentString(IntToString(count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XTRIM"); + NWNXPushString(key); + NWNXPushString(strategy); + if (approx != "") NWNXPushString(approx); + NWNXPushString(IntToString(count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_XDEL( string key, string ID ) { - NWNX_PushArgumentString("XDEL"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(ID); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XDEL"); + NWNXPushString(key); + NWNXPushString(ID); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_XRANGE( @@ -5730,13 +5729,13 @@ int NWNX_Redis_XRANGE( // Redis type: integer int count_count = 0 ) { - NWNX_PushArgumentString("XRANGE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(start); - NWNX_PushArgumentString(end); - if (count_count != 0) NWNX_PushArgumentString(IntToString(count_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XRANGE"); + NWNXPushString(key); + NWNXPushString(start); + NWNXPushString(end); + if (count_count != 0) NWNXPushString(IntToString(count_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_XREVRANGE( @@ -5746,22 +5745,22 @@ int NWNX_Redis_XREVRANGE( // Redis type: integer int count_count = 0 ) { - NWNX_PushArgumentString("XREVRANGE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(end); - NWNX_PushArgumentString(start); - if (count_count != 0) NWNX_PushArgumentString(IntToString(count_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XREVRANGE"); + NWNXPushString(key); + NWNXPushString(end); + NWNXPushString(start); + if (count_count != 0) NWNXPushString(IntToString(count_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_XLEN( string key ) { - NWNX_PushArgumentString("XLEN"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XLEN"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_XREAD( @@ -5774,14 +5773,14 @@ int NWNX_Redis_XREAD( string key = "", string ID = "" ) { - NWNX_PushArgumentString("XREAD"); - if (count_count != 0) NWNX_PushArgumentString(IntToString(count_count)); - if (block_milliseconds != 0) NWNX_PushArgumentString(IntToString(block_milliseconds)); - NWNX_PushArgumentString(streams); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(ID); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XREAD"); + if (count_count != 0) NWNXPushString(IntToString(count_count)); + if (block_milliseconds != 0) NWNXPushString(IntToString(block_milliseconds)); + NWNXPushString(streams); + NWNXPushString(key); + NWNXPushString(ID); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_XGROUP( @@ -5801,20 +5800,20 @@ int NWNX_Redis_XGROUP( string delconsumer_groupname = "", string delconsumer_consumername = "" ) { - NWNX_PushArgumentString("XGROUP"); - if (create_key != "") NWNX_PushArgumentString(create_key); - if (create_groupname != "") NWNX_PushArgumentString(create_groupname); - if (create_id_or__ != "") NWNX_PushArgumentString(create_id_or__); - if (setid_key != "") NWNX_PushArgumentString(setid_key); - if (setid_groupname != "") NWNX_PushArgumentString(setid_groupname); - if (setid_id_or__ != "") NWNX_PushArgumentString(setid_id_or__); - if (destroy_key != "") NWNX_PushArgumentString(destroy_key); - if (destroy_groupname != "") NWNX_PushArgumentString(destroy_groupname); - if (delconsumer_key != "") NWNX_PushArgumentString(delconsumer_key); - if (delconsumer_groupname != "") NWNX_PushArgumentString(delconsumer_groupname); - if (delconsumer_consumername != "") NWNX_PushArgumentString(delconsumer_consumername); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XGROUP"); + if (create_key != "") NWNXPushString(create_key); + if (create_groupname != "") NWNXPushString(create_groupname); + if (create_id_or__ != "") NWNXPushString(create_id_or__); + if (setid_key != "") NWNXPushString(setid_key); + if (setid_groupname != "") NWNXPushString(setid_groupname); + if (setid_id_or__ != "") NWNXPushString(setid_id_or__); + if (destroy_key != "") NWNXPushString(destroy_key); + if (destroy_groupname != "") NWNXPushString(destroy_groupname); + if (delconsumer_key != "") NWNXPushString(delconsumer_key); + if (delconsumer_groupname != "") NWNXPushString(delconsumer_groupname); + if (delconsumer_consumername != "") NWNXPushString(delconsumer_consumername); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_XREADGROUP( @@ -5831,17 +5830,17 @@ int NWNX_Redis_XREADGROUP( string key = "", string ID = "" ) { - NWNX_PushArgumentString("XREADGROUP"); - NWNX_PushArgumentString(group_group); - NWNX_PushArgumentString(group_consumer); - if (count_count != 0) NWNX_PushArgumentString(IntToString(count_count)); - if (block_milliseconds != 0) NWNX_PushArgumentString(IntToString(block_milliseconds)); - if (noack != "") NWNX_PushArgumentString(noack); - NWNX_PushArgumentString(streams); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(ID); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XREADGROUP"); + NWNXPushString(group_group); + NWNXPushString(group_consumer); + if (count_count != 0) NWNXPushString(IntToString(count_count)); + if (block_milliseconds != 0) NWNXPushString(IntToString(block_milliseconds)); + if (noack != "") NWNXPushString(noack); + NWNXPushString(streams); + NWNXPushString(key); + NWNXPushString(ID); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_XACK( @@ -5849,12 +5848,12 @@ int NWNX_Redis_XACK( string group, string ID ) { - NWNX_PushArgumentString("XACK"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(group); - NWNX_PushArgumentString(ID); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XACK"); + NWNXPushString(key); + NWNXPushString(group); + NWNXPushString(ID); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_XCLAIM( @@ -5870,17 +5869,17 @@ int NWNX_Redis_XCLAIM( // Redis type: integer int retrycount_count = 0 ) { - NWNX_PushArgumentString("XCLAIM"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(group); - NWNX_PushArgumentString(consumer); - NWNX_PushArgumentString(min_idle_time); - NWNX_PushArgumentString(ID); - if (idle_ms != 0) NWNX_PushArgumentString(IntToString(idle_ms)); - if (time_ms_unix_time != 0) NWNX_PushArgumentString(IntToString(time_ms_unix_time)); - if (retrycount_count != 0) NWNX_PushArgumentString(IntToString(retrycount_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XCLAIM"); + NWNXPushString(key); + NWNXPushString(group); + NWNXPushString(consumer); + NWNXPushString(min_idle_time); + NWNXPushString(ID); + if (idle_ms != 0) NWNXPushString(IntToString(idle_ms)); + if (time_ms_unix_time != 0) NWNXPushString(IntToString(time_ms_unix_time)); + if (retrycount_count != 0) NWNXPushString(IntToString(retrycount_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int NWNX_Redis_XPENDING( @@ -5892,15 +5891,15 @@ int NWNX_Redis_XPENDING( int count = 0, string consumer = "" ) { - NWNX_PushArgumentString("XPENDING"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(group); - if (start != "") NWNX_PushArgumentString(start); - if (end != "") NWNX_PushArgumentString(end); - if (count != 0) NWNX_PushArgumentString(IntToString(count)); - if (consumer != "") NWNX_PushArgumentString(consumer); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XPENDING"); + NWNXPushString(key); + NWNXPushString(group); + if (start != "") NWNXPushString(start); + if (end != "") NWNXPushString(end); + if (count != 0) NWNXPushString(IntToString(count)); + if (consumer != "") NWNXPushString(consumer); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } /// @} diff --git a/_module/nss/nwnx_redis_lib.nss b/_module/nss/nwnx_redis_lib.nss index 1593345f..ce931a2b 100644 --- a/_module/nss/nwnx_redis_lib.nss +++ b/_module/nss/nwnx_redis_lib.nss @@ -3,7 +3,6 @@ /// @{ /// @file nwnx_redis_lib.nss /// @brief Allows connection and interfacing with a redis server. -#include "nwnx" /// @anchor redis_results /// @name Redis Results @@ -65,44 +64,44 @@ string NWNX_Redis_GetResultAsString(int resultId); int NWNX_Redis_GetResultType(int resultId) { - NWNX_PushArgumentInt(resultId); - NWNX_CallFunction("NWNX_Redis", "GetResultType"); - return NWNX_GetReturnValueInt(); + NWNXPushInt(resultId); + NWNXCall("NWNX_Redis", "GetResultType"); + return NWNXPopInt(); } int NWNX_Redis_GetArrayLength(int resultId) { - NWNX_PushArgumentInt(resultId); - NWNX_CallFunction("NWNX_Redis", "GetResultArrayLength"); - return NWNX_GetReturnValueInt(); + NWNXPushInt(resultId); + NWNXCall("NWNX_Redis", "GetResultArrayLength"); + return NWNXPopInt(); } // Returns the last int NWNX_Redis_GetArrayElement(int resultId, int idx) { - NWNX_PushArgumentInt(resultId); - NWNX_PushArgumentInt(idx); - NWNX_CallFunction("NWNX_Redis", "GetResultArrayElement"); - return NWNX_GetReturnValueInt(); + NWNXPushInt(resultId); + NWNXPushInt(idx); + NWNXCall("NWNX_Redis", "GetResultArrayElement"); + return NWNXPopInt(); } float NWNX_Redis_GetResultAsFloat(int resultId) { - NWNX_PushArgumentInt(resultId); - NWNX_CallFunction("NWNX_Redis", "GetResultAsString"); - return StringToFloat(NWNX_GetReturnValueString()); + NWNXPushInt(resultId); + NWNXCall("NWNX_Redis", "GetResultAsString"); + return StringToFloat(NWNXPopString()); } int NWNX_Redis_GetResultAsInt(int resultId) { - NWNX_PushArgumentInt(resultId); - NWNX_CallFunction("NWNX_Redis", "GetResultAsString"); - return StringToInt(NWNX_GetReturnValueString()); + NWNXPushInt(resultId); + NWNXCall("NWNX_Redis", "GetResultAsString"); + return StringToInt(NWNXPopString()); } string NWNX_Redis_GetResultAsString(int resultId) { - NWNX_PushArgumentInt(resultId); - NWNX_CallFunction("NWNX_Redis", "GetResultAsString"); - return NWNX_GetReturnValueString(); + NWNXPushInt(resultId); + NWNXCall("NWNX_Redis", "GetResultAsString"); + return NWNXPopString(); } diff --git a/_module/nss/nwnx_redis_ps.nss b/_module/nss/nwnx_redis_ps.nss index 83ca4485..ca03f317 100644 --- a/_module/nss/nwnx_redis_ps.nss +++ b/_module/nss/nwnx_redis_ps.nss @@ -2,7 +2,6 @@ /// @brief Interface to Redis PUBSUB /// @{ /// @file nwnx_redis_ps.nss -#include "nwnx" /// A redis PUBSUB message struct NWNX_Redis_PubSubMessageData { @@ -15,9 +14,9 @@ struct NWNX_Redis_PubSubMessageData { struct NWNX_Redis_PubSubMessageData NWNX_Redis_GetPubSubMessageData() { struct NWNX_Redis_PubSubMessageData ret; - NWNX_CallFunction("NWNX_Redis", "GetPubSubData"); - ret.message = NWNX_GetReturnValueString(); - ret.channel = NWNX_GetReturnValueString(); + NWNXCall("NWNX_Redis", "GetPubSubData"); + ret.message = NWNXPopString(); + ret.channel = NWNXPopString(); return ret; } /// @} diff --git a/_module/nss/nwnx_redis_short.nss b/_module/nss/nwnx_redis_short.nss index 53b2d01f..ec1945e6 100644 --- a/_module/nss/nwnx_redis_short.nss +++ b/_module/nss/nwnx_redis_short.nss @@ -1,4 +1,3 @@ -#include "nwnx" #include "nwnx_redis_lib" @@ -3230,32 +3229,32 @@ int APPEND( string key, string value ) { - NWNX_PushArgumentString("APPEND"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("APPEND"); + NWNXPushString(key); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int AUTH( string password ) { - NWNX_PushArgumentString("AUTH"); - NWNX_PushArgumentString(password); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("AUTH"); + NWNXPushString(password); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int BGREWRITEAOF() { - NWNX_PushArgumentString("BGREWRITEAOF"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BGREWRITEAOF"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int BGSAVE() { - NWNX_PushArgumentString("BGSAVE"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BGSAVE"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int BITCOUNT( @@ -3265,12 +3264,12 @@ int BITCOUNT( // Redis type: integer int end = 0 ) { - NWNX_PushArgumentString("BITCOUNT"); - NWNX_PushArgumentString(key); - if (start != 0) NWNX_PushArgumentString(IntToString(start)); - if (end != 0) NWNX_PushArgumentString(IntToString(end)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BITCOUNT"); + NWNXPushString(key); + if (start != 0) NWNXPushString(IntToString(start)); + if (end != 0) NWNXPushString(IntToString(end)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int BITFIELD( @@ -3292,18 +3291,18 @@ int BITFIELD( // Redis type: integer int incrby_increment = 0 ) { - NWNX_PushArgumentString("BITFIELD"); - NWNX_PushArgumentString(key); - if (get_type != "") NWNX_PushArgumentString(get_type); - if (get_offset != 0) NWNX_PushArgumentString(IntToString(get_offset)); - if (set_type != "") NWNX_PushArgumentString(set_type); - if (set_offset != 0) NWNX_PushArgumentString(IntToString(set_offset)); - if (set_value != 0) NWNX_PushArgumentString(IntToString(set_value)); - if (incrby_type != "") NWNX_PushArgumentString(incrby_type); - if (incrby_offset != 0) NWNX_PushArgumentString(IntToString(incrby_offset)); - if (incrby_increment != 0) NWNX_PushArgumentString(IntToString(incrby_increment)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BITFIELD"); + NWNXPushString(key); + if (get_type != "") NWNXPushString(get_type); + if (get_offset != 0) NWNXPushString(IntToString(get_offset)); + if (set_type != "") NWNXPushString(set_type); + if (set_offset != 0) NWNXPushString(IntToString(set_offset)); + if (set_value != 0) NWNXPushString(IntToString(set_value)); + if (incrby_type != "") NWNXPushString(incrby_type); + if (incrby_offset != 0) NWNXPushString(IntToString(incrby_offset)); + if (incrby_increment != 0) NWNXPushString(IntToString(incrby_increment)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int BITOP( @@ -3312,12 +3311,12 @@ int BITOP( string destkey, string key ) { - NWNX_PushArgumentString("BITOP"); - NWNX_PushArgumentString(operation); - NWNX_PushArgumentString(destkey); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BITOP"); + NWNXPushString(operation); + NWNXPushString(destkey); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int BITPOS( @@ -3329,13 +3328,13 @@ int BITPOS( // Redis type: integer int end = 0 ) { - NWNX_PushArgumentString("BITPOS"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(bit)); - if (start != 0) NWNX_PushArgumentString(IntToString(start)); - if (end != 0) NWNX_PushArgumentString(IntToString(end)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BITPOS"); + NWNXPushString(key); + NWNXPushString(IntToString(bit)); + if (start != 0) NWNXPushString(IntToString(start)); + if (end != 0) NWNXPushString(IntToString(end)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int BLPOP( @@ -3343,11 +3342,11 @@ int BLPOP( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("BLPOP"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(timeout)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BLPOP"); + NWNXPushString(key); + NWNXPushString(IntToString(timeout)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int BRPOP( @@ -3355,11 +3354,11 @@ int BRPOP( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("BRPOP"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(timeout)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BRPOP"); + NWNXPushString(key); + NWNXPushString(IntToString(timeout)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int BRPOPLPUSH( @@ -3370,12 +3369,12 @@ int BRPOPLPUSH( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("BRPOPLPUSH"); - NWNX_PushArgumentString(source); - NWNX_PushArgumentString(destination); - NWNX_PushArgumentString(IntToString(timeout)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BRPOPLPUSH"); + NWNXPushString(source); + NWNXPushString(destination); + NWNXPushString(IntToString(timeout)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int BZPOPMIN( @@ -3383,11 +3382,11 @@ int BZPOPMIN( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("BZPOPMIN"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(timeout)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BZPOPMIN"); + NWNXPushString(key); + NWNXPushString(IntToString(timeout)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int BZPOPMAX( @@ -3395,17 +3394,17 @@ int BZPOPMAX( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("BZPOPMAX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(timeout)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("BZPOPMAX"); + NWNXPushString(key); + NWNXPushString(IntToString(timeout)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLIENT_ID() { - NWNX_PushArgumentString("CLIENT_ID"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLIENT_ID"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLIENT_KILL( @@ -3415,54 +3414,54 @@ int CLIENT_KILL( string addr_ip_port = "", string skipme_yes_no = "" ) { - NWNX_PushArgumentString("CLIENT_KILL"); - if (ip_port != "") NWNX_PushArgumentString(ip_port); - if (id_client_id != 0) NWNX_PushArgumentString(IntToString(id_client_id)); - if (addr_ip_port != "") NWNX_PushArgumentString(addr_ip_port); - if (skipme_yes_no != "") NWNX_PushArgumentString(skipme_yes_no); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLIENT_KILL"); + if (ip_port != "") NWNXPushString(ip_port); + if (id_client_id != 0) NWNXPushString(IntToString(id_client_id)); + if (addr_ip_port != "") NWNXPushString(addr_ip_port); + if (skipme_yes_no != "") NWNXPushString(skipme_yes_no); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLIENT_LIST() { - NWNX_PushArgumentString("CLIENT_LIST"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLIENT_LIST"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLIENT_GETNAME() { - NWNX_PushArgumentString("CLIENT_GETNAME"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLIENT_GETNAME"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLIENT_PAUSE( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("CLIENT_PAUSE"); - NWNX_PushArgumentString(IntToString(timeout)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLIENT_PAUSE"); + NWNXPushString(IntToString(timeout)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLIENT_REPLY( // Redis type: enum string reply_mode ) { - NWNX_PushArgumentString("CLIENT_REPLY"); - NWNX_PushArgumentString(reply_mode); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLIENT_REPLY"); + NWNXPushString(reply_mode); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLIENT_SETNAME( string connection_name ) { - NWNX_PushArgumentString("CLIENT_SETNAME"); - NWNX_PushArgumentString(connection_name); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLIENT_SETNAME"); + NWNXPushString(connection_name); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLIENT_UNBLOCK( @@ -3470,69 +3469,69 @@ int CLIENT_UNBLOCK( // Redis type: enum string unblock_type = "" ) { - NWNX_PushArgumentString("CLIENT_UNBLOCK"); - NWNX_PushArgumentString(client_id); - if (unblock_type != "") NWNX_PushArgumentString(unblock_type); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLIENT_UNBLOCK"); + NWNXPushString(client_id); + if (unblock_type != "") NWNXPushString(unblock_type); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLUSTER_ADDSLOTS( // Redis type: integer int slot ) { - NWNX_PushArgumentString("CLUSTER_ADDSLOTS"); - NWNX_PushArgumentString(IntToString(slot)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_ADDSLOTS"); + NWNXPushString(IntToString(slot)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLUSTER_COUNT_FAILURE_REPORTS( string node_id ) { - NWNX_PushArgumentString("CLUSTER_COUNT_FAILURE_REPORTS"); - NWNX_PushArgumentString(node_id); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_COUNT_FAILURE_REPORTS"); + NWNXPushString(node_id); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLUSTER_COUNTKEYSINSLOT( // Redis type: integer int slot ) { - NWNX_PushArgumentString("CLUSTER_COUNTKEYSINSLOT"); - NWNX_PushArgumentString(IntToString(slot)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_COUNTKEYSINSLOT"); + NWNXPushString(IntToString(slot)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLUSTER_DELSLOTS( // Redis type: integer int slot ) { - NWNX_PushArgumentString("CLUSTER_DELSLOTS"); - NWNX_PushArgumentString(IntToString(slot)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_DELSLOTS"); + NWNXPushString(IntToString(slot)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLUSTER_FAILOVER( // Redis type: enum string options = "" ) { - NWNX_PushArgumentString("CLUSTER_FAILOVER"); - if (options != "") NWNX_PushArgumentString(options); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_FAILOVER"); + if (options != "") NWNXPushString(options); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLUSTER_FORGET( string node_id ) { - NWNX_PushArgumentString("CLUSTER_FORGET"); - NWNX_PushArgumentString(node_id); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_FORGET"); + NWNXPushString(node_id); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLUSTER_GETKEYSINSLOT( @@ -3541,26 +3540,26 @@ int CLUSTER_GETKEYSINSLOT( // Redis type: integer int count ) { - NWNX_PushArgumentString("CLUSTER_GETKEYSINSLOT"); - NWNX_PushArgumentString(IntToString(slot)); - NWNX_PushArgumentString(IntToString(count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_GETKEYSINSLOT"); + NWNXPushString(IntToString(slot)); + NWNXPushString(IntToString(count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLUSTER_INFO() { - NWNX_PushArgumentString("CLUSTER_INFO"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_INFO"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLUSTER_KEYSLOT( string key ) { - NWNX_PushArgumentString("CLUSTER_KEYSLOT"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_KEYSLOT"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLUSTER_MEET( @@ -3568,52 +3567,52 @@ int CLUSTER_MEET( // Redis type: integer int port ) { - NWNX_PushArgumentString("CLUSTER_MEET"); - NWNX_PushArgumentString(ip); - NWNX_PushArgumentString(IntToString(port)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_MEET"); + NWNXPushString(ip); + NWNXPushString(IntToString(port)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLUSTER_NODES() { - NWNX_PushArgumentString("CLUSTER_NODES"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_NODES"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLUSTER_REPLICATE( string node_id ) { - NWNX_PushArgumentString("CLUSTER_REPLICATE"); - NWNX_PushArgumentString(node_id); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_REPLICATE"); + NWNXPushString(node_id); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLUSTER_RESET( // Redis type: enum string reset_type = "" ) { - NWNX_PushArgumentString("CLUSTER_RESET"); - if (reset_type != "") NWNX_PushArgumentString(reset_type); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_RESET"); + if (reset_type != "") NWNXPushString(reset_type); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLUSTER_SAVECONFIG() { - NWNX_PushArgumentString("CLUSTER_SAVECONFIG"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_SAVECONFIG"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLUSTER_SET_CONFIG_EPOCH( // Redis type: integer int config_epoch ) { - NWNX_PushArgumentString("CLUSTER_SET_CONFIG_EPOCH"); - NWNX_PushArgumentString(IntToString(config_epoch)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_SET_CONFIG_EPOCH"); + NWNXPushString(IntToString(config_epoch)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLUSTER_SETSLOT( @@ -3623,125 +3622,125 @@ int CLUSTER_SETSLOT( string subcommand, string node_id = "" ) { - NWNX_PushArgumentString("CLUSTER_SETSLOT"); - NWNX_PushArgumentString(IntToString(slot)); - NWNX_PushArgumentString(subcommand); - if (node_id != "") NWNX_PushArgumentString(node_id); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_SETSLOT"); + NWNXPushString(IntToString(slot)); + NWNXPushString(subcommand); + if (node_id != "") NWNXPushString(node_id); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLUSTER_SLAVES( string node_id ) { - NWNX_PushArgumentString("CLUSTER_SLAVES"); - NWNX_PushArgumentString(node_id); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_SLAVES"); + NWNXPushString(node_id); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLUSTER_REPLICAS( string node_id ) { - NWNX_PushArgumentString("CLUSTER_REPLICAS"); - NWNX_PushArgumentString(node_id); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_REPLICAS"); + NWNXPushString(node_id); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CLUSTER_SLOTS() { - NWNX_PushArgumentString("CLUSTER_SLOTS"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CLUSTER_SLOTS"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int COMMAND() { - NWNX_PushArgumentString("COMMAND"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("COMMAND"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int COMMAND_COUNT() { - NWNX_PushArgumentString("COMMAND_COUNT"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("COMMAND_COUNT"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int COMMAND_GETKEYS() { - NWNX_PushArgumentString("COMMAND_GETKEYS"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("COMMAND_GETKEYS"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int COMMAND_INFO( string command_name ) { - NWNX_PushArgumentString("COMMAND_INFO"); - NWNX_PushArgumentString(command_name); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("COMMAND_INFO"); + NWNXPushString(command_name); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CONFIG_GET( string parameter ) { - NWNX_PushArgumentString("CONFIG_GET"); - NWNX_PushArgumentString(parameter); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CONFIG_GET"); + NWNXPushString(parameter); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CONFIG_REWRITE() { - NWNX_PushArgumentString("CONFIG_REWRITE"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CONFIG_REWRITE"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CONFIG_SET( string parameter, string value ) { - NWNX_PushArgumentString("CONFIG_SET"); - NWNX_PushArgumentString(parameter); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CONFIG_SET"); + NWNXPushString(parameter); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int CONFIG_RESETSTAT() { - NWNX_PushArgumentString("CONFIG_RESETSTAT"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("CONFIG_RESETSTAT"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int DBSIZE() { - NWNX_PushArgumentString("DBSIZE"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("DBSIZE"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int DEBUG_OBJECT( string key ) { - NWNX_PushArgumentString("DEBUG_OBJECT"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("DEBUG_OBJECT"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int DEBUG_SEGFAULT() { - NWNX_PushArgumentString("DEBUG_SEGFAULT"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("DEBUG_SEGFAULT"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int DECR( string key ) { - NWNX_PushArgumentString("DECR"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("DECR"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int DECRBY( @@ -3749,44 +3748,44 @@ int DECRBY( // Redis type: integer int decrement ) { - NWNX_PushArgumentString("DECRBY"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(decrement)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("DECRBY"); + NWNXPushString(key); + NWNXPushString(IntToString(decrement)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int DEL( string key ) { - NWNX_PushArgumentString("DEL"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("DEL"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int DISCARD() { - NWNX_PushArgumentString("DISCARD"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("DISCARD"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int DUMP( string key ) { - NWNX_PushArgumentString("DUMP"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("DUMP"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ECHO( string message ) { - NWNX_PushArgumentString("ECHO"); - NWNX_PushArgumentString(message); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ECHO"); + NWNXPushString(message); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int EVAL( @@ -3796,13 +3795,13 @@ int EVAL( string key, string arg ) { - NWNX_PushArgumentString("EVAL"); - NWNX_PushArgumentString(script); - NWNX_PushArgumentString(IntToString(numkeys)); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(arg); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("EVAL"); + NWNXPushString(script); + NWNXPushString(IntToString(numkeys)); + NWNXPushString(key); + NWNXPushString(arg); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int EVALSHA( @@ -3812,28 +3811,28 @@ int EVALSHA( string key, string arg ) { - NWNX_PushArgumentString("EVALSHA"); - NWNX_PushArgumentString(sha1); - NWNX_PushArgumentString(IntToString(numkeys)); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(arg); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("EVALSHA"); + NWNXPushString(sha1); + NWNXPushString(IntToString(numkeys)); + NWNXPushString(key); + NWNXPushString(arg); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int EXEC() { - NWNX_PushArgumentString("EXEC"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("EXEC"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int EXISTS( string key ) { - NWNX_PushArgumentString("EXISTS"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("EXISTS"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int EXPIRE( @@ -3841,11 +3840,11 @@ int EXPIRE( // Redis type: integer int seconds ) { - NWNX_PushArgumentString("EXPIRE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(seconds)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("EXPIRE"); + NWNXPushString(key); + NWNXPushString(IntToString(seconds)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int EXPIREAT( @@ -3853,31 +3852,31 @@ int EXPIREAT( // Redis type: posix time string timestamp ) { - NWNX_PushArgumentString("EXPIREAT"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(timestamp); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("EXPIREAT"); + NWNXPushString(key); + NWNXPushString(timestamp); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int FLUSHALL( // Redis type: enum string async = "" ) { - NWNX_PushArgumentString("FLUSHALL"); - if (async != "") NWNX_PushArgumentString(async); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("FLUSHALL"); + if (async != "") NWNXPushString(async); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int FLUSHDB( // Redis type: enum string async = "" ) { - NWNX_PushArgumentString("FLUSHDB"); - if (async != "") NWNX_PushArgumentString(async); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("FLUSHDB"); + if (async != "") NWNXPushString(async); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int GEOADD( @@ -3888,35 +3887,35 @@ int GEOADD( float latitude, string member ) { - NWNX_PushArgumentString("GEOADD"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(FloatToString(longitude, 0)); - NWNX_PushArgumentString(FloatToString(latitude, 0)); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("GEOADD"); + NWNXPushString(key); + NWNXPushString(FloatToString(longitude, 0)); + NWNXPushString(FloatToString(latitude, 0)); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int GEOHASH( string key, string member ) { - NWNX_PushArgumentString("GEOHASH"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("GEOHASH"); + NWNXPushString(key); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int GEOPOS( string key, string member ) { - NWNX_PushArgumentString("GEOPOS"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("GEOPOS"); + NWNXPushString(key); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int GEODIST( @@ -3925,13 +3924,13 @@ int GEODIST( string member2, string unit = "" ) { - NWNX_PushArgumentString("GEODIST"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member1); - NWNX_PushArgumentString(member2); - if (unit != "") NWNX_PushArgumentString(unit); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("GEODIST"); + NWNXPushString(key); + NWNXPushString(member1); + NWNXPushString(member2); + if (unit != "") NWNXPushString(unit); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int GEORADIUS( @@ -3959,21 +3958,21 @@ int GEORADIUS( // Redis type: key string storedist_key = "" ) { - NWNX_PushArgumentString("GEORADIUS"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(FloatToString(longitude, 0)); - NWNX_PushArgumentString(FloatToString(latitude, 0)); - NWNX_PushArgumentString(FloatToString(radius, 0)); - NWNX_PushArgumentString(unit); - if (withcoord != "") NWNX_PushArgumentString(withcoord); - if (withdist != "") NWNX_PushArgumentString(withdist); - if (withhash != "") NWNX_PushArgumentString(withhash); - if (count_count != 0) NWNX_PushArgumentString(IntToString(count_count)); - if (order != "") NWNX_PushArgumentString(order); - if (store_key != "") NWNX_PushArgumentString(store_key); - if (storedist_key != "") NWNX_PushArgumentString(storedist_key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("GEORADIUS"); + NWNXPushString(key); + NWNXPushString(FloatToString(longitude, 0)); + NWNXPushString(FloatToString(latitude, 0)); + NWNXPushString(FloatToString(radius, 0)); + NWNXPushString(unit); + if (withcoord != "") NWNXPushString(withcoord); + if (withdist != "") NWNXPushString(withdist); + if (withhash != "") NWNXPushString(withhash); + if (count_count != 0) NWNXPushString(IntToString(count_count)); + if (order != "") NWNXPushString(order); + if (store_key != "") NWNXPushString(store_key); + if (storedist_key != "") NWNXPushString(storedist_key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int GEORADIUSBYMEMBER( @@ -3998,29 +3997,29 @@ int GEORADIUSBYMEMBER( // Redis type: key string storedist_key = "" ) { - NWNX_PushArgumentString("GEORADIUSBYMEMBER"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member); - NWNX_PushArgumentString(FloatToString(radius, 0)); - NWNX_PushArgumentString(unit); - if (withcoord != "") NWNX_PushArgumentString(withcoord); - if (withdist != "") NWNX_PushArgumentString(withdist); - if (withhash != "") NWNX_PushArgumentString(withhash); - if (count_count != 0) NWNX_PushArgumentString(IntToString(count_count)); - if (order != "") NWNX_PushArgumentString(order); - if (store_key != "") NWNX_PushArgumentString(store_key); - if (storedist_key != "") NWNX_PushArgumentString(storedist_key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("GEORADIUSBYMEMBER"); + NWNXPushString(key); + NWNXPushString(member); + NWNXPushString(FloatToString(radius, 0)); + NWNXPushString(unit); + if (withcoord != "") NWNXPushString(withcoord); + if (withdist != "") NWNXPushString(withdist); + if (withhash != "") NWNXPushString(withhash); + if (count_count != 0) NWNXPushString(IntToString(count_count)); + if (order != "") NWNXPushString(order); + if (store_key != "") NWNXPushString(store_key); + if (storedist_key != "") NWNXPushString(storedist_key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int GET( string key ) { - NWNX_PushArgumentString("GET"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("GET"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int GETBIT( @@ -4028,11 +4027,11 @@ int GETBIT( // Redis type: integer int offset ) { - NWNX_PushArgumentString("GETBIT"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(offset)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("GETBIT"); + NWNXPushString(key); + NWNXPushString(IntToString(offset)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int GETRANGE( @@ -4042,65 +4041,65 @@ int GETRANGE( // Redis type: integer int end ) { - NWNX_PushArgumentString("GETRANGE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(start)); - NWNX_PushArgumentString(IntToString(end)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("GETRANGE"); + NWNXPushString(key); + NWNXPushString(IntToString(start)); + NWNXPushString(IntToString(end)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int GETSET( string key, string value ) { - NWNX_PushArgumentString("GETSET"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("GETSET"); + NWNXPushString(key); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int HDEL( string key, string field ) { - NWNX_PushArgumentString("HDEL"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(field); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HDEL"); + NWNXPushString(key); + NWNXPushString(field); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int HEXISTS( string key, string field ) { - NWNX_PushArgumentString("HEXISTS"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(field); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HEXISTS"); + NWNXPushString(key); + NWNXPushString(field); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int HGET( string key, string field ) { - NWNX_PushArgumentString("HGET"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(field); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HGET"); + NWNXPushString(key); + NWNXPushString(field); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int HGETALL( string key ) { - NWNX_PushArgumentString("HGETALL"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HGETALL"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int HINCRBY( @@ -4109,12 +4108,12 @@ int HINCRBY( // Redis type: integer int increment ) { - NWNX_PushArgumentString("HINCRBY"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(field); - NWNX_PushArgumentString(IntToString(increment)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HINCRBY"); + NWNXPushString(key); + NWNXPushString(field); + NWNXPushString(IntToString(increment)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int HINCRBYFLOAT( @@ -4123,41 +4122,41 @@ int HINCRBYFLOAT( // Redis type: double float increment ) { - NWNX_PushArgumentString("HINCRBYFLOAT"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(field); - NWNX_PushArgumentString(FloatToString(increment, 0)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HINCRBYFLOAT"); + NWNXPushString(key); + NWNXPushString(field); + NWNXPushString(FloatToString(increment, 0)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int HKEYS( string key ) { - NWNX_PushArgumentString("HKEYS"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HKEYS"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int HLEN( string key ) { - NWNX_PushArgumentString("HLEN"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HLEN"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int HMGET( string key, string field ) { - NWNX_PushArgumentString("HMGET"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(field); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HMGET"); + NWNXPushString(key); + NWNXPushString(field); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int HMSET( @@ -4165,12 +4164,12 @@ int HMSET( string field, string value ) { - NWNX_PushArgumentString("HMSET"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(field); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HMSET"); + NWNXPushString(key); + NWNXPushString(field); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int HSET( @@ -4178,12 +4177,12 @@ int HSET( string field, string value ) { - NWNX_PushArgumentString("HSET"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(field); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HSET"); + NWNXPushString(key); + NWNXPushString(field); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int HSETNX( @@ -4191,41 +4190,41 @@ int HSETNX( string field, string value ) { - NWNX_PushArgumentString("HSETNX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(field); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HSETNX"); + NWNXPushString(key); + NWNXPushString(field); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int HSTRLEN( string key, string field ) { - NWNX_PushArgumentString("HSTRLEN"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(field); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HSTRLEN"); + NWNXPushString(key); + NWNXPushString(field); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int HVALS( string key ) { - NWNX_PushArgumentString("HVALS"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HVALS"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int INCR( string key ) { - NWNX_PushArgumentString("INCR"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("INCR"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int INCRBY( @@ -4233,11 +4232,11 @@ int INCRBY( // Redis type: integer int increment ) { - NWNX_PushArgumentString("INCRBY"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(increment)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("INCRBY"); + NWNXPushString(key); + NWNXPushString(IntToString(increment)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int INCRBYFLOAT( @@ -4245,35 +4244,35 @@ int INCRBYFLOAT( // Redis type: double float increment ) { - NWNX_PushArgumentString("INCRBYFLOAT"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(FloatToString(increment, 0)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("INCRBYFLOAT"); + NWNXPushString(key); + NWNXPushString(FloatToString(increment, 0)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int INFO( string section = "" ) { - NWNX_PushArgumentString("INFO"); - if (section != "") NWNX_PushArgumentString(section); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("INFO"); + if (section != "") NWNXPushString(section); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int KEYS( string pattern ) { - NWNX_PushArgumentString("KEYS"); - NWNX_PushArgumentString(pattern); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("KEYS"); + NWNXPushString(pattern); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int LASTSAVE() { - NWNX_PushArgumentString("LASTSAVE"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LASTSAVE"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int LINDEX( @@ -4281,11 +4280,11 @@ int LINDEX( // Redis type: integer int index ) { - NWNX_PushArgumentString("LINDEX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(index)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LINDEX"); + NWNXPushString(key); + NWNXPushString(IntToString(index)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int LINSERT( @@ -4295,53 +4294,53 @@ int LINSERT( string pivot, string value ) { - NWNX_PushArgumentString("LINSERT"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(where); - NWNX_PushArgumentString(pivot); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LINSERT"); + NWNXPushString(key); + NWNXPushString(where); + NWNXPushString(pivot); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int LLEN( string key ) { - NWNX_PushArgumentString("LLEN"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LLEN"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int LPOP( string key ) { - NWNX_PushArgumentString("LPOP"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LPOP"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int LPUSH( string key, string value ) { - NWNX_PushArgumentString("LPUSH"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LPUSH"); + NWNXPushString(key); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int LPUSHX( string key, string value ) { - NWNX_PushArgumentString("LPUSHX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LPUSHX"); + NWNXPushString(key); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int LRANGE( @@ -4351,12 +4350,12 @@ int LRANGE( // Redis type: integer int stop ) { - NWNX_PushArgumentString("LRANGE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(start)); - NWNX_PushArgumentString(IntToString(stop)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LRANGE"); + NWNXPushString(key); + NWNXPushString(IntToString(start)); + NWNXPushString(IntToString(stop)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int LREM( @@ -4365,12 +4364,12 @@ int LREM( int count, string value ) { - NWNX_PushArgumentString("LREM"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(count)); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LREM"); + NWNXPushString(key); + NWNXPushString(IntToString(count)); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int LSET( @@ -4379,12 +4378,12 @@ int LSET( int index, string value ) { - NWNX_PushArgumentString("LSET"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(index)); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LSET"); + NWNXPushString(key); + NWNXPushString(IntToString(index)); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int LTRIM( @@ -4394,42 +4393,42 @@ int LTRIM( // Redis type: integer int stop ) { - NWNX_PushArgumentString("LTRIM"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(start)); - NWNX_PushArgumentString(IntToString(stop)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("LTRIM"); + NWNXPushString(key); + NWNXPushString(IntToString(start)); + NWNXPushString(IntToString(stop)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int MEMORY_DOCTOR() { - NWNX_PushArgumentString("MEMORY_DOCTOR"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MEMORY_DOCTOR"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int MEMORY_HELP() { - NWNX_PushArgumentString("MEMORY_HELP"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MEMORY_HELP"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int MEMORY_MALLOC_STATS() { - NWNX_PushArgumentString("MEMORY_MALLOC_STATS"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MEMORY_MALLOC_STATS"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int MEMORY_PURGE() { - NWNX_PushArgumentString("MEMORY_PURGE"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MEMORY_PURGE"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int MEMORY_STATS() { - NWNX_PushArgumentString("MEMORY_STATS"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MEMORY_STATS"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int MEMORY_USAGE( @@ -4437,20 +4436,20 @@ int MEMORY_USAGE( // Redis type: integer int samples_count = 0 ) { - NWNX_PushArgumentString("MEMORY_USAGE"); - NWNX_PushArgumentString(key); - if (samples_count != 0) NWNX_PushArgumentString(IntToString(samples_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MEMORY_USAGE"); + NWNXPushString(key); + if (samples_count != 0) NWNXPushString(IntToString(samples_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int MGET( string key ) { - NWNX_PushArgumentString("MGET"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MGET"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int MIGRATE( @@ -4470,24 +4469,24 @@ int MIGRATE( // Redis type: key string keys_key = "" ) { - NWNX_PushArgumentString("MIGRATE"); - NWNX_PushArgumentString(host); - NWNX_PushArgumentString(port); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(destination_db)); - NWNX_PushArgumentString(IntToString(timeout)); - if (copy != "") NWNX_PushArgumentString(copy); - if (replace != "") NWNX_PushArgumentString(replace); - if (auth_password != "") NWNX_PushArgumentString(auth_password); - if (keys_key != "") NWNX_PushArgumentString(keys_key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MIGRATE"); + NWNXPushString(host); + NWNXPushString(port); + NWNXPushString(key); + NWNXPushString(IntToString(destination_db)); + NWNXPushString(IntToString(timeout)); + if (copy != "") NWNXPushString(copy); + if (replace != "") NWNXPushString(replace); + if (auth_password != "") NWNXPushString(auth_password); + if (keys_key != "") NWNXPushString(keys_key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int MONITOR() { - NWNX_PushArgumentString("MONITOR"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MONITOR"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int MOVE( @@ -4495,59 +4494,59 @@ int MOVE( // Redis type: integer int db ) { - NWNX_PushArgumentString("MOVE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(db)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MOVE"); + NWNXPushString(key); + NWNXPushString(IntToString(db)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int MSET( string key, string value ) { - NWNX_PushArgumentString("MSET"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MSET"); + NWNXPushString(key); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int MSETNX( string key, string value ) { - NWNX_PushArgumentString("MSETNX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MSETNX"); + NWNXPushString(key); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int MULTI() { - NWNX_PushArgumentString("MULTI"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("MULTI"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int OBJECT( string subcommand, string arguments = "" ) { - NWNX_PushArgumentString("OBJECT"); - NWNX_PushArgumentString(subcommand); - if (arguments != "") NWNX_PushArgumentString(arguments); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("OBJECT"); + NWNXPushString(subcommand); + if (arguments != "") NWNXPushString(arguments); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int PERSIST( string key ) { - NWNX_PushArgumentString("PERSIST"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PERSIST"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int PEXPIRE( @@ -4555,11 +4554,11 @@ int PEXPIRE( // Redis type: integer int milliseconds ) { - NWNX_PushArgumentString("PEXPIRE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(milliseconds)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PEXPIRE"); + NWNXPushString(key); + NWNXPushString(IntToString(milliseconds)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int PEXPIREAT( @@ -4567,31 +4566,31 @@ int PEXPIREAT( // Redis type: posix time string milliseconds_timestamp ) { - NWNX_PushArgumentString("PEXPIREAT"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(milliseconds_timestamp); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PEXPIREAT"); + NWNXPushString(key); + NWNXPushString(milliseconds_timestamp); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int PFADD( string key, string element ) { - NWNX_PushArgumentString("PFADD"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(element); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PFADD"); + NWNXPushString(key); + NWNXPushString(element); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int PFCOUNT( string key ) { - NWNX_PushArgumentString("PFCOUNT"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PFCOUNT"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int PFMERGE( @@ -4600,20 +4599,20 @@ int PFMERGE( // Redis type: key string sourcekey ) { - NWNX_PushArgumentString("PFMERGE"); - NWNX_PushArgumentString(destkey); - NWNX_PushArgumentString(sourcekey); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PFMERGE"); + NWNXPushString(destkey); + NWNXPushString(sourcekey); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int PING( string message = "" ) { - NWNX_PushArgumentString("PING"); - if (message != "") NWNX_PushArgumentString(message); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PING"); + if (message != "") NWNXPushString(message); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int PSETEX( @@ -4622,67 +4621,67 @@ int PSETEX( int milliseconds, string value ) { - NWNX_PushArgumentString("PSETEX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(milliseconds)); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PSETEX"); + NWNXPushString(key); + NWNXPushString(IntToString(milliseconds)); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int PUBSUB( string subcommand, string argument = "" ) { - NWNX_PushArgumentString("PUBSUB"); - NWNX_PushArgumentString(subcommand); - if (argument != "") NWNX_PushArgumentString(argument); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PUBSUB"); + NWNXPushString(subcommand); + if (argument != "") NWNXPushString(argument); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int PTTL( string key ) { - NWNX_PushArgumentString("PTTL"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PTTL"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int PUBLISH( string channel, string message ) { - NWNX_PushArgumentString("PUBLISH"); - NWNX_PushArgumentString(channel); - NWNX_PushArgumentString(message); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("PUBLISH"); + NWNXPushString(channel); + NWNXPushString(message); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int QUIT() { - NWNX_PushArgumentString("QUIT"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("QUIT"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int RANDOMKEY() { - NWNX_PushArgumentString("RANDOMKEY"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("RANDOMKEY"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int READONLY() { - NWNX_PushArgumentString("READONLY"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("READONLY"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int READWRITE() { - NWNX_PushArgumentString("READWRITE"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("READWRITE"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int RENAME( @@ -4690,11 +4689,11 @@ int RENAME( // Redis type: key string newkey ) { - NWNX_PushArgumentString("RENAME"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(newkey); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("RENAME"); + NWNXPushString(key); + NWNXPushString(newkey); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int RENAMENX( @@ -4702,11 +4701,11 @@ int RENAMENX( // Redis type: key string newkey ) { - NWNX_PushArgumentString("RENAMENX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(newkey); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("RENAMENX"); + NWNXPushString(key); + NWNXPushString(newkey); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int RESTORE( @@ -4723,31 +4722,31 @@ int RESTORE( // Redis type: integer int freq_frequency = 0 ) { - NWNX_PushArgumentString("RESTORE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(ttl)); - NWNX_PushArgumentString(serialized_value); - if (replace != "") NWNX_PushArgumentString(replace); - if (absttl != "") NWNX_PushArgumentString(absttl); - if (idletime_seconds != 0) NWNX_PushArgumentString(IntToString(idletime_seconds)); - if (freq_frequency != 0) NWNX_PushArgumentString(IntToString(freq_frequency)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("RESTORE"); + NWNXPushString(key); + NWNXPushString(IntToString(ttl)); + NWNXPushString(serialized_value); + if (replace != "") NWNXPushString(replace); + if (absttl != "") NWNXPushString(absttl); + if (idletime_seconds != 0) NWNXPushString(IntToString(idletime_seconds)); + if (freq_frequency != 0) NWNXPushString(IntToString(freq_frequency)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ROLE() { - NWNX_PushArgumentString("ROLE"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ROLE"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int RPOP( string key ) { - NWNX_PushArgumentString("RPOP"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("RPOP"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int RPOPLPUSH( @@ -4756,108 +4755,108 @@ int RPOPLPUSH( // Redis type: key string destination ) { - NWNX_PushArgumentString("RPOPLPUSH"); - NWNX_PushArgumentString(source); - NWNX_PushArgumentString(destination); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("RPOPLPUSH"); + NWNXPushString(source); + NWNXPushString(destination); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int RPUSH( string key, string value ) { - NWNX_PushArgumentString("RPUSH"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("RPUSH"); + NWNXPushString(key); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int RPUSHX( string key, string value ) { - NWNX_PushArgumentString("RPUSHX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("RPUSHX"); + NWNXPushString(key); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SADD( string key, string member ) { - NWNX_PushArgumentString("SADD"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SADD"); + NWNXPushString(key); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SAVE() { - NWNX_PushArgumentString("SAVE"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SAVE"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SCARD( string key ) { - NWNX_PushArgumentString("SCARD"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SCARD"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SCRIPT_DEBUG( // Redis type: enum string mode ) { - NWNX_PushArgumentString("SCRIPT_DEBUG"); - NWNX_PushArgumentString(mode); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SCRIPT_DEBUG"); + NWNXPushString(mode); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SCRIPT_EXISTS( string sha1 ) { - NWNX_PushArgumentString("SCRIPT_EXISTS"); - NWNX_PushArgumentString(sha1); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SCRIPT_EXISTS"); + NWNXPushString(sha1); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SCRIPT_FLUSH() { - NWNX_PushArgumentString("SCRIPT_FLUSH"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SCRIPT_FLUSH"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SCRIPT_KILL() { - NWNX_PushArgumentString("SCRIPT_KILL"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SCRIPT_KILL"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SCRIPT_LOAD( string script ) { - NWNX_PushArgumentString("SCRIPT_LOAD"); - NWNX_PushArgumentString(script); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SCRIPT_LOAD"); + NWNXPushString(script); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SDIFF( string key ) { - NWNX_PushArgumentString("SDIFF"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SDIFF"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SDIFFSTORE( @@ -4865,21 +4864,21 @@ int SDIFFSTORE( string destination, string key ) { - NWNX_PushArgumentString("SDIFFSTORE"); - NWNX_PushArgumentString(destination); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SDIFFSTORE"); + NWNXPushString(destination); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SELECT( // Redis type: integer int index ) { - NWNX_PushArgumentString("SELECT"); - NWNX_PushArgumentString(IntToString(index)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SELECT"); + NWNXPushString(IntToString(index)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SET( @@ -4888,12 +4887,12 @@ int SET( // Redis type: enum string condition = "" ) { - NWNX_PushArgumentString("SET"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(value); - if (condition != "") NWNX_PushArgumentString(condition); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SET"); + NWNXPushString(key); + NWNXPushString(value); + if (condition != "") NWNXPushString(condition); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SETBIT( @@ -4902,12 +4901,12 @@ int SETBIT( int offset, string value ) { - NWNX_PushArgumentString("SETBIT"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(offset)); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SETBIT"); + NWNXPushString(key); + NWNXPushString(IntToString(offset)); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SETEX( @@ -4916,23 +4915,23 @@ int SETEX( int seconds, string value ) { - NWNX_PushArgumentString("SETEX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(seconds)); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SETEX"); + NWNXPushString(key); + NWNXPushString(IntToString(seconds)); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SETNX( string key, string value ) { - NWNX_PushArgumentString("SETNX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SETNX"); + NWNXPushString(key); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SETRANGE( @@ -4941,31 +4940,31 @@ int SETRANGE( int offset, string value ) { - NWNX_PushArgumentString("SETRANGE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(offset)); - NWNX_PushArgumentString(value); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SETRANGE"); + NWNXPushString(key); + NWNXPushString(IntToString(offset)); + NWNXPushString(value); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SHUTDOWN( // Redis type: enum string save_mode = "" ) { - NWNX_PushArgumentString("SHUTDOWN"); - if (save_mode != "") NWNX_PushArgumentString(save_mode); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SHUTDOWN"); + if (save_mode != "") NWNXPushString(save_mode); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SINTER( string key ) { - NWNX_PushArgumentString("SINTER"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SINTER"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SINTERSTORE( @@ -4973,64 +4972,64 @@ int SINTERSTORE( string destination, string key ) { - NWNX_PushArgumentString("SINTERSTORE"); - NWNX_PushArgumentString(destination); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SINTERSTORE"); + NWNXPushString(destination); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SISMEMBER( string key, string member ) { - NWNX_PushArgumentString("SISMEMBER"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SISMEMBER"); + NWNXPushString(key); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SLAVEOF( string host, string port ) { - NWNX_PushArgumentString("SLAVEOF"); - NWNX_PushArgumentString(host); - NWNX_PushArgumentString(port); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SLAVEOF"); + NWNXPushString(host); + NWNXPushString(port); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int REPLICAOF( string host, string port ) { - NWNX_PushArgumentString("REPLICAOF"); - NWNX_PushArgumentString(host); - NWNX_PushArgumentString(port); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("REPLICAOF"); + NWNXPushString(host); + NWNXPushString(port); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SLOWLOG( string subcommand, string argument = "" ) { - NWNX_PushArgumentString("SLOWLOG"); - NWNX_PushArgumentString(subcommand); - if (argument != "") NWNX_PushArgumentString(argument); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SLOWLOG"); + NWNXPushString(subcommand); + if (argument != "") NWNXPushString(argument); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SMEMBERS( string key ) { - NWNX_PushArgumentString("SMEMBERS"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SMEMBERS"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SMOVE( @@ -5040,12 +5039,12 @@ int SMOVE( string destination, string member ) { - NWNX_PushArgumentString("SMOVE"); - NWNX_PushArgumentString(source); - NWNX_PushArgumentString(destination); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SMOVE"); + NWNXPushString(source); + NWNXPushString(destination); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SORT( @@ -5064,17 +5063,17 @@ int SORT( // Redis type: key string store_destination = "" ) { - NWNX_PushArgumentString("SORT"); - NWNX_PushArgumentString(key); - if (by_pattern != "") NWNX_PushArgumentString(by_pattern); - if (limit_offset != 0) NWNX_PushArgumentString(IntToString(limit_offset)); - if (limit_count != 0) NWNX_PushArgumentString(IntToString(limit_count)); - if (get_pattern != "") NWNX_PushArgumentString(get_pattern); - if (order != "") NWNX_PushArgumentString(order); - if (sorting != "") NWNX_PushArgumentString(sorting); - if (store_destination != "") NWNX_PushArgumentString(store_destination); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SORT"); + NWNXPushString(key); + if (by_pattern != "") NWNXPushString(by_pattern); + if (limit_offset != 0) NWNXPushString(IntToString(limit_offset)); + if (limit_count != 0) NWNXPushString(IntToString(limit_count)); + if (get_pattern != "") NWNXPushString(get_pattern); + if (order != "") NWNXPushString(order); + if (sorting != "") NWNXPushString(sorting); + if (store_destination != "") NWNXPushString(store_destination); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SPOP( @@ -5082,11 +5081,11 @@ int SPOP( // Redis type: integer int count = 0 ) { - NWNX_PushArgumentString("SPOP"); - NWNX_PushArgumentString(key); - if (count != 0) NWNX_PushArgumentString(IntToString(count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SPOP"); + NWNXPushString(key); + if (count != 0) NWNXPushString(IntToString(count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SRANDMEMBER( @@ -5094,40 +5093,40 @@ int SRANDMEMBER( // Redis type: integer int count = 0 ) { - NWNX_PushArgumentString("SRANDMEMBER"); - NWNX_PushArgumentString(key); - if (count != 0) NWNX_PushArgumentString(IntToString(count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SRANDMEMBER"); + NWNXPushString(key); + if (count != 0) NWNXPushString(IntToString(count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SREM( string key, string member ) { - NWNX_PushArgumentString("SREM"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SREM"); + NWNXPushString(key); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int STRLEN( string key ) { - NWNX_PushArgumentString("STRLEN"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("STRLEN"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SUNION( string key ) { - NWNX_PushArgumentString("SUNION"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SUNION"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SUNIONSTORE( @@ -5135,11 +5134,11 @@ int SUNIONSTORE( string destination, string key ) { - NWNX_PushArgumentString("SUNIONSTORE"); - NWNX_PushArgumentString(destination); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SUNIONSTORE"); + NWNXPushString(destination); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SWAPDB( @@ -5148,65 +5147,65 @@ int SWAPDB( // Redis type: integer int index_1 ) { - NWNX_PushArgumentString("SWAPDB"); - NWNX_PushArgumentString(IntToString(index)); - NWNX_PushArgumentString(IntToString(index_1)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SWAPDB"); + NWNXPushString(IntToString(index)); + NWNXPushString(IntToString(index_1)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SYNC() { - NWNX_PushArgumentString("SYNC"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SYNC"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int TIME() { - NWNX_PushArgumentString("TIME"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("TIME"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int TOUCH( string key ) { - NWNX_PushArgumentString("TOUCH"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("TOUCH"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int TTL( string key ) { - NWNX_PushArgumentString("TTL"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("TTL"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int TYPE( string key ) { - NWNX_PushArgumentString("TYPE"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("TYPE"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int UNLINK( string key ) { - NWNX_PushArgumentString("UNLINK"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("UNLINK"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int UNWATCH() { - NWNX_PushArgumentString("UNWATCH"); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("UNWATCH"); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int WAIT( @@ -5215,20 +5214,20 @@ int WAIT( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("WAIT"); - NWNX_PushArgumentString(IntToString(numreplicas)); - NWNX_PushArgumentString(IntToString(timeout)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("WAIT"); + NWNXPushString(IntToString(numreplicas)); + NWNXPushString(IntToString(timeout)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int WATCH( string key ) { - NWNX_PushArgumentString("WATCH"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("WATCH"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZADD( @@ -5243,24 +5242,24 @@ int ZADD( float score = 0.0, string member = "" ) { - NWNX_PushArgumentString("ZADD"); - NWNX_PushArgumentString(key); - if (condition != "") NWNX_PushArgumentString(condition); - if (change != "") NWNX_PushArgumentString(change); - if (increment != "") NWNX_PushArgumentString(increment); - NWNX_PushArgumentString(FloatToString(score, 0)); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZADD"); + NWNXPushString(key); + if (condition != "") NWNXPushString(condition); + if (change != "") NWNXPushString(change); + if (increment != "") NWNXPushString(increment); + NWNXPushString(FloatToString(score, 0)); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZCARD( string key ) { - NWNX_PushArgumentString("ZCARD"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZCARD"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZCOUNT( @@ -5270,12 +5269,12 @@ int ZCOUNT( // Redis type: double float max ) { - NWNX_PushArgumentString("ZCOUNT"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(FloatToString(min, 0)); - NWNX_PushArgumentString(FloatToString(max, 0)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZCOUNT"); + NWNXPushString(key); + NWNXPushString(FloatToString(min, 0)); + NWNXPushString(FloatToString(max, 0)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZINCRBY( @@ -5284,12 +5283,12 @@ int ZINCRBY( int increment, string member ) { - NWNX_PushArgumentString("ZINCRBY"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(increment)); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZINCRBY"); + NWNXPushString(key); + NWNXPushString(IntToString(increment)); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZINTERSTORE( @@ -5303,14 +5302,14 @@ int ZINTERSTORE( // Redis type: enum string aggregate_aggregate = "" ) { - NWNX_PushArgumentString("ZINTERSTORE"); - NWNX_PushArgumentString(destination); - NWNX_PushArgumentString(IntToString(numkeys)); - NWNX_PushArgumentString(key); - if (weights_weight != 0) NWNX_PushArgumentString(IntToString(weights_weight)); - if (aggregate_aggregate != "") NWNX_PushArgumentString(aggregate_aggregate); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZINTERSTORE"); + NWNXPushString(destination); + NWNXPushString(IntToString(numkeys)); + NWNXPushString(key); + if (weights_weight != 0) NWNXPushString(IntToString(weights_weight)); + if (aggregate_aggregate != "") NWNXPushString(aggregate_aggregate); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZLEXCOUNT( @@ -5318,12 +5317,12 @@ int ZLEXCOUNT( string min, string max ) { - NWNX_PushArgumentString("ZLEXCOUNT"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(min); - NWNX_PushArgumentString(max); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZLEXCOUNT"); + NWNXPushString(key); + NWNXPushString(min); + NWNXPushString(max); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZPOPMAX( @@ -5331,11 +5330,11 @@ int ZPOPMAX( // Redis type: integer int count = 0 ) { - NWNX_PushArgumentString("ZPOPMAX"); - NWNX_PushArgumentString(key); - if (count != 0) NWNX_PushArgumentString(IntToString(count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZPOPMAX"); + NWNXPushString(key); + if (count != 0) NWNXPushString(IntToString(count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZPOPMIN( @@ -5343,11 +5342,11 @@ int ZPOPMIN( // Redis type: integer int count = 0 ) { - NWNX_PushArgumentString("ZPOPMIN"); - NWNX_PushArgumentString(key); - if (count != 0) NWNX_PushArgumentString(IntToString(count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZPOPMIN"); + NWNXPushString(key); + if (count != 0) NWNXPushString(IntToString(count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZRANGE( @@ -5359,13 +5358,13 @@ int ZRANGE( // Redis type: enum string withscores = "" ) { - NWNX_PushArgumentString("ZRANGE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(start)); - NWNX_PushArgumentString(IntToString(stop)); - if (withscores != "") NWNX_PushArgumentString(withscores); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZRANGE"); + NWNXPushString(key); + NWNXPushString(IntToString(start)); + NWNXPushString(IntToString(stop)); + if (withscores != "") NWNXPushString(withscores); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZRANGEBYLEX( @@ -5377,14 +5376,14 @@ int ZRANGEBYLEX( // Redis type: integer int limit_count = 0 ) { - NWNX_PushArgumentString("ZRANGEBYLEX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(min); - NWNX_PushArgumentString(max); - if (limit_offset != 0) NWNX_PushArgumentString(IntToString(limit_offset)); - if (limit_count != 0) NWNX_PushArgumentString(IntToString(limit_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZRANGEBYLEX"); + NWNXPushString(key); + NWNXPushString(min); + NWNXPushString(max); + if (limit_offset != 0) NWNXPushString(IntToString(limit_offset)); + if (limit_count != 0) NWNXPushString(IntToString(limit_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZREVRANGEBYLEX( @@ -5396,14 +5395,14 @@ int ZREVRANGEBYLEX( // Redis type: integer int limit_count = 0 ) { - NWNX_PushArgumentString("ZREVRANGEBYLEX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(max); - NWNX_PushArgumentString(min); - if (limit_offset != 0) NWNX_PushArgumentString(IntToString(limit_offset)); - if (limit_count != 0) NWNX_PushArgumentString(IntToString(limit_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZREVRANGEBYLEX"); + NWNXPushString(key); + NWNXPushString(max); + NWNXPushString(min); + if (limit_offset != 0) NWNXPushString(IntToString(limit_offset)); + if (limit_count != 0) NWNXPushString(IntToString(limit_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZRANGEBYSCORE( @@ -5419,37 +5418,37 @@ int ZRANGEBYSCORE( // Redis type: integer int limit_count = 0 ) { - NWNX_PushArgumentString("ZRANGEBYSCORE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(FloatToString(min, 0)); - NWNX_PushArgumentString(FloatToString(max, 0)); - if (withscores != "") NWNX_PushArgumentString(withscores); - if (limit_offset != 0) NWNX_PushArgumentString(IntToString(limit_offset)); - if (limit_count != 0) NWNX_PushArgumentString(IntToString(limit_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZRANGEBYSCORE"); + NWNXPushString(key); + NWNXPushString(FloatToString(min, 0)); + NWNXPushString(FloatToString(max, 0)); + if (withscores != "") NWNXPushString(withscores); + if (limit_offset != 0) NWNXPushString(IntToString(limit_offset)); + if (limit_count != 0) NWNXPushString(IntToString(limit_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZRANK( string key, string member ) { - NWNX_PushArgumentString("ZRANK"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZRANK"); + NWNXPushString(key); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZREM( string key, string member ) { - NWNX_PushArgumentString("ZREM"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZREM"); + NWNXPushString(key); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZREMRANGEBYLEX( @@ -5457,12 +5456,12 @@ int ZREMRANGEBYLEX( string min, string max ) { - NWNX_PushArgumentString("ZREMRANGEBYLEX"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(min); - NWNX_PushArgumentString(max); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZREMRANGEBYLEX"); + NWNXPushString(key); + NWNXPushString(min); + NWNXPushString(max); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZREMRANGEBYRANK( @@ -5472,12 +5471,12 @@ int ZREMRANGEBYRANK( // Redis type: integer int stop ) { - NWNX_PushArgumentString("ZREMRANGEBYRANK"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(start)); - NWNX_PushArgumentString(IntToString(stop)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZREMRANGEBYRANK"); + NWNXPushString(key); + NWNXPushString(IntToString(start)); + NWNXPushString(IntToString(stop)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZREMRANGEBYSCORE( @@ -5487,12 +5486,12 @@ int ZREMRANGEBYSCORE( // Redis type: double float max ) { - NWNX_PushArgumentString("ZREMRANGEBYSCORE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(FloatToString(min, 0)); - NWNX_PushArgumentString(FloatToString(max, 0)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZREMRANGEBYSCORE"); + NWNXPushString(key); + NWNXPushString(FloatToString(min, 0)); + NWNXPushString(FloatToString(max, 0)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZREVRANGE( @@ -5504,13 +5503,13 @@ int ZREVRANGE( // Redis type: enum string withscores = "" ) { - NWNX_PushArgumentString("ZREVRANGE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(start)); - NWNX_PushArgumentString(IntToString(stop)); - if (withscores != "") NWNX_PushArgumentString(withscores); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZREVRANGE"); + NWNXPushString(key); + NWNXPushString(IntToString(start)); + NWNXPushString(IntToString(stop)); + if (withscores != "") NWNXPushString(withscores); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZREVRANGEBYSCORE( @@ -5526,37 +5525,37 @@ int ZREVRANGEBYSCORE( // Redis type: integer int limit_count = 0 ) { - NWNX_PushArgumentString("ZREVRANGEBYSCORE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(FloatToString(max, 0)); - NWNX_PushArgumentString(FloatToString(min, 0)); - if (withscores != "") NWNX_PushArgumentString(withscores); - if (limit_offset != 0) NWNX_PushArgumentString(IntToString(limit_offset)); - if (limit_count != 0) NWNX_PushArgumentString(IntToString(limit_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZREVRANGEBYSCORE"); + NWNXPushString(key); + NWNXPushString(FloatToString(max, 0)); + NWNXPushString(FloatToString(min, 0)); + if (withscores != "") NWNXPushString(withscores); + if (limit_offset != 0) NWNXPushString(IntToString(limit_offset)); + if (limit_count != 0) NWNXPushString(IntToString(limit_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZREVRANK( string key, string member ) { - NWNX_PushArgumentString("ZREVRANK"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZREVRANK"); + NWNXPushString(key); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZSCORE( string key, string member ) { - NWNX_PushArgumentString("ZSCORE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(member); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZSCORE"); + NWNXPushString(key); + NWNXPushString(member); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZUNIONSTORE( @@ -5570,14 +5569,14 @@ int ZUNIONSTORE( // Redis type: enum string aggregate_aggregate = "" ) { - NWNX_PushArgumentString("ZUNIONSTORE"); - NWNX_PushArgumentString(destination); - NWNX_PushArgumentString(IntToString(numkeys)); - NWNX_PushArgumentString(key); - if (weights_weight != 0) NWNX_PushArgumentString(IntToString(weights_weight)); - if (aggregate_aggregate != "") NWNX_PushArgumentString(aggregate_aggregate); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZUNIONSTORE"); + NWNXPushString(destination); + NWNXPushString(IntToString(numkeys)); + NWNXPushString(key); + if (weights_weight != 0) NWNXPushString(IntToString(weights_weight)); + if (aggregate_aggregate != "") NWNXPushString(aggregate_aggregate); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SCAN( @@ -5589,13 +5588,13 @@ int SCAN( int count_count = 0, string type_type = "" ) { - NWNX_PushArgumentString("SCAN"); - NWNX_PushArgumentString(IntToString(cursor)); - if (match_pattern != "") NWNX_PushArgumentString(match_pattern); - if (count_count != 0) NWNX_PushArgumentString(IntToString(count_count)); - if (type_type != "") NWNX_PushArgumentString(type_type); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SCAN"); + NWNXPushString(IntToString(cursor)); + if (match_pattern != "") NWNXPushString(match_pattern); + if (count_count != 0) NWNXPushString(IntToString(count_count)); + if (type_type != "") NWNXPushString(type_type); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int SSCAN( @@ -5607,13 +5606,13 @@ int SSCAN( // Redis type: integer int count_count = 0 ) { - NWNX_PushArgumentString("SSCAN"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(cursor)); - if (match_pattern != "") NWNX_PushArgumentString(match_pattern); - if (count_count != 0) NWNX_PushArgumentString(IntToString(count_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("SSCAN"); + NWNXPushString(key); + NWNXPushString(IntToString(cursor)); + if (match_pattern != "") NWNXPushString(match_pattern); + if (count_count != 0) NWNXPushString(IntToString(count_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int HSCAN( @@ -5625,13 +5624,13 @@ int HSCAN( // Redis type: integer int count_count = 0 ) { - NWNX_PushArgumentString("HSCAN"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(cursor)); - if (match_pattern != "") NWNX_PushArgumentString(match_pattern); - if (count_count != 0) NWNX_PushArgumentString(IntToString(count_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("HSCAN"); + NWNXPushString(key); + NWNXPushString(IntToString(cursor)); + if (match_pattern != "") NWNXPushString(match_pattern); + if (count_count != 0) NWNXPushString(IntToString(count_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int ZSCAN( @@ -5643,13 +5642,13 @@ int ZSCAN( // Redis type: integer int count_count = 0 ) { - NWNX_PushArgumentString("ZSCAN"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(IntToString(cursor)); - if (match_pattern != "") NWNX_PushArgumentString(match_pattern); - if (count_count != 0) NWNX_PushArgumentString(IntToString(count_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("ZSCAN"); + NWNXPushString(key); + NWNXPushString(IntToString(cursor)); + if (match_pattern != "") NWNXPushString(match_pattern); + if (count_count != 0) NWNXPushString(IntToString(count_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int XINFO( @@ -5663,14 +5662,14 @@ int XINFO( // Redis type: enum string help = "" ) { - NWNX_PushArgumentString("XINFO"); - if (consumers_key != "") NWNX_PushArgumentString(consumers_key); - if (consumers_groupname != "") NWNX_PushArgumentString(consumers_groupname); - if (groups_key != "") NWNX_PushArgumentString(groups_key); - if (stream_key != "") NWNX_PushArgumentString(stream_key); - if (help != "") NWNX_PushArgumentString(help); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XINFO"); + if (consumers_key != "") NWNXPushString(consumers_key); + if (consumers_groupname != "") NWNXPushString(consumers_groupname); + if (groups_key != "") NWNXPushString(groups_key); + if (stream_key != "") NWNXPushString(stream_key); + if (help != "") NWNXPushString(help); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int XADD( @@ -5680,13 +5679,13 @@ int XADD( string field, string str ) { - NWNX_PushArgumentString("XADD"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(ID); - NWNX_PushArgumentString(field); - NWNX_PushArgumentString(str); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XADD"); + NWNXPushString(key); + NWNXPushString(ID); + NWNXPushString(field); + NWNXPushString(str); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int XTRIM( @@ -5698,24 +5697,24 @@ int XTRIM( // Redis type: integer int count = 0 ) { - NWNX_PushArgumentString("XTRIM"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(strategy); - if (approx != "") NWNX_PushArgumentString(approx); - NWNX_PushArgumentString(IntToString(count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XTRIM"); + NWNXPushString(key); + NWNXPushString(strategy); + if (approx != "") NWNXPushString(approx); + NWNXPushString(IntToString(count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int XDEL( string key, string ID ) { - NWNX_PushArgumentString("XDEL"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(ID); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XDEL"); + NWNXPushString(key); + NWNXPushString(ID); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int XRANGE( @@ -5725,13 +5724,13 @@ int XRANGE( // Redis type: integer int count_count = 0 ) { - NWNX_PushArgumentString("XRANGE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(start); - NWNX_PushArgumentString(end); - if (count_count != 0) NWNX_PushArgumentString(IntToString(count_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XRANGE"); + NWNXPushString(key); + NWNXPushString(start); + NWNXPushString(end); + if (count_count != 0) NWNXPushString(IntToString(count_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int XREVRANGE( @@ -5741,22 +5740,22 @@ int XREVRANGE( // Redis type: integer int count_count = 0 ) { - NWNX_PushArgumentString("XREVRANGE"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(end); - NWNX_PushArgumentString(start); - if (count_count != 0) NWNX_PushArgumentString(IntToString(count_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XREVRANGE"); + NWNXPushString(key); + NWNXPushString(end); + NWNXPushString(start); + if (count_count != 0) NWNXPushString(IntToString(count_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int XLEN( string key ) { - NWNX_PushArgumentString("XLEN"); - NWNX_PushArgumentString(key); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XLEN"); + NWNXPushString(key); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int XREAD( @@ -5769,14 +5768,14 @@ int XREAD( string key = "", string ID = "" ) { - NWNX_PushArgumentString("XREAD"); - if (count_count != 0) NWNX_PushArgumentString(IntToString(count_count)); - if (block_milliseconds != 0) NWNX_PushArgumentString(IntToString(block_milliseconds)); - NWNX_PushArgumentString(streams); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(ID); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XREAD"); + if (count_count != 0) NWNXPushString(IntToString(count_count)); + if (block_milliseconds != 0) NWNXPushString(IntToString(block_milliseconds)); + NWNXPushString(streams); + NWNXPushString(key); + NWNXPushString(ID); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int XGROUP( @@ -5796,20 +5795,20 @@ int XGROUP( string delconsumer_groupname = "", string delconsumer_consumername = "" ) { - NWNX_PushArgumentString("XGROUP"); - if (create_key != "") NWNX_PushArgumentString(create_key); - if (create_groupname != "") NWNX_PushArgumentString(create_groupname); - if (create_id_or__ != "") NWNX_PushArgumentString(create_id_or__); - if (setid_key != "") NWNX_PushArgumentString(setid_key); - if (setid_groupname != "") NWNX_PushArgumentString(setid_groupname); - if (setid_id_or__ != "") NWNX_PushArgumentString(setid_id_or__); - if (destroy_key != "") NWNX_PushArgumentString(destroy_key); - if (destroy_groupname != "") NWNX_PushArgumentString(destroy_groupname); - if (delconsumer_key != "") NWNX_PushArgumentString(delconsumer_key); - if (delconsumer_groupname != "") NWNX_PushArgumentString(delconsumer_groupname); - if (delconsumer_consumername != "") NWNX_PushArgumentString(delconsumer_consumername); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XGROUP"); + if (create_key != "") NWNXPushString(create_key); + if (create_groupname != "") NWNXPushString(create_groupname); + if (create_id_or__ != "") NWNXPushString(create_id_or__); + if (setid_key != "") NWNXPushString(setid_key); + if (setid_groupname != "") NWNXPushString(setid_groupname); + if (setid_id_or__ != "") NWNXPushString(setid_id_or__); + if (destroy_key != "") NWNXPushString(destroy_key); + if (destroy_groupname != "") NWNXPushString(destroy_groupname); + if (delconsumer_key != "") NWNXPushString(delconsumer_key); + if (delconsumer_groupname != "") NWNXPushString(delconsumer_groupname); + if (delconsumer_consumername != "") NWNXPushString(delconsumer_consumername); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int XREADGROUP( @@ -5826,17 +5825,17 @@ int XREADGROUP( string key = "", string ID = "" ) { - NWNX_PushArgumentString("XREADGROUP"); - NWNX_PushArgumentString(group_group); - NWNX_PushArgumentString(group_consumer); - if (count_count != 0) NWNX_PushArgumentString(IntToString(count_count)); - if (block_milliseconds != 0) NWNX_PushArgumentString(IntToString(block_milliseconds)); - if (noack != "") NWNX_PushArgumentString(noack); - NWNX_PushArgumentString(streams); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(ID); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XREADGROUP"); + NWNXPushString(group_group); + NWNXPushString(group_consumer); + if (count_count != 0) NWNXPushString(IntToString(count_count)); + if (block_milliseconds != 0) NWNXPushString(IntToString(block_milliseconds)); + if (noack != "") NWNXPushString(noack); + NWNXPushString(streams); + NWNXPushString(key); + NWNXPushString(ID); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int XACK( @@ -5844,12 +5843,12 @@ int XACK( string group, string ID ) { - NWNX_PushArgumentString("XACK"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(group); - NWNX_PushArgumentString(ID); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XACK"); + NWNXPushString(key); + NWNXPushString(group); + NWNXPushString(ID); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int XCLAIM( @@ -5865,17 +5864,17 @@ int XCLAIM( // Redis type: integer int retrycount_count = 0 ) { - NWNX_PushArgumentString("XCLAIM"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(group); - NWNX_PushArgumentString(consumer); - NWNX_PushArgumentString(min_idle_time); - NWNX_PushArgumentString(ID); - if (idle_ms != 0) NWNX_PushArgumentString(IntToString(idle_ms)); - if (time_ms_unix_time != 0) NWNX_PushArgumentString(IntToString(time_ms_unix_time)); - if (retrycount_count != 0) NWNX_PushArgumentString(IntToString(retrycount_count)); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XCLAIM"); + NWNXPushString(key); + NWNXPushString(group); + NWNXPushString(consumer); + NWNXPushString(min_idle_time); + NWNXPushString(ID); + if (idle_ms != 0) NWNXPushString(IntToString(idle_ms)); + if (time_ms_unix_time != 0) NWNXPushString(IntToString(time_ms_unix_time)); + if (retrycount_count != 0) NWNXPushString(IntToString(retrycount_count)); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } int XPENDING( @@ -5887,13 +5886,13 @@ int XPENDING( int count = 0, string consumer = "" ) { - NWNX_PushArgumentString("XPENDING"); - NWNX_PushArgumentString(key); - NWNX_PushArgumentString(group); - if (start != "") NWNX_PushArgumentString(start); - if (end != "") NWNX_PushArgumentString(end); - if (count != 0) NWNX_PushArgumentString(IntToString(count)); - if (consumer != "") NWNX_PushArgumentString(consumer); - NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt(); + NWNXPushString("XPENDING"); + NWNXPushString(key); + NWNXPushString(group); + if (start != "") NWNXPushString(start); + if (end != "") NWNXPushString(end); + if (count != 0) NWNXPushString(IntToString(count)); + if (consumer != "") NWNXPushString(consumer); + NWNXCall("NWNX_Redis", "Deferred"); + return NWNXPopInt(); } diff --git a/_module/nss/nwnx_rename.nss b/_module/nss/nwnx_rename.nss index fbd3cfc8..88231eb8 100644 --- a/_module/nss/nwnx_rename.nss +++ b/_module/nss/nwnx_rename.nss @@ -2,7 +2,6 @@ /// @brief Facilitates renaming, overriding and customization of player names. /// @{ /// @file nwnx_rename.nss -#include "nwnx" const string NWNX_Rename = "NWNX_Rename"; ///< @private @@ -46,35 +45,26 @@ void NWNX_Rename_ClearPCNameOverride(object oTarget, object oObserver = OBJECT_I void NWNX_Rename_SetPCNameOverride(object oTarget, string sNewName, string sPrefix = "" , string sSuffix = "" , int iPlayerNameState = NWNX_RENAME_PLAYERNAME_DEFAULT, object oObserver = OBJECT_INVALID) { - string sFunc = "SetPCNameOverride"; - - NWNX_PushArgumentObject(oObserver); - NWNX_PushArgumentInt(iPlayerNameState); - NWNX_PushArgumentString(sSuffix); - NWNX_PushArgumentString(sPrefix); - NWNX_PushArgumentString(sNewName); - NWNX_PushArgumentObject(oTarget); - - NWNX_CallFunction(NWNX_Rename, sFunc); + NWNXPushObject(oObserver); + NWNXPushInt(iPlayerNameState); + NWNXPushString(sSuffix); + NWNXPushString(sPrefix); + NWNXPushString(sNewName); + NWNXPushObject(oTarget); + NWNXCall(NWNX_Rename, "SetPCNameOverride"); } string NWNX_Rename_GetPCNameOverride(object oTarget, object oObserver = OBJECT_INVALID) { - string sFunc = "GetPCNameOverride"; - - NWNX_PushArgumentObject(oObserver); - NWNX_PushArgumentObject(oTarget); - - NWNX_CallFunction(NWNX_Rename, sFunc); - return NWNX_GetReturnValueString(); + NWNXPushObject(oObserver); + NWNXPushObject(oTarget); + NWNXCall(NWNX_Rename, "GetPCNameOverride"); + return NWNXPopString(); } void NWNX_Rename_ClearPCNameOverride(object oTarget, object oObserver = OBJECT_INVALID, int clearAll = FALSE) { - string sFunc = "ClearPCNameOverride"; - - NWNX_PushArgumentInt(clearAll); - NWNX_PushArgumentObject(oObserver); - NWNX_PushArgumentObject(oTarget); - - NWNX_CallFunction(NWNX_Rename, sFunc); + NWNXPushInt(clearAll); + NWNXPushObject(oObserver); + NWNXPushObject(oTarget); + NWNXCall(NWNX_Rename, "ClearPCNameOverride"); } diff --git a/_module/nss/nwnx_reveal.nss b/_module/nss/nwnx_reveal.nss index 4615e886..12618306 100644 --- a/_module/nss/nwnx_reveal.nss +++ b/_module/nss/nwnx_reveal.nss @@ -2,7 +2,6 @@ /// @brief Allows the selective revealing of a stealthing character to another character or their party. /// @{ /// @file nwnx_reveal.nss -#include "nwnx" const string NWNX_Reveal = "NWNX_Reveal"; ///< @private @@ -28,22 +27,16 @@ void NWNX_Reveal_SetRevealToParty(object oHiding, int bReveal, int iDetectionMet void NWNX_Reveal_RevealTo(object oHiding, object oObserver, int iDetectionMethod = NWNX_REVEAL_HEARD) { - string sFunc = "RevealTo"; - - NWNX_PushArgumentInt(iDetectionMethod); - NWNX_PushArgumentObject(oObserver); - NWNX_PushArgumentObject(oHiding); - - NWNX_CallFunction(NWNX_Reveal, sFunc); + NWNXPushInt(iDetectionMethod); + NWNXPushObject(oObserver); + NWNXPushObject(oHiding); + NWNXCall(NWNX_Reveal, "RevealTo"); } void NWNX_Reveal_SetRevealToParty(object oHiding, int bReveal, int iDetectionMethod = NWNX_REVEAL_HEARD) { - string sFunc = "SetRevealToParty"; - - NWNX_PushArgumentInt(iDetectionMethod); - NWNX_PushArgumentInt(bReveal); - NWNX_PushArgumentObject(oHiding); - - NWNX_CallFunction(NWNX_Reveal, sFunc); + NWNXPushInt(iDetectionMethod); + NWNXPushInt(bReveal); + NWNXPushObject(oHiding); + NWNXCall(NWNX_Reveal, "SetRevealToParty"); } diff --git a/_module/nss/nwnx_ruby.nss b/_module/nss/nwnx_ruby.nss index 3c31819a..ce377cc8 100644 --- a/_module/nss/nwnx_ruby.nss +++ b/_module/nss/nwnx_ruby.nss @@ -2,7 +2,6 @@ /// @brief Allows users to execute arbitrary Ruby from the game. /// @{ /// @file nwnx_ruby.nss -#include "nwnx" const string NWNX_Ruby = "NWNX_Ruby"; ///< @private @@ -13,11 +12,9 @@ string NWNX_Ruby_Evaluate(string sCode); /// @return The output of the call. string NWNX_Ruby_Evaluate(string sCode) { - string sFunc = "Evaluate"; - - NWNX_PushArgumentString(sCode); - NWNX_CallFunction(NWNX_Ruby, sFunc); - return NWNX_GetReturnValueString(); + NWNXPushString(sCode); + NWNXCall(NWNX_Ruby, "Evaluate"); + return NWNXPopString(); } /// @} diff --git a/_module/nss/nwnx_skillranks.nss b/_module/nss/nwnx_skillranks.nss index 9cab9883..ae38d96f 100644 --- a/_module/nss/nwnx_skillranks.nss +++ b/_module/nss/nwnx_skillranks.nss @@ -3,7 +3,6 @@ /// skill related feats as well as modifying stock feats. /// @{ /// @file nwnx_skillranks.nss -#include "nwnx" const string NWNX_SkillRanks = "NWNX_SkillRanks"; ///< @private @@ -144,82 +143,67 @@ void NWNX_SkillRanks_SetAreaModifier(object oArea, int iSkill, int iModifier); int NWNX_SkillRanks_GetSkillFeatCountForSkill(int iSkill) { - string sFunc = "GetSkillFeatCountForSkill"; - - NWNX_PushArgumentInt(iSkill); - NWNX_CallFunction(NWNX_SkillRanks, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(iSkill); + NWNXCall(NWNX_SkillRanks, "GetSkillFeatCountForSkill"); + return NWNXPopInt(); } struct NWNX_SkillRanks_SkillFeat NWNX_SkillRanks_GetSkillFeatForSkillByIndex(int iSkill, int iIndex) { - string sFunc = "GetSkillFeatForSkillByIndex"; - - NWNX_PushArgumentInt(iIndex); - NWNX_PushArgumentInt(iSkill); - NWNX_CallFunction(NWNX_SkillRanks, sFunc); - + NWNXPushInt(iIndex); + NWNXPushInt(iSkill); + NWNXCall(NWNX_SkillRanks, "GetSkillFeatForSkillByIndex"); struct NWNX_SkillRanks_SkillFeat skillFeat; - skillFeat.iSkill = iSkill; - skillFeat.iFeat = NWNX_GetReturnValueInt(); - skillFeat.iModifier = NWNX_GetReturnValueInt(); - skillFeat.iFocusFeat = NWNX_GetReturnValueInt(); - skillFeat.sClasses = NWNX_GetReturnValueString(); - skillFeat.fClassLevelMod = NWNX_GetReturnValueFloat(); - skillFeat.iAreaFlagsRequired = NWNX_GetReturnValueInt(); - skillFeat.iAreaFlagsForbidden = NWNX_GetReturnValueInt(); - skillFeat.iDayOrNight = NWNX_GetReturnValueInt(); - skillFeat.bBypassArmorCheckPenalty = NWNX_GetReturnValueInt(); - skillFeat.iKeyAbilityMask = NWNX_GetReturnValueInt(); - + skillFeat.iFeat = NWNXPopInt(); + skillFeat.iModifier = NWNXPopInt(); + skillFeat.iFocusFeat = NWNXPopInt(); + skillFeat.sClasses = NWNXPopString(); + skillFeat.fClassLevelMod = NWNXPopFloat(); + skillFeat.iAreaFlagsRequired = NWNXPopInt(); + skillFeat.iAreaFlagsForbidden = NWNXPopInt(); + skillFeat.iDayOrNight = NWNXPopInt(); + skillFeat.bBypassArmorCheckPenalty = NWNXPopInt(); + skillFeat.iKeyAbilityMask = NWNXPopInt(); return skillFeat; } struct NWNX_SkillRanks_SkillFeat NWNX_SkillRanks_GetSkillFeat(int iSkill, int iFeat) { - string sFunc = "GetSkillFeat"; - - NWNX_PushArgumentInt(iFeat); - NWNX_PushArgumentInt(iSkill); - NWNX_CallFunction(NWNX_SkillRanks, sFunc); - + NWNXPushInt(iFeat); + NWNXPushInt(iSkill); + NWNXCall(NWNX_SkillRanks, "GetSkillFeat"); struct NWNX_SkillRanks_SkillFeat skillFeat; - skillFeat.iSkill = iSkill; skillFeat.iFeat = iFeat; - skillFeat.iModifier = NWNX_GetReturnValueInt(); - skillFeat.iFocusFeat = NWNX_GetReturnValueInt(); - skillFeat.sClasses = NWNX_GetReturnValueString(); - skillFeat.fClassLevelMod = NWNX_GetReturnValueFloat(); - skillFeat.iAreaFlagsRequired = NWNX_GetReturnValueInt(); - skillFeat.iAreaFlagsForbidden = NWNX_GetReturnValueInt(); - skillFeat.iDayOrNight = NWNX_GetReturnValueInt(); - skillFeat.bBypassArmorCheckPenalty = NWNX_GetReturnValueInt(); - skillFeat.iKeyAbilityMask = NWNX_GetReturnValueInt(); - + skillFeat.iModifier = NWNXPopInt(); + skillFeat.iFocusFeat = NWNXPopInt(); + skillFeat.sClasses = NWNXPopString(); + skillFeat.fClassLevelMod = NWNXPopFloat(); + skillFeat.iAreaFlagsRequired = NWNXPopInt(); + skillFeat.iAreaFlagsForbidden = NWNXPopInt(); + skillFeat.iDayOrNight = NWNXPopInt(); + skillFeat.bBypassArmorCheckPenalty = NWNXPopInt(); + skillFeat.iKeyAbilityMask = NWNXPopInt(); return skillFeat; } void NWNX_SkillRanks_SetSkillFeat(struct NWNX_SkillRanks_SkillFeat skillFeat, int createIfNonExistent = FALSE) { - string sFunc = "SetSkillFeat"; - - NWNX_PushArgumentInt(createIfNonExistent); - NWNX_PushArgumentInt(skillFeat.iKeyAbilityMask); - NWNX_PushArgumentInt(skillFeat.bBypassArmorCheckPenalty); - NWNX_PushArgumentInt(skillFeat.iDayOrNight); - NWNX_PushArgumentInt(skillFeat.iAreaFlagsForbidden); - NWNX_PushArgumentInt(skillFeat.iAreaFlagsRequired); - NWNX_PushArgumentFloat(skillFeat.fClassLevelMod); + NWNXPushInt(createIfNonExistent); + NWNXPushInt(skillFeat.iKeyAbilityMask); + NWNXPushInt(skillFeat.bBypassArmorCheckPenalty); + NWNXPushInt(skillFeat.iDayOrNight); + NWNXPushInt(skillFeat.iAreaFlagsForbidden); + NWNXPushInt(skillFeat.iAreaFlagsRequired); + NWNXPushFloat(skillFeat.fClassLevelMod); // We only need to send the string from the point of the first set bit - NWNX_PushArgumentString(GetStringRight(skillFeat.sClasses,GetStringLength(skillFeat.sClasses)-FindSubString(skillFeat.sClasses,"1"))); - NWNX_PushArgumentInt(skillFeat.iFocusFeat); - NWNX_PushArgumentInt(skillFeat.iModifier); - NWNX_PushArgumentInt(skillFeat.iFeat); - NWNX_PushArgumentInt(skillFeat.iSkill); - NWNX_CallFunction(NWNX_SkillRanks, sFunc); + NWNXPushString(GetStringRight(skillFeat.sClasses,GetStringLength(skillFeat.sClasses)-FindSubString(skillFeat.sClasses,"1"))); + NWNXPushInt(skillFeat.iFocusFeat); + NWNXPushInt(skillFeat.iModifier); + NWNXPushInt(skillFeat.iFeat); + NWNXPushInt(skillFeat.iSkill); + NWNXCall(NWNX_SkillRanks, "SetSkillFeat"); } struct NWNX_SkillRanks_SkillFeat NWNX_SkillRanks_AddSkillFeatClass(struct NWNX_SkillRanks_SkillFeat skillFeat, int iClass) @@ -237,47 +221,35 @@ struct NWNX_SkillRanks_SkillFeat NWNX_SkillRanks_AddSkillFeatClass(struct NWNX_S void NWNX_SkillRanks_SetSkillFeatFocusModifier(int iModifier, int epicFocus = FALSE) { - string sFunc = "SetSkillFeatFocusModifier"; - - NWNX_PushArgumentInt(epicFocus); - NWNX_PushArgumentInt(iModifier); - NWNX_CallFunction(NWNX_SkillRanks, sFunc); + NWNXPushInt(epicFocus); + NWNXPushInt(iModifier); + NWNXCall(NWNX_SkillRanks, "SetSkillFeatFocusModifier"); } int NWNX_SkillRanks_GetBlindnessPenalty() { - string sFunc = "GetBlindnessPenalty"; - - NWNX_CallFunction(NWNX_SkillRanks, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_SkillRanks, "GetBlindnessPenalty"); + return NWNXPopInt(); } void NWNX_SkillRanks_SetBlindnessPenalty(int iModifier) { - string sFunc = "SetBlindnessPenalty"; - - NWNX_PushArgumentInt(iModifier); - NWNX_CallFunction(NWNX_SkillRanks, sFunc); + NWNXPushInt(iModifier); + NWNXCall(NWNX_SkillRanks, "SetBlindnessPenalty"); } int NWNX_SkillRanks_GetAreaModifier(object oArea, int iSkill) { - string sFunc = "GetAreaModifier"; - - NWNX_PushArgumentInt(iSkill); - NWNX_PushArgumentObject(oArea); - NWNX_CallFunction(NWNX_SkillRanks, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(iSkill); + NWNXPushObject(oArea); + NWNXCall(NWNX_SkillRanks, "GetAreaModifier"); + return NWNXPopInt(); } void NWNX_SkillRanks_SetAreaModifier(object oArea, int iSkill, int iModifier) { - string sFunc = "SetAreaModifier"; - - NWNX_PushArgumentInt(iModifier); - NWNX_PushArgumentInt(iSkill); - NWNX_PushArgumentObject(oArea); - NWNX_CallFunction(NWNX_SkillRanks, sFunc); + NWNXPushInt(iModifier); + NWNXPushInt(iSkill); + NWNXPushObject(oArea); + NWNXCall(NWNX_SkillRanks, "SetAreaModifier"); } diff --git a/_module/nss/nwnx_spellcheck.nss b/_module/nss/nwnx_spellcheck.nss index 5a6b268d..45a0e659 100644 --- a/_module/nss/nwnx_spellcheck.nss +++ b/_module/nss/nwnx_spellcheck.nss @@ -2,7 +2,6 @@ /// @brief Functions related to spellchecking /// @{ /// @file nwnx_spellcheck.nss -#include "nwnx" const string NWNX_SpellChecker = "NWNX_SpellChecker"; ///< @private @@ -27,17 +26,14 @@ string NWNX_SpellChecker_GetSuggestSpell(string word); string NWNX_SpellChecker_FindMisspell(string sentence) { - string sFunc = "FindMisspell"; - - NWNX_PushArgumentString(sentence); - NWNX_CallFunction(NWNX_SpellChecker, sFunc); - return NWNX_GetReturnValueString(); + NWNXPushString(sentence); + NWNXCall(NWNX_SpellChecker, "FindMisspell"); + return NWNXPopString(); } string NWNX_SpellChecker_GetSuggestSpell(string word) { - string sFunc = "GetSuggestSpell"; - NWNX_PushArgumentString(word); - NWNX_CallFunction(NWNX_SpellChecker, sFunc); - return NWNX_GetReturnValueString(); + NWNXPushString(word); + NWNXCall(NWNX_SpellChecker, "GetSuggestSpell"); + return NWNXPopString(); } diff --git a/_module/nss/nwnx_sql.nss b/_module/nss/nwnx_sql.nss index f3ab3d20..cb324943 100644 --- a/_module/nss/nwnx_sql.nss +++ b/_module/nss/nwnx_sql.nss @@ -2,7 +2,6 @@ /// @brief Functions to interface with a database through SQL /// @{ /// @file nwnx_sql.nss -#include "nwnx" const string NWNX_SQL = "NWNX_SQL"; ///< @private @@ -116,19 +115,15 @@ void NWNX_SQL_PostgreSQL_SetNextQueryResultsBinaryMode(); int NWNX_SQL_PrepareQuery(string query) { - string sFunc = "PrepareQuery"; - - NWNX_PushArgumentString(query); - NWNX_CallFunction(NWNX_SQL, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushString(query); + NWNXCall(NWNX_SQL, "PrepareQuery"); + return NWNXPopInt(); } int NWNX_SQL_ExecutePreparedQuery() { - string sFunc = "ExecutePreparedQuery"; - - NWNX_CallFunction(NWNX_SQL, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_SQL, "ExecutePreparedQuery"); + return NWNXPopInt(); } int NWNX_SQL_ExecuteQuery(string query) @@ -146,76 +141,58 @@ int NWNX_SQL_ExecuteQuery(string query) int NWNX_SQL_ReadyToReadNextRow() { - string sFunc = "ReadyToReadNextRow"; - - NWNX_CallFunction(NWNX_SQL, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_SQL, "ReadyToReadNextRow"); + return NWNXPopInt(); } void NWNX_SQL_ReadNextRow() { - string sFunc = "ReadNextRow"; - - NWNX_CallFunction(NWNX_SQL, sFunc); + NWNXCall(NWNX_SQL, "ReadNextRow"); } string NWNX_SQL_ReadDataInActiveRow(int column = 0) { - string sFunc = "ReadDataInActiveRow"; - - NWNX_PushArgumentInt(column); - NWNX_CallFunction(NWNX_SQL, sFunc); - return NWNX_GetReturnValueString(); + NWNXPushInt(column); + NWNXCall(NWNX_SQL, "ReadDataInActiveRow"); + return NWNXPopString(); } void NWNX_SQL_PreparedInt(int position, int value) { - string sFunc = "PreparedInt"; - - NWNX_PushArgumentInt(value); - NWNX_PushArgumentInt(position); - NWNX_CallFunction(NWNX_SQL, sFunc); + NWNXPushInt(value); + NWNXPushInt(position); + NWNXCall(NWNX_SQL, "PreparedInt"); } void NWNX_SQL_PreparedString(int position, string value) { - string sFunc = "PreparedString"; - - NWNX_PushArgumentString(value); - NWNX_PushArgumentInt(position); - NWNX_CallFunction(NWNX_SQL, sFunc); + NWNXPushString(value); + NWNXPushInt(position); + NWNXCall(NWNX_SQL, "PreparedString"); } void NWNX_SQL_PreparedFloat(int position, float value) { - string sFunc = "PreparedFloat"; - - NWNX_PushArgumentFloat(value); - NWNX_PushArgumentInt(position); - NWNX_CallFunction(NWNX_SQL, sFunc); + NWNXPushFloat(value); + NWNXPushInt(position); + NWNXCall(NWNX_SQL, "PreparedFloat"); } void NWNX_SQL_PreparedObjectId(int position, object value) { - string sFunc = "PreparedObjectId"; - - NWNX_PushArgumentObject(value); - NWNX_PushArgumentInt(position); - NWNX_CallFunction(NWNX_SQL, sFunc); + NWNXPushObject(value); + NWNXPushInt(position); + NWNXCall(NWNX_SQL, "PreparedObjectId"); } void NWNX_SQL_PreparedObjectFull(int position, object value, int base64 = TRUE) { - string sFunc = "PreparedObjectFull"; - - NWNX_PushArgumentInt(base64); - NWNX_PushArgumentObject(value); - NWNX_PushArgumentInt(position); - NWNX_CallFunction(NWNX_SQL, sFunc); + NWNXPushInt(base64); + NWNXPushObject(value); + NWNXPushInt(position); + NWNXCall(NWNX_SQL, "PreparedObjectFull"); } void NWNX_SQL_PreparedNULL(int position) { - string sFunc = "PreparedNULL"; - - NWNX_PushArgumentInt(position); - NWNX_CallFunction(NWNX_SQL, sFunc); + NWNXPushInt(position); + NWNXCall(NWNX_SQL, "PreparedNULL"); } void NWNX_SQL_PreparedJson(int position, json value) { @@ -227,60 +204,46 @@ void NWNX_SQL_PreparedJson(int position, json value) object NWNX_SQL_ReadFullObjectInActiveRow(int column = 0, object owner = OBJECT_INVALID, float x = 0.0, float y = 0.0, float z = 0.0, int base64 = TRUE) { - string sFunc = "ReadFullObjectInActiveRow"; - - NWNX_PushArgumentInt(base64); - NWNX_PushArgumentFloat(z); - NWNX_PushArgumentFloat(y); - NWNX_PushArgumentFloat(x); - NWNX_PushArgumentObject(owner); - NWNX_PushArgumentInt(column); - NWNX_CallFunction(NWNX_SQL, sFunc); - return NWNX_GetReturnValueObject(); + NWNXPushInt(base64); + NWNXPushFloat(z); + NWNXPushFloat(y); + NWNXPushFloat(x); + NWNXPushObject(owner); + NWNXPushInt(column); + NWNXCall(NWNX_SQL, "ReadFullObjectInActiveRow"); + return NWNXPopObject(); } int NWNX_SQL_GetAffectedRows() { - string sFunc = "GetAffectedRows"; - - NWNX_CallFunction(NWNX_SQL, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_SQL, "GetAffectedRows"); + return NWNXPopInt(); } string NWNX_SQL_GetDatabaseType() { - string sFunc = "GetDatabaseType"; - - NWNX_CallFunction(NWNX_SQL, sFunc); - return NWNX_GetReturnValueString(); + NWNXCall(NWNX_SQL, "GetDatabaseType"); + return NWNXPopString(); } void NWNX_SQL_DestroyPreparedQuery() { - string sFunc = "DestroyPreparedQuery"; - - NWNX_CallFunction(NWNX_SQL, sFunc); + NWNXCall(NWNX_SQL, "DestroyPreparedQuery"); } string NWNX_SQL_GetLastError() { - string sFunc = "GetLastError"; - - NWNX_CallFunction(NWNX_SQL, sFunc); - return NWNX_GetReturnValueString(); + NWNXCall(NWNX_SQL, "GetLastError"); + return NWNXPopString(); } int NWNX_SQL_GetPreparedQueryParamCount() { - string sFunc = "GetPreparedQueryParamCount"; - - NWNX_CallFunction(NWNX_SQL, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_SQL, "GetPreparedQueryParamCount"); + return NWNXPopInt(); } void NWNX_SQL_PostgreSQL_SetNextQueryResultsBinaryMode() { - string sFunc = "PostgreSQL_SetNextQueryResultsBinaryMode"; - - NWNX_CallFunction(NWNX_SQL, sFunc); + NWNXCall(NWNX_SQL, "PostgreSQL_SetNextQueryResultsBinaryMode"); } diff --git a/_module/nss/nwnx_store.nss b/_module/nss/nwnx_store.nss index 00b2014d..8f6d2524 100644 --- a/_module/nss/nwnx_store.nss +++ b/_module/nss/nwnx_store.nss @@ -2,7 +2,6 @@ /// @brief Functions exposing additional store properties. /// @{ /// @file nwnx_store.nss -#include "nwnx" const string NWNX_Store = "NWNX_Store"; ///< @private @@ -51,81 +50,57 @@ int NWNX_Store_GetCurrentCustomersCount(object oStore); int NWNX_Store_GetIsRestrictedBuyItem(object oStore, int nBaseItem) { - string sFunc = "GetIsRestrictedBuyItem"; - - NWNX_PushArgumentInt(nBaseItem); - NWNX_PushArgumentObject(oStore); - - NWNX_CallFunction(NWNX_Store, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(nBaseItem); + NWNXPushObject(oStore); + NWNXCall(NWNX_Store, "GetIsRestrictedBuyItem"); + return NWNXPopInt(); } int NWNX_Store_GetBlackMarketMarkDown(object oStore) { - string sFunc = "GetBlackMarketMarkDown"; - - NWNX_PushArgumentObject(oStore); - - NWNX_CallFunction(NWNX_Store, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(oStore); + NWNXCall(NWNX_Store, "GetBlackMarketMarkDown"); + return NWNXPopInt(); } void NWNX_Store_SetBlackMarketMarkDown(object oStore, int nValue) { - string sFunc = "SetBlackMarketMarkDown"; - - NWNX_PushArgumentInt(nValue); - NWNX_PushArgumentObject(oStore); - - NWNX_CallFunction(NWNX_Store, sFunc); + NWNXPushInt(nValue); + NWNXPushObject(oStore); + NWNXCall(NWNX_Store, "SetBlackMarketMarkDown"); } int NWNX_Store_GetMarkDown(object oStore) { - string sFunc = "GetMarkDown"; - - NWNX_PushArgumentObject(oStore); - - NWNX_CallFunction(NWNX_Store, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(oStore); + NWNXCall(NWNX_Store, "GetMarkDown"); + return NWNXPopInt(); } void NWNX_Store_SetMarkDown(object oStore, int nValue) { - string sFunc = "SetMarkDown"; - - NWNX_PushArgumentInt(nValue); - NWNX_PushArgumentObject(oStore); - - NWNX_CallFunction(NWNX_Store, sFunc); + NWNXPushInt(nValue); + NWNXPushObject(oStore); + NWNXCall(NWNX_Store, "SetMarkDown"); } int NWNX_Store_GetMarkUp(object oStore) { - string sFunc = "GetMarkUp"; - - NWNX_PushArgumentObject(oStore); - - NWNX_CallFunction(NWNX_Store, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(oStore); + NWNXCall(NWNX_Store, "GetMarkUp"); + return NWNXPopInt(); } void NWNX_Store_SetMarkUp(object oStore, int nValue) { - string sFunc = "SetMarkUp"; - - NWNX_PushArgumentInt(nValue); - NWNX_PushArgumentObject(oStore); - - NWNX_CallFunction(NWNX_Store, sFunc); + NWNXPushInt(nValue); + NWNXPushObject(oStore); + NWNXCall(NWNX_Store, "SetMarkUp"); } int NWNX_Store_GetCurrentCustomersCount(object oStore) { - string sFunc = "GetCurrentCustomersCount"; - - NWNX_PushArgumentObject(oStore); - - NWNX_CallFunction(NWNX_Store, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushObject(oStore); + NWNXCall(NWNX_Store, "GetCurrentCustomersCount"); + return NWNXPopInt(); } diff --git a/_module/nss/nwnx_tileset.nss b/_module/nss/nwnx_tileset.nss index eab4e289..fa07a379 100644 --- a/_module/nss/nwnx_tileset.nss +++ b/_module/nss/nwnx_tileset.nss @@ -2,7 +2,6 @@ /// @brief An advanced plugin that exposes additional tileset and tile properties and allows builders to override the tiles of an area created with CreateArea(). /// @{ /// @file nwnx_tileset.nss -#include "nwnx" const string NWNX_Tileset = "NWNX_Tileset"; ///< @private @@ -166,174 +165,160 @@ void NWNX_Tileset_DeleteOverrideTileData(string sOverrideName, int nIndex); struct NWNX_Tileset_TilesetData NWNX_Tileset_GetTilesetData(string sTileset) { - NWNX_PushArgumentString(sTileset); - NWNX_CallFunction(NWNX_Tileset, "GetTilesetData"); - + NWNXPushString(sTileset); + NWNXCall(NWNX_Tileset, "GetTilesetData"); struct NWNX_Tileset_TilesetData str; - str.bHasHeightTransition = NWNX_GetReturnValueInt(); - str.bInterior = NWNX_GetReturnValueInt(); - str.sUnlocalizedName = NWNX_GetReturnValueString(); - str.nDisplayNameStrRef = NWNX_GetReturnValueInt(); - str.sFloorTerrain = NWNX_GetReturnValueString(); - str.sDefaultTerrain = NWNX_GetReturnValueString(); - str.sBorderTerrain = NWNX_GetReturnValueString(); - str.nNumGroups = NWNX_GetReturnValueInt(); - str.nNumCrossers = NWNX_GetReturnValueInt(); - str.nNumTerrain = NWNX_GetReturnValueInt(); - str.fHeightTransition = NWNX_GetReturnValueFloat(); - str.nNumTileData = NWNX_GetReturnValueInt(); - + str.bHasHeightTransition = NWNXPopInt(); + str.bInterior = NWNXPopInt(); + str.sUnlocalizedName = NWNXPopString(); + str.nDisplayNameStrRef = NWNXPopInt(); + str.sFloorTerrain = NWNXPopString(); + str.sDefaultTerrain = NWNXPopString(); + str.sBorderTerrain = NWNXPopString(); + str.nNumGroups = NWNXPopInt(); + str.nNumCrossers = NWNXPopInt(); + str.nNumTerrain = NWNXPopInt(); + str.fHeightTransition = NWNXPopFloat(); + str.nNumTileData = NWNXPopInt(); return str; } string NWNX_Tileset_GetTilesetTerrain(string sTileset, int nIndex) { - NWNX_PushArgumentInt(nIndex); - NWNX_PushArgumentString(sTileset); - NWNX_CallFunction(NWNX_Tileset, "GetTilesetTerrain"); - - return NWNX_GetReturnValueString(); + NWNXPushInt(nIndex); + NWNXPushString(sTileset); + NWNXCall(NWNX_Tileset, "GetTilesetTerrain"); + return NWNXPopString(); } string NWNX_Tileset_GetTilesetCrosser(string sTileset, int nIndex) { - NWNX_PushArgumentInt(nIndex); - NWNX_PushArgumentString(sTileset); - NWNX_CallFunction(NWNX_Tileset, "GetTilesetCrosser"); - - return NWNX_GetReturnValueString(); + NWNXPushInt(nIndex); + NWNXPushString(sTileset); + NWNXCall(NWNX_Tileset, "GetTilesetCrosser"); + return NWNXPopString(); } struct NWNX_Tileset_TilesetGroupData NWNX_Tileset_GetTilesetGroupData(string sTileset, int nIndex) { - NWNX_PushArgumentInt(nIndex); - NWNX_PushArgumentString(sTileset); - NWNX_CallFunction(NWNX_Tileset, "GetTilesetGroupData"); - + NWNXPushInt(nIndex); + NWNXPushString(sTileset); + NWNXCall(NWNX_Tileset, "GetTilesetGroupData"); struct NWNX_Tileset_TilesetGroupData str; - str.nColumns = NWNX_GetReturnValueInt(); - str.nRows = NWNX_GetReturnValueInt(); - str.nStrRef = NWNX_GetReturnValueInt(); - str.sName = NWNX_GetReturnValueString(); - + str.nColumns = NWNXPopInt(); + str.nRows = NWNXPopInt(); + str.nStrRef = NWNXPopInt(); + str.sName = NWNXPopString(); return str; } int NWNX_Tileset_GetTilesetGroupTile(string sTileset, int nGroupIndex, int nTileIndex) { - NWNX_PushArgumentInt(nTileIndex); - NWNX_PushArgumentInt(nGroupIndex); - NWNX_PushArgumentString(sTileset); - NWNX_CallFunction(NWNX_Tileset, "GetTilesetGroupTile"); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(nTileIndex); + NWNXPushInt(nGroupIndex); + NWNXPushString(sTileset); + NWNXCall(NWNX_Tileset, "GetTilesetGroupTile"); + return NWNXPopInt(); } string NWNX_Tileset_GetTileModel(string sTileset, int nTileID) { - NWNX_PushArgumentInt(nTileID); - NWNX_PushArgumentString(sTileset); - NWNX_CallFunction(NWNX_Tileset, "GetTileModel"); - - return NWNX_GetReturnValueString(); + NWNXPushInt(nTileID); + NWNXPushString(sTileset); + NWNXCall(NWNX_Tileset, "GetTileModel"); + return NWNXPopString(); } string NWNX_Tileset_GetTileMinimapTexture(string sTileset, int nTileID) { - NWNX_PushArgumentInt(nTileID); - NWNX_PushArgumentString(sTileset); - NWNX_CallFunction(NWNX_Tileset, "GetTileMinimapTexture"); - - return NWNX_GetReturnValueString(); + NWNXPushInt(nTileID); + NWNXPushString(sTileset); + NWNXCall(NWNX_Tileset, "GetTileMinimapTexture"); + return NWNXPopString(); } struct NWNX_Tileset_TileEdgesAndCorners NWNX_Tileset_GetTileEdgesAndCorners(string sTileset, int nTileID) { - NWNX_PushArgumentInt(nTileID); - NWNX_PushArgumentString(sTileset); - NWNX_CallFunction(NWNX_Tileset, "GetTileEdgesAndCorners"); - + NWNXPushInt(nTileID); + NWNXPushString(sTileset); + NWNXCall(NWNX_Tileset, "GetTileEdgesAndCorners"); struct NWNX_Tileset_TileEdgesAndCorners str; - str.sLeft = NWNX_GetReturnValueString(); - str.sBottomLeft = NWNX_GetReturnValueString(); - str.sBottom = NWNX_GetReturnValueString(); - str.sBottomRight = NWNX_GetReturnValueString(); - str.sRight = NWNX_GetReturnValueString(); - str.sTopRight = NWNX_GetReturnValueString(); - str.sTop = NWNX_GetReturnValueString(); - str.sTopLeft = NWNX_GetReturnValueString(); - + str.sLeft = NWNXPopString(); + str.sBottomLeft = NWNXPopString(); + str.sBottom = NWNXPopString(); + str.sBottomRight = NWNXPopString(); + str.sRight = NWNXPopString(); + str.sTopRight = NWNXPopString(); + str.sTop = NWNXPopString(); + str.sTopLeft = NWNXPopString(); return str; } int NWNX_Tileset_GetTileNumDoors(string sTileset, int nTileID) { - NWNX_PushArgumentInt(nTileID); - NWNX_PushArgumentString(sTileset); - NWNX_CallFunction(NWNX_Tileset, "GetTileNumDoors"); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(nTileID); + NWNXPushString(sTileset); + NWNXCall(NWNX_Tileset, "GetTileNumDoors"); + return NWNXPopInt(); } struct NWNX_Tileset_TileDoorData NWNX_Tileset_GetTileDoorData(string sTileset, int nTileID, int nIndex = 0) { - NWNX_PushArgumentInt(nIndex); - NWNX_PushArgumentInt(nTileID); - NWNX_PushArgumentString(sTileset); - NWNX_CallFunction(NWNX_Tileset, "GetTileDoorData"); - + NWNXPushInt(nIndex); + NWNXPushInt(nTileID); + NWNXPushString(sTileset); + NWNXCall(NWNX_Tileset, "GetTileDoorData"); struct NWNX_Tileset_TileDoorData str; - str.fOrientation = NWNX_GetReturnValueFloat(); - str.fZ = NWNX_GetReturnValueFloat(); - str.fY = NWNX_GetReturnValueFloat(); - str.fX = NWNX_GetReturnValueFloat(); - str.nType = NWNX_GetReturnValueInt(); - + str.fOrientation = NWNXPopFloat(); + str.fZ = NWNXPopFloat(); + str.fY = NWNXPopFloat(); + str.fX = NWNXPopFloat(); + str.nType = NWNXPopInt(); return str; } void NWNX_Tileset_SetAreaTileOverride(string sAreaResRef, string sOverrideName) { - NWNX_PushArgumentString(sOverrideName); - NWNX_PushArgumentString(sAreaResRef); - NWNX_CallFunction(NWNX_Tileset, "SetAreaTileOverride"); + NWNXPushString(sOverrideName); + NWNXPushString(sAreaResRef); + NWNXCall(NWNX_Tileset, "SetAreaTileOverride"); } void NWNX_Tileset_CreateTileOverride(string sOverrideName, string sTileSet, int nWidth, int nHeight) { - NWNX_PushArgumentInt(nHeight); - NWNX_PushArgumentInt(nWidth); - NWNX_PushArgumentString(sTileSet); - NWNX_PushArgumentString(sOverrideName); - NWNX_CallFunction(NWNX_Tileset, "CreateTileOverride"); + NWNXPushInt(nHeight); + NWNXPushInt(nWidth); + NWNXPushString(sTileSet); + NWNXPushString(sOverrideName); + NWNXCall(NWNX_Tileset, "CreateTileOverride"); } void NWNX_Tileset_DeleteTileOverride(string sOverrideName) { - NWNX_PushArgumentString(sOverrideName); - NWNX_CallFunction(NWNX_Tileset, "DeleteTileOverride"); + NWNXPushString(sOverrideName); + NWNXCall(NWNX_Tileset, "DeleteTileOverride"); } void NWNX_Tileset_SetOverrideTileData(string sOverrideName, int nIndex, struct NWNX_Tileset_CustomTileData strCustomTileData) { - NWNX_PushArgumentInt(strCustomTileData.bAnimLoop3); - NWNX_PushArgumentInt(strCustomTileData.bAnimLoop2); - NWNX_PushArgumentInt(strCustomTileData.bAnimLoop1); - NWNX_PushArgumentInt(strCustomTileData.nSourceLightColor2); - NWNX_PushArgumentInt(strCustomTileData.nSourceLightColor1); - NWNX_PushArgumentInt(strCustomTileData.nMainLightColor2); - NWNX_PushArgumentInt(strCustomTileData.nMainLightColor1); - NWNX_PushArgumentInt(strCustomTileData.nHeight); - NWNX_PushArgumentInt(strCustomTileData.nOrientation); - NWNX_PushArgumentInt(strCustomTileData.nTileID); - NWNX_PushArgumentInt(nIndex); - NWNX_PushArgumentString(sOverrideName); - NWNX_CallFunction(NWNX_Tileset, "SetOverrideTileData"); + NWNXPushInt(strCustomTileData.bAnimLoop3); + NWNXPushInt(strCustomTileData.bAnimLoop2); + NWNXPushInt(strCustomTileData.bAnimLoop1); + NWNXPushInt(strCustomTileData.nSourceLightColor2); + NWNXPushInt(strCustomTileData.nSourceLightColor1); + NWNXPushInt(strCustomTileData.nMainLightColor2); + NWNXPushInt(strCustomTileData.nMainLightColor1); + NWNXPushInt(strCustomTileData.nHeight); + NWNXPushInt(strCustomTileData.nOrientation); + NWNXPushInt(strCustomTileData.nTileID); + NWNXPushInt(nIndex); + NWNXPushString(sOverrideName); + NWNXCall(NWNX_Tileset, "SetOverrideTileData"); } void NWNX_Tileset_DeleteOverrideTileData(string sOverrideName, int nIndex) { - NWNX_PushArgumentInt(nIndex); - NWNX_PushArgumentString(sOverrideName); - NWNX_CallFunction(NWNX_Tileset, "DeleteOverrideTileData"); + NWNXPushInt(nIndex); + NWNXPushString(sOverrideName); + NWNXCall(NWNX_Tileset, "DeleteOverrideTileData"); } diff --git a/_module/nss/nwnx_time.nss b/_module/nss/nwnx_time.nss index 44d949e9..7b1788b7 100644 --- a/_module/nss/nwnx_time.nss +++ b/_module/nss/nwnx_time.nss @@ -2,7 +2,6 @@ /// @brief Provides various time related functions /// @{ /// @file nwnx_time.nss -#include "nwnx" #include "nwnx_util" #include "inc_sqlite_time" diff --git a/_module/nss/nwnx_util.nss b/_module/nss/nwnx_util.nss index ef32e355..1de3d14d 100644 --- a/_module/nss/nwnx_util.nss +++ b/_module/nss/nwnx_util.nss @@ -2,7 +2,6 @@ /// @brief Provides various utility functions that don't have a better home /// @{ /// @file nwnx_util.nss -#include "nwnx" const string NWNX_Util = "NWNX_Util"; ///< @private @@ -174,12 +173,6 @@ int NWNX_Util_RegisterServerConsoleCommand(string sCommand, string sScriptChunk) /// @param sCommand The name of the command. void NWNX_Util_UnregisterServerConsoleCommand(string sCommand); -/// @brief Determines if the given plugin exists and is enabled. -/// @param sPlugin The name of the plugin to check. This is the case sensitive plugin name as used by NWNX_CallFunction, NWNX_PushArgumentX -/// @note Example usage: NWNX_Util_PluginExists("NWNX_Creature"); -/// @return TRUE if the plugin exists and is enabled, otherwise FALSE. -int NWNX_Util_PluginExists(string sPlugin); - /// @brief Gets the server's current working user folder. /// @return The absolute path of the server's home directory (-userDirectory) string NWNX_Util_GetUserDirectory(); @@ -228,10 +221,18 @@ int NWNX_Util_GetScriptParamIsSet(string sParamName); /// @param nDawnHour The new dawn hour void NWNX_Util_SetDawnHour(int nDawnHour); +/// @brief Get the module dawn hour. +/// @return The dawn hour +int NWNX_Util_GetDawnHour(); + /// @brief Set the module dusk hour. /// @param nDuskHour The new dusk hour void NWNX_Util_SetDuskHour(int nDuskHour); +/// @brief Get the module dusk hour. +/// @return The dusk hour +int NWNX_Util_GetDuskHour(); + /// @return Returns the number of microseconds since midnight on January 1, 1970. struct NWNX_Util_HighResTimestamp NWNX_Util_GetHighResTimeStamp(); @@ -263,397 +264,327 @@ int NWNX_Util_CleanResourceDirectory(string sAlias, int nResType = 0xFFFF); /// @return The name string NWNX_Util_GetModuleTlkFile(); +/// @brief Update a resource directory by having ResMan reindex it. +/// @param sAlias A resource directory alias, eg: TEMP +/// @return TRUE if successful, FALSE on error. +int NWNX_Util_UpdateResourceDirectory(string sAlias); + /// @} string NWNX_Util_GetCurrentScriptName(int depth = 0) { - string sFunc = "GetCurrentScriptName"; - NWNX_PushArgumentInt(depth); - NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueString(); + NWNXPushInt(depth); + NWNXCall(NWNX_Util, "GetCurrentScriptName"); + return NWNXPopString(); } string NWNX_Util_GetAsciiTableString() { - string sFunc = "GetAsciiTableString"; - NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueString(); + NWNXCall(NWNX_Util, "GetAsciiTableString"); + return NWNXPopString(); } int NWNX_Util_Hash(string str) { - string sFunc = "Hash"; - NWNX_PushArgumentString(str); - NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushString(str); + NWNXCall(NWNX_Util, "Hash"); + return NWNXPopInt(); } int NWNX_Util_GetModuleMtime() { - NWNX_CallFunction(NWNX_Util, "GetModuleMtime"); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_Util, "GetModuleMtime"); + return NWNXPopInt(); } string NWNX_Util_GetModuleFile() { - NWNX_CallFunction(NWNX_Util, "GetModuleFile"); - return NWNX_GetReturnValueString(); + NWNXCall(NWNX_Util, "GetModuleFile"); + return NWNXPopString(); } string NWNX_Util_GetCustomToken(int customTokenNumber) { - string sFunc = "GetCustomToken"; - NWNX_PushArgumentInt(customTokenNumber); - NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueString(); + NWNXPushInt(customTokenNumber); + NWNXCall(NWNX_Util, "GetCustomToken"); + return NWNXPopString(); } itemproperty NWNX_Util_EffectToItemProperty(effect e) { - string sFunc = "EffectTypeCast"; - NWNX_PushArgumentEffect(e); - NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueItemProperty(); + NWNXPushEffect(e); + NWNXCall(NWNX_Util, "EffectTypeCast"); + return NWNXPopItemProperty(); } effect NWNX_Util_ItemPropertyToEffect(itemproperty ip) { - string sFunc = "EffectTypeCast"; - NWNX_PushArgumentItemProperty(ip); - NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueEffect(); + NWNXPushItemProperty(ip); + NWNXCall(NWNX_Util, "EffectTypeCast"); + return NWNXPopEffect(); } string NWNX_Util_StripColors(string str) { - string sFunc = "StripColors"; - NWNX_PushArgumentString(str); - NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueString(); + NWNXPushString(str); + NWNXCall(NWNX_Util, "StripColors"); + return NWNXPopString(); } string NWNX_Util_GetEnvironmentVariable(string sVarname) { - string sFunc = "GetEnvironmentVariable"; - NWNX_PushArgumentString(sVarname); - NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueString(); + NWNXPushString(sVarname); + NWNXCall(NWNX_Util, "GetEnvironmentVariable"); + return NWNXPopString(); } int NWNX_Util_GetMinutesPerHour() { - string sFunc = "GetMinutesPerHour"; - NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_Util, "GetMinutesPerHour"); + return NWNXPopInt(); } void NWNX_Util_SetMinutesPerHour(int minutes) { - string sFunc = "SetMinutesPerHour"; - NWNX_PushArgumentInt(minutes); - NWNX_CallFunction(NWNX_Util, sFunc); + NWNXPushInt(minutes); + NWNXCall(NWNX_Util, "SetMinutesPerHour"); } string NWNX_Util_EncodeStringForURL(string sURL) { - string sFunc = "EncodeStringForURL"; - - NWNX_PushArgumentString(sURL); - NWNX_CallFunction(NWNX_Util, sFunc); - - return NWNX_GetReturnValueString(); + NWNXPushString(sURL); + NWNXCall(NWNX_Util, "EncodeStringForURL"); + return NWNXPopString(); } string NWNX_Util_GetFirstResRef(int nType, string sRegexFilter = "", int bModuleResourcesOnly = TRUE) { - string sFunc = "GetFirstResRef"; - - NWNX_PushArgumentInt(bModuleResourcesOnly); - NWNX_PushArgumentString(sRegexFilter); - NWNX_PushArgumentInt(nType); - NWNX_CallFunction(NWNX_Util, sFunc); - - return NWNX_GetReturnValueString(); + NWNXPushInt(bModuleResourcesOnly); + NWNXPushString(sRegexFilter); + NWNXPushInt(nType); + NWNXCall(NWNX_Util, "GetFirstResRef"); + return NWNXPopString(); } string NWNX_Util_GetNextResRef() { - string sFunc = "GetNextResRef"; - - NWNX_CallFunction(NWNX_Util, sFunc); - - return NWNX_GetReturnValueString(); + NWNXCall(NWNX_Util, "GetNextResRef"); + return NWNXPopString(); } object NWNX_Util_GetLastCreatedObject(int nObjectType, int nNthLast = 1) { - string sFunc = "GetLastCreatedObject"; - - NWNX_PushArgumentInt(nNthLast); - NWNX_PushArgumentInt(nObjectType); - NWNX_CallFunction(NWNX_Util, sFunc); - - return NWNX_GetReturnValueObject(); + NWNXPushInt(nNthLast); + NWNXPushInt(nObjectType); + NWNXCall(NWNX_Util, "GetLastCreatedObject"); + return NWNXPopObject(); } string NWNX_Util_AddScript(string sFileName, string sScriptData, int bWrapIntoMain = FALSE, string sAlias = "NWNX") { - string sFunc = "AddScript"; - - NWNX_PushArgumentString(sAlias); - NWNX_PushArgumentInt(bWrapIntoMain); - NWNX_PushArgumentString(sScriptData); - NWNX_PushArgumentString(sFileName); - NWNX_CallFunction(NWNX_Util, sFunc); - - return NWNX_GetReturnValueString(); + NWNXPushString(sAlias); + NWNXPushInt(bWrapIntoMain); + NWNXPushString(sScriptData); + NWNXPushString(sFileName); + NWNXCall(NWNX_Util, "AddScript"); + return NWNXPopString(); } int NWNX_Util_AddNSSFile(string sFileName, string sContents, string sAlias = "NWNX") { - string sFunc = "AddNSSFile"; - - NWNX_PushArgumentString(sAlias); - NWNX_PushArgumentString(sContents); - NWNX_PushArgumentString(sFileName); - NWNX_CallFunction(NWNX_Util, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushString(sAlias); + NWNXPushString(sContents); + NWNXPushString(sFileName); + NWNXCall(NWNX_Util, "AddNSSFile"); + return NWNXPopInt(); } int NWNX_Util_RemoveNWNXResourceFile(string sFileName, int nType, string sAlias = "NWNX") { - string sFunc = "RemoveNWNXResourceFile"; - - NWNX_PushArgumentString(sAlias); - NWNX_PushArgumentInt(nType); - NWNX_PushArgumentString(sFileName); - NWNX_CallFunction(NWNX_Util, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushString(sAlias); + NWNXPushInt(nType); + NWNXPushString(sFileName); + NWNXCall(NWNX_Util, "RemoveNWNXResourceFile"); + return NWNXPopInt(); } void NWNX_Util_SetInstructionLimit(int nInstructionLimit) { - string sFunc = "SetInstructionLimit"; - - NWNX_PushArgumentInt(nInstructionLimit); - NWNX_CallFunction(NWNX_Util, sFunc); + NWNXPushInt(nInstructionLimit); + NWNXCall(NWNX_Util, "SetInstructionLimit"); } int NWNX_Util_GetInstructionLimit() { - string sFunc = "GetInstructionLimit"; - - NWNX_CallFunction(NWNX_Util, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_Util, "GetInstructionLimit"); + return NWNXPopInt(); } void NWNX_Util_SetInstructionsExecuted(int nInstructions) { - string sFunc = "SetInstructionsExecuted"; - - NWNX_PushArgumentInt(nInstructions); - NWNX_CallFunction(NWNX_Util, sFunc); + NWNXPushInt(nInstructions); + NWNXCall(NWNX_Util, "SetInstructionsExecuted"); } int NWNX_Util_GetInstructionsExecuted() { - string sFunc = "GetInstructionsExecuted"; - - NWNX_CallFunction(NWNX_Util, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_Util, "GetInstructionsExecuted"); + return NWNXPopInt(); } int NWNX_Util_RegisterServerConsoleCommand(string sCommand, string sScriptChunk) { - string sFunc = "RegisterServerConsoleCommand"; - - NWNX_PushArgumentString(sScriptChunk); - NWNX_PushArgumentString(sCommand); - NWNX_CallFunction(NWNX_Util, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushString(sScriptChunk); + NWNXPushString(sCommand); + NWNXCall(NWNX_Util, "RegisterServerConsoleCommand"); + return NWNXPopInt(); } void NWNX_Util_UnregisterServerConsoleCommand(string sCommand) { - string sFunc = "UnregisterServerConsoleCommand"; - - NWNX_PushArgumentString(sCommand); - NWNX_CallFunction(NWNX_Util, sFunc); -} - -int NWNX_Util_PluginExists(string sPlugin) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Util_PluginExists is deprecated. You should migrate to NWNX_PluginExists."); - return NWNX_PluginExists(sPlugin); + NWNXPushString(sCommand); + NWNXCall(NWNX_Util, "UnregisterServerConsoleCommand"); } string NWNX_Util_GetUserDirectory() { - string sFunc = "GetUserDirectory"; - NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueString(); + NWNXCall(NWNX_Util, "GetUserDirectory"); + return NWNXPopString(); } int NWNX_Util_GetScriptReturnValue() { - string sFunc = "GetScriptReturnValue"; - - NWNX_CallFunction(NWNX_Util, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXCall(NWNX_Util, "GetScriptReturnValue"); + return NWNXPopInt(); } object NWNX_Util_CreateDoor(string sResRef, location locLocation, string sNewTag = "", int nAppearanceType = -1) { - string sFunc = "CreateDoor"; - - vector vPosition = GetPositionFromLocation(locLocation); - - NWNX_PushArgumentInt(nAppearanceType); - NWNX_PushArgumentString(sNewTag); - NWNX_PushArgumentFloat(GetFacingFromLocation(locLocation)); - NWNX_PushArgumentFloat(vPosition.z); - NWNX_PushArgumentFloat(vPosition.y); - NWNX_PushArgumentFloat(vPosition.x); - NWNX_PushArgumentObject(GetAreaFromLocation(locLocation)); - NWNX_PushArgumentString(sResRef); - NWNX_CallFunction(NWNX_Util, sFunc); - - return NWNX_GetReturnValueObject(); + NWNXPushInt(nAppearanceType); + NWNXPushString(sNewTag); + NWNXPushLocation(locLocation); + NWNXPushString(sResRef); + NWNXCall(NWNX_Util, "CreateDoor"); + return NWNXPopObject(); } void NWNX_Util_SetItemActivator(object oObject) { - string sFunc = "SetItemActivator"; - - NWNX_PushArgumentObject(oObject); - NWNX_CallFunction(NWNX_Util, sFunc); + NWNXPushObject(oObject); + NWNXCall(NWNX_Util, "SetItemActivator"); } struct NWNX_Util_WorldTime NWNX_Util_GetWorldTime(float fAdjustment = 0.0f) { - string sFunc = "GetWorldTime"; - - NWNX_PushArgumentFloat(fAdjustment); - NWNX_CallFunction(NWNX_Util, sFunc); - + NWNXPushFloat(fAdjustment); + NWNXCall(NWNX_Util, "GetWorldTime"); struct NWNX_Util_WorldTime strWorldTime; - strWorldTime.nTimeOfDay = NWNX_GetReturnValueInt(); - strWorldTime.nCalendarDay = NWNX_GetReturnValueInt(); - + strWorldTime.nTimeOfDay = NWNXPopInt(); + strWorldTime.nCalendarDay = NWNXPopInt(); return strWorldTime; } void NWNX_Util_SetResourceOverride(int nResType, string sOldName, string sNewName) { - string sFunc = "SetResourceOverride"; - - NWNX_PushArgumentString(sNewName); - NWNX_PushArgumentString(sOldName); - NWNX_PushArgumentInt(nResType); - NWNX_CallFunction(NWNX_Util, sFunc); + NWNXPushString(sNewName); + NWNXPushString(sOldName); + NWNXPushInt(nResType); + NWNXCall(NWNX_Util, "SetResourceOverride"); } string NWNX_Util_GetResourceOverride(int nResType, string sName) { - string sFunc = "GetResourceOverride"; - - NWNX_PushArgumentString(sName); - NWNX_PushArgumentInt(nResType); - NWNX_CallFunction(NWNX_Util, sFunc); - - return NWNX_GetReturnValueString(); + NWNXPushString(sName); + NWNXPushInt(nResType); + NWNXCall(NWNX_Util, "GetResourceOverride"); + return NWNXPopString(); } int NWNX_Util_GetScriptParamIsSet(string sParamName) { - string sFunc = "GetScriptParamIsSet"; - - NWNX_PushArgumentString(sParamName); - NWNX_CallFunction(NWNX_Util, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushString(sParamName); + NWNXCall(NWNX_Util, "GetScriptParamIsSet"); + return NWNXPopInt(); } void NWNX_Util_SetDawnHour(int nDawnHour) { - string sFunc = "SetDawnHour"; + NWNXPushInt(nDawnHour); + NWNXCall(NWNX_Util, "SetDawnHour"); +} - NWNX_PushArgumentInt(nDawnHour); - NWNX_CallFunction(NWNX_Util, sFunc); +int NWNX_Util_GetDawnHour() +{ + NWNXCall(NWNX_Util, "GetDawnHour"); + return NWNXPopInt(); } void NWNX_Util_SetDuskHour(int nDuskHour) { - string sFunc = "SetDuskHour"; + NWNXPushInt(nDuskHour); + NWNXCall(NWNX_Util, "SetDuskHour"); +} - NWNX_PushArgumentInt(nDuskHour); - NWNX_CallFunction(NWNX_Util, sFunc); +int NWNX_Util_GetDuskHour() +{ + NWNXCall(NWNX_Util, "GetDuskHour"); + return NWNXPopInt(); } struct NWNX_Util_HighResTimestamp NWNX_Util_GetHighResTimeStamp() { struct NWNX_Util_HighResTimestamp t; - string sFunc = "GetHighResTimeStamp"; - - NWNX_CallFunction(NWNX_Util, sFunc); - t.microseconds = NWNX_GetReturnValueInt(); - t.seconds = NWNX_GetReturnValueInt(); + NWNXCall(NWNX_Util, "GetHighResTimeStamp"); + t.microseconds = NWNXPopInt(); + t.seconds = NWNXPopInt(); return t; } string NWNX_Util_GetTTY() { - string sFunc = "GetTTY"; - - NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueString(); + NWNXCall(NWNX_Util, "GetTTY"); + return NWNXPopString(); } void NWNX_Util_SetCurrentlyRunningEvent(int nEventID) { - string sFunc = "SetCurrentlyRunningEvent"; - - NWNX_PushArgumentInt(nEventID); - NWNX_CallFunction(NWNX_Util, sFunc); + NWNXPushInt(nEventID); + NWNXCall(NWNX_Util, "SetCurrentlyRunningEvent"); } int NWNX_Util_GetStringLevenshteinDistance(string sString, string sCompareTo) { - string sFunc = "LevenshteinDistance"; - - NWNX_PushArgumentString(sCompareTo); - NWNX_PushArgumentString(sString); - NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushString(sCompareTo); + NWNXPushString(sString); + NWNXCall(NWNX_Util, "GetStringLevenshteinDistance"); + return NWNXPopInt(); } void NWNX_Util_UpdateClientObject(object oObjectToUpdate, object oPlayer = OBJECT_INVALID) { - string sFunc = "UpdateClientObject"; - - NWNX_PushArgumentObject(oPlayer); - NWNX_PushArgumentObject(oObjectToUpdate); - NWNX_CallFunction(NWNX_Util, sFunc); + NWNXPushObject(oPlayer); + NWNXPushObject(oObjectToUpdate); + NWNXCall(NWNX_Util, "UpdateClientObject"); } int NWNX_Util_CleanResourceDirectory(string sAlias, int nResType = 0xFFFF) { - string sFunc = "CleanResourceDirectory"; - NWNX_PushArgumentInt(nResType); - NWNX_PushArgumentString(sAlias); - NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueInt(); + NWNXPushInt(nResType); + NWNXPushString(sAlias); + NWNXCall(NWNX_Util, "CleanResourceDirectory"); + return NWNXPopInt(); } string NWNX_Util_GetModuleTlkFile() { string sFunc = "GetModuleTlkFile"; - NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueString(); + NWNXCall(NWNX_Util, sFunc); + return NWNXPopString(); +} + +int NWNX_Util_UpdateResourceDirectory(string sAlias) +{ + NWNXPushString(sAlias); + NWNXCall(NWNX_Util, "UpdateResourceDirectory"); + return NWNXPopInt(); } diff --git a/_module/nss/nwnx_visibility.nss b/_module/nss/nwnx_visibility.nss index 3ef03b1f..be70ed0c 100644 --- a/_module/nss/nwnx_visibility.nss +++ b/_module/nss/nwnx_visibility.nss @@ -2,7 +2,6 @@ /// @brief Functions to manipulate visibility of objects both globally or per observer /// @{ /// @file nwnx_visibility.nss -#include "nwnx" const string NWNX_Visibility = "NWNX_Visibility"; ///< @private @@ -57,21 +56,16 @@ void NWNX_Visibility_SetVisibilityOverride(object oPlayer, object oTarget, int n int NWNX_Visibility_GetVisibilityOverride(object oPlayer, object oTarget) { - string sFunc = "GetVisibilityOverride"; - - NWNX_PushArgumentObject(oTarget); - NWNX_PushArgumentObject(oPlayer); - NWNX_CallFunction(NWNX_Visibility, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oTarget); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Visibility, "GetVisibilityOverride"); + return NWNXPopInt(); } void NWNX_Visibility_SetVisibilityOverride(object oPlayer, object oTarget, int nOverride) { - string sFunc = "SetVisibilityOverride"; - - NWNX_PushArgumentInt(nOverride); - NWNX_PushArgumentObject(oTarget); - NWNX_PushArgumentObject(oPlayer); - NWNX_CallFunction(NWNX_Visibility, sFunc); + NWNXPushInt(nOverride); + NWNXPushObject(oTarget); + NWNXPushObject(oPlayer); + NWNXCall(NWNX_Visibility, "SetVisibilityOverride"); } diff --git a/_module/nss/nwnx_weapon.nss b/_module/nss/nwnx_weapon.nss index 8470d9ff..eced73f0 100644 --- a/_module/nss/nwnx_weapon.nss +++ b/_module/nss/nwnx_weapon.nss @@ -2,7 +2,6 @@ /// @brief Functions exposing additional weapon properties. /// @{ /// @file nwnx_weapon.nss -#include "nwnx" const string NWNX_Weapon = "NWNX_Weapon"; ///< @private @@ -138,214 +137,152 @@ void NWNX_Weapon_SetMaxRangedAttackDistanceOverride(int nBaseItem, float fMax, f void NWNX_Weapon_SetWeaponFocusFeat(int nBaseItem, int nFeat) { - string sFunc = "SetWeaponFocusFeat"; - - NWNX_PushArgumentInt(nFeat); - NWNX_PushArgumentInt(nBaseItem); - - NWNX_CallFunction(NWNX_Weapon, sFunc); + NWNXPushInt(nFeat); + NWNXPushInt(nBaseItem); + NWNXCall(NWNX_Weapon, "SetWeaponFocusFeat"); } void NWNX_Weapon_SetEpicWeaponFocusFeat(int nBaseItem, int nFeat) { - string sFunc = "SetEpicWeaponFocusFeat"; - - NWNX_PushArgumentInt(nFeat); - NWNX_PushArgumentInt(nBaseItem); - - NWNX_CallFunction(NWNX_Weapon, sFunc); + NWNXPushInt(nFeat); + NWNXPushInt(nBaseItem); + NWNXCall(NWNX_Weapon, "SetEpicWeaponFocusFeat"); } void NWNX_Weapon_SetGreaterWeaponFocusFeat(int nBaseItem, int nFeat) { - string sFunc = "SetGreaterWeaponFocusFeat"; - - NWNX_PushArgumentInt(nFeat); - NWNX_PushArgumentInt(nBaseItem); - - NWNX_CallFunction(NWNX_Weapon, sFunc); + NWNXPushInt(nFeat); + NWNXPushInt(nBaseItem); + NWNXCall(NWNX_Weapon, "SetGreaterWeaponFocusFeat"); } void NWNX_Weapon_SetWeaponFinesseSize(int nBaseItem, int nSize) { - string sFunc = "SetWeaponFinesseSize"; - - NWNX_PushArgumentInt(nSize); - NWNX_PushArgumentInt(nBaseItem); - - NWNX_CallFunction(NWNX_Weapon, sFunc); + NWNXPushInt(nSize); + NWNXPushInt(nBaseItem); + NWNXCall(NWNX_Weapon, "SetWeaponFinesseSize"); } int NWNX_Weapon_GetWeaponFinesseSize(int nBaseItem) { - string sFunc = "GetWeaponFinesseSize"; - - NWNX_PushArgumentInt(nBaseItem); - - NWNX_CallFunction(NWNX_Weapon, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushInt(nBaseItem); + NWNXCall(NWNX_Weapon, "GetWeaponFinesseSize"); + return NWNXPopInt(); } void NWNX_Weapon_SetWeaponUnarmed(int nBaseItem) { - string sFunc = "SetWeaponUnarmed"; - - NWNX_PushArgumentInt(nBaseItem); - - NWNX_CallFunction(NWNX_Weapon, sFunc); + NWNXPushInt(nBaseItem); + NWNXCall(NWNX_Weapon, "SetWeaponUnarmed"); } void NWNX_Weapon_SetWeaponIsMonkWeapon(int nBaseItem) { WriteTimestampedLogEntry("NWNX_Weapon_SetWeaponIsMonkWeapon() is deprecated. Please use baseitems.2da instead."); - - string sFunc = "SetWeaponIsMonkWeapon"; - - NWNX_PushArgumentInt(nBaseItem); - - NWNX_CallFunction(NWNX_Weapon, sFunc); + NWNXPushInt(nBaseItem); + NWNXCall(NWNX_Weapon, "SetWeaponIsMonkWeapon"); } void NWNX_Weapon_SetWeaponImprovedCriticalFeat(int nBaseItem, int nFeat) { - string sFunc = "SetWeaponImprovedCriticalFeat"; - - NWNX_PushArgumentInt(nFeat); - NWNX_PushArgumentInt(nBaseItem); - - NWNX_CallFunction(NWNX_Weapon, sFunc); + NWNXPushInt(nFeat); + NWNXPushInt(nBaseItem); + NWNXCall(NWNX_Weapon, "SetWeaponImprovedCriticalFeat"); } void NWNX_Weapon_SetWeaponSpecializationFeat(int nBaseItem, int nFeat) { - string sFunc = "SetWeaponSpecializationFeat"; - - NWNX_PushArgumentInt(nFeat); - NWNX_PushArgumentInt(nBaseItem); - - NWNX_CallFunction(NWNX_Weapon, sFunc); + NWNXPushInt(nFeat); + NWNXPushInt(nBaseItem); + NWNXCall(NWNX_Weapon, "SetWeaponSpecializationFeat"); } void NWNX_Weapon_SetGreaterWeaponSpecializationFeat(int nBaseItem, int nFeat) { - string sFunc = "SetGreaterWeaponSpecializationFeat"; - - NWNX_PushArgumentInt(nFeat); - NWNX_PushArgumentInt(nBaseItem); - - NWNX_CallFunction(NWNX_Weapon, sFunc); + NWNXPushInt(nFeat); + NWNXPushInt(nBaseItem); + NWNXCall(NWNX_Weapon, "SetGreaterWeaponSpecializationFeat"); } void NWNX_Weapon_SetEpicWeaponSpecializationFeat(int nBaseItem, int nFeat) { - string sFunc = "SetEpicWeaponSpecializationFeat"; - - NWNX_PushArgumentInt(nFeat); - NWNX_PushArgumentInt(nBaseItem); - - NWNX_CallFunction(NWNX_Weapon, sFunc); + NWNXPushInt(nFeat); + NWNXPushInt(nBaseItem); + NWNXCall(NWNX_Weapon, "SetEpicWeaponSpecializationFeat"); } void NWNX_Weapon_SetEpicWeaponOverwhelmingCriticalFeat(int nBaseItem, int nFeat) { - string sFunc = "SetEpicWeaponOverwhelmingCriticalFeat"; - - NWNX_PushArgumentInt(nFeat); - NWNX_PushArgumentInt(nBaseItem); - - NWNX_CallFunction(NWNX_Weapon, sFunc); + NWNXPushInt(nFeat); + NWNXPushInt(nBaseItem); + NWNXCall(NWNX_Weapon, "SetEpicWeaponOverwhelmingCriticalFeat"); } void NWNX_Weapon_SetEpicWeaponDevastatingCriticalFeat(int nBaseItem, int nFeat) { - string sFunc = "SetEpicWeaponDevastatingCriticalFeat"; - - NWNX_PushArgumentInt(nFeat); - NWNX_PushArgumentInt(nBaseItem); - - NWNX_CallFunction(NWNX_Weapon, sFunc); + NWNXPushInt(nFeat); + NWNXPushInt(nBaseItem); + NWNXCall(NWNX_Weapon, "SetEpicWeaponDevastatingCriticalFeat"); } void NWNX_Weapon_SetWeaponOfChoiceFeat(int nBaseItem, int nFeat) { - string sFunc = "SetWeaponOfChoiceFeat"; - - NWNX_PushArgumentInt(nFeat); - NWNX_PushArgumentInt(nBaseItem); - - NWNX_CallFunction(NWNX_Weapon, sFunc); + NWNXPushInt(nFeat); + NWNXPushInt(nBaseItem); + NWNXCall(NWNX_Weapon, "SetWeaponOfChoiceFeat"); } void NWNX_Weapon_SetOption(int nOption, int nVal) { - string sFunc = "SetOption"; - - NWNX_PushArgumentInt(nVal); - NWNX_PushArgumentInt(nOption); - - NWNX_CallFunction(NWNX_Weapon, sFunc); + NWNXPushInt(nVal); + NWNXPushInt(nOption); + NWNXCall(NWNX_Weapon, "SetOption"); } void NWNX_Weapon_SetDevastatingCriticalEventScript(string sScript) { - string sFunc = "SetDevastatingCriticalEventScript"; - - NWNX_PushArgumentString(sScript); - - NWNX_CallFunction(NWNX_Weapon, sFunc); + NWNXPushString(sScript); + NWNXCall(NWNX_Weapon, "SetDevastatingCriticalEventScript"); } void NWNX_Weapon_BypassDevastatingCritical() { - string sFunc = "SetEventData"; - - NWNX_PushArgumentInt(1); - NWNX_PushArgumentInt(NWNX_WEAPON_SETDATA_DC_BYPASS); - - NWNX_CallFunction(NWNX_Weapon, sFunc); + NWNXPushInt(1); + NWNXPushInt(NWNX_WEAPON_SETDATA_DC_BYPASS); + NWNXCall(NWNX_Weapon, "SetEventData"); } struct NWNX_Weapon_DevastatingCriticalEvent_Data NWNX_Weapon_GetDevastatingCriticalEventData() { - string sFunc = "GetEventData"; struct NWNX_Weapon_DevastatingCriticalEvent_Data data; - - NWNX_PushArgumentInt(NWNX_WEAPON_GETDATA_DC); - NWNX_CallFunction(NWNX_Weapon, sFunc); - - data.oWeapon = NWNX_GetReturnValueObject(); - data.oTarget = NWNX_GetReturnValueObject(); - data.nDamage = NWNX_GetReturnValueInt(); - + NWNXPushInt(NWNX_WEAPON_GETDATA_DC); + NWNXCall(NWNX_Weapon, "GetEventData"); + data.oWeapon = NWNXPopObject(); + data.oTarget = NWNXPopObject(); + data.nDamage = NWNXPopInt(); return data; } void NWNX_Weapon_SetOneHalfStrength(object oWeapon, int nEnable, int bPersist = FALSE) { - string sFunc = "SetOneHalfStrength"; - NWNX_PushArgumentInt(bPersist); - NWNX_PushArgumentInt(nEnable); - NWNX_PushArgumentObject(oWeapon); - NWNX_CallFunction(NWNX_Weapon, sFunc); + NWNXPushInt(bPersist); + NWNXPushInt(nEnable); + NWNXPushObject(oWeapon); + NWNXCall(NWNX_Weapon, "SetOneHalfStrength"); } int NWNX_Weapon_GetOneHalfStrength(object oWeapon) { - string sFunc = "GetOneHalfStrength"; - NWNX_PushArgumentObject(oWeapon); - NWNX_CallFunction(NWNX_Weapon, sFunc); - - return NWNX_GetReturnValueInt(); + NWNXPushObject(oWeapon); + NWNXCall(NWNX_Weapon, "GetOneHalfStrength"); + return NWNXPopInt(); } void NWNX_Weapon_SetMaxRangedAttackDistanceOverride(int nBaseItem, float fMax, float fMaxPassive, float fPreferred) { - string sFunc = "SetMaxRangedAttackDistanceOverride"; - - NWNX_PushArgumentFloat(fPreferred); - NWNX_PushArgumentFloat(fMaxPassive); - NWNX_PushArgumentFloat(fMax); - NWNX_PushArgumentInt(nBaseItem); - NWNX_CallFunction(NWNX_Weapon, sFunc); + NWNXPushFloat(fPreferred); + NWNXPushFloat(fMaxPassive); + NWNXPushFloat(fMax); + NWNXPushInt(nBaseItem); + NWNXCall(NWNX_Weapon, "SetMaxRangedAttackDistanceOverride"); } diff --git a/_module/nss/nwnx_webhook.nss b/_module/nss/nwnx_webhook.nss index f1f2e82f..2d7e7ed0 100644 --- a/_module/nss/nwnx_webhook.nss +++ b/_module/nss/nwnx_webhook.nss @@ -2,7 +2,6 @@ /// @brief Send messages to external entities through web hooks. /// @{ /// @file nwnx_webhook.nss -#include "nwnx" const string NWNX_WebHook = "NWNX_WebHook"; ///< @private @@ -28,13 +27,12 @@ void NWNX_WebHook_ResendWebHookHTTPS(string host, string path, string sMessage, void NWNX_WebHook_SendWebHookHTTPS(string host, string path, string message, string username = "", int mrkdwn = 1) { - string sFunc = "SendWebHookHTTPS"; - NWNX_PushArgumentInt(mrkdwn); - NWNX_PushArgumentString(username); - NWNX_PushArgumentString(message); - NWNX_PushArgumentString(path); - NWNX_PushArgumentString(host); - NWNX_CallFunction(NWNX_WebHook, sFunc); + NWNXPushInt(mrkdwn); + NWNXPushString(username); + NWNXPushString(message); + NWNXPushString(path); + NWNXPushString(host); + NWNXCall(NWNX_WebHook, "SendWebHookHTTPS"); } void NWNX_WebHook_ResendWebHookHTTPS(string host, string path, string sMessage, float delay = 0.0f) diff --git a/_module/ra_tdog.mod b/_module/ra_tdog.mod index c5ded0d1..3dc2b4c3 100644 Binary files a/_module/ra_tdog.mod and b/_module/ra_tdog.mod differ